* fix some bugs.

module/install/control.php

@@ -126,10 +126,6 @@ class install extends control
             if(dao::isError()) die(js::error(dao::getError()));
             $this->loadModel('setting')->updateVersion($this->config->version);
             $this->setting->setSN();
-            //echo (js::alert($this->lang->install->success));
-            //unset($_SESSION['installing']);
-            //session_destroy();
-            //die(js::locate('index.php', 'parent'));
 			die(js::locate(inlink('step5'), 'parent'));
         }
 
@@ -169,7 +165,12 @@ class install extends control
 		{
 			$this->app->user->account = $this->session->account;
 			$response = $this->admin->registerByAPI();	
-			if($response == 'success') die(js::locate('index.php', 'parent'));
+			if($response == 'success')
+			{
+				unset($_SESSION['installing']);
+				session_destroy();
+				die(js::locate('index.php', 'parent'));
+			}
 		}
 		$this->view->sn = $this->admin->getSN();
 		$this->display();	
@@ -187,7 +188,12 @@ class install extends control
 		{
 			$this->app->user->account = $this->session->account;
 			$response = $this->admin->loginByAPI();	
-			if($response == 'success') die(js::locate('index.php', 'parent'));
+			if($response == 'success')
+			{
+				unset($_SESSION['installing']);
+				session_destroy();
+				die(js::locate('index.php', 'parent'));
+			}
 		}
 		$this->view->sn = $this->admin->getSN();
 		$this->display();

module/install/lang/zh-cn.php

@@ -107,7 +107,7 @@ $lang->install->success = "安装成功";
 $lang->install->joinZentao = <<<EOT
 您已经成功安装禅道管理系统%s，<strong class='red'>请及时删除install.php</strong>。现在，您可以：
 
-<a href=%s>注册</a>或<a href=%s>登录</a>禅道社区，反馈建议并获得技术支持。
+<a href=%s>注册</a>禅道社区，反馈建议并获得技术支持，系统赠送200积分。如果您已经拥有社区账号，只需<a href=%s>关联</a>账号，系统将赠送150积分。
 
-<a href='/'>登录</a>禅道管理系统，设置用户及分组！
+直接<a href='/'>登录</a>禅道管理系统，设置用户及分组！
 EOT;

module/install/lang/zh-tw.php

@@ -107,7 +107,7 @@ $lang->install->success = "安裝成功";
 $lang->install->joinZentao = <<<EOT
 您已經成功安裝禪道管理系統%s，<strong class='red'>請及時刪除install.php</strong>。現在，您可以：
 
-<a href=%s>註冊</a>或<a href=%s>登錄</a>禪道社區，反饋建議並獲得技術支持。
+<a href=%s>註冊</a>禪道社區，反饋建議並獲得技術支持，系統贈送200積分。如果您已經擁有社區賬號，只需<a href=%s>關聯</a>賬號，系統將贈送150積分。
 
 <a href='/'>登錄</a>禪道管理系統，設置用戶及分組！
 EOT;

module/install/view/index.html.php

@@ -15,9 +15,7 @@
   <tr><td><?php echo nl2br(sprintf($lang->install->desc, $config->version));?></td></tr>
   <tr>
     <td>
-    <?php if(!isset($latestRelease)):?>
-    <h3 class='a-center'><?php echo html::a($this->createLink('install', 'step1'), $lang->install->start);?></h3>
-    <?php else:?>
+    <?php if(isset($latestRelease) and (version_compare($latestRelease->version, $config->version) > 0)):?>
     <?php vprintf($lang->install->newReleased, $latestRelease);?>
     <h3 class='a-center'>
       <?php 
@@ -26,6 +24,8 @@
       echo html::a($this->createLink('install', 'step1'), $lang->install->keepInstalling);
       ?>
     </h3>
+	<?php else:?>
+      <h3 class='a-center'><?php echo html::a($this->createLink('install', 'step1'), $lang->install->start);?></h3>
     <?php endif;?>
     </td>
   </tr>

module/install/view/step2.html.php

@@ -44,7 +44,7 @@
     </tr>
     <tr>
       <th><?php echo $lang->install->dbPassword;?></th>
-      <td><?php echo html::input('dbPassword', '', 'class=text-3');?></td>
+      <td><?php echo html::password('dbPassword', '', 'class=text-3');?></td>
     </tr>
     <tr>
       <th><?php echo $lang->install->dbName;?></th>

module/install/view/step5.html.php

@@ -14,7 +14,7 @@
   <caption><?php echo $lang->install->success;?></caption>
   <tr>
 	<td>
-<?php echo nl2br(sprintf($lang->install->joinZentao, $config->version, inlink('register'), inlink('login')));?>
+	  <?php echo nl2br(sprintf($lang->install->joinZentao, $config->version, inlink('register'), inlink('login')));?>
 	</td>
   </tr>
 </table>