Merge branch 'master' of https://github.com/iapt-platform/mint

app/db/user.php

@@ -175,7 +175,7 @@ class User extends Table
 			$ok = $this->_update(["reset_password_token"=>$resetToken],["reset_password_token"],["email"=>$email]);
 			if($ok){
 				#send email
-				$resetLink=WWW_DOMAIN_NAME."/app/ucenter/reset.php?token=".$resetToken;
+				$resetLink='https://'.WWW_DOMAIN_NAME."/app/ucenter/reset.php?token=".$resetToken;
 				$resetString=WWW_DOMAIN_NAME."/app/ucenter/reset.php";
 		
 				// 打开文件并读取数据

app/studio/pc_get_book_index.php

@@ -12,7 +12,7 @@ echo "<index>";
 
 //open database
 PDO_Connect(_FILE_DB_PALITEXT_);
-$query = "SELECT * FROM "._TABLE_PALI_TEXT_." where book = ? ";
+$query = "SELECT * FROM "._TABLE_PALI_TEXT_." where book = ? order by paragraph ASC";
 
 $Fetch = PDO_FetchAll($query,array($currBook));
 $iFetch = count($Fetch);

app/ucenter/index.php

@@ -496,7 +496,7 @@ if (isset($_POST["username"]) && $_username_ok == true) {
     }
     ?>
 
-
+			<a href="forgot_pwd.php">忘记密码</a>
 			<div class="login_form" style="padding: 3em 0 3em 0;">
 			<form action="index.php" method="post">
 				<div>