Changeset 2063:ce9d8e07b76b for admin

Timestamp:

09/24/13 16:12:38 (12 years ago)

Author:

Dsls

Branch:

default

Message:

Added anchor possibility for redirections
updated post.php to handle correctly redirections when changing comments.
See #1717, notifications may be analysed more generally

File:

• admin/post.php (modified) (8 diffs)

admin/post.php

@@ -358 +358 @@
 }
 
+if (isset($_REQUEST['section']) && $_REQUEST['section']=='trackbacks') {
+     $anchor = 'trackbacks';
+} else {
+     $anchor = 'comments';
+}    
+$comments_actions_page = new dcCommentsActionsPage($core,'post.php',array('id' => $post_id, '_ANCHOR'=>$anchor));
+
+if ($comments_actions_page->process()) {
+     return;
+}
 
 dcPage::open($page_title.' - '.__('Entries'),
@@ -622 +632 @@
      
      $comments = $core->blog->getComments(array_merge($params,array('comment_trackback'=>0)));
-     
-     # Actions combo box
-     $combo_action = array();
-     if ($can_edit_post && $core->auth->check('publish,contentadmin',$core->blog->id))
-     {
-          $combo_action[__('Publish')] = 'publish';
-          $combo_action[__('Unpublish')] = 'unpublish';
-          $combo_action[__('Mark as pending')] = 'pending';
-          $combo_action[__('Mark as junk')] = 'junk';
-     }
-     
-     if ($can_edit_post && $core->auth->check('delete,contentadmin',$core->blog->id))
-     {
-          $combo_action[__('Delete')] = 'delete';
-     }
-     
+          
      echo
      '<div id="comments" class="clear multi-part" title="'.__('Comments').'">';
-          
-     # --BEHAVIOR-- adminCommentsActionsCombo
-     $core->callBehavior('adminCommentsActionsCombo',array(&$combo_action));
-     
+     $combo_action = $comments_actions_page->getCombo();    
      $has_action = !empty($combo_action) && !$comments->isEmpty();
      echo 
@@ -649 +641 @@
      
      if ($has_action) {
-          echo '<form action="comments_actions.php" id="form-comments" method="post">';
+          echo '<form action="post.php" id="form-comments" method="post">';
      }
      
@@ -666 +658 @@
           '<p class="col right"><label for="action" class="classic">'.__('Selected comments action:').'</label> '.
           form::combo('action',$combo_action).
-          form::hidden('redir','post.php?id='.$post_id.'&amp;co=1').
+          form::hidden('section','comments').
+          form::hidden(array('id'),$post_id).
           $core->formNonce().
           '<input type="submit" value="'.__('ok').'" /></p>'.
@@ -698 +691 @@
      '</p>'.
      
-     '<p>'.form::hidden('post_id',$post_id).
+     '<p>'.
+     form::hidden('id',$post_id).
      $core->formNonce().
      '<input type="submit" name="add" value="'.__('Save').'" /></p>'.
@@ -717 +711 @@
      
      # Actions combo box
-     $combo_action = array();
-     if ($can_edit_post && $core->auth->check('publish,contentadmin', $core->blog->id))
-     {
-          $combo_action[__('Publish')] = 'publish';
-          $combo_action[__('Unpublish')] = 'unpublish';
-          $combo_action[__('Mark as pending')] = 'pending';
-          $combo_action[__('Mark as junk')] = 'junk';
-     }
-     
-     if ($can_edit_post && $core->auth->check('delete,contentadmin', $core->blog->id))
-     {
-          $combo_action[__('Delete')] = 'delete';
-     }
-     
-     # --BEHAVIOR-- adminTrackbacksActionsCombo
-     $core->callBehavior('adminTrackbacksActionsCombo', array(&$combo_action));
-     
+     $combo_action = $comments_actions_page->getCombo();    
      $has_action = !empty($combo_action) && !$trackbacks->isEmpty();
      
@@ -746 +724 @@
      # tracbacks actions
      if ($has_action) {
-          echo '<form action="comments_actions.php" id="form-trackbacks" method="post">';
+          echo '<form action="post.php" id="form-trackbacks" method="post">';
      }
      
@@ -764 +742 @@
           '<p class="col right"><label for="action" class="classic">'.__('Selected trackbacks action:').'</label> '.
           form::combo('action', $combo_action).
-          form::hidden('redir', 'post.php?id='.$post_id.'&amp;tb=1').
+          form::hidden('id',$post_id).
+          form::hidden('section','trackbacks').
           $core->formNonce().
           '<input type="submit" value="'.__('ok').'" /></p>'.