Index: hadoop-register/new_register.php
===================================================================
--- hadoop-register/new_register.php	(revision 61)
+++ hadoop-register/new_register.php	(revision 62)
@@ -17,8 +17,15 @@
 	  return false;
 	}
+	if ( (document.myForm.password.value) != (document.myForm.checkPassword.value) )
+	{
+	  alert("密碼不相符");
+	  return false;
+	}
 
-	if (document.myForm.email.value.length == 0)
+	var mailString = document.myForm.email.value;
+        var pattern=/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;	
+	if (!pattern.exec(mailString) )
 	{
-	  alert("E-mail不可空白");
+	  alert(mailString + " : E-mail 格式錯誤");
 	  return false;
 	}
@@ -53,60 +60,66 @@
   </HEAD>
 
-    <BODY>
-        <P ALIGN="center"> Hadoop 帳號申請表格 </P>
-        <FORM ACTION="adduser.php" METHOD="post" NAME="myForm">
-            <TABLE WIDTH="40%" ALIGN="center">
-                <TR> 
-                    <TD ALIGN="center"> 
-                        <FONT COLOR="#3333FF">帳號：</FONT> 
-                        <INPUT NAME="user" TYPE="text" SIZE="20">
-                    </TD>
-                </TR>
-                <TR> 
-                    <TD ALIGN="center"> 
-                        <FONT COLOR="#3333FF">密碼：</FONT> 
-                        <INPUT NAME="password" TYPE="password" SIZE="20">
-                    </TD>
-                </TR>
-                <TR> 
-                    <TD ALIGN="center"> 
-                        <FONT COLOR="#3333FF">E-mail：</FONT> 
-                        <INPUT NAME="email" TYPE="text" SIZE="30">
-                    </TD>
-                </TR>
-                <TR> 
-                    <TD ALIGN="center"> 
-                        <FONT COLOR="#3333FF">姓名：</FONT> 
-                        <INPUT NAME="name" TYPE="text" SIZE="20">
-                    </TD>
-                </TR>
-                <TR> 
-                    <TD ALIGN="center"> 
-                        <FONT COLOR="#3333FF">電話：</FONT> 
-                        <INPUT NAME="telephone" TYPE="text" SIZE="20">
-                    </TD>
-                </TR>
-                <TR> 
-                    <TD ALIGN="center"> 
-                        <FONT COLOR="#3333FF">單位：</FONT> 
-                        <INPUT NAME="department" TYPE="text" SIZE="30">
-                    </TD>
-                </TR>
-                <TR> 
-                    <TD ALIGN="center"> 
-                        <FONT COLOR="#3333FF">用途：</FONT> 
-                        <INPUT NAME="purpose" TYPE="text" SIZE="30">
-                    </TD>
-                </TR>
-                <TR>
-                    <TD ALIGN="center"> 
-              			<INPUT TYPE="button" VALUE="送出" onClick="check_data()"> 
-              			<INPUT TYPE="reset" VALUE="重填">
-					</TD>
-        		</TR>
-      		</TABLE>
-		</FORM>
+  <BODY>
+    <P ALIGN="center"> Hadoop 帳號申請表格 </P>
+    <FORM ACTION="adduser.php" METHOD="post" NAME="myForm">
+    <TABLE WIDTH="40%" ALIGN="center">
+      <TR> 
+        <TD ALIGN="center"> 
+          <FONT COLOR="#3333FF">帳號：</FONT> 
+          <INPUT NAME="user" TYPE="text" SIZE="20">
+        </TD>
+      </TR>
+      <TR> 
+	<TD ALIGN="center"> 
+	  <FONT COLOR="#3333FF">密碼：</FONT> 
+	  <INPUT NAME="password" TYPE="password" SIZE="20">
+	</TD>
+      </TR>
+      <TR> 
+      <TR> 
+	<TD ALIGN="center"> 
+	  <FONT COLOR="#3333FF">確認密碼：</FONT> 
+	  <INPUT NAME="checkPassword" TYPE="checkPassword" SIZE="20">
+	</TD>
+      </TR>
+	<TD ALIGN="center"> 
+	  <FONT COLOR="#3333FF">E-mail：</FONT> 
+          <INPUT NAME="email" TYPE="text" SIZE="30">
+        </TD>
+      </TR>
+      <TR> 
+	<TD ALIGN="center"> 
+	  <FONT COLOR="#3333FF">姓名：</FONT> 
+          <INPUT NAME="name" TYPE="text" SIZE="20">
+	</TD>
+      </TR>
+      <TR> 
+        <TD ALIGN="center"> 
+          <FONT COLOR="#3333FF">電話：</FONT> 
+          <INPUT NAME="telephone" TYPE="text" SIZE="20">
+        </TD>
+      </TR>
+      <TR> 
+	<TD ALIGN="center"> 
+	  <FONT COLOR="#3333FF">單位：</FONT> 
+          <INPUT NAME="department" TYPE="text" SIZE="30">
+        </TD>
+      </TR>
+        <TR> 
+          <TD ALIGN="center"> 
+            <FONT COLOR="#3333FF">用途：</FONT> 
+            <INPUT NAME="purpose" TYPE="text" SIZE="30">
+          </TD>
+        </TR>
+        <TR>
+          <TD ALIGN="center"> 
+	    <INPUT TYPE="button" VALUE="送出" onClick="check_data()"> 
+            <INPUT TYPE="reset" VALUE="重填">
+	  </TD>
+        </TR>
+      </TABLE>
+    </FORM>
     <P ALIGN="center">&nbsp;</P>
-	</BODY>
+  </BODY>
 </HTML>
 
