updated install script

libraries/Cipher/CrazyCrypt1.class.php

@@ -3,10 +3,10 @@
  * @Author: printempw
  * @Date:   2016-04-03 14:55:38
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-04-03 15:19:12
+ * @Last Modified time: 2016-04-03 17:17:06
  */
 
-namespace Encryption;
+namespace Cipher;
 
 class CrazyCrypt1 implements EncryptInterface
 {

libraries/Cipher/EncryptInterface.class.php

@@ -3,10 +3,10 @@
  * @Author: printempw
  * @Date:   2016-04-03 14:43:46
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-04-03 15:37:11
+ * @Last Modified time: 2016-04-03 17:17:06
  */
 
-namespace Encryption;
+namespace Cipher;
 
 interface EncryptInterface
 {

libraries/Cipher/MD5.class.php

@@ -3,10 +3,10 @@
  * @Author: printempw
  * @Date:   2016-04-03 14:53:42
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-04-03 15:19:09
+ * @Last Modified time: 2016-04-03 17:17:06
  */
 
-namespace Encryption;
+namespace Cipher;
 
 class MD5 implements EncryptInterface
 {

libraries/Cipher/SALTED2MD5.class.php

@@ -3,10 +3,10 @@
  * @Author: printempw
  * @Date:   2016-04-03 14:58:11
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-04-03 15:27:11
+ * @Last Modified time: 2016-04-03 17:17:07
  */
 
-namespace Encryption;
+namespace Cipher;
 
 class SALTED2MD5 implements EncryptInterface
 {

libraries/Cipher/SHA256.class.php

@@ -3,10 +3,10 @@
  * @Author: printempw
  * @Date:   2016-04-03 14:50:45
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-04-03 15:19:06
+ * @Last Modified time: 2016-04-03 17:17:07
  */
 
-namespace Encryption;
+namespace Cipher;
 
 class SHA256 implements EncryptInterface
 {

setup/index.php

@@ -3,7 +3,7 @@
  * @Author: printempw
  * @Date:   2016-03-27 13:30:00
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-03-27 17:01:20
+ * @Last Modified time: 2016-04-03 16:16:57
  */
 
 // Sanity check
@@ -55,7 +55,8 @@ if ($conn->connect_error): ?>
 <?php exit; endif;
 $conn->query("SET names 'utf8'");
 
-if (Database\Database::checkTableExist($conn)): ?>
+$sql = "SELECT table_name FROM `INFORMATION_SCHEMA`.`TABLES` WHERE (table_name ='".DB_PREFIX."users'OR table_name ='".DB_PREFIX."options') AND TABLE_SCHEMA='".DB_NAME."'";
+if ($conn->query($sql)->num_rows == 2): ?>
 <h1>已安装过</h1>
 <p>Blessing Skin Server 看起来已经安装妥当。如果想重新安装，请删除数据库中的旧数据表，或者换一个数据表前缀。</p>
 <p class="step"><a href="../index.php" class="button button-large">返回首页</a></p>
@@ -153,7 +154,7 @@ function checkRewrite() {
 <div class="test">
     <span class="test-name">重写规则</span>
     <?php echo checkRewrite(); ?>
-    <div class="info">伪静态，用于支持传统皮肤获取链接。</div>
+    <div class="info">伪静态，用于支持传统皮肤获取链接。<small>*可能会判断错误</small></div>
 </div>
 
 <div class="test">
@@ -188,7 +189,11 @@ function checkRewrite() {
 if ($fails == 0) {
     echo '<p class="step"><a href="install.php" class="button button-large">下一步</a></p>';
 } else {
-    echo '<p class="step"><a disabled="disabled" class="button button-large">下一步</a></p>';
+    echo
+    '<p class="step">
+        <a disabled="disabled" class="button button-large">下一步</a>
+        <a style="float: right;" href="install.php" class="button button-large">无视，继续安装</a>
+    </p>';
 }
 ?>
 

setup/install.php

@@ -3,7 +3,7 @@
  * @Author: printempw
  * @Date:   2016-01-16 23:01:33
  * @Last Modified by:   printempw
- * @Last Modified time: 2016-04-03 07:55:52
+ * @Last Modified time: 2016-04-03 17:14:26
  *
  * Blessing Skin Server Installer
  */
@@ -26,9 +26,7 @@ $step = isset($_GET['step']) ? $_GET['step'] : 1;
 <?php
 
 // use error control to hide shitty connect warnings
-error_reporting(0);
+@$conn = new mysqli(DB_HOST, DB_USER, DB_PASSWD, DB_NAME, DB_PORT);
-$conn = new mysqli(DB_HOST, DB_USER, DB_PASSWD, DB_NAME, DB_PORT);
-error_reporting(E_ALL ^ E_NOTICE);
 
 if ($conn->connect_error): ?>
 <h1>MySQL 连接错误</h1>
@@ -37,11 +35,9 @@ if ($conn->connect_error): ?>
 <?php exit; endif;
 $conn->query("SET names 'utf8'");
 
-if (Database\Database::checkTableExist($conn)): ?>
+$sql = "SELECT table_name FROM `INFORMATION_SCHEMA`.`TABLES` WHERE (table_name ='".DB_PREFIX."users'OR table_name ='".DB_PREFIX."options') AND TABLE_SCHEMA='".DB_NAME."'";
-<h1>已安装过</h1>
+if ($conn->query($sql)->num_rows == 2)
-<p>Blessing Skin Server 看起来已经安装妥当。如果想重新安装，请删除数据库中的旧数据表，或者换一个数据表前缀。</p>
+    Utils::redirect('index.php');
-<p class="step"><a href="../index.php" class="button button-large">返回首页</a></p>
-<?php exit; endif;
 
 /*
  * Stepped installation
@@ -103,70 +99,39 @@ case 2:
 // check post
 if (isset($_POST['username']) && isset($_POST['password']) && isset($_POST['password2'])) {
     if ($_POST['password'] != $_POST['password2']) {
-        Utils::redirect('install.php?step=2&msg=确认密码不一致。'); exit;
+        Utils::redirect('install.php?msg=确认密码不一致。'); exit;
     }
     $username = $_POST['username'];
     $password = $_POST['password'];
     $sitename = isset($_POST['sitename']) ? $_POST['sitename'] : "Blessing Skin Server";
     if (User::checkValidUname($username)) {
         if (strlen($password) > 16 || strlen($password) < 5) {
-            Utils::redirect('install.php?step=2&msg=无效的密码。密码长度应该大于 6 并小于 15。');
+            Utils::redirect('install.php?msg=无效的密码。密码长度应该大于 6 并小于 15。');
             exit;
         } else if (Utils::convertString($password) != $password) {
-            Utils::redirect('install.php?step=2&msg=无效的密码。密码中包含了奇怪的字符。'); exit;
+            Utils::redirect('install.php?msg=无效的密码。密码中包含了奇怪的字符。'); exit;
         }
     } else {
-        Utils::redirect('install.php?step=2&msg=无效的用户名。用户名只能包含数字，字母以及下划线。'); exit;
+        Utils::redirect('install.php?msg=无效的用户名。用户名只能包含数字，字母以及下划线。'); exit;
     }
 } else {
-    Utils::redirect('install.php?step=2&msg=表单信息不完整。'); exit;
+    Utils::redirect('install.php?msg=表单信息不完整。'); exit;
 }
 
 $table_users   = DB_PREFIX."users";
 $table_options = DB_PREFIX."options";
 
-$sql1  =  "CREATE TABLE IF NOT EXISTS `$table_users` (
+$sql  = str_replace('{$prefix}',   DB_PREFIX, file_get_contents(BASE_DIR.'/setup/tables.sql'));
-              `uid` int(20) NOT NULL AUTO_INCREMENT,
+$sql  = str_replace('{$sitename}', $sitename, $sql);
-              `username` varchar(50) NOT NULL,
+// I don't know why semicolon in sql statement dosen't work ...
-              `password` varchar(255) NOT NULL,
+$sql = explode(';', $sql);
-              `ip` varchar(32) NOT NULL,
-              `preference` varchar(10) NOT NULL,
-              `hash_steve` varchar(64),
-              `hash_alex` varchar(64),
-              `hash_cape` varchar(64),
-              `last_modified` datetime,
-              PRIMARY KEY (`uid`)
-            ) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
 
-$sql2  =  "CREATE TABLE IF NOT EXISTS `$table_options` (
+if (!$conn->query($sql[0]) || !$conn->query($sql[1]) || !$conn->query($sql[2])) { ?>
-              `option_id` int(20) unsigned NOT NULL AUTO_INCREMENT,
-              `option_name` varchar(50) NOT NULL,
-              `option_value` longtext,
-              PRIMARY KEY (`option_id`)
-            ) ENGINE=MyISAM DEFAULT CHARSET=utf8;";
-
-// import options
-$sql3  =  "INSERT INTO `$table_options` (`option_id`, `option_name`, `option_value`) VALUES
-            (1,  'site_url',           ''),
-            (2,  'site_name',          '$sitename'),
-            (3,  'site_description',   'Minecraft 皮肤站'),
-            (4,  'current_version',    '2.3.4'),
-            (5,  'user_can_register',  '1'),
-            (6,  'regs_per_ip',        '2'),
-            (7,  'api_type',           '0'),
-            (8,  'announcement',       '这是默认的公告~'),
-            (9,  'data_adapter',       ''),
-            (10, 'data_table_name',    'authme for example'),
-            (11, 'data_column_uname',  'username'),
-            (12, 'data_column_passwd', 'password'),
-            (13, 'data_column_ip',     'ip'),
-            (14, 'color_scheme',       'skin-blue'),
-            (15, 'home_pic_url',       './assets/images/bg.jpg');";
-
-if (!$conn->query($sql1) || !$conn->query($sql2) || !$conn->query($sql3)) { ?>
     <h1>数据表创建失败</h1>
     <p>照理来说不应该的，请带上错误信息联系作者：</p>
     <p><?php echo $conn->error; ?></p>
+    <p>SQL 语句：</p>
+    <p><?php echo nl2br($sql); ?></p>
     <?php exit;
 }
 

setup/tables.sql

@@ -0,0 +1,50 @@
+/*
+* @Author: printempw
+* @Date:   2016-04-03 16:22:11
+* @Last Modified by:   printempw
+* @Last Modified time: 2016-04-03 17:14:53
+*/
+
+CREATE TABLE IF NOT EXISTS `{$prefix}users` (
+  `uid` int(20) NOT NULL AUTO_INCREMENT,
+  `username` varchar(50) NOT NULL,
+  `password` varchar(255) NOT NULL,
+  `ip` varchar(32) NOT NULL,
+  `preference` varchar(10) NOT NULL,
+  `hash_steve` varchar(64),
+  `hash_alex` varchar(64),
+  `hash_cape` varchar(64),
+  `last_modified` datetime,
+  PRIMARY KEY (`uid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `{$prefix}options` (
+  `option_id` int(20) unsigned NOT NULL AUTO_INCREMENT,
+  `option_name` varchar(50) NOT NULL,
+  `option_value` longtext,
+  PRIMARY KEY (`option_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `{$prefix}options` (`option_name`, `option_value`) VALUES
+('site_url',           ''),
+('site_name',          '{$sitename}'),
+('site_description',   'Minecraft 皮肤站'),
+('current_version',    '2.4'),
+('user_can_register',  '1'),
+('user_default_skin',  ''),
+('regs_per_ip',        '2'),
+('upload_max_size',    '10'),
+('api_type',           '0'),
+('announcement',       '这是默认的公告~'),
+('data_adapter',       ''),
+('encryption',         ''),
+('data_table_name',    'authme for example'),
+('data_column_uname',  'username'),
+('data_column_passwd', 'password'),
+('data_column_ip',     'ip'),
+('color_scheme',       'skin-blue'),
+('home_pic_url',       './assets/images/bg.jpg'),
+('google_font_cdn',    ''),
+('custom_css',         ''),
+('custom_js',          '');
+