Changeset 2878

Timestamp:

11/25/08 06:22:49 (6 weeks ago)

Author:

MattRead

Message:

branch:adminhandler organize adminpage things and use actions

Location:

branches/adminhandler/htdocs

Files:

• index.php (modified) (1 diff)
• system/admin/classes (added)
• system/admin/classes/adminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/adminpage.php) (1 prop)
• system/admin/classes/commentadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/commentadminpage.php) (2 diffs, 1 prop)
• system/admin/classes/commentsadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/commentsadminpage.php) (1 prop)
• system/admin/classes/dashboardadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/dashboardadminpage.php) (1 prop)
• system/admin/classes/groupadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/groupadminpage.php) (1 prop)
• system/admin/classes/groupsadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/groupsadminpage.php) (1 prop)
• system/admin/classes/importadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/importadminpage.php) (1 prop)
• system/admin/classes/logsadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/logsadminpage.php) (1 prop)
• system/admin/classes/mediaadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/mediaadminpage.php) (1 prop)
• system/admin/classes/optionsadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/optionsadminpage.php) (3 diffs, 1 prop)
• system/admin/classes/pluginsadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/pluginsadminpage.php) (1 prop)
• system/admin/classes/postsadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/postsadminpage.php) (1 prop)
• system/admin/classes/publishadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/publishadminpage.php) (1 prop)
• system/admin/classes/tagsadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/tagsadminpage.php) (1 prop)
• system/admin/classes/themesadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/themesadminpage.php) (1 prop)
• system/admin/classes/useradminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/useradminpage.php) (1 prop)
• system/admin/classes/usersadminpage.php (moved) (moved from branches/adminhandler/htdocs/system/classes/usersadminpage.php) (1 prop)
• system/classes/adminhandler.php (modified) (4 diffs)

branches/adminhandler/htdocs/index.php

@@ -74 +74 @@
     if( empty($files) ) {
         $files = array();
-        $dirs= array( HABARI_PATH . '/system', HABARI_PATH . '/user' );
+        $dirs= array( HABARI_PATH . '/system', HABARI_PATH . '/system/admin', HABARI_PATH . '/user' );
 
         // For each directory, save the available files in the $files array.

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

@@ -3 +3 @@
 class CommentAdminPage extends AdminPage
 {
-    public function act_request_get($update = FALSE) {
+    public function act_request_get($update = FALSE)
+    {
         if ( isset( $this->handler_vars['id'] ) && $comment = Comment::get( $this->handler_vars['id'] ) ) {
             $this->theme->comment = $comment;
@@ -67 +68 @@
     }
 
-    public function act_request_post() {
+    public function act_request_post()
+    {
         $this->act_request_get(true);
     }
     
-        public function ajax_update_comment( $handler_vars )
+    public function act_ajax_update_comment( $handler_vars )
     {
         // check WSSE authentication

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

@@ -4 +4 @@
 {
     /**
-     * Handles get requests from the options admin page
+     * Handles get requests from the options admin page.
+     * Send all POST request to GET so FormUI can proccess them.
      */
     public function act_request_post()
@@ -158 +159 @@
      * @param FormUI $form The successfully submitted form
      */
-    public function form_options_success($form)
+    public function form_options_success( FormUI $form )
     {
         $wsse = Utils::WSSE( $form->nonce->value, $form->timestamp->value );
@@ -165 +166 @@
             $form->save();
         }
-        Session::error( _t('WSSE Authentication Failed') );
+        else {
+            Session::error( _t('WSSE authentication failed. Could not update options.') );
+        }
     }
 }

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

@@ -70 +70 @@
     public function act_admin()
     {
-        $page = ( isset( $this->handler_vars['page'] ) && !empty( $this->handler_vars['page'] ) ) ? $this->handler_vars['page'] : 'dashboard';
-        $type = ( isset( $this->handler_vars['content_type'] ) && !empty( $this->handler_vars['content_type'] ) ) ? $this->handler_vars['content_type'] : '';
-        $theme_dir = Plugins::filter( 'admin_theme_dir', Site::get_dir( 'admin_theme', TRUE ) );
-        $this->theme = Themes::create( 'admin', 'RawPHPEngine', $theme_dir );
-
-        // Add some default stylesheets
-        Stack::add('admin_stylesheet', array(Site::get_url('admin_theme') . '/css/admin.css', 'screen'), 'admin');
-
-        // Add some default template variables
-        $this->set_admin_template_vars( $this->theme );
-        $this->theme->admin_type = $type;
-        $this->theme->admin_page = $page;
-        $this->theme->page = $page;
-        $this->theme->admin_title = ucwords($page) . ( $type != '' ? ' ' . ucwords($type) : '' );
+        $page = ( !empty($this->handler_vars['page']) ) ? $this->handler_vars['page'] : 'dashboard';
+        $this->theme = $this->get_admin_theme($page);
         
         $request_method = strtolower($_SERVER['REQUEST_METHOD']);
         $admin_page = $page . 'AdminPage';
         Plugins::act("admin_theme_{$request_method}_{$page}", $this, $this->theme);
+        
         if ( class_exists($admin_page) ) {
             $admin_page = new $admin_page( $request_method, $this, $this->theme );
@@ -117 +106 @@
             _e('Page Not Found');
         }
+    }
+    
+    protected function get_admin_theme( $page )
+    {
+        $type = ( isset( $this->handler_vars['content_type'] ) && !empty( $this->handler_vars['content_type'] ) ) ? $this->handler_vars['content_type'] : '';
+        $theme_dir = Plugins::filter( 'admin_theme_dir', Site::get_dir( 'admin_theme', TRUE ) );
+        $theme = Themes::create( 'admin', 'RawPHPEngine', $theme_dir );
+
+        // Add some default stylesheets
+        Stack::add('admin_stylesheet', array(Site::get_url('admin_theme') . '/css/admin.css', 'screen'), 'admin');
+
+        // Add some default template variables
+        $this->get_main_menu( $theme );
+        $theme->admin_type = $type;
+        $theme->admin_page = $page;
+        $theme->page = $page;
+        $theme->admin_title = ucwords($page) . ( $type != '' ? ' ' . ucwords($type) : '' );
+        
+        return $theme;
     }
 
@@ -216 +224 @@
 
     /**
-     * Assigns the main menu to $mainmenu into the theme.
-        */
-    protected function set_admin_template_vars( $theme )
-    {
-        $this->get_main_menu( $theme );
-    }
-
-    /**
      * Setup the default admin javascript stack here so that it can be called
      * from plugins, etc. This is not an ideal solution, but works for now.
@@ -229 +229 @@
      */
     public static function setup_stacks() {
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.core.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.slider.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.tabs.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.sortable.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.resizable.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.spinner.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.color.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('habari') . "/3rdparty/humanmsg/humanmsg.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('habari') . "/3rdparty/hotkeys/jquery.hotkeys.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('admin_theme') . "/js/media.js" );
-        Stack::add( 'admin_header_javascript', Site::get_url('admin_theme') . "/js/admin.js" );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.js", 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.core.js", 'ui.core', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.slider.js", 'ui.slider', array('jquery', 'ui.core') );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.tabs.js", 'ui.tabs', array('jquery', 'ui.core') );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.sortable.js", 'ui.sortable', array('jquery', 'ui.core') );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/ui.resizable.js", 'ui.resizable', array('jquery', 'ui.core') );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.spinner.js", 'jquery.spinner', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('scripts') . "/jquery.color.js", 'jquery.color', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('habari') . "/3rdparty/humanmsg/humanmsg.js", 'humanmsg', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('habari') . "/3rdparty/hotkeys/jquery.hotkeys.js", 'jquery.hotkeys', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('admin_theme') . "/js/media.js", 'media', 'jquery' );
+        Stack::add( 'admin_header_javascript', Site::get_url('admin_theme') . "/js/admin.js", 'admin', 'jquery' );
     }
 }