Changeset 7021
- Timestamp:
- 11/20/08 17:13:29 (7 weeks ago)
- Location:
- trunk
- Files:
-
- 3 modified
-
dispatcher.php (modified) (2 diffs)
-
library/context.php (modified) (1 diff)
-
library/data/Setting.php (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/dispatcher.php
r7020 r7021 74 74 75 75 /* TODO: Database Initialization (if necessary) 76 /* TODO: Parse virtual blog information (if necessary) 76 /* TODO: Parse virtual blog information (if necessary)*/ 77 $gCacheStorage = new globalCacheStorage; 78 $context->URIParser(); 79 $context->globalVariableParser(); 80 77 81 /* TODO: Session management. (if necessary) */ 78 82 /* TODO: ACL validation */ … … 84 88 // loads its necessary libraries, models and components. 85 89 // before actual execution. 86 $gCacheStorage = new globalCacheStorage; 90 87 91 require(ROOT.'/'.$context->accessInfo['interfacePath']); 88 92 -
trunk/library/context.php
r7020 r7021 20 20 // self::__GValParser(); 21 21 } 22 public function URIParser() { self::__URIParser();} 23 public function globalVariableParser() { self::__GValParser();} 22 24 23 25 private function __URIInterpreter() { -
trunk/library/data/Setting.php
r7020 r7021 41 41 return $query->getCell('value'); 42 42 } 43 $settings = setting::getBlogSettingsGlobal(($blogid == null ? getBlogId() : $blogid));43 $settings = Setting::getBlogSettingsGlobal(($blogid == null ? getBlogId() : $blogid)); 44 44 if ($settings === false) return $default; 45 45 if( isset($settings[$name]) ) { … … 106 106 if(!in_array($name,$blogSettingFields)) { 107 107 $result[$name] = $value; 108 setting::setBlogSettingDefault($name,$value,$blogid);108 Setting::setBlogSettingDefault($name,$value,$blogid); 109 109 } 110 110 } … … 127 127 if (!array_key_exists($blogid, $__gCacheBlogSettings)) { 128 128 // force loading 129 setting::getBlogSettingsGlobal($blogid);129 Setting::getBlogSettingsGlobal($blogid); 130 130 } 131 131 if ($__gCacheBlogSettings[$blogid] === false) { … … 169 169 if (!array_key_exists($blogid, $__gCacheBlogSettings)) { 170 170 // force loading 171 setting::getBlogSettingsGlobal($blogid);171 Setting::getBlogSettingsGlobal($blogid); 172 172 } 173 173 if ($__gCacheBlogSettings[$blogid] === false) { … … 191 191 // For plugin-specific use. 192 192 function getBlogSetting($name, $default = null) { 193 $settings = setting::getBlogSettingsGlobal(getBlogId()); // from blog.service.php193 $settings = Setting::getBlogSettingsGlobal(getBlogId()); // from blog.service.php 194 194 if ($settings === false) return $default; 195 195 $name = 'plugin_' . $name; … … 203 203 global $database, $blogid; 204 204 $name = 'plugin_' . $name; 205 return setting::setBlogSettingGlobal($name, $value);205 return Setting::setBlogSettingGlobal($name, $value); 206 206 } 207 207 … … 209 209 global $database, $blogid; 210 210 $name = 'plugin_' . $name; 211 return setting::removeBlogSettingGlobal($name);211 return Setting::removeBlogSettingGlobal($name); 212 212 } 213 213 … … 216 216 global $database, $userSetting; 217 217 $name = 'plugin_' . $name; 218 return setting::getUserSettingGlobal($name, $default);218 return Setting::getUserSettingGlobal($name, $default); 219 219 } 220 220 … … 243 243 global $database; 244 244 $name = 'plugin_' . $name; 245 return setting::setUserSettingGlobal($name, $value);245 return Setting::setUserSettingGlobal($name, $value); 246 246 } 247 247 … … 257 257 global $database; 258 258 $name = 'plugin_' . $name; 259 return setting::removeUserSettingGlobal($name);259 return Setting::removeUserSettingGlobal($name); 260 260 } 261 261
