Changeset 2048:a23152342139 for inc/admin/actions

Timestamp:

09/23/13 23:40:40 (12 years ago)

Author:

Dsls

Branch:

default

Message:

exit is a bit rough and not really ob_start compliand, made it smoother for plugins; Tuned pages plugin so that it works ... now

Location:

inc/admin/actions

Files:

• class.dcaction.php (modified) (2 diffs)
• class.dcactionposts.php (modified) (8 diffs)

inc/admin/actions/class.dcaction.php

@@ -223 +223 @@
      public function redirect($params=array(),$with_selected_entries=false) {
           http::redirect($this->getRedirection($params,$with_selected_entries));
+          exit;
      }    
      
@@ -270 +271 @@
                     }
                     if ($performed) {
-                         exit;
+                         return true;
                     }
                } catch (Exception $e) {

inc/admin/actions/class.dcactionposts.php

@@ -48 +48 @@
                array(
                     html::escapeHTML($this->core->blog->name) => '',
-                    __('Entries') => 'posts.php',
+                    __('Entries') => $this->getRedirection(array(),true),
                     '<span class="page-title">'.__('Entries actions').'</span>' => ''
                ))
@@ -87 +87 @@
 class dcDefaultPostActions 
 {
-     public static function adminPostsActionsPage($core, dcPostsActionsPage $ap) {
+     public static function adminPostsActionsPage($core, $ap) {
           if ($core->auth->check('publish,contentadmin',$core->blog->id)) {
                $ap->addAction(
@@ -211 +211 @@
                $ap->redirect(array('upd'=>1),true);
           } else {
+
                $ap->beginPage(
                     dcPage::breadcrumb(
                          array(
                               html::escapeHTML($core->blog->name) => '',
-                              __('Entries') => 'posts.php',
+                              __('Entries') => $ap->getRedirection(array(),true),
                               '<span class="page-title">'.__('Change category for entries').'</span>' => ''
                )));
-               
                # categories list
                # Getting categories
                $categories_combo = dcAdminCombos::getCategoriesCombo(
-                    $core->blog->getCategories(array('post_type'=>'post'))
+                    $core->blog->getCategories()
                );             
                echo
-               '<form action="posts.php" method="post">'.
+               '<form action="'.$ap->getRedirection(array(),true).'" method="post">'.
                $ap->getCheckboxes().
                '<p><label for="new_cat_id" class="classic">'.__('Category:').'</label> '.
-               form::combo('new_cat_id',$categories_combo,'');
+               form::combo(array('new_cat_id'),$categories_combo,'');
                
                if ($core->auth->check('categories', $core->blog->id)) {
@@ -244 +244 @@
                echo
                $core->formNonce().
+               $ap->getHiddenFields().
                form::hidden(array('action'),'category').
                '<input type="submit" value="'.__('Save').'" /></p>'.
@@ -285 +286 @@
                          array(
                               html::escapeHTML($core->blog->name) => '',
-                              __('Entries') => 'posts.php',
+                              __('Entries') => $ap->getRedirection(array(),true),
                               '<span class="page-title">'.__('Change author for entries').'</span>' => '')),
                          dcPage::jsLoad('js/jquery/jquery.autocomplete.js').
@@ -302 +303 @@
                
                echo
-                    $core->formNonce().
+                    $core->formNonce().$ap->getHiddenFields().
                     form::hidden(array('action'),'author').
                     '<input type="submit" value="'.__('Save').'" /></p>'.
@@ -326 +327 @@
                          array(
                               html::escapeHTML($core->blog->name) => '',
-                              __('Entries') => 'posts.php',
+                              __('Entries') => $ap->getRedirection(array(),true),
                               '<span class="page-title">'.__('Change language for entries').'</span>' => ''
                )));
@@ -353 +354 @@
                
                echo
-                    $core->formNonce().
+                    $core->formNonce().$ap->getHiddenFields().
                     form::hidden(array('action'),'lang').
                     '<input type="submit" value="'.__('Save').'" /></p>'.