Index: /hadoop-register/check_user_identification.php
===================================================================
--- /hadoop-register/check_user_identification.php	(revision 81)
+++ /hadoop-register/check_user_identification.php	(revision 82)
@@ -2,89 +2,89 @@
 /*
 <HEAD>
-	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-	<TITLE>Hadoop 帳號</TITLE>
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+  <TITLE>Hadoop 帳號</TITLE>
 </HEAD>
 */
 ?>
 <?
-	/*
-	 * 取得由 index.php 傳來的表單資料，並驗證使用者身份。 
-	 */
+  /*
+   * 取得由 index.php 傳來的表單資料，並驗證使用者身份。
+   * 20090520 增加 hadoop_user、hadoop_password 的 input tag
+   */
 
-	require_once ("./etc/init.php");
-	include_once ("./etc/funs.php");
+  require_once ("./etc/init.php");
+  include_once ("./etc/funs.php");
 	
-	// 取得表單資料
-	$user = $_POST["user"];
-	$password = md5($_POST["password"]);
+  // 取得表單資料
+  $user = $_POST["user"];
+  $password = md5($_POST["password"]);
 
-	// 連結資料庫
-	$link = mysql_connect($mysql_host, $mysql_user, $mysql_password) or die(mysql_error() );
-	mysql_select_db($mysql_database, $link);
-	mysql_query("SET NAMES 'utf8'");
+  // 連結資料庫
+  $link = mysql_connect($mysql_host, $mysql_user, $mysql_password) or die(mysql_error() );
+  mysql_select_db($mysql_database, $link);
+  mysql_query("SET NAMES 'utf8'");
 
-	// 驗證帳號密碼是否正確
-	$str = sprintf("SELECT * FROM `%s` 
-					WHERE `user` LIKE '%s' AND `password` LIKE '%s' limit 1", 
-					$mysql_table, $user ,$password);
-	$result = mysql_query($str, $link) or die(mysql_error() );
+  // 驗證帳號密碼是否正確
+  $str = sprintf("SELECT * FROM `%s` 
+		  WHERE `user` LIKE '%s' AND `password` LIKE '%s' limit 1", 
+		  $mysql_table, $user ,$password);
 
-	// 顯示使用者資料
-	$row = mysql_fetch_assoc($result);
-	if ($row["password"] == $password) 
-	{
-		echo '<TABLE ALIGN="center" BORDER="1">';
-		echo '<TR> <TD> 帳號 </TD> <TD>' . $row["user"] . '</TD> <TR>';
-		if ($row["is_activate"] == 0)
-		{
-			echo '<TR> <TD> 認證 </TD> <TD> <FONT COLOR="#FF000000"> 未認證 </FONT> -- <A HREF=re_send_activate_code.php?user=' . "$user" . "&email=" . $row["email"] . ">重寄認證信</A> </TD> <TR>";
-		}
-		else
-		{
-		    // 讀取使用者 hadoop 帳號
-		    $str = sprintf("SELECT `hadoop_user` FROM `%s` 
-            				WHERE `hadoop_owner` LIKE '%s' limit 1",
-            				$mysql_table_owner, $user ,$password);
-    		$result = mysql_query($str, $link) or die(mysql_error() );
-			$row1 = mysql_fetch_assoc($result);
-			echo '<TR> <TD> Hadoop 帳號 </TD> <TD>' . $row1["hadoop_user"] . '</TD> <TR>';
-		}
-		echo '<TR> <TD> E-mail </TD> <TD>' . $row["email"]       . '</TD> <TR>';
-		echo '<TR> <TD> 姓名   </TD> <TD>' . $row["name"]        . '</TD> <TR>';
-		echo '<TR> <TD> 電話   </TD> <TD>' . $row["telephone"]   . '</TD> <TR>';
-		echo '<TR> <TD> 單位   </TD> <TD>' . $row["department"]  . '</TD> <TR>';
-		echo '<TR> <TD> 用途   </TD> <TD>' . $row["purpose"]     . '</TD> <TR>';
-		echo '</TABLE>';
-		/* 
-        echo '
-			<FORM ACTION="check_user_identification.php" METHOD="post" NAME="myForm">
-            <TABLE WIDTH="40%" ALIGN="center">
-                <TR><TD ALIGN="center">
-                	<FONT COLOR="#3333FF">修改密碼：</FONT>
-                    <INPUT NAME="password" TYPE="password" SIZE="15">
-                </TD></TR>
-                <TR><TD ALIGN="center">
-                    <FONT COLOR="#3333FF">再次確認密碼：</FONT>
-                    <INPUT NAME="password" TYPE="password" SIZE="15">
-                </TD></TR>
-                <TR><TD ALIGN="center">
-                        <FONT COLOR="#3333FF">修改Email：</FONT>
-                        <INPUT NAME="password" TYPE="password" SIZE="15">
-                </TD></TR>
-                <TR><TD ALIGN="center">
-                        <INPUT TYPE="button" VALUE="送出" onClick="check_data()">
-                </TD></TR>
-            </TABLE>
-        	</FORM>
+  $result = mysql_query($str, $link) or die(mysql_error() );
 
-			';
-		*/
+  // 顯示使用者資料
+  $row = mysql_fetch_assoc($result);
+  
+  if ($row["password"] == $password) 
+  {
 
-	}
-	else
-	{
-		$my_user = new W_user();
-		$my_user->redirect_to("http://$w_localhost", "帳號密碼錯誤");
-	}
-	mysql_close($link);
+    // 設定標頭
+    echo '
+      <HEAD>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+	<TITLE>Hadoop 帳號</TITLE>
+      </HEAD>';
+
+    echo '<TABLE ALIGN="center" BORDER="1" width="100%">';
+
+    // 如果帳號未啟動就出現重新認證信的連結
+    if ($row["is_activate"] == 0)
+    {
+      echo '<TR> <TD> 認證 </TD> <TD colspan="5"> <FONT COLOR="#FF000000"> 未認證 </FONT> -- <A HREF=re_send_activate_code.php?user=' . "$user" . "&email=" . $row["email"] . ">重寄認證信</A> </TD> <TR>";
+    }
+    else
+    {
+
+      // 讀取使用者 hadoop 帳號、密碼
+      $str = sprintf("SELECT `hadoop_user`, `hadoop_password` FROM `%s` 
+		    WHERE `hadoop_owner` LIKE '%s' limit 1",
+		    $mysql_table_owner, $user ,$password);
+      $result = mysql_query($str, $link) or die(mysql_error() );
+      $row1 = mysql_fetch_assoc($result);
+    }
+
+    // 顯示使用者註冊資料
+    echo '<TR> <TD> 網站帳號 </TD> <TD>' . $row["user"] . '</TD>';
+    echo '<TD> E-mail </TD> <TD>' . $row["email"]       . '</TD>';
+    echo '<TD> 姓名   </TD> <TD>' . $row["name"]        . '</TD>';
+    echo '<TD> 電話   </TD> <TD>' . $row["telephone"]   . '</TD>';
+    echo '<TD> 單位   </TD> <TD>' . $row["department"]  . '</TD>';
+    echo '<TD> 用途   </TD> <TD>' . $row["purpose"]     . '</TD>';
+    echo "<TD> 主機帳號 </TD> 
+	  <TD>". $row1["hadoop_user"] . "</TD>";
+    echo "<TD> 主機密碼 </TD> 
+	  <TD>". $row1["hadoop_password"]."</TD>";
+    echo '<TD> <A HREF="index.php"> 登出</A> </TD>';
+    echo '</TR></TABLE>';
+    echo '<applet code=org.zhouer.zterm.ZTerm.class name="w_zterm" width=100% height=100% archive=ZTermApplet.jar>
+	    <param name="p1" value="' . $row1["hadoop_user"] . '">' .
+	    '<param name="p2" value="' . $row1["hadoop_password"] . '">
+	  </applet>
+	  ';
+  }
+  else
+  {
+    $my_user = new W_user();
+    $my_user->redirect_to("http://$w_localhost", "帳號密碼錯誤");
+  }
+  mysql_close($link);
 ?>
Index: /hadoop-register/etc/init.php
===================================================================
--- /hadoop-register/etc/init.php	(revision 81)
+++ /hadoop-register/etc/init.php	(revision 82)
@@ -40,5 +40,5 @@
 
     // mail password
-    $mail_password = '0911772703';
+    $mail_password = '';
  
 ?>
Index: /hadoop-register/new_register.php
===================================================================
--- /hadoop-register/new_register.php	(revision 81)
+++ /hadoop-register/new_register.php	(revision 82)
@@ -80,5 +80,5 @@
 	<TD ALIGN="center"> 
 	  <FONT COLOR="#3333FF">確認密碼：</FONT> 
-	  <INPUT NAME="checkPassword" TYPE="checkPassword" SIZE="20">
+	  <INPUT NAME="checkPassword" TYPE="password" SIZE="20">
 	</TD>
       </TR>
