OSDN Git Service

重複キーをコメントアウト(install.sql)
[nucleus-jp/nucleus-jp-ancient.git] / install.php
index 6474954..7f7b4d3 100755 (executable)
@@ -18,7 +18,7 @@
 /**\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
  * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
- * @version $Id: install.php,v 1.8 2007-04-25 06:34:29 kimitake Exp $\r
+ * @version $Id$\r
  * $NucleusJP: install.php,v 1.7 2007/02/04 06:28:44 kimitake Exp $\r
  */\r
 \r
@@ -30,7 +30,7 @@
        -- Start Of Configurable Part --\r
 */\r
 \r
-include('./install_lang_japanese.php');\r
+include('./install_lang_japanese-utf8.php');\r
 \r
 // array with names of plugins to install. Plugin files must be present in the nucleus/plugin/\r
 // directory.\r
@@ -83,7 +83,7 @@ include_once('nucleus/libs/mysql.php');
                showInstallForm();\r
        }\r
 \r
-       exit;\r
+exit;\r
 \r
 function showInstallForm() {\r
        // 0. pre check if all necessary files exist\r
@@ -93,7 +93,7 @@ function showInstallForm() {
        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
        <html xmlns="http://www.w3.org/1999/xhtml">\r
        <head>\r
-               <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" />\r
+               <meta http-equiv="content-type" content="application/xhtml+xml; charset=<?php echo _CHARSET; ?>" />\r
                <title><?php echo _TITLE; ?></title>\r
                <style type="text/css"><!--\r
                        @import url('nucleus/documentation/styles/manual.css');\r
@@ -132,9 +132,9 @@ function showInstallForm() {
        $minVersion = '4.0.6';\r
 \r
        if (phpversion() < $minVersion) {\r
-               echo ' <span class="warning">', _TEXT2_WARN , $minVersion, '</span>';\r
+               echo ' <span class="warning" style="display:block">' . sprintf(_TEXT2_WARN, $minVersion) . '</span>';\r
        } elseif (phpversion() < '5') {\r
-               echo ' <span class="warning">' . _TEXT2_WARN3 . '</span>';\r
+               echo ' <span class="warning" style="display:block">' . _TEXT2_WARN3 . '</span>';\r
        }\r
 ?>\r
 \r
@@ -146,13 +146,13 @@ function showInstallForm() {
        $result = @mysql_query('SELECT VERSION() AS version');\r
 \r
        if ($result != FALSE && @mysql_num_rows($result) > 0) {\r
-               $row = mysql_fetch_array($result);\r
+               $row   = mysql_fetch_array($result);\r
                $match = explode('.', $row['version']);\r
        } else {\r
                $result = @mysql_query('SHOW VARIABLES LIKE \'version\'');\r
 \r
                if ($result != FALSE && @mysql_num_rows($result) > 0) {\r
-                       $row = mysql_fetch_row($result);\r
+                       $row   = mysql_fetch_row($result);\r
                        $match = explode('.', $row[1]);\r
                } else {\r
                        $output = shell_exec('mysql -V');\r
@@ -178,7 +178,7 @@ function showInstallForm() {
        }\r
 \r
        if ($mysqlVersion < $minVersion) {\r
-               echo ' <span class="warning">'._TEXT2_WARN2 , $minVersion.'</span>';\r
+               echo ' <span class="warning" style="display:block">' . sprintf(_TEXT2_WARN2, $minVersion) . '</span>';\r
        }\r
 ?>\r
 \r
@@ -187,7 +187,7 @@ function showInstallForm() {
 \r
 <?php\r
        // tell people how they can have their config file filled out automatically\r
-       if (@file_exists('config.php') && @!is_writable('config.php') ) {\r
+       if (@file_exists('config.php') && @!is_writable('config.php')) {\r
 ?>\r
 \r
                <h1><?php echo _HEADER3; ?></h1>\r
@@ -204,20 +204,20 @@ function showInstallForm() {
                        <legend><?php echo _TEXT4_TAB_HEAD; ?></legend>\r
                        <table>\r
                                <tr>\r
-                                       <td><?php echo _TEXT4_TAB_FIELD1; ?>:</td>\r
+                                       <td><?php echo _TEXT4_TAB_FIELD1; ?></td>\r
                                        <td><input name="mySQL_host" value="<?php echo htmlspecialchars(@ini_get('mysql.default_host') )?>" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT4_TAB_FIELD2; ?>:</td>\r
+                                       <td><?php echo _TEXT4_TAB_FIELD2; ?></td>\r
                                        <td><input name="mySQL_user" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT4_TAB_FIELD3; ?>:</td>\r
+                                       <td><?php echo _TEXT4_TAB_FIELD3; ?></td>\r
                                        <td><input name="mySQL_password" type="password" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT4_TAB_FIELD4; ?>:</td>\r
-                                       <td><input name="mySQL_database" /> (<input name="mySQL_create" value="1" type="checkbox" id="mySQL_create"><label for="mySQL_create" /><?php echo _TEXT4_TAB_FIELD4_ADD; ?></label>)</td>\r
+                                       <td><?php echo _TEXT4_TAB_FIELD4; ?></td>\r
+                                       <td><input name="mySQL_database" /> (<input name="mySQL_create" value="1" type="checkbox" id="mySQL_create" /><label for="mySQL_create"><?php echo _TEXT4_TAB_FIELD4_ADD; ?></label>)</td>\r
                                </tr>\r
                        </table>\r
                </fieldset>\r
@@ -226,7 +226,7 @@ function showInstallForm() {
                        <legend><?php echo _TEXT4_TAB2_HEAD; ?></legend>\r
                        <table>\r
                                <tr>\r
-                                       <td><input name="mySQL_usePrefix" value="1" type="checkbox" id="mySQL_usePrefix"><label for="mySQL_usePrefix" /><?php echo _TEXT4_TAB2_FIELD; ?>:</label></td>\r
+                                       <td><input name="mySQL_usePrefix" value="1" type="checkbox" id="mySQL_usePrefix" /><label for="mySQL_usePrefix"><?php echo _TEXT4_TAB2_FIELD; ?></label></td>\r
                                        <td><input name="mySQL_tablePrefix" value="" /></td>\r
                                </tr>\r
                        </table>\r
@@ -267,7 +267,7 @@ function showInstallForm() {
                        <legend><?php echo _TEXT5_TAB_HEAD; ?></legend>\r
                        <table>\r
                                <tr>\r
-                                       <td><?php echo _TEXT5_TAB_FIELD1;?>:</td>\r
+                                       <td><?php echo _TEXT5_TAB_FIELD1; ?></td>\r
                                        <td><input name="IndexURL" size="60" value="<?php\r
                                                $url = 'http://' . serverVar('HTTP_HOST') . serverVar('PHP_SELF');\r
                                                $url = str_replace('install.php', '', $url);\r
@@ -281,63 +281,63 @@ function showInstallForm() {
                                                echo $url; ?>" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT5_TAB_FIELD2;?>:</td>\r
+                                       <td><?php echo _TEXT5_TAB_FIELD2; ?></td>\r
                                        <td><input name="AdminURL" size="60" value="<?php\r
                                                if ($url) {\r
-                                                       echo $url, 'nucleus/';\r
+                                                       echo $url . 'nucleus/';\r
                                                } ?>" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT5_TAB_FIELD3;?>:</td>\r
+                                       <td><?php echo _TEXT5_TAB_FIELD3; ?></td>\r
                                        <td><input name="AdminPath" size="60" value="<?php\r
                                                if($basePath) {\r
-                                                       echo $basePath, 'nucleus/';\r
+                                                       echo $basePath . 'nucleus/';\r
                                                } ?>" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT5_TAB_FIELD4;?>:</td>\r
+                                       <td><?php echo _TEXT5_TAB_FIELD4; ?></td>\r
                                        <td><input name="MediaURL" size="60" value="<?php\r
                                                if ($url) {\r
-                                                       echo $url, 'media/';\r
+                                                       echo $url . 'media/';\r
                                                } ?>" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT5_TAB_FIELD5;?>:</td>\r
+                                       <td><?php echo _TEXT5_TAB_FIELD5; ?></td>\r
                                        <td><input name="MediaPath" size="60" value="<?php\r
                                                if ($basePath) {\r
-                                                       echo $basePath, 'media/';\r
+                                                       echo $basePath . 'media/';\r
                                                } ?>" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT5_TAB_FIELD6;?>:</td>\r
+                                       <td><?php echo _TEXT5_TAB_FIELD6; ?></td>\r
                                        <td><input name="SkinsURL" size="60" value="<?php\r
                                                if ($url) {\r
-                                                       echo $url, 'skins/';\r
+                                                       echo $url . 'skins/';\r
                                                } ?>" />\r
-                                               <br />(used by imported skins)\r
+                                               <br />(<?php echo _TEXT5_TAB_FIELD7_2; ?>)\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT5_TAB_FIELD7;?>:</td>\r
+                                       <td><?php echo _TEXT5_TAB_FIELD7; ?></td>\r
                                        <td><input name="SkinsPath" size="60" value="<?php\r
                                                if ($basePath) {\r
-                                                       echo $basePath, 'skins/';\r
+                                                       echo $basePath . 'skins/';\r
                                                } ?>" />\r
-                                               <br />(<?php echo _TEXT5_TAB_FIELD7_2;?>)\r
+                                               <br />(<?php echo _TEXT5_TAB_FIELD7_2; ?>)\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT5_TAB_FIELD8;?>:</td>\r
+                                       <td><?php echo _TEXT5_TAB_FIELD8; ?></td>\r
                                        <td><input name="PluginURL" size="60" value="<?php\r
                                                if ($url) {\r
-                                                       echo $url, 'nucleus/plugins/';\r
+                                                       echo $url . 'nucleus/plugins/';\r
                                                } ?>" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT5_TAB_FIELD9;?>:</td>\r
+                                       <td><?php echo _TEXT5_TAB_FIELD9; ?></td>\r
                                        <td><input name="ActionURL" size="60" value="<?php\r
                                                if ($url) {\r
-                                                       echo $url, 'action.php';\r
+                                                       echo $url . 'action.php';\r
                                                } ?>" />\r
                                                <br />(<?php echo _TEXT5_TAB_FIELD9_2;?>)\r
                                        </td>\r
@@ -355,23 +355,23 @@ function showInstallForm() {
                        <legend><?php echo _TEXT6_TAB_HEAD; ?></legend>\r
                        <table>\r
                                <tr>\r
-                                       <td><?php echo _TEXT6_TAB_FIELD1; ?>:</td>\r
+                                       <td><?php echo _TEXT6_TAB_FIELD1; ?></td>\r
                                        <td><input name="User_name" value="" /> <small>(<?php echo _TEXT6_TAB_FIELD1_2; ?>)</small></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT6_TAB_FIELD2; ?>:</td>\r
+                                       <td><?php echo _TEXT6_TAB_FIELD2; ?></td>\r
                                        <td><input name="User_realname" value="" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT6_TAB_FIELD3; ?>:</td>\r
+                                       <td><?php echo _TEXT6_TAB_FIELD3; ?></td>\r
                                        <td><input name="User_password" type="password" value="" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT6_TAB_FIELD4; ?>:</td>\r
+                                       <td><?php echo _TEXT6_TAB_FIELD4; ?></td>\r
                                        <td><input name="User_password2" type="password" value="" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT6_TAB_FIELD5; ?>:</td>\r
+                                       <td><?php echo _TEXT6_TAB_FIELD5; ?></td>\r
                                        <td><input name="User_email" value="" /> <small>(<?php echo _TEXT6_TAB_FIELD5_2; ?>)</small></td>\r
                                </tr>\r
                        </table>\r
@@ -385,11 +385,11 @@ function showInstallForm() {
                        <legend><?php echo _TEXT7_TAB_HEAD; ?></legend>\r
                        <table>\r
                                <tr>\r
-                                       <td><?php echo _TEXT7_TAB_FIELD1; ?>:</td>\r
+                                       <td><?php echo _TEXT7_TAB_FIELD1; ?></td>\r
                                        <td><input name="Blog_name" size="60" value="My Nucleus CMS" /></td>\r
                                </tr>\r
                                <tr>\r
-                                       <td><?php echo _TEXT7_TAB_FIELD2; ?>:</td>\r
+                                       <td><?php echo _TEXT7_TAB_FIELD2; ?></td>\r
                                        <td><input name="Blog_shortname" value="mynucleuscms" /> <small>(<?php echo _TEXT7_TAB_FIELD2_2; ?>)</small></td>\r
                                </tr>\r
                        </table>\r
@@ -432,42 +432,42 @@ function doInstall() {
        global $mysql_usePrefix, $mysql_prefix, $weblog_ping;\r
 \r
        // 0. put all POST-vars into vars\r
-       $mysql_host = postVar('mySQL_host');\r
-       $mysql_user = postVar('mySQL_user');\r
-       $mysql_password = postVar('mySQL_password');\r
-       $mysql_database = postVar('mySQL_database');\r
-       $mysql_create = postVar('mySQL_create');\r
-       $mysql_usePrefix = postVar('mySQL_usePrefix');\r
-       $mysql_prefix = postVar('mySQL_tablePrefix');\r
-       $config_indexurl = postVar('IndexURL');\r
-       $config_adminurl = postVar('AdminURL');\r
-       $config_adminpath = postVar('AdminPath');\r
-       $config_mediaurl = postVar('MediaURL');\r
-       $config_skinsurl = postVar('SkinsURL');\r
-       $config_pluginurl = postVar('PluginURL');\r
-       $config_actionurl = postVar('ActionURL');\r
-       $config_mediapath = postVar('MediaPath');\r
-       $config_skinspath = postVar('SkinsPath');\r
-       $user_name = postVar('User_name');\r
-       $user_realname = postVar('User_realname');\r
-       $user_password = postVar('User_password');\r
-       $user_password2 = postVar('User_password2');\r
-       $user_email = postVar('User_email');\r
-       $blog_name = postVar('Blog_name');\r
-       $blog_shortname = postVar('Blog_shortname');\r
+       $mysql_host        = postVar('mySQL_host');\r
+       $mysql_user        = postVar('mySQL_user');\r
+       $mysql_password    = postVar('mySQL_password');\r
+       $mysql_database    = postVar('mySQL_database');\r
+       $mysql_create      = postVar('mySQL_create');\r
+       $mysql_usePrefix   = postVar('mySQL_usePrefix');\r
+       $mysql_prefix      = postVar('mySQL_tablePrefix');\r
+       $config_indexurl   = postVar('IndexURL');\r
+       $config_adminurl   = postVar('AdminURL');\r
+       $config_adminpath  = postVar('AdminPath');\r
+       $config_mediaurl   = postVar('MediaURL');\r
+       $config_skinsurl   = postVar('SkinsURL');\r
+       $config_pluginurl  = postVar('PluginURL');\r
+       $config_actionurl  = postVar('ActionURL');\r
+       $config_mediapath  = postVar('MediaPath');\r
+       $config_skinspath  = postVar('SkinsPath');\r
+       $user_name         = postVar('User_name');\r
+       $user_realname     = postVar('User_realname');\r
+       $user_password     = postVar('User_password');\r
+       $user_password2    = postVar('User_password2');\r
+       $user_email        = postVar('User_email');\r
+       $blog_name         = postVar('Blog_name');\r
+       $blog_shortname    = postVar('Blog_shortname');\r
        $config_adminemail = $user_email;\r
-       $config_sitename = $blog_name;\r
-       $weblog_ping = postVar('Weblog_ping');\r
-\r
-       $config_indexurl = replaceDoubleBackslash($config_indexurl);\r
-       $config_adminurl = replaceDoubleBackslash($config_adminurl);\r
-       $config_mediaurl = replaceDoubleBackslash($config_mediaurl);\r
-       $config_skinsurl = replaceDoubleBackslash($config_skinsurl);\r
-       $config_pluginurl = replaceDoubleBackslash($config_pluginurl);\r
-       $config_actionurl = replaceDoubleBackslash($config_actionurl);\r
-       $config_adminpath = replaceDoubleBackslash($config_adminpath);\r
-       $config_skinspath = replaceDoubleBackslash($config_skinspath);\r
-       $config_mediapath = replaceDoubleBackslash($config_mediapath);\r
+       $config_sitename   = $blog_name;\r
+       $weblog_ping       = postVar('Weblog_ping');\r
+\r
+       $config_indexurl   = replaceDoubleBackslash($config_indexurl);\r
+       $config_adminurl   = replaceDoubleBackslash($config_adminurl);\r
+       $config_mediaurl   = replaceDoubleBackslash($config_mediaurl);\r
+       $config_skinsurl   = replaceDoubleBackslash($config_skinsurl);\r
+       $config_pluginurl  = replaceDoubleBackslash($config_pluginurl);\r
+       $config_actionurl  = replaceDoubleBackslash($config_actionurl);\r
+       $config_adminpath  = replaceDoubleBackslash($config_adminpath);\r
+       $config_skinspath  = replaceDoubleBackslash($config_skinspath);\r
+       $config_mediapath  = replaceDoubleBackslash($config_mediapath);\r
 \r
        // 1. check all the data\r
        $errors = array();\r
@@ -569,7 +569,7 @@ function doInstall() {
                'nucleus_team',\r
                'nucleus_activation',\r
                'nucleus_tickets'\r
-               );\r
+       );\r
 // these are unneeded (one of the replacements above takes care of them)\r
 //                     'nucleus_plugin_event',\r
 //                     'nucleus_plugin_option',\r
@@ -593,7 +593,7 @@ function doInstall() {
                $mysql_prefix . 'nucleus_team',\r
                $mysql_prefix . 'nucleus_activation',\r
                $mysql_prefix . 'nucleus_tickets'\r
-               );\r
+       );\r
 // these are unneeded (one of the replacements above takes care of them)\r
 //                     $mysql_prefix . 'nucleus_plugin_event',\r
 //                     $mysql_prefix . 'nucleus_plugin_option',\r
@@ -618,44 +618,47 @@ function doInstall() {
        }\r
 \r
        // 5a make first post\r
-       $newpost = "INSERT INTO `nucleus_item` VALUES (1, '" . _1ST_POST_TITLE . "', '" . _1ST_POST . "', '" . _1ST_POST2 . "', 1, 1, '2005-08-15 11:04:26', 0, 0, 0, 1, 0, 1);";\r
+       $newpost = "INSERT INTO " . tableName('nucleus_item') . " VALUES (1, '" . _1ST_POST_TITLE . "', '" . _1ST_POST . "', '" . _1ST_POST2 . "', 1, 1, '2005-08-15 11:04:26', 0, 0, 0, 1, 0, 1);";\r
        mysql_query($newpost) or _doError(_ERROR18 . ' (<small>' . htmlspecialchars($newpost) . '</small>): ' . mysql_error() );\r
 \r
        // 6. update global settings\r
-       updateConfig('IndexURL', $config_indexurl);\r
-       updateConfig('AdminURL', $config_adminurl);\r
-       updateConfig('MediaURL', $config_mediaurl);\r
-       updateConfig('SkinsURL', $config_skinsurl);\r
-       updateConfig('PluginURL', $config_pluginurl);\r
-       updateConfig('ActionURL', $config_actionurl);\r
+       updateConfig('IndexURL',   $config_indexurl);\r
+       updateConfig('AdminURL',   $config_adminurl);\r
+       updateConfig('MediaURL',   $config_mediaurl);\r
+       updateConfig('SkinsURL',   $config_skinsurl);\r
+       updateConfig('PluginURL',  $config_pluginurl);\r
+       updateConfig('ActionURL',  $config_actionurl);\r
        updateConfig('AdminEmail', $config_adminemail);\r
-       updateConfig('SiteName', $config_sitename);\r
+       updateConfig('SiteName',   $config_sitename);\r
 \r
        // 7. update GOD member\r
        $query = 'UPDATE ' . tableName('nucleus_member')\r
-                       . " SET mname='" . addslashes($user_name) . "',"\r
-                       . " mrealname='" . addslashes($user_realname) . "',"\r
-                       . " mpassword='" . md5(addslashes($user_password) ) . "',"\r
-                       . " murl='" . addslashes($config_indexurl) . "',"\r
-                       . " memail='" . addslashes($user_email) . "',"\r
-                       . " madmin=1, mcanlogin=1"\r
-                       . " WHERE mnumber=1";\r
+                  . " SET mname     = '" . addslashes($user_name) . "',"\r
+                  . " mrealname     = '" . addslashes($user_realname) . "',"\r
+                  . " mpassword     = '" . md5(addslashes($user_password) ) . "',"\r
+                  . " murl          = '" . addslashes($config_indexurl) . "',"\r
+                  . " memail        = '" . addslashes($user_email) . "',"\r
+                  . " madmin        = 1,"\r
+                  . " mcanlogin     = 1"\r
+                  . " WHERE"\r
+                  . " mnumber       = 1";\r
 \r
        mysql_query($query) or _doError(_ERROR19 . ': ' . mysql_error() );\r
 \r
        // 8. update weblog settings\r
        $query = 'UPDATE ' . tableName('nucleus_blog')\r
-                       . " SET bname='" . addslashes($blog_name) . "',"\r
-                       . " bshortname='" . addslashes($blog_shortname) . "',"\r
-                       . " burl='" . addslashes($config_indexurl) . "'"\r
-                       . " WHERE bnumber=1";\r
+                  . " SET bname  = '" . addslashes($blog_name) . "',"\r
+                  . " bshortname = '" . addslashes($blog_shortname) . "',"\r
+                  . " burl       = '" . addslashes($config_indexurl) . "'"\r
+                  . " WHERE"\r
+                  . " bnumber    = 1";\r
 \r
        mysql_query($query) or _doError(_ERROR20 . ': ' . mysql_error() );\r
 \r
        // 9. update item date\r
        $query = 'UPDATE ' . tableName('nucleus_item')\r
-                       . " SET itime='" . date('Y-m-d H:i:s', time() ) ."'"\r
-                       . " WHERE inumber=1";\r
+                  . " SET   itime   = '" . date('Y-m-d H:i:s', time() ) ."'"\r
+                  . " WHERE inumber = 1";\r
 \r
        mysql_query($query) or _doError(_ERROR21 . ': ' . mysql_error() );\r
 \r
@@ -667,20 +670,20 @@ function doInstall() {
                // 10. set global variables\r
                global $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE, $MYSQL_PREFIX;\r
 \r
-               $MYSQL_HOST = $mysql_host;\r
-               $MYSQL_USER = $mysql_user;\r
+               $MYSQL_HOST     = $mysql_host;\r
+               $MYSQL_USER     = $mysql_user;\r
                $MYSQL_PASSWORD = $mysql_password;\r
                $MYSQL_DATABASE = $mysql_database;\r
-               $MYSQL_PREFIX = ($mysql_usePrefix == 1)?$mysql_prefix:'';\r
+               $MYSQL_PREFIX   = ($mysql_usePrefix == 1) ? $mysql_prefix : '';\r
 \r
                global $DIR_NUCLEUS, $DIR_MEDIA, $DIR_SKINS, $DIR_PLUGINS, $DIR_LANG, $DIR_LIBS;\r
 \r
                $DIR_NUCLEUS = $config_adminpath;\r
-               $DIR_MEDIA = $config_mediapath;\r
-               $DIR_SKINS = $config_skinspath;\r
+               $DIR_MEDIA   = $config_mediapath;\r
+               $DIR_SKINS   = $config_skinspath;\r
                $DIR_PLUGINS = $DIR_NUCLEUS . 'plugins/';\r
-               $DIR_LANG = $DIR_NUCLEUS . 'language/';\r
-               $DIR_LIBS = $DIR_NUCLEUS . 'libs/';\r
+               $DIR_LANG    = $DIR_NUCLEUS . 'language/';\r
+               $DIR_LIBS    = $DIR_NUCLEUS . 'libs/';\r
 \r
                // close database connection (needs to be closed if we want to include globalfunctions.php)\r
                mysql_close();\r
@@ -708,31 +711,31 @@ function doInstall() {
                $config_data = '<' . '?php' . "\n\n";\r
                //$config_data .= "\n"; (extraneous, just added extra \n to previous line\r
                $config_data .= "       // mySQL connection information\n";\r
-               $config_data .= "       \$MYSQL_HOST = '" . $mysql_host . "';\n";\r
-               $config_data .= "       \$MYSQL_USER = '" . $mysql_user . "';\n";\r
+               $config_data .= "       \$MYSQL_HOST     = '" . $mysql_host . "';\n";\r
+               $config_data .= "       \$MYSQL_USER     = '" . $mysql_user . "';\n";\r
                $config_data .= "       \$MYSQL_PASSWORD = '" . $mysql_password . "';\n";\r
                $config_data .= "       \$MYSQL_DATABASE = '" . $mysql_database . "';\n";\r
-               $config_data .= "       \$MYSQL_PREFIX = '" . (($mysql_usePrefix == 1)?$mysql_prefix:'') . "';\n";\r
+               $config_data .= "       \$MYSQL_PREFIX   = '" . (($mysql_usePrefix == 1) ? $mysql_prefix : '') . "';\n";\r
                $config_data .= "\n";\r
                $config_data .= "       // main nucleus directory\n";\r
                $config_data .= "       \$DIR_NUCLEUS = '" . $config_adminpath . "';\n";\r
                $config_data .= "\n";\r
                $config_data .= "       // path to media dir\n";\r
-               $config_data .= "       \$DIR_MEDIA = '" . $config_mediapath . "';\n";\r
+               $config_data .= "       \$DIR_MEDIA   = '" . $config_mediapath . "';\n";\r
                $config_data .= "\n";\r
                $config_data .= "       // extra skin files for imported skins\n";\r
-               $config_data .= "       \$DIR_SKINS = '" . $config_skinspath . "';\n";\r
+               $config_data .= "       \$DIR_SKINS   = '" . $config_skinspath . "';\n";\r
                $config_data .= "\n";\r
                $config_data .= "       // these dirs are normally sub dirs of the nucleus dir, but \n";\r
                $config_data .= "       // you can redefine them if you wish\n";\r
                $config_data .= "       \$DIR_PLUGINS = \$DIR_NUCLEUS . 'plugins/';\n";\r
-               $config_data .= "       \$DIR_LANG = \$DIR_NUCLEUS . 'language/';\n";\r
-               $config_data .= "       \$DIR_LIBS = \$DIR_NUCLEUS . 'libs/';\n";\r
+               $config_data .= "       \$DIR_LANG    = \$DIR_NUCLEUS . 'language/';\n";\r
+               $config_data .= "       \$DIR_LIBS    = \$DIR_NUCLEUS . 'libs/';\n";\r
                $config_data .= "\n";\r
                $config_data .= "       // include libs\n";\r
-               $config_data .= "       include(\$DIR_LIBS.'globalfunctions.php');\n";\r
+               $config_data .= "       include(\$DIR_LIBS . 'globalfunctions.php');\n";\r
                $config_data .= "       if (!extension_loaded('mbstring')) {\n";\r
-               $config_data .= "       include(\$DIR_LIBS.'mb_emulator/mb-emulator.php');\n";\r
+               $config_data .= "               include(\$DIR_LIBS . 'mb_emulator/mb-emulator.php');\n";\r
                $config_data .= "       }\n";\r
                $config_data .= "?" . ">";\r
 \r
@@ -748,7 +751,7 @@ function doInstall() {
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
 <html xmlns="http://www.w3.org/1999/xhtml">\r
 <head>\r
-       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+       <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _CHARSET; ?>" />\r
        <title><?php echo _TITLE; ?></title>\r
        <style>@import url('nucleus/styles/manual.css');</style>\r
 </head>\r
@@ -770,31 +773,31 @@ function doInstall() {
 \r
                <pre><code>&lt;?php\r
        // mySQL connection information\r
-       $MYSQL_HOST = '<b><?php echo $mysql_host?></b>';\r
-       $MYSQL_USER = '<b><?php echo $mysql_user?></b>';\r
+       $MYSQL_HOST     = '<b><?php echo $mysql_host?></b>';\r
+       $MYSQL_USER     = '<b><?php echo $mysql_user?></b>';\r
        $MYSQL_PASSWORD = '<i><b>xxxxxxxxxxx</b></i>';\r
        $MYSQL_DATABASE = '<b><?php echo $mysql_database?></b>';\r
-       $MYSQL_PREFIX = '<b><?php echo ($mysql_usePrefix == 1)?$mysql_prefix:''?></b>';\r
+       $MYSQL_PREFIX   = '<b><?php echo ($mysql_usePrefix == 1)?$mysql_prefix:''?></b>';\r
 \r
        // main nucleus directory\r
        $DIR_NUCLEUS = '<b><?php echo $config_adminpath?></b>';\r
 \r
        // path to media dir\r
-       $DIR_MEDIA = '<b><?php echo $config_mediapath?></b>';\r
+       $DIR_MEDIA   = '<b><?php echo $config_mediapath?></b>';\r
 \r
        // extra skin files for imported skins\r
-       $DIR_SKINS = '<b><?php echo $config_skinspath?></b>';\r
+       $DIR_SKINS   = '<b><?php echo $config_skinspath?></b>';\r
 \r
        // these dirs are normally sub dirs of the nucleus dir, but\r
        // you can redefine them if you wish\r
        $DIR_PLUGINS = $DIR_NUCLEUS . 'plugins/';\r
-       $DIR_LANG = $DIR_NUCLEUS . 'language/';\r
-       $DIR_LIBS = $DIR_NUCLEUS . 'libs/';\r
+       $DIR_LANG    = $DIR_NUCLEUS . 'language/';\r
+       $DIR_LIBS    = $DIR_NUCLEUS . 'libs/';\r
 \r
        // include libs\r
-       include($DIR_LIBS.'globalfunctions.php');\r
+       include($DIR_LIBS . 'globalfunctions.php');\r
        if (!extension_loaded('mbstring')) {\r
-               include($DIR_LIBS.'mb_emulator/mb-emulator.php');\r
+               include($DIR_LIBS . 'mb_emulator/mb-emulator.php');\r
        }\r
 ?&gt;</code></pre>\r
 \r
@@ -821,11 +824,12 @@ function doInstall() {
                <li><?php echo _TEXT14_L2; ?></li>\r
        </ul>\r
 \r
-       <p>もしこれらのファイルを削除していなければ、管理領域を開くことが出来ません。</p>\r
+       <?php echo _TEXT14_EX; ?>\r
 \r
        <h1><?php echo _HEADER10; ?></h1>\r
 \r
        <?php echo _TEXT15; ?>\r
+\r
                <ul>\r
                <li><?php echo _TEXT15_L1; ?></li>\r
                <li><?php echo _TEXT15_L2; ?></li>\r
@@ -887,7 +891,7 @@ function installCustomPlugs(&$manager) {
        $res = sql_query('SELECT pid, pfile FROM ' . sql_table('plugin') );\r
 \r
        while($o = mysql_fetch_object($res) ) {\r
-               $pid = $o->pid;\r
+               $pid  =  $o->pid;\r
                $plug =& $manager->getPlugin($o->pfile);\r
 \r
                if ($plug) {\r
@@ -963,7 +967,7 @@ function doCheckFiles() {
                'nucleus/libs/MEDIA.php',\r
                'nucleus/libs/ACTIONLOG.php',\r
                'nucleus/media.php'\r
-               );\r
+       );\r
 \r
        $count = count($files);\r
 \r
@@ -986,11 +990,11 @@ function doCheckFiles() {
 \r
 function updateConfig($name, $val) {\r
        $name = addslashes($name);\r
-       $val = trim(addslashes($val) );\r
+       $val  = trim(addslashes($val) );\r
 \r
        $query = 'UPDATE ' . tableName('nucleus_config')\r
-                       . " SET value='$val'"\r
-                       . " WHERE name='$name'";\r
+                  . " SET   value = '$val'"\r
+                  . " WHERE name  = '$name'";\r
 \r
        mysql_query($query) or _doError(_ERROR26 . ': ' . mysql_error() );\r
        return mysql_insert_id();\r
@@ -1044,7 +1048,7 @@ function _doError($msg) {
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
 <html xmlns="http://www.w3.org/1999/xhtml">\r
 <head>\r
-       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+       <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _CHARSET ?>" />\r
        <title><?php echo _TITLE; ?></title>\r
        <style>@import url('nucleus/styles/manual.css');</style>\r
 </head>\r
@@ -1054,7 +1058,7 @@ function _doError($msg) {
 \r
        <p><?php echo _ERROR28; ?>: "<?php echo $msg?>";</p>\r
 \r
-       <p><a href="install.php" onclick="history.back();return false;"><?php echo _TEXT17; ?></a></p>\r
+       <p><a href="install.php" onclick="history.back();"><?php echo _TEXT17; ?></a></p>\r
 </body>\r
 </html>\r
 \r
@@ -1067,7 +1071,7 @@ function showErrorMessages($errors) {
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
 <html xmlns="http://www.w3.org/1999/xhtml">\r
 <head>\r
-       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+       <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _CHARSET ?>" />\r
        <title><?php echo _TITLE; ?></title>\r
        <style>@import url('nucleus/styles/manual.css');</style>\r
 </head>\r
@@ -1081,7 +1085,7 @@ function showErrorMessages($errors) {
 \r
 <?php\r
        while($msg = array_shift($errors) ) {\r
-               echo '<li>', $msg, '</li>';\r
+               echo '<li>' . $msg . '</li>';\r
        }\r
 ?>\r
 \r
@@ -1098,4 +1102,4 @@ function showErrorMessages($errors) {
 /* for the non-php systems that decide to show the contents:\r
 ?></div><?php  */\r
 \r
-?>\r
+?>
\ No newline at end of file