Changeset 7087

Timestamp:

11/26/08 02:30:30 (6 weeks ago)

Author:

inureyes

Message:

refs #1156

• DB bind시 변수 저장을 초기화하여 DB의 charset을 제대로 인식하지 못하는 문제 수정
  

Location:

trunk/library

Files:

• components/Needlworks.DBMS.MySQLi.php (modified) (2 diffs)
• components/Needlworks.PHP.Core.php (modified) (1 diff)
• components/Textcube.Data.Config.php (modified) (1 diff)
• preprocessor.php (modified) (3 diffs)

trunk/library/components/Needlworks.DBMS.MySQLi.php

@@ -14 +14 @@
         // Connects DB and set environment variables
         // $database array should contain 'server','username','password'.
+        self::$cachedResult = self::$dbProperties = array();
         if(!isset($database) || empty($database)) return false;
         if(!isset($database['port']) && strpos($database['server'],':')) {
@@ -33 +34 @@
             self::$dbProperties['charset'] = 'default';
         @self::query('SET SESSION collation_connection = \'utf8_general_ci\'');
-        self::$cachedResult = self::$dbProperties = array();
         return true;
     }

trunk/library/components/Needlworks.PHP.Core.php

@@ -254 +254 @@
     **/
 
-
+    private static $queue;
+    
+    static function addRule($iv) {
+        if(empty(self::$queue)) self::$queue = array('GET'=>array(),'POST'=>array(),'REQUEST'=>array(),'SERVER'=>array(),'FILES'=>array());
+        if(isset($iv['GET'])) self::$queue['GET'] = array_merge(self::$queue['GET'],$iv['GET']);
+        if(isset($iv['POST'])) self::$queue['POST'] = array_merge(self::$queue['POST'],$iv['POST']);
+        if(isset($iv['REQUEST'])) self::$queue['REQUEST'] = array_merge(self::$queue['REQUEST'],$iv['REQUEST']);
+        if(isset($iv['SERVER'])) self::$queue['SERVER'] = array_merge(self::$queue['SERVER'],$iv['SERVER']);
+        if(isset($iv['FILES'])) self::$queue['FILES'] = array_merge(self::$queue['FILES'],$iv['FILES']);
+    }
+    static function isValid() {
+        return self::validate(self::$queue);
+    }
+    
     static function validate(&$iv) {
         if (isset($iv['GET'])) {

trunk/library/components/Textcube.Data.Config.php

@@ -40 +40 @@
         
         // Database setting.
-//      if(isset($service['dbms'])) {
-//          if($service['dbms'] == 'mysql' && class_exists('mysqli')) $service['dbms'] = 'mysqli';
-//      }
-        
-        // Debug mode configuration.
-        if($service['debugmode'] == true) {
-            if(isset($service['dbms'])) {
-                switch($service['dbms']) {
-                    case 'mysqli':         require_once(ROOT. "/library/components/Needlworks.Debug.MySQLi.php"); break;
-                    case 'mysql': default: require_once(ROOT. "/library/components/Needlworks.Debug.MySQL.php"); break;
-                }
-            } else require_once(ROOT. "/library/components/Needlworks.Debug.MySQL.php");
+        if(isset($service['dbms'])) {
+            if($service['dbms'] == 'mysql' && class_exists('mysqli')) $service['dbms'] = 'mysqli';
         }
         

trunk/library/preprocessor.php

@@ -4 +4 @@
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
 
-/** Dispatcher
+/** Pre-processor - This file 
     ----------
+    
 */
 /** Loading Basic Components */
@@ -27 +28 @@
 );
 Validator::validateArray($_SERVER, $basicIV);
+/** Basic URI information validation. */
 if(isset($URLInfo)) {
     $basicIV = array(
@@ -46 +48 @@
 
 /** Loading debug module */
-
+if($config->service['debugmode'] == true) {
+    if(isset($config->service['dbms'])) {
+        switch($config->service['dbms']) {
+            case 'mysqli':         require_once(ROOT. "/library/components/Needlworks.Debug.MySQLi.php");break;
+            case 'mysql': default: require_once(ROOT. "/library/components/Needlworks.Debug.MySQL.php"); break;
+        }
+    } else require_once(ROOT. "/library/components/Needlworks.Debug.MySQL.php");
+}
+    
 /** Loading components / models / views */
 require_once (ROOT.'/library/include.'.$context->URLInfo['interfaceType'].'.php');