Index: /hadoop-register/adduser.php
===================================================================
--- /hadoop-register/adduser.php	(revision 84)
+++ /hadoop-register/adduser.php	(revision 85)
@@ -28,4 +28,4 @@
 	$my_user->operator = "identification";          // user 需要發認證信服務
 	include ("smtp_mail.php");
-	$my_user->redirect_to("http://$w_localhost", "認證信寄送完畢");
+	$my_user->redirect_to("$w_localhost", "認證信寄送完畢");
 ?>
Index: /hadoop-register/check_activate_code.php
===================================================================
--- /hadoop-register/check_activate_code.php	(revision 84)
+++ /hadoop-register/check_activate_code.php	(revision 85)
@@ -1,62 +1,68 @@
 <?
-	/* 
-	 * 驗證使用者身份及信箱是否正確 
-	 */
+    /* 
+     * 驗證使用者身份及信箱是否正確 
+     */
 
-	require_once ("./etc/init.php");
-	include_once ("./etc/funs.php");
+    require_once ("./etc/init.php");
+    include_once ("./etc/funs.php");
 
     $receiver_user = $_GET["user"];
     $receiver_act = $_GET["act"];
 
-	// 連結資料庫
-	$link = mysql_connect($mysql_host, $mysql_user, $mysql_password) or die(mysql_error() );
-	mysql_select_db($mysql_database, $link) or die(mysql_error() );
-	mysql_query("SET NAMES 'utf8'");
+    // 連結資料庫
+    $link = mysql_connect($mysql_host, $mysql_user, $mysql_password) or die(mysql_error() );
+    mysql_select_db($mysql_database, $link) or die(mysql_error() );
+    mysql_query("SET NAMES 'utf8'");
 
-	// 抓取使用者認證碼
-    $str = sprintf("SELECT `activate_code`, `email` FROM `%s` WHERE `user` LIKE '%s' limit 1", $mysql_table, $receiver_user);
+    // 抓取使用者認證碼
+    $str = sprintf("SELECT `activate_code`, `is_activate`, `email` FROM `%s` WHERE `user` LIKE '%s' limit 1", $mysql_table, $receiver_user);
     $result = mysql_query($str , $link);
-
     $row = mysql_fetch_assoc($result);
 
-	$my_user = new W_user;
+    $my_user = new W_user;
 
-	// 如果通過驗證
-	if ( ($row["activate_code"] == $receiver_act) &&  ($receiver_act != null) )
-	{
-		$my_user->email = $row["email"];
-		// 分配一組 hadoop 帳號密碼給 user
-		$str = sprintf("SELECT `hadoop_user` , `hadoop_password` 
-						FROM `%s` 
-						WHERE `hadoop_owner` LIKE '' 
-						LIMIT 1 ",$mysql_table_owner );
-		$result = mysql_query($str, $link) or die(mysql_error() );
-		$row = mysql_fetch_assoc($result);
-		$my_user->hadoop_user = $row["hadoop_user"];
-		$my_user->hadoop_password = $row["hadoop_password"];
-		// 更新 hadoop 帳號擁有者資料庫
-		$str = sprintf("UPDATE `%s` SET `hadoop_owner` = '%s' 
-						WHERE `hadoop_user` LIKE '%s' limit 1", 
-						$mysql_table_owner, $receiver_user, $my_user->hadoop_user); 
+    // 如果已認證就不再寄認證信
+    if ($row["is_activate"] == 1)
+    {
+	$my_user->redirect_to("$w_localhost", "你已經通過驗證"); 
+    }
+    // 如果通過驗證
+    else if ( ($row["activate_code"] == $receiver_act) &&  ($receiver_act != null) )
+    {
+	$my_user->email = $row["email"];
+	// 分配一組 hadoop 帳號密碼給 user
+	$str = sprintf("SELECT `hadoop_user` , `hadoop_password` 
+			FROM `%s` 
+			WHERE `hadoop_owner` LIKE '' 
+			LIMIT 1 ",$mysql_table_owner );
+	$result = mysql_query($str, $link) or die(mysql_error() );
+	$row = mysql_fetch_assoc($result);
+	$my_user->hadoop_user = $row["hadoop_user"];
+	$my_user->hadoop_password = $row["hadoop_password"];
+	// 更新 hadoop 帳號擁有者資料庫
+	$str = sprintf("UPDATE `%s` SET `hadoop_owner` = '%s' 
+			WHERE `hadoop_user` LIKE '%s' limit 1", 
+			$mysql_table_owner, $receiver_user, $my_user->hadoop_user); 
         mysql_query($str, $link) or die(mysql_error() );
-		// 寄送 hadoop 帳號密碼信至使用者信箱
-		$my_user->operator = "hadoop_user_password";
-		include ("smtp_mail.php");
+	
+	// 寄送 hadoop 帳號密碼信至使用者信箱
+	$my_user->operator = "hadoop_user_password";
+	include ("smtp_mail.php");
 
-		// 將使用者設為已認證
-		$str = sprintf("UPDATE `%s` SET `is_activate` = 1 
-						WHERE `user` LIKE '%s' limit 1", $mysql_table, $receiver_user); 
-		mysql_query($str, $link) or die(mysql_error() );
-		
-		// 重新導向 localhost
-		$my_user->redirect_to("http://$w_localhost", "驗證成功"); 
-	}
-	// 沒有通過驗證
-	else 
-	{
-       	// 重新導向 localhost
-        $my_user->redirect_to("http://$w_localhost", "驗證碼錯誤");
-	}
-	mysql_close($link); 	
+	// 將使用者設為已認證
+	$str = sprintf("UPDATE `%s` SET `is_activate` = 1 
+			WHERE `user` LIKE '%s' limit 1", $mysql_table, $receiver_user); 
+	mysql_query($str, $link) or die(mysql_error() );
+	
+	// 重新導向 localhost
+	$my_user->redirect_to("$w_localhost", "驗證成功"); 
+    }
+    // 沒有通過驗證
+    else 
+    {
+	// 重新導向 localhost
+	$my_user->redirect_to("$w_localhost", "驗證碼錯誤");
+    }
+
+    mysql_close($link); 	
 ?>
Index: /hadoop-register/check_user_identification.php
===================================================================
--- /hadoop-register/check_user_identification.php	(revision 84)
+++ /hadoop-register/check_user_identification.php	(revision 85)
@@ -85,5 +85,5 @@
   {
     $my_user = new W_user();
-    $my_user->redirect_to("http://$w_localhost", "帳號密碼錯誤");
+    $my_user->redirect_to("$w_localhost", "帳號密碼錯誤");
   }
   mysql_close($link);
Index: /hadoop-register/etc/funs.php
===================================================================
--- /hadoop-register/etc/funs.php	(revision 84)
+++ /hadoop-register/etc/funs.php	(revision 85)
@@ -17,5 +17,5 @@
     {
       header ("refresh:5 ;url=$w_url");
-      echo '<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">"';
+      echo '<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">';
       echo "<BR> 此網頁將於 5 秒後重新導向 <BR>";
       echo "<BR> ======== System Message ========";
@@ -35,5 +35,5 @@
 	      <br>
 	      ';
-      $str .= "<br><A href=http://" . "$w_localhost" . "check_activate_code.php?user=" .
+      $str .= "<br><A href=" . "$w_localhost" . "/check_activate_code.php?user=" .
       $this->user . "&" . "act=" . $this->activate_code . ">啟動 Hadoop 帳號</A>";
       return $str;
@@ -56,5 +56,5 @@
 	      <br>帳號：$this->user
 	      <br>密碼：$this->new_password
-	      <br>登入 http://$w_localhost。
+	      <br>登入：$w_localhost
 	      ";
       return $str;
@@ -100,5 +100,5 @@
       echo "<br>========";
       echo "<br>this is in W_user->test() <br>";
-      $str = "<br><A href=http://" . "$w_localhost" . "check_activate_code.php?user=" .
+      $str = "<br><A href=" . "$w_localhost" . "/check_activate_code.php?user=" .
       $this->user . "&" . "act=" . $this->activate_code . ">啟動 Hadoop 帳號</A>";
       //echo $this->user;
Index: /hadoop-register/etc/init.php
===================================================================
--- /hadoop-register/etc/init.php	(revision 84)
+++ /hadoop-register/etc/init.php	(revision 85)
@@ -6,10 +6,10 @@
      */
 	
-	// [本機設定]	
-	// 設定主機網址
-	$w_localhost = "hadoop.nchc.org.tw/";
+    // [本機設定]	
+    // 設定主機網址
+    $w_localhost = "http://hadoop.nchc.org.tw";
 	
 
-	// [mysql 設定]
+    // [mysql 設定]
     // mysql 主機位址
 	$mysql_host = 'localhost';
@@ -25,13 +25,13 @@
   
     // mysql 資料表
-    $mysql_table = 'hadoop_reg';				// 基本使用者資料表
-	$mysql_table_owner = 'hadoop_owner';	// hadoop 帳號分配擁有者
+    $mysql_table = 'hadoop_reg';		// 基本使用者資料表
+    $mysql_table_owner = 'hadoop_owner';	// hadoop 帳號分配擁有者
    
     // [mail 設定]
-	// mail server host
-	$mail_server_host = 'smtp.gmail.com';
+    // mail server host
+    $mail_server_host = 'smtp.gmail.com';
 
-	// mail account
-	$mail_account = 'nchcdrbl@gmail.com';
+    // mail account
+    $mail_account = 'nchcdrbl@gmail.com';
     $mail_account_name = 'Hadoop admin';
 
Index: /hadoop-register/forget_password.php
===================================================================
--- /hadoop-register/forget_password.php	(revision 84)
+++ /hadoop-register/forget_password.php	(revision 85)
@@ -88,9 +88,9 @@
       $my_user->operator = "new_password";		// user 需要更新密碼
       include ("smtp_mail.php");
-      $my_user->redirect_to("http://$w_localhost", "新密碼寄送完畢");
+      $my_user->redirect_to("$w_localhost", "新密碼寄送完畢");
     }
     else
     {
-      $my_user->redirect_to("http://$w_localhost", "帳號與密碼不符合");
+      $my_user->redirect_to("$w_localhost", "帳號與密碼不符合");
     }
   }
Index: /hadoop-register/re_send_activate_code.php
===================================================================
--- /hadoop-register/re_send_activate_code.php	(revision 84)
+++ /hadoop-register/re_send_activate_code.php	(revision 85)
@@ -29,5 +29,5 @@
 	$my_user->operator = "identification";          // user 需要發認證信服務
 	include ("smtp_mail.php");
-	$my_user->redirect_to("http://$w_localhost", "認證碼更新完畢"); 	
+	$my_user->redirect_to("$w_localhost", "認證碼更新完畢"); 	
 ?>
 
Index: /hadoop-register/smtp_mail.php
===================================================================
--- /hadoop-register/smtp_mail.php	(revision 84)
+++ /hadoop-register/smtp_mail.php	(revision 85)
@@ -71,8 +71,8 @@
 	$message = "Mailer Error: " . $mail->ErrorInfo;
 	echo "<BR>" . $message;
-  	// $my_user->redirect_to("http://$w_localhost", $message); 
+  	// $my_user->redirect_to("$w_localhost", $message); 
 } else {
     // $message = "Message sent!"; 
-    // $my_user->redirect_to("http://$w_localhost", $error_message);
+    // $my_user->redirect_to("$w_localhost", $error_message);
 }