Changeset 2872

Timestamp:

11/24/08 17:42:02 (6 weeks ago)

Author:

MattRead

Message:

branch:adminhandler use the action handler_var for calling different action methods

Location:

branches/adminhandler/htdocs/system/classes

Files:

• adminhandler.php (modified) (2 diffs)
• adminpage.php (modified) (3 diffs)
• dashboardadminpage.php (modified) (2 diffs)
• pluginsadminpage.php (modified) (2 diffs)
• publishadminpage.php (modified) (1 diff)

branches/adminhandler/htdocs/system/classes/adminhandler.php

@@ -90 +90 @@
         if ( class_exists($admin_page) ) {
             $admin_page = new $admin_page( $request_method, $this, $this->theme );
-            $fn = 'act_request_' . strtolower($request_method);
-            $admin_page->$fn();
+            $action = isset($this->handler_vars['action']) ? $this->handler_vars['action'] : 'request';
+            $admin_page->act( $action, $request_method );
         }
         else {
@@ -110 +110 @@
         if ( class_exists($admin_page) ) {
             $admin_page = new $admin_page( $request_method, $this );
-            $fn = 'act_ajax_' . strtolower($request_method);
-            $admin_page->$fn( $this->handler_vars );
+            $action = isset($this->handler_vars['action']) ? $this->handler_vars['action'] : 'request';
+            $admin_page->act_ajax( $action, $request_method );
         }
         else {

branches/adminhandler/htdocs/system/classes/adminpage.php

@@ -5 +5 @@
     protected $request_method;
     protected $handler;
+    protected $handler_vars = array();
     protected $theme;
     
@@ -15 +16 @@
     }
     
+    // @todo fix allow list for new action methods.
     public function __call( $method, $args )
     {
         $class = get_class($this);
-        Plugins::act( "{$class}_{$this->request_method}", $this, $args );
+        Plugins::act( "{$class}_{$method}", $this, $args );
         header( 'HTTP/1.1 405 Method Not Allowed', true, 405 );
         // Build list of accepted methods and send allow header as per spec..
@@ -38 +40 @@
     }
     
+    public function act( $action, $method )
+    {
+        $this->{"act_{$action}_{$method}"}();
+    }
+    
+    public function act_ajax( $action, $method )
+    {
+        $this->{"act_ajax_{$action}_{$method}"}();
+    }
+    
     protected function display( $template_name )
     {

branches/adminhandler/htdocs/system/classes/dashboardadminpage.php

@@ -130 +130 @@
     
     /**
-     * Handles ajax requests from the dashboard
-     */
-    public function act_ajax_post( $handler_vars )
-    {
-        $theme_dir = Plugins::filter( 'admin_theme_dir', Site::get_dir( 'admin_theme', TRUE ) );
-        $this->theme = Themes::create( 'admin', 'RawPHPEngine', $theme_dir );
-
-        switch ( $handler_vars['action'] ) {
-        case 'updateModules':
-            $modules = array();
-            foreach($_POST as $key => $module ) {
-                // skip POST elements which are not module names
-                if ( preg_match( '/^module\d+$/', $key ) ) {
-                    list( $module_id, $module_name ) = split( ':', $module, 2 );
-                    // remove non-sortable modules from the list
-                    if ( $module_id != 'nosort' ) {
-                        $modules[$module_id] = $module_name;
-                    }
-                }
-            }
-
-            Modules::set_active( $modules );
-            echo json_encode( true );
-            break;
-        case 'addModule':
-            $id = Modules::add( $handler_vars['module_name'] );
-            $this->fetch_dashboard_modules();
-            $result = array(
-                'message' => "Added module {$handler_vars['module_name']}.",
-                'modules' => $this->theme->fetch( 'dashboard_modules' ),
-            );
-            echo json_encode( $result );
-            break;
-        case 'removeModule':
-            Modules::remove( $handler_vars['moduleid'] );
-            $this->fetch_dashboard_modules();
-            $result = array(
-                'message' => 'Removed module',
-                'modules' => $this->theme->fetch( 'dashboard_modules' ),
-            );
-            echo json_encode( $result );
-            break;
-        }
-    }
-    
-    /**
      * Adds a module to the user's dashboard
      * @param object form FormUI object
@@ -187 +141 @@
         return false;
     }
+    
+    // AJAX Methods
+    
+    public function act_ajax( $action, $method )
+    {
+        $theme_dir = Plugins::filter( 'admin_theme_dir', Site::get_dir( 'admin_theme', TRUE ) );
+        $this->theme = Themes::create( 'admin', 'RawPHPEngine', $theme_dir );
+        
+        parent::act_ajax( $action, $method );
+    }
+    
+    public function act_ajax_updateModules_post()
+    {
+        $modules = array();
+        foreach($_POST as $key => $module ) {
+            // skip POST elements which are not module names
+            if ( preg_match( '/^module\d+$/', $key ) ) {
+                list( $module_id, $module_name ) = split( ':', $module, 2 );
+                // remove non-sortable modules from the list
+                if ( $module_id != 'nosort' ) {
+                    $modules[$module_id] = $module_name;
+                }
+            }
+        }
+
+        Modules::set_active( $modules );
+        echo json_encode( true );
+    }
+    
+    public function act_ajax_addModule_post()
+    {
+        $id = Modules::add( $this->handler_vars['module_name'] );
+        $this->fetch_dashboard_modules();
+        $result = array(
+            'message' => "Added module {$this->handler_vars['module_name']}.",
+            'modules' => $this->theme->fetch( 'dashboard_modules' ),
+        );
+        echo json_encode( $result );
+    }
+    
+    public function act_ajax_removeModule_post()
+    {
+        Modules::remove( $this->handler_vars['moduleid'] );
+        $this->fetch_dashboard_modules();
+        $result = array(
+            'message' => 'Removed module',
+            'modules' => $this->theme->fetch( 'dashboard_modules' ),
+        );
+        echo json_encode( $result );
+    }
 }

branches/adminhandler/htdocs/system/classes/pluginsadminpage.php

@@ -3 +3 @@
 class PluginsAdminPage extends AdminPage
 {
-        /**
+    /**
      * A POST handler for the admin plugins page that simply passes those options through.
      */
-    public function post_plugins()
+    public function act_request_post()
     {
-        return $this->get_plugins();
+        return $this->act_request_get();
     }
 
-    public function get_plugins()
+    public function act_request_get()
     {
         $all_plugins = Plugins::list_all();
@@ -69 +69 @@
     }
     
-        /**
-     * Handles plugin activation or deactivation.
-     */
-    public function get_plugin_toggle()
-    {
-        $extract = $this->handler_vars->filter_keys('plugin_id', 'action');
-        foreach($extract as $key => $value) {
-            $$key = $value;
-        }
-
-        $plugins = Plugins::list_all();
-        foreach($plugins as $file) {
-            if(Plugins::id_from_file($file) == $plugin_id) {
-                switch ( strtolower($action) ) {
-                    case 'activate':
-                        if ( Plugins::activate_plugin($file) ) {
-                            $plugins = Plugins::get_active();
-                            Session::notice(
-                                _t( "Activated plugin '%s'", array($plugins[Plugins::id_from_file( $file )]->info->name) ),
-                                $plugins[Plugins::id_from_file($file)]->plugin_id
-                            );
-                        }
-                    break;
-                    case 'deactivate':
-                        if ( Plugins::deactivate_plugin($file) ) {
-                            $plugins = Plugins::get_active();
-                            Session::notice(
-                                _t( "Deactivated plugin '%s'", array($plugins[Plugins::id_from_file( $file )]->info->name) ),
-                                $plugins[Plugins::id_from_file($file)]->plugin_id
-                            );
-                        }
-                    break;
-                    default:
-                        Plugins::act(
-                            'adminhandler_get_plugin_toggle_action',
-                            $action,
-                            $file,
-                            $plugin_id,
-                            $plugins
-                        );
-                    break;
-                }
-            }
-        }
-        Utils::redirect( URL::get( 'admin', 'page=plugins' ) );
-    }
-    
-        /**
+    /**
      * Handles plugin activation or deactivation.
      */

branches/adminhandler/htdocs/system/classes/publishadminpage.php

@@ -101 +101 @@
     }
 
-    public function form_publish($post, $newpost = true)
+    public function form_publish( Post $post, $newpost = true)
     {
         $form = new FormUI('create-content');