Changeset 1568

Timestamp:

2009년 10월 20일 15시 54분 49초 (3 years ago)

Author:

yupmin

Message:

dispatcher 실행처리 정리(플러그인 처리 재조정)

Location:

trunk/metabbs

Files:

• app/admin/controllers/setting/index.php (modified) (1 diff)
• app/admin/views/setting/index.php (modified) (1 diff)
• core/core.php (modified) (1 diff)
• core/dispatcher.php (modified) (1 diff)
• metabbs.php (modified) (2 diffs)

trunk/metabbs/app/admin/controllers/setting/index.php

@@ -19 +19 @@
                 $settings['plugin_extra_path'] .= '/';
         $config->set('plugin_extra_path', $settings['plugin_extra_path']);
+        $config->set('reserved_containers', $settings['reserved_containers']);
         $config->write_to_file();
         Flash::set('Setting saved');

trunk/metabbs/app/admin/views/setting/index.php

@@ -57 +57 @@
         <dt><?=label_tag(i('Path of Extra Plugins'), 'settings', 'plugin_extra_path')?></dt>
         <dd><input type="text" name="settings[plugin_extra_path]" size="30" value="<?=$config->get('plugin_extra_path')?>" /></dd>
+
+        <dt><?=label_tag(i('Reserved Containers'), 'settings', 'reserved_containers')?></dt>
+        <dd>admin, <input type="text" name="settings[reserved_containers]" size="30" value="<?=$config->get('reserved_containers')?>" /></dd>
 </dl>
 <p><input type="submit" value="OK" /></p>

trunk/metabbs/core/core.php

@@ -4 +4 @@
 requireCore('config');
 $config = new Config(METABBS_DIR . '/metabbs.conf.php');
+$reserved_containers = array_map(create_function('$s','return trim($s);'), explode(',',$config->get('reserved_containers')));
 
 $backend = $config->get('backend', 'mysql');

trunk/metabbs/core/dispatcher.php

@@ -6 +6 @@
         var $reserved_controllers = array('admin');
 
-        function Dispatcher() { }
-
+        function Dispatcher($reserved_controllers = null) { 
+                if (!empty($reserved_controllers))
+                        $this->reserved_controllers = array_merge($this->reserved_controllers, $reserved_controllers);
+        }
+ 
         function load($uri = null) {
                 if (!$uri) return;
-
-                apply_filters('BeforeDispatcherLoad', $this);
 
                 $this->parts = explode('/', trim($uri, '/ '));

trunk/metabbs/metabbs.php

@@ -2 +2 @@
 require 'core/common.php';
 
-$dispatcher = new Dispatcher();
-import_enabled_plugins();
+$dispatcher = new Dispatcher($reserved_containers);
 $dispatcher->load($_SERVER['PATH_INFO']);
 $params = $dispatcher->params;
@@ -15 +14 @@
 $title = &$layout->title;
 $view = DEFAULT_VIEW;
+
+import_enabled_plugins();
 
 if ($account->is_guest() && using_openid() && cookie_is_registered('openid')