Changeset 2210:591007da831e

Timestamp:

10/02/13 16:33:49 (12 years ago)

Author:

Dsls

Branch:

default

Children:

2211:dd80020754f1, 2212:f26730fd9f07

Message:

search.php with new actions, closes #1748

File:

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

admin/search.php

@@ -15 +15 @@
 dcPage::check('usage,contentadmin');
 
-$q = !empty($_GET['q']) ? $_GET['q'] : (!empty($_GET['qx']) ? $_GET['qx'] : null);
-$qtype = !empty($_GET['qtype']) ? $_GET['qtype'] : 'p';
+$q = !empty($_REQUEST['q']) ? $_REQUEST['q'] : (!empty($_REQUEST['qx']) ? $_REQUEST['qx'] : null);
+$qtype = !empty($_REQUEST['qtype']) ? $_REQUEST['qtype'] : 'p';
 if ($qtype != 'c' && $qtype != 'p') {
      $qtype = 'p';
@@ -69 +69 @@
 }
 
+if ($qtype == 'p') {
+     $posts_actions_page = new dcPostsActionsPage($core,'search.php',array('q'=>$q,'qtype'=>$qtype));
+
+     if ($posts_actions_page->process()) {
+          return;
+     }
+} else {
+     $comments_actions_page = new dcCommentsActionsPage($core,'search.php',array('q'=>$q,'qtype'=>$qtype));
+
+     if ($comments_actions_page->process()) {
+          return;
+     }
+}
 
 dcPage::open(__('Search'),$starting_scripts,
@@ -95 +108 @@
      if ($qtype == 'p')
      {
-          # Actions combo box
-          $combo_action = array();
-          if ($core->auth->check('publish,contentadmin',$core->blog->id))
-          {
-               $combo_action[__('publish')] = 'publish';
-               $combo_action[__('unpublish')] = 'unpublish';
-               $combo_action[__('schedule')] = 'schedule';
-               $combo_action[__('mark as pending')] = 'pending';
-          }
-          $combo_action[__('change category')] = 'category';
-          if ($core->auth->check('admin',$core->blog->id)) {
-               $combo_action[__('change author')] = 'author';
-          }
-          if ($core->auth->check('delete,contentadmin',$core->blog->id))
-          {
-               $combo_action[__('Delete')] = 'delete';
-          }
-          
-          # --BEHAVIOR-- adminPostsActionsCombo
-          $core->callBehavior('adminPostsActionsCombo',array(&$combo_action));
-          
+     
           if ($counter->f(0) > 0) {
                printf('<h3>'.
@@ -123 +116 @@
           
           $post_list->display($page,$nb_per_page,
-          '<form action="posts_actions.php" method="post" id="form-entries">'.
+          '<form action="search.php" method="post" id="form-entries">'.
           
           '%s'.
@@ -131 +124 @@
           
           '<p class="col right"><label for="action1" class="classic">'.__('Selected entries action:').'</label> '.
-          form::combo(array('action','action1'),$combo_action).
+          form::combo(array('action','action1'),$posts_actions_page->getCombo()).
           '<input type="submit" value="'.__('ok').'" /></p>'.
-          form::hidden('redir',preg_replace('/%/','%%',$redir)).
           $core->formNonce().
+          $posts_actions_page->getHiddenFields().
           '</div>'.
           '</form>'
@@ -143 +136 @@
      {
           # Actions combo box
-          $combo_action = array();
-          if ($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 ($core->auth->check('delete,contentadmin',$core->blog->id))
-          {
-               $combo_action[__('Delete')] = 'delete';
-          }
           
           if ($counter->f(0) > 0) {
@@ -163 +144 @@
           
           $comment_list->display($page,$nb_per_page,
-          '<form action="comments_actions.php" method="post" id="form-comments">'.
+          '<form action="search.php" method="post" id="form-comments">'.
           
           '%s'.
@@ -171 +152 @@
           
           '<p class="col right"><label for="action2" class="classic">'.__('Selected comments action:').'</label> '.
-          form::combo(array('action','action2'),$combo_action).
+          form::combo(array('action','action2'),$comments_actions_page->getCombo()).
           '<input type="submit" value="'.__('ok').'" /></p>'.
-          form::hidden('redir',preg_replace('/%/','%%',$redir)).
           $core->formNonce().
+          $comments_actions_page->getHiddenFields().
           '</div>'.
           '</form>'