Changeset 1999:a0ed28c2da5a for admin/comments.php

Timestamp:

09/22/13 11:38:22 (12 years ago)

Author:

Dsls

Branch:

default

Parents:

1998:dae906985ebb (diff), 1905:d72d24250853 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fusion avec actionsreloaded

Files:

• admin/comments.php (modified) (1 diff)
• admin/comments.php (modified) (5 diffs)

admin/comments.php

@@ -66 +66 @@
 $show_filters = false;
 
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
+$page = !empty($_GET['page']) ? max(1,(integer) $_GET['page']) : 1;
 $nb_per_page =  30;
 

admin/comments.php

@@ -131 +131 @@
 $combo_action = array();
 $default = '';
-if ($core->auth->check('publish,contentadmin',$core->blog->id))
+if ($core->auth->check('delete,contentadmin',$core->blog->id) && $status == -2)
 {
-     $combo_action[__('Publish')] = 'publish';
-     $combo_action[__('Unpublish')] = 'unpublish';
-     $combo_action[__('Mark as pending')] = 'pending';
-     $combo_action[__('Mark as junk')] = 'junk';
-}
-if ($core->auth->check('delete,contentadmin',$core->blog->id))
-{
-     $combo_action[__('Delete')] = 'delete';
-     if ($status == -2) {
-          $default = 'delete';
-     }
-}
-
-# --BEHAVIOR-- adminCommentsActionsCombo
-$core->callBehavior('adminCommentsActionsCombo',array(&$combo_action));
+     $default = 'delete';
+}
+
+$comments_actions_page = new dcCommentsActionsPage($core,'comments.php');
+
+$comments_actions_page->process();
 
 /* Get comments
@@ -165 +156 @@
      $starting_script .= dcPage::jsLoad('js/filter-controls.js');
 }
-# --BEHAVIOR-- adminCommentsHeaders
-$starting_script .= $core->callBehavior('adminCommentsHeaders');
 
 dcPage::open(__('Comments and trackbacks'),$starting_script,
@@ -175 +164 @@
           ))
 );
+if (!empty($_GET['upd'])) {
+     dcPage::success(__('Selected comments have been successfully updated.'));
+} elseif (!empty($_GET['del'])) {
+     dcPage::success(__('Selected comments have been successfully deleted.'));
+}
 
 if (!$core->error->flag())
@@ -254 +248 @@
      # Show comments
      $comment_list->display($page,$nb_per_page,
-     '<form action="comments_actions.php" method="post" id="form-comments">'.
+     '<form action="comments.php" method="post" id="form-comments">'.
      
      '%s'.
@@ -262 +256 @@
      
      '<p class="col right"><label for="action" class="classic">'.__('Selected comments action:').'</label> '.
-     form::combo('action',$combo_action,$default,'','','','title="'.__('Actions').'"').
+     form::combo('action',$comments_actions_page->getCombo(),$default,'','','','title="'.__('Actions').'"').
      $core->formNonce().
      '<input type="submit" value="'.__('ok').'" /></p>'.