MERGE: リビジョン1747のマージ。./install/index.phpの修正。

上流/master/skinnable-masterの差分を埋めるためにコミット。

Revision 1747: minor updates for install/index.php
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1747

diff --git a/install/index.php b/install/index.php
index 49fa8e6..1f93430 100644 (file)
--- a/install/index.php
+++ b/install/index.php
@@ -16,7 +16,7 @@
 /**\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
  * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
- * @version $Id$\r
+ * @version $Id: index.php 1745 2012-04-12 23:45:47Z sakamocchi $
  */\r
 \r
 /* global values initialize */\r
@@ -160,7 +160,8 @@ function do_action()
                                }\r
                                break;\r
                        case 'weblog':\r
-                               if ( count($param->check_user_parameters()) == 0 && count($param->check_weblog_parameters()) == 0 )\r
+                               if ( count($param->check_user_parameters()) == 0\r
+                                       && count($param->check_weblog_parameters()) == 0 )\r
                                {\r
                                        $param->set_state('install');\r
                                        $isPostback = false;\r
@@ -815,18 +816,18 @@ function do_install()
        /*\r
         * 1. put all param-vars into vars\r
         */\r
-       $MYSQL_HOST     = $param->mysql_host;\r
-       $MYSQL_USER     = $param->mysql_user;\r
-       $MYSQL_PASSWORD = $param->mysql_password;\r
-       $MYSQL_DATABASE = $param->mysql_database;\r
-       $MYSQL_PREFIX   = $param->mysql_tablePrefix;\r
-\r
-       $DIR_NUCLEUS = $param->AdminPath;\r
-       $DIR_MEDIA   = $param->MediaPath;\r
-       $DIR_SKINS   = $param->SkinsPath;\r
-       $DIR_PLUGINS = $DIR_NUCLEUS . 'plugins/';\r
-       $DIR_LOCALES = $DIR_NUCLEUS . 'locales/';\r
-       $DIR_LIBS    = $DIR_NUCLEUS . 'libs/';\r
+       $MYSQL_HOST             = $param->mysql_host;\r
+       $MYSQL_USER             = $param->mysql_user;\r
+       $MYSQL_PASSWORD = $param->mysql_password;\r
+       $MYSQL_DATABASE = $param->mysql_database;\r
+       $MYSQL_PREFIX   = $param->mysql_tablePrefix;\r
+\r
+       $DIR_NUCLEUS    = $param->AdminPath;\r
+       $DIR_MEDIA              = $param->MediaPath;\r
+       $DIR_SKINS              = $param->SkinsPath;\r
+       $DIR_PLUGINS    = $DIR_NUCLEUS . 'plugins/';\r
+       $DIR_LOCALES    = $DIR_NUCLEUS . 'locales/';\r
+       $DIR_LIBS               = $DIR_NUCLEUS . 'libs/';\r
 \r
        /*\r
         * 2.open mySQL connection\r
@@ -948,13 +949,13 @@ function do_install()
        array_merge($errors, updateConfig('Locale', i18n::get_current_locale()));\r
 \r
        /* escape strings for SQL */\r
-       $user_name       = sql_real_escape_string($param->user_name);\r
-       $user_realname   = sql_real_escape_string($param->user_realname);\r
-       $user_password   = sql_real_escape_string(md5($param->user_password));\r
-       $user_email      = sql_real_escape_string($param->user_email);\r
-       $blog_name       = sql_real_escape_string($param->blog_name);\r
-       $blog_shortname  = sql_real_escape_string($param->blog_shortname);\r
-       $config_indexurl = sql_real_escape_string($param->IndexURL);\r
+       $user_name                      = sql_real_escape_string($param->user_name);\r
+       $user_realname          = sql_real_escape_string($param->user_realname);\r
+       $user_password          = sql_real_escape_string(md5($param->user_password));\r
+       $user_email                     = sql_real_escape_string($param->user_email);\r
+       $blog_name                      = sql_real_escape_string($param->blog_name);\r
+       $blog_shortname         = sql_real_escape_string($param->blog_shortname);\r
+       $config_indexurl        = sql_real_escape_string($param->IndexURL);\r
 \r
        /* push super admin */\r
        $query = "UPDATE %s SET mname = '%s', mrealname = '%s', mpassword = '%s', memail = '%s', murl = '%s', madmin = 1, mcanlogin = 1 WHERE mnumber = 1";\r
@@ -999,18 +1000,18 @@ function do_install()
                }\r
 \r
                include_once($DIR_LIBS . 'skinie.php');\r
-\r
+               \r
                $aSkinErrors = installCustomSkins();\r
                if ( count($aSkinErrors) > 0 )\r
                {\r
                        array_merge($errors, $aSkinErrors);\r
                }\r
 \r
-               $query = "SELECT sdnumber FROM %s WHERE sdname='default'";\r
-               $query = sprintf($query, tableName('nucleus_skin_desc'));\r
-               $res = sql_query($query);\r
-               $obj = sql_fetch_assoc($res);\r
-               $defSkinID = (integer) $obj['sdnumber'];\r
+               $query          = "SELECT sdnumber FROM %s WHERE sdname='default'";\r
+               $query          = sprintf($query, tableName('nucleus_skin_desc'));\r
+               $res            = sql_query($query);\r
+               $obj            = sql_fetch_assoc($res);\r
+               $defSkinID      = (integer) $obj['sdnumber'];\r
 \r
                $query = "UPDATE %s SET bdefskin=%d WHERE bnumber=1";\r
                $query = sprintf($query, tableName('nucleus_blog'), $defSkinID);\r
@@ -1141,7 +1142,6 @@ function getMySqlVersion()
                }\r
                else\r
                {\r
-                       //$output = shell_exec('mysql -V');\r
                        $output = (function_exists('shell_exec')) ? @shell_exec('mysql -V') : '0.0.0';\r
                        preg_match('@[0-9]+\.[0-9]+\.[0-9]+@', $output, $version);\r
                        $match = preg_split('#\.#', $version[0]);\r
@@ -1426,7 +1426,6 @@ class ParamManager
                $this->blog_shortname = 'mynucleuscms';\r
 \r
                /* root path */\r
-               //              $this->root_path = realpath(dirname(__FILE__) . '/..');\r
                $directory_separator = preg_quote(DIRECTORY_SEPARATOR, '|');\r
                $this->root_path = implode('/', preg_split("|$directory_separator|", realpath(dirname(__FILE__) . '/..')));\r
                if ( substr($this->root_path, -1, 1) !== '/' )\r
@@ -1436,7 +1435,7 @@ class ParamManager
                $base_path_pcre = preg_quote($this->root_path, '|');\r
 \r
                /* current directry name */\r
-               $directory_name = preg_replace("|$base_path_pcre|", '', implode('/', preg_split("|$directory_separator|", realpath(dirname(__FILE__)))));\r
+               $directory_name = preg_replace("#{$base_path_pcre}#", '', implode('/', preg_split("#{$directory_separator}#", realpath(dirname(__FILE__)))));\r
                $directory_name_pcre = preg_quote($directory_name, '|');\r
 \r
                /* root uri */\r
@@ -1447,10 +1446,10 @@ class ParamManager
                $this->MediaPath = $this->root_path . 'media/';\r
                $this->SkinsPath = $this->root_path . 'skins/';\r
 \r
-               $this->IndexURL = $this->root_url;\r
-               $this->AdminURL = $this->root_url . 'nucleus/';\r
-               $this->MediaURL = $this->root_url . 'media/';\r
-               $this->SkinsURL = $this->root_url . 'skins/';\r
+               $this->IndexURL  = $this->root_url;\r
+               $this->AdminURL  = $this->root_url . 'nucleus/';\r
+               $this->MediaURL  = $this->root_url . 'media/';\r
+               $this->SkinsURL  = $this->root_url . 'skins/';\r
                $this->PluginURL = $this->root_url . 'nucleus/plugins/';\r
                $this->ActionURL = $this->root_url . 'action.php';\r
        }\r
@@ -1500,18 +1499,13 @@ class ParamManager
                {\r
                        $errors[] = sprintf(_VALID_ERROR1, _DB_FIELD2);\r
                }\r
-\r
+               \r
                if ( $this->mysql_user != ''\r
                        && !preg_match('/^[a-z0-9_\-]+$/i', $this->mysql_user) )\r
                {\r
                        $errors[] = sprintf(_VALID_ERROR2, _DB_FIELD2);\r
                }\r
-\r
-               //              if ( $this->mysql_password == '' )\r
-               //              {\r
-               //                      $errors[] = sprintf(_VALID_ERROR1, _DB_FIELD3);\r
-               //              }\r
-\r
+               \r
                if ( $this->mysql_database == '' )\r
                {\r
                        $errors[] = sprintf(_VALID_ERROR1, _DB_FIELD4);\r
@@ -1528,7 +1522,7 @@ class ParamManager
                {\r
                        $errors[] = sprintf(_VALID_ERROR3, _DB_FIELD5);\r
                }\r
-\r
+               \r
                if ( count($errors) == 0 )\r
                {\r
                        $mysql_conn = @sql_connect_args($this->mysql_host, $this->mysql_user, $this->mysql_password);\r