Changeset 7022

Timestamp:

11/20/08 17:52:00 (7 weeks ago)

Author:

inureyes

Message:

refs #777

• 로더의 플로우 패치를 통하여 '일단 돌아가게' 만듬.
  
• TODO :
  
  • Setting 컴포넌트의 재작성, Config 의 컨텐츠를 Setting 을 통해서 접근가능하도록 함
    
  • 캐시 구조 재작성
    
  • dispatcher 에서 DB 커넥션 후에 전역변수 설정 로드가 일어나야 하므로 DB 접속 초기화 시점을 당김
    
  • 세션 매니지먼트 구조를 dispatcher 로 이전
    

Location:

trunk

Files:

• dispatcher.php (modified) (2 diffs)
• library/auth.php (modified) (1 diff)
• library/cache/PageCache.php (modified) (1 diff)
• library/context.php (modified) (5 diffs)
• library/data/Setting.php (modified) (11 diffs)
• library/loader.php (modified) (3 diffs)
• library/model/blog.service.php (modified) (2 diffs)
• library/settings.php (modified) (1 diff)

trunk/dispatcher.php

@@ -23 +23 @@
 include(ROOT.'/library/loader.php');
 $config = Config::getInstance();
-
 /** Parse and normalize URI. */
 /* TODO: Unify the environment and do work-arounds. (For IIS, Apache - mod_php or fastcgi, lighttpd, and etc.) */
@@ -74 +73 @@
 
 /* TODO: Database Initialization (if necessary)
+
+
 /* TODO: Parse virtual blog information (if necessary)*/
-$gCacheStorage = new globalCacheStorage;
 $context->URIParser();
+$gCacheStorage = new GlobalCacheStorage;
 $context->globalVariableParser();
 

trunk/library/auth.php

@@ -63 +63 @@
 function getUserId() {
     return Acl::getIdentity('textcube');
-}
-
-
-function getBlogId() {
-    global $blogid;
-    return Context::$blogid;
-//  return $blogid;
 }
 

trunk/library/cache/PageCache.php

@@ -253 +253 @@
 // blogSettings, ServiceSettings, activePlugins, etc..
 // Textcube will use it as global object.
-class globalCacheStorage extends pageCache {
+class GlobalCacheStorage extends pageCache {
     function __construct($blogid = null) {
+        $context = Context::getInstance();
         $this->_isChanged = false;
         $this->_gCacheStorage = array();
-        if(is_null($blogid)) $this->_gBlogId = getBlogId();
+        if(is_null($blogid)) $this->_gBlogId = $context->blogid;
         else $this->_gBlogId = $blogid;
     }

trunk/library/context.php

@@ -178 +178 @@
                 Respond::NotFoundPage();
         }
-
-
-        $blog = Setting::getBlogSettingsGlobal($this->blogid);
-        $skinSetting = getSkinSetting($blogid);
         
         if(isset($context->accessInfo['interfacePath'])) {
@@ -224 +220 @@
     
     private function __GValParser() {
-        global $serviceURL, $pathURL, $defaultURL, $baseURL, $pathURL, $blog, $hostURL, $folderURL, $suri;
+        global $serviceURL, $pathURL, $defaultURL, $baseURL, $pathURL, $hostURL, $folderURL;
+        global $suri, $blog, $blogid, $skinSetting;
         $config = Config::getInstance();
-        $suri = $self->suri;
+        
+        $suri = $this->suri;
+        $blog = Setting::getBlogSettingsGlobal($this->blogid);
+        $skinSetting = Setting::getSkinSetting($this->blogid);
+        $blogid = $this->blogid;
+        
         if (!isset($serviceURL))
-            $serviceURL = 'http://' . $config->service['domain'] . (isset($config->service['port']) ? ':' . $config->service['port'] : '') . $service['path'];
+            $serviceURL = 'http://' . $config->service['domain'] . (isset($config->service['port']) ? ':' . $config->service['port'] : '') . $config->service['path'];
         switch ($config->service['type']) {
             case 'domain':
@@ -274 +276 @@
         }
         $hostURL = 'http://' . $_SERVER['HTTP_HOST'] . (isset($config->service['port']) ? ':' . $config->service['port'] : '');
-        $blogURL = $pathURL.getFancyURLpostfix();
+        $blogURL = $pathURL.$this->__getFancyURLpostfix();
         $folderURL = rtrim($blogURL . $suri['directive'], '/');
         if (defined('__TEXTCUBE_MOBILE__')) {
@@ -295 +297 @@
         return POD::queryCell("SELECT blogid FROM {$database['prefix']}BlogSettings WHERE name = 'secondaryDomain' AND (value = '$domain' OR  value = '" . (substr($domain, 0, 4) == 'www.' ? substr($domain, 4) : 'www.' . $domain) ."')");    
     }
+    private function __getFancyURLpostfix() {   
+        $config = Config::getInstance();
+        switch($config->service['fancyURL']) {
+            case 0: return '/index.php?';
+            case 1: return '/?';
+            case 2:default: return '';
+        }
+    }
     
     function __destruct() {
@@ -300 +310 @@
     }
 }
+
+/** Support functions */
+
+function getBlogId() {
+    global $blogid;
+    return $blogid; 
+}
+
 ?>

trunk/library/data/Setting.php

@@ -41 +41 @@
             return $query->getCell('value');
         }
-        $settings = Setting::getBlogSettingsGlobal(($blogid == null ? getBlogId() : $blogid)); 
+        $settings = setting::getBlogSettingsGlobal(($blogid == null ? getBlogId() : $blogid)); 
         if ($settings === false) return $default;
         if( isset($settings[$name]) ) {
@@ -106 +106 @@
                 if(!in_array($name,$blogSettingFields)) {
                     $result[$name] = $value;
-                    Setting::setBlogSettingDefault($name,$value,$blogid);
+                    setting::setBlogSettingDefault($name,$value,$blogid);
                 }
             }
@@ -127 +127 @@
         if (!array_key_exists($blogid, $__gCacheBlogSettings)) {
             // force loading
-            Setting::getBlogSettingsGlobal($blogid);
+            setting::getBlogSettingsGlobal($blogid);
         }
         if ($__gCacheBlogSettings[$blogid] === false) {
@@ -169 +169 @@
         if (!array_key_exists($blogid, $__gCacheBlogSettings)) {
             // force loading
-            Setting::getBlogSettingsGlobal($blogid);
+            setting::getBlogSettingsGlobal($blogid);
         }
         if ($__gCacheBlogSettings[$blogid] === false) {
@@ -191 +191 @@
     // For plugin-specific use.
     function getBlogSetting($name, $default = null) {
-        $settings = Setting::getBlogSettingsGlobal(getBlogId()); // from blog.service.php
+        $settings = setting::getBlogSettingsGlobal(getBlogId()); // from blog.service.php
         if ($settings === false) return $default;
         $name = 'plugin_' . $name;
@@ -203 +203 @@
         global $database, $blogid;
         $name = 'plugin_' . $name;
-        return Setting::setBlogSettingGlobal($name, $value);
+        return setting::setBlogSettingGlobal($name, $value);
     }
     
@@ -209 +209 @@
         global $database, $blogid;
         $name = 'plugin_' . $name;
-        return Setting::removeBlogSettingGlobal($name);
+        return setting::removeBlogSettingGlobal($name);
     }
 
@@ -216 +216 @@
         global $database, $userSetting;
         $name = 'plugin_' . $name;
-        return Setting::getUserSettingGlobal($name, $default);
+        return setting::getUserSettingGlobal($name, $default);
     }
 
@@ -243 +243 @@
         global $database;
         $name = 'plugin_' . $name;
-        return Setting::setUserSettingGlobal($name, $value);
+        return setting::setUserSettingGlobal($name, $value);
     }
     
@@ -257 +257 @@
         global $database;
         $name = 'plugin_' . $name;
-        return Setting::removeUserSettingGlobal($name);
+        return setting::removeUserSettingGlobal($name);
     }
 
@@ -285 +285 @@
         $name = 'plugin_' . $name;
         return POD::execute("DELETE FROM {$database['prefix']}ServiceSettings WHERE name = '".POD::escapeString($name)."'");
+    }
+
+    function getSkinSetting($blogid, $forceReload = false) {
+        global $database, $service, $skinSetting;
+        global $__gCacheSkinSetting;
+        global $gCacheStorage;
+        if (
+            ($forceReload == false) 
+            && (isset($__gCacheSkinSetting)) 
+            && (array_key_exists($blogid, $__gCacheSkinSetting))
+            ) 
+        {
+            return $__gCacheSkinSetting[$blogid];
+        }
+        if($blogid == getBlogId() && $forceReload == false) {
+            $retval = $gCacheStorage->getContent('SkinSetting');
+            if(!empty($retval)) {
+                $__gCacheSkinSetting[$blogid] = $retval;
+                return $retval;
+            }
+        }
+        if ($retval = POD::queryRow("SELECT * FROM {$database['prefix']}SkinSettings WHERE blogid = $blogid",MYSQL_ASSOC)) {
+            if ($retval != FALSE) {
+                if (!Validator::directory($retval['skin']) && ($retval['skin'] !="customize/$blogid")) {
+                    $retval['skin'] = $service['skin'];
+                }
+                $__gCacheSkinSetting[$blogid] = $retval;
+                if($blogid == getBlogId())  $gCacheStorage->setContent('SkinSetting',$retval);
+                return $retval;
+            }
+        }
+        
+        $retval = array( 'blogid' => $blogid , 'skin' => $service['skin'], 
+            'entriesOnRecent' => 5, 'commentsOnRecent' => 5, 'commentsOnGuestbook' => 5,
+            'tagsOnTagbox' => 30, 'tagboxAlign' => 3, 'trackbacksOnRecent' => 5, 
+            'expandComment' => 1, 'expandTrackback' => 1, 
+            'recentNoticeLength' => 25, 'recentEntryLength' => 30, 
+            'recentCommentLength' => 30, 'recentTrackbackLength' => 30, 
+            'linkLength' => 30, 'showListOnCategory' => 1, 'showListOnArchive' => 1, 
+            'tree' => 'base', 
+            'colorOnTree' => '000000', 'bgColorOnTree' => '', 
+            'activeColorOnTree' => 'FFFFFF', 'activeBgColorOnTree' => '00ADEF', 
+            'labelLengthOnTree' => 27, 'showValueOnTree' => 1 );
+        
+        $__gCacheSkinSetting[$blogid] = $retval;
+        if($blogid == getBlogId())  $gCacheStorage->setContent('SkinSetting',$retval);
+        return $retval; 
     }
     

trunk/library/loader.php

@@ -8 +8 @@
     private static $classInfo = array(
         'auth'        => array('Auth','OpenID',array('Privilege'=>'Auth','Acl'=>'Auth')),
-        'cache'       => array('PageCache','ICache',array('globalCacheStorage','PageCache'),
+        'cache'       => array('PageCache','ICache',array('GlobalCacheStorage'=>'PageCache')),
         'data'        => array('BlogSetting','BlogStatistics','DailyStatistics',
             'DataMaintenance','Filter','Image','POD','RSS',
@@ -55 +55 @@
     }
     public static function autoload($name) {
-        global $service;
         $name = ucfirst($name);
         $config = Config::getInstance();
@@ -62 +61 @@
             require_once(ROOT . "/library/data/".$config->backend_name."/Adapter.php");
             require_once(ROOT . "/library/data/Database.php");
-        } else if(self::$relation[$name] == 'session' && isset($service['memcached']) && $service['memcached'] == true) {
+        } else if(self::$relation[$name] == 'session' && isset($config->service['memcached']) && $config->service['memcached'] == true) {
             require_once(ROOT . "/library/session/Session_Memcached.php");
         } else if(empty(self::$relation[$name])) {

trunk/library/model/blog.service.php

@@ -12 +12 @@
 
 function getSkinSetting($blogid, $forceReload = false) {
-    global $database, $service, $skinSetting;
-    global $__gCacheSkinSetting;
-    global $gCacheStorage;
-    if (
-        ($forceReload == false) 
-        && (isset($__gCacheSkinSetting)) 
-        && (array_key_exists($blogid, $__gCacheSkinSetting))
-        ) 
-    {
-        return $__gCacheSkinSetting[$blogid];
-    }
-    if($blogid == getBlogId() && $forceReload == false) {
-        $retval = $gCacheStorage->getContent('SkinSetting');
-        if(!empty($retval)) {
-            $__gCacheSkinSetting[$blogid] = $retval;
-            return $retval;
-        }
-    }
-    if ($retval = POD::queryRow("SELECT * FROM {$database['prefix']}SkinSettings WHERE blogid = $blogid",MYSQL_ASSOC)) {
-        if ($retval != FALSE) {
-            if (!Validator::directory($retval['skin']) && ($retval['skin'] !="customize/$blogid")) {
-                $retval['skin'] = $service['skin'];
-            }
-            $__gCacheSkinSetting[$blogid] = $retval;
-            if($blogid == getBlogId())  $gCacheStorage->setContent('SkinSetting',$retval);
-            return $retval;
-        }
-    }
-    
-    $retval = array( 'blogid' => $blogid , 'skin' => $service['skin'], 
-        'entriesOnRecent' => 5, 'commentsOnRecent' => 5, 'commentsOnGuestbook' => 5,
-        'tagsOnTagbox' => 30, 'tagboxAlign' => 3, 'trackbacksOnRecent' => 5, 
-        'expandComment' => 1, 'expandTrackback' => 1, 
-        'recentNoticeLength' => 25, 'recentEntryLength' => 30, 
-        'recentCommentLength' => 30, 'recentTrackbackLength' => 30, 
-        'linkLength' => 30, 'showListOnCategory' => 1, 'showListOnArchive' => 1, 
-        'tree' => 'base', 
-        'colorOnTree' => '000000', 'bgColorOnTree' => '', 
-        'activeColorOnTree' => 'FFFFFF', 'activeBgColorOnTree' => '00ADEF', 
-        'labelLengthOnTree' => 27, 'showValueOnTree' => 1 );
-    
-    $__gCacheSkinSetting[$blogid] = $retval;
-    if($blogid == getBlogId())  $gCacheStorage->setContent('SkinSetting',$retval);
-    return $retval; 
+    return Setting::getSkinSetting($blogid, $forceReload);
 }
 
@@ -92 +49 @@
         case 'single':default:
             return "http://$domain$path".getFancyURLpostfix();
-    }
-}
-
-function getFancyURLpostfix() {
-    global $service;
-    switch($service['fancyURL']) {
-        case 0: return '/index.php?';
-        case 1: return '/?';
-        case 2:default: return '';
     }
 }

trunk/library/settings.php

@@ -12 +12 @@
 
     protected function __construct() {
-        self::__basicConfigLoader();
+        $this->__basicConfigLoader();
     }