Changeset 7010

Timestamp:

11/18/08 16:43:37 (7 weeks ago)

Author:

inureyes

Message:

refs #777

• Input validation 루틴의 이전
  
• config 로드 시점 변경
  
• dispatcher 에 TODO 갱신
  
• initialize 루틴 수정
  

Location:

trunk

Files:

• dispatcher.php (modified) (4 diffs)
• library/context.php (modified) (1 diff)
• library/data/POD.php (modified) (1 diff)
• library/environment/config.php (modified) (3 diffs)
• library/include.php (modified) (1 diff)
• library/includeForBlog.php (modified) (1 diff)
• library/includeForBlogOwner.php (modified) (1 diff)
• library/includeForFeeder.php (modified) (1 diff)
• library/includeForIcon.php (modified) (1 diff)
• library/includeForReader.php (modified) (1 diff)
• library/initialize.php (modified) (1 diff)
• library/loader.php (modified) (1 diff)
• library/settings.php (modified) (1 diff)

trunk/dispatcher.php

@@ -11 +11 @@
 define('ROOT', '.');
 
-/// Load config.php.
-if (file_exists(ROOT.'/config.php')) {
-    require_once(ROOT.'/config.php');
-} else {
+/// Check config.php.
+if (!file_exists(ROOT.'/config.php')) {
     require(ROOT.'/setup.php');
     exit;
@@ -25 +23 @@
 $config = Config::getInstance();
 
-// Parse and normalize URI. */
+/** Parse and normalize URI. */
 /* TODO: Unify the environment and do work-arounds. (For IIS, Apache - mod_php or fastcgi, lighttpd, and etc.) */
 // Structure of fancy URL:
 //   host + blog prefix + interface path + pagination info + extra arguments not in $_REQUEST
 // TODO: Apply this structure to $context->accessInfo...
+
 try {
     $context = Context::getInstance(); // automatic initialization via first instanciation
@@ -39 +38 @@
 }
 
-/* Special pre-handlers. (favicon.ico, index.gif) */
+/// Special pre-handlers. (favicon.ico, index.gif)
 if ($context->accessInfo['prehandler']) {
     // Skip further processes such as session management.
@@ -46 +45 @@
 }
 
-/* TODO: Session management. */
+/// Input Validation
+// Basic POST/GET variable validation.
+if (isset($IV)) {
+    if (!Validator::validate($IV)) {
+        header('HTTP/1.1 404 Not Found');
+        exit;
+    }
+}
+// Basic SERVER variable validation.
+$basicIV = array(
+    'SCRIPT_NAME' => array('string'),
+    'REQUEST_URI' => array('string'),
+    'REDIRECT_URL' => array('string', 'mandatory' => false)
+);
+Validator::validateArray($_SERVER, $basicIV);
+/*if(isset($accessInfo)) {
+    $basicIV = array(
+        'fullpath' => array('string'),
+        'input'    => array('string'),
+        'position' => array('string'),
+        'root'     => array('string'),
+        'input'    => array('string', 'mandatory' => false)
+    );
+    $accessInfo['fullpath'] = urldecode($accessInfo['fullpath']);
+    Validator::validateArray($accessInfo, $basicIV);
+}*/
 
-// TODO: Do input validation as soon as possible?
+/* TODO: Database Initialization (if necessary)
+/* TODO: Parse virtual blog information (if necessary)
+/* TODO: Session management. (if necessary) */
+/* TODO: ACL validation */
+
 /* Load final interface handler. */
 // Each interface...

trunk/library/context.php

@@ -97 +97 @@
 
         // TODO: Parse $_GET, $_POST, and etc.
-
+        if(isset($accessInfo['URLfragment'][0]) && $accessInfo['URLfragment'][0] == 'owner') $this->mode = 'owner';
+        else $this->mode = 'blog';
         $this->accessInfo = $accessInfo;
     }

trunk/library/data/POD.php

@@ -19 +19 @@
     /** Initialization **/
     function __construct($domain = null, $type = null, $prefix = '') {
-        requireComponent('Needlworks.Cache.PageCache');
         global $_pod_setting;
         if($domain != null) $this->_domain = $domain;

trunk/library/environment/config.php

@@ -22 +22 @@
 global $database, $service, $blog, $memcache;
 
+// Default configuration.
 $database['server'] = 'localhost';
 $database['database'] = '';
@@ -33 +34 @@
 $service['language'] = 'ko';
 $service['timezone'] = 'Asia/Seoul';
-$service['encoding'] = 'EUC-KR';
+$service['encoding'] = 'UTF-8';
 $service['umask'] = 0;
 $service['skin'] = 'coolant';
@@ -54 +55 @@
 $service['debug_rewrite_module'] = false;
 $service['useNumericURLonRSS'] = false;
-// Map port setting.
-if (@is_numeric($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != 80) && ($_SERVER['SERVER_PORT'] != 443))
-    $service['port'] = $_SERVER['SERVER_PORT'];
-
-// Include installation configuration.
-$service['session_cookie_path'] = '/';
-if(!defined('__TEXTCUBE_SETUP__')) @include ROOT . '/config.php';
-
-// Set resource path.
-if($service['externalresources']) {
-    if(isset($service['resourceURL']) && !empty($service['resourceURL'])) 
-        $service['resourcepath'] = $service['resourceURL'];
-    else 
-        $service['resourcepath'] = TEXTCUBE_RESOURCE_URL;
-} else {
-    $service['resourcepath'] = $service['path'].'/resources';
-}
-
-// 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':         requireLibrary("debug/MySQLi"); break;
-            case 'mysql': default: requireLibrary("debug/MySQL"); break;
-        }
-    } else requireLibrary("debug/MySQL"); 
-}
-
-// Session cookie patch.
-if(!empty($service['domain']) && strstr( $_SERVER['HTTP_HOST'], $service['domain'] ) ) {
-    $service['session_cookie_domain'] = $service['domain'];
-} else {
-    $service['session_cookie_domain'] = $_SERVER['HTTP_HOST'];
-}
-
-// Basic POST/GET variable validation.
-if (isset($IV)) {
-    if (!Validator::validate($IV)) {
-        header('HTTP/1.1 404 Not Found');
-        exit;
-    }
-}
-// Basic SERVER variable validation.
-$basicIV = array(
-    'SCRIPT_NAME' => array('string'),
-    'REQUEST_URI' => array('string'),
-    'REDIRECT_URL' => array('string', 'mandatory' => false)
-);
-Validator::validateArray($_SERVER, $basicIV);
-if(isset($accessInfo)) {
-    $basicIV = array(
-        'fullpath' => array('string'),
-        'input'    => array('string'),
-        'position' => array('string'),
-        'root'     => array('string'),
-        'input'    => array('string', 'mandatory' => false)
-    );
-    $accessInfo['fullpath'] = urldecode($accessInfo['fullpath']);
-    Validator::validateArray($accessInfo, $basicIV);
-}
+$service['dbms'] = 'mysql';
 ?>

trunk/library/include.php

@@ -40 +40 @@
 }
 
-/***** Autoload components *****/
-class Autoload {
-    private static $drivers = array(
-        'auth'        => array('Auth','OpenID',array('Privilege'=>'Auth','Acl'=>'Auth')),
-        'cache'       => array('PageCache'),
-        'data'        => array('BlogSetting','BlogStatistics','DailyStatistics',
-            'DataMaintenance','Filter','Image','MySQL','MySQLi','POD','RSS',
-            'RefererLog','RefererStatistics','ServiceSetting','Setting',
-            'Statistics','SubscriptionLog','SubscriptionStatistics','Syndication',
-            'TData','UserInfo','UserSetting'),
-        'entry'       => array(
-            'Attachment','Category','Comment','CommentNotified','CommentNotifiedSiteInfo',
-            'Feed','GuestComment','Keyword','Link','Notice','PluginSetting',
-            'Post','RemoteResponse','SkinSetting','Tag','Trackback','TrackbackLog'),
-        'environment' => array(
-            'Base64Stream','HTTPRequest','OutputWriter','XMLRPC',
-            array('XMLRPCFault'=>'XMLRPC','XMLCustomType'=>'XMLRPC'),
-            'XMLTree','Pop3'),
-        'plugin'      => array('Misc','PluginCustomConfig'),
-        'session'     => array('Session'),
-        'skin'        => array('BlogSkin'),
-        'view'        => array('BlogView','Paging','Respond'));
-    private static $relation = array();
-    public static function register() {
-        foreach (self::$drivers as $namespace => $classes) {
-            if(!empty($classes)) foreach($classes as $class) {
-                if(is_array($class)) {
-                    foreach($class as $module => $file) self::$relation[$module] = $namespace.'/'.$file;
-                } else self::$relation[$class] = $namespace.'/'.$class;
-            }
-        }   
-    }
-    public static function load($name) {
-        global $service;
-        $name = ucfirst($name);
-        if(empty(self::$relation)) {self::register();}
-        if (in_array($name,array('DBQuery'))) {
-            if (!isset($service['dbms'])) $service['dbms'] = 'mysql';
-            require_once(ROOT . "/library/data/".$service['dbms']."/Adapter.php");
-            require_once(ROOT . "/library/data/Database.php");
-        } else if(self::$relation[$name] == 'session' && isset($service['memcached']) && $service['memcached'] == true) {
-            require_once(ROOT . "/library/session/Session_Memcached.php");
-        } else if(empty(self::$relation[$name])) {
-            if(defined('TCDEBUG')) print "Textcube: Unregisterred auto load class: $name<br/>\n";
-        } else {
-            require_once(ROOT . "/library/".self::$relation[$name]."/".$name.".php");
-        }
-
-    }
-}
-spl_autoload_register(array('Autoload', 'load'));
-
 /***** Pre-define basic components *****/
 $__coreLibrary = array(
     'environment/Needlworks.PHP.UnifiedEnvironment',
-    'environment/Needlworks.PHP.Core',
+//  'environment/Needlworks.PHP.Core',
     'environment/Locale',
     'data/Core',

trunk/library/includeForBlog.php

@@ -6 +6 @@
 $__requireComponent = array();
 $__requireBasics = array(
-    'environment/config',                   // Basics
+    // Basics
     'function/string',
     'function/time',

trunk/library/includeForBlogOwner.php

@@ -7 +7 @@
 $__requireComponent = array();
 $__requireBasics = array(
-    'environment/config',               // Basics
     'function/string',
     'function/time',

trunk/library/includeForFeeder.php

@@ -8 +8 @@
 $__requireComponent = array();
 $__requireBasics = array(       // Basics
-    'environment/config',
     'function/string',
     'function/time',

trunk/library/includeForIcon.php

@@ -8 +8 @@
 $__requireComponent = array();
 $__requireBasics = array(       // Basics
-    'environment/config',
     'function/file');
 $__requireLibrary = array(      // Library

trunk/library/includeForReader.php

@@ -7 +7 @@
 $__requireComponent = array();
 $__requireBasics = array(       // Basics
-    'environment/config',
     'function/string',
     'function/time',

trunk/library/initialize.php

@@ -112 +112 @@
             $adminSkinSetting['editorTemplate'] = "/resources/style/default-wysiwyg.css";
     }
-    if (!file_exists(ROOT . '/config.php')) {
-        header('Location: ' . ROOT . '/setup.php');
-        exit;
-    }
 }
 ?>

trunk/library/loader.php

@@ -6 +6 @@
 final class FrameworkAutoloader
 {
-    private static $classPaths = array(
-            'Context' => './library/context.php',
-            'Debug' => './library/debug.php',
-            'IModel' => './library/data/IAdapter.php',
-            'DBException' => './library/data/IAdapter.php',
-            'DBConnectionError' => './library/data/IAdapter.php',
-            'DBQueryError' => './library/data/IAdapter.php',
-            'IAdapter' => './library/data/IModel.php',
-            'ICache' => './library/cache/ICache.php',
-            'Entry' => './library/model/Entry.php',
+    private static $classInfo = array(
+        'auth'        => array('Auth','OpenID',array('Privilege'=>'Auth','Acl'=>'Auth')),
+        'cache'       => array('PageCache','ICache'),
+        'data'        => array('BlogSetting','BlogStatistics','DailyStatistics',
+            'DataMaintenance','Filter','Image','MySQL','MySQLi','POD','RSS',
+            'RefererLog','RefererStatistics','ServiceSetting','Setting',
+            'Statistics','SubscriptionLog','SubscriptionStatistics','Syndication',
+            'TData','UserInfo','UserSetting',
+            array('IAdapter'=>'IModel','DBQueryError'=>'IAdapter',
+                'DBConnectionError'=>'IAdapter','DBException'=>'IAdapter')
+                ),
+        'entry'       => array(
+            'Attachment','Category','Comment','CommentNotified','CommentNotifiedSiteInfo',
+            'Feed','GuestComment','Keyword','Link','Notice','PluginSetting',
+            'Post','RemoteResponse','SkinSetting','Tag','Trackback','TrackbackLog'),
+        'environment' => array(
+            'Base64Stream','HTTPRequest','OutputWriter','XMLRPC',
+            'XMLTree','Pop3',
+            array('XMLRPCFault'=>'XMLRPC','XMLCustomType'=>'XMLRPC',
+                'Validator'=>'Needlworks.PHP.Core')),
+        'plugin'      => array('Misc','PluginCustomConfig'),
+        'session'     => array('Session'),
+        'skin'        => array('BlogSkin'),
+        'view'        => array('BlogView','Paging','Respond'),
+        'root'        => array('Context','Debug')
         );
-
+        
     static function init() {
         $config = Config::getInstance();
-
         // Set paths for DB classes according to the current backend configuration.
-        self::$classPaths['Adapter'] = './data/' . $config->backend_name . '/Adapter.php';
-        self::$classPaths['Model'] = './data/' . $config->backend_name . '/Model.php';
+        array_push(self::$classInfo['data'],array('IAdapter'=>'data/'.$config->backend_name.'/Adapter.php'));
+        array_push(self::$classInfo['data'],array('IModel'=>'data/'.$config->backend_name.'/Model.php'));
     }
 
-    static function autoload($name) {
-        if (isset(self::$classPaths[$name]))
-            require_once(self::$classPaths[$name]);
-        // Because multiple autoload functions can be defined, we don't throw any exception here.
-        // If PHP finally fails finding the class, it will say FATAL error.
+    private static $relation = array();
+    
+    public static function register() {
+        foreach (self::$classInfo as $namespace => $classes) {
+            if(!empty($classes)) { 
+                foreach($classes as $class) {
+                    if($namespace == 'root') self::$relation[$class] = $class; 
+                    else if(is_array($class)) {
+                        foreach($class as $module => $file) self::$relation[$module] = $namespace.'/'.$file;
+                    } else self::$relation[$class] = $namespace.'/'.$class;
+                }
+            }
+        }   
+    }
+    public static function autoload($name) {
+        global $service;
+        $name = ucfirst($name);
+        if(empty(self::$relation)) {self::register();}
+        if (in_array($name,array('DBQuery'))) {
+            if (!isset($service['dbms'])) $service['dbms'] = 'mysql';
+            require_once(ROOT . "/library/data/".$service['dbms']."/Adapter.php");
+            require_once(ROOT . "/library/data/Database.php");
+        } else if(self::$relation[$name] == 'session' && isset($service['memcached']) && $service['memcached'] == true) {
+            require_once(ROOT . "/library/session/Session_Memcached.php");
+        } else if(empty(self::$relation[$name])) {
+            if(defined('TCDEBUG')) print "Textcube: Unregisterred auto load class: $name<br/>\n";
+        } else {
+            require_once(ROOT . "/library/".self::$relation[$name].".php");
+        }
     }
 }
-
 FrameworkAutoloader::init();
 spl_autoload_register(array('FrameworkAutoloader', 'autoload'));

trunk/library/settings.php

@@ -12 +12 @@
 
     protected function __construct() {
+        global $database, $service;
+
         $this->settings = array();
+        require_once(ROOT.'/library/environment/config.php');   // Loading default configuration
+        if (file_exists(ROOT.'/config.php')) require_once(ROOT.'/config.php');  // Override configuration
+        // Map port setting.
+        if (@is_numeric($_SERVER['SERVER_PORT']) && ($_SERVER['SERVER_PORT'] != 80) && ($_SERVER['SERVER_PORT'] != 443))
+            $service['port'] = $_SERVER['SERVER_PORT'];
+        
+        // Include installation configuration.
+        $service['session_cookie_path'] = '/';
+        if(!defined('__TEXTCUBE_SETUP__')) @include ROOT . '/config.php';
+        
+        // Set resource path.
+        if($service['externalresources']) {
+            if(isset($service['resourceURL']) && !empty($service['resourceURL'])) 
+                $service['resourcepath'] = $service['resourceURL'];
+            else 
+                $service['resourcepath'] = TEXTCUBE_RESOURCE_URL;
+        } else {
+            $service['resourcepath'] = $service['path'].'/resources';
+        }
+        
+        // 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/debug/MySQLi.php"); break;
+                    case 'mysql': default: require_once(ROOT. "/library/debug/MySQL.php"); break;
+                }
+            } else requireLibrary("debug/MySQL"); 
+        }
+        
+        // Session cookie patch.
+        if(!empty($service['domain']) && strstr( $_SERVER['HTTP_HOST'], $service['domain'] ) ) {
+            $service['session_cookie_domain'] = $service['domain'];
+        } else {
+            $service['session_cookie_domain'] = $_SERVER['HTTP_HOST'];
+        }
 
-        // TODO: Temporary implementation: just import from config.php's global variables
-        global $database, $service;
         $this->database = $database;
         $this->service = $service;
-        $this->backend_name = isset($service['dbms']) ? $service['dbms'] : 'mysql';
+        $this->backend_name = $service['dbms'];
     }