インストールスクリプトを統合

[nucleus-jp/nucleus-jp-ancient.git] / nucleus / libs / globalfunctions.php

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 71c2a05..421763c 100755 (executable)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -336,7 +336,7 @@ include($DIR_LANG . ereg_replace( '[\\|/]', '', $language) . '.php');
 \r
 // check if valid charset\r
 if (!encoding_check(false, false, _CHARSET)) {\r
-       foreach(array($_REQUEST, $_SERVER) as $input) {\r
+       foreach(array($_GET, $_POST) as $input) {\r
                array_walk($input, 'encoding_check');\r
        }\r
 }\r
@@ -518,6 +518,18 @@ function sql_connect() {
        $MYSQL_CONN = @mysql_connect($MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD) or startUpError('<p>Could not connect to MySQL database.</p>', 'Connect Error');\r
        mysql_select_db($MYSQL_DATABASE) or startUpError('<p>Could not select database: ' . mysql_error() . '</p>', 'Connect Error');\r
 \r
+/*/ <add for garble measure>\r
+       $resource = sql_query("show variables LIKE 'character_set_database'");\r
+       $fetchDat = mysql_fetch_assoc($resource);\r
+       $charset  = $fetchDat['Value'];\r
+       $mySqlVer = implode('.', array_map('intval', explode('.', mysql_get_server_info($MYSQL_CONN))));\r
+       if ($mySqlVer >= '5.0.7' && phpversion() >= '5.2.3') {\r
+               mysql_set_charset($charset);\r
+       } else {\r
+               sql_query("SET NAMES " . $charset);\r
+       }\r
+// </add for garble measure>*/\r
+\r
        return $MYSQL_CONN;\r
 }\r
 \r
@@ -588,7 +600,7 @@ function sendContentType($contenttype, $pagetype = '', $charset = _CHARSET) {
 \r
                // check if valid charset\r
                if (!encoding_check(false,false,$charset)) {\r
-                       foreach(array($_REQUEST, $_SERVER) as $input) {\r
+                       foreach(array($_GET, $_POST) as $input) {\r
                                array_walk($input, 'encoding_check');\r
                        }\r
                }\r
@@ -1546,6 +1558,12 @@ function formatDate($format, $timestamp, $defaultFormat, &$blog) {
 \r
 function encoding_check($val, $key, $encoding=false, $exclude=false) {\r
        /*\r
+         Set $CONF['DisableEncodingCheck']=1 only for special occasion, e.g. install script.\r
+         Don't set this permanently in nucleus_config table.\r
+       */\r
+       global $CONF;\r
+//     if (!empty($CONF['DisableEncodingCheck'])) return true;\r
+       /*\r
          When 3rd argument is set, return if checked already.\r
          When 4th argument is set, set the excluded key(s).\r
        */\r