Changeset 1905:d72d24250853

Timestamp:

09/16/13 13:28:17 (12 years ago)

Author:

Dsls

Branch:

actionsreloaded

Children:

1999:a0ed28c2da5a, 2037:cdcd97549428

Message:

RIP admin/comments_actions.php

Files:

• admin/comments.php (modified) (5 diffs)
• admin/comments_actions.php (modified) (1 diff)
• inc/admin/actions/class.dcaction.php (modified) (6 diffs)
• inc/admin/actions/class.dcactioncomments.php (added)
• inc/admin/lib.pager.php (modified) (4 diffs)
• inc/prepend.php (modified) (1 diff)
• plugins/dclegacy/_admin.php (modified) (2 diffs)

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>'.

admin/comments_actions.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 
+/* ### THIS FILE IS DEPRECATED                         ### */
+/* ### IT IS ONLY USED FOR PLUGINS COMPATIBILITY ### */
+
 require dirname(__FILE__).'/../inc/admin/prepend.php';
 
 dcPage::check('usage,contentadmin');
 
-$params = array();
-$redir = 'comments.php';
+$comments_actions_page = new dcCommentsActionsPage($core,'posts.php');
 
-if (!empty($_POST['action']) && !empty($_POST['comments']))
-{
-     $comments = $_POST['comments'];
-     $action = $_POST['action'];
-     
-     if (isset($_POST['redir']) && strpos($_POST['redir'],'://') === false)
-     {
-          $redir = $_POST['redir'];
-     }
-     else
-     {
-          $redir =
-          'comments.php?type='.$_POST['type'].
-          '&author='.$_POST['author'].
-          '&status='.$_POST['status'].
-          '&sortby='.$_POST['sortby'].
-          '&ip='.$_POST['ip'].
-          '&order='.$_POST['order'].
-          '&page='.$_POST['page'].
-          '&nb='.(integer) $_POST['nb'];
-     }
-     
-     foreach ($comments as $k => $v) {
-          $comments[$k] = (integer) $v;
-     }
-     
-     $params['sql'] = 'AND C.comment_id IN('.implode(',',$comments).') ';
-     
-     if (!isset($_POST['full_content']) || empty($_POST['full_content'])) {
-          $params['no_content'] = true;
-     }
-     
-     $co = $core->blog->getComments($params);
-     
-     $co_ids = array();
-     while ($co->fetch())     {
-          $co_ids[] = $co->comment_id;
-     }
-     
-     # --BEHAVIOR-- adminCommentsActions
-     $core->callBehavior('adminCommentsActions',$core,$co,$action,$redir);
-     
-     if (preg_match('/^(publish|unpublish|pending|junk)$/',$action))
-     {
-          switch ($action) {
-               case 'unpublish' : $status = 0; break;
-               case 'pending' : $status = -1; break;
-               case 'junk' : $status = -2; break;
-               default : $status = 1; break;
-          }
-          
-          try {
-               $core->blog->updCommentsStatus($co_ids,$status);
-          } catch (Exception $e) {
-               $core->error->add($e->getMessage());
-          }
-          
-          if (!$core->error->flag()) {
-               http::redirect($redir);
-          }
-     }
-     elseif ($action == 'delete')
-     {
-          try {
-               // Backward compatibility
-               foreach($co_ids as $comment_id)
-               {
-                    # --BEHAVIOR-- adminBeforeCommentDelete
-                    $core->callBehavior('adminBeforeCommentDelete',$comment_id);                    
-               }
-               
-               # --BEHAVIOR-- adminBeforeCommentsDelete
-               $core->callBehavior('adminBeforeCommentsDelete',$co_ids);
-               
-               $core->blog->delComments($co_ids);
-          } catch (Exception $e) {
-               $core->error->add($e->getMessage());
-          }
-          
-          if (!$core->error->flag()) {
-               http::redirect($redir);
-          }
-     }
-}
+$comments_actions_page->process();
 
-/* DISPLAY
--------------------------------------------------------- */
-dcPage::open(__('Comments'));
-
-if (!isset($action)) {
-     dcPage::close();
-     exit;
-}
-
-$hidden_fields = '';
-while ($co->fetch()) {
-     $hidden_fields .= form::hidden(array('comments[]'),$co->comment_id);
-} 
-
-if (isset($_POST['redir']) && strpos($_POST['redir'],'://') === false)
-{
-     $hidden_fields .= form::hidden(array('redir'),html::escapeURL($_POST['redir']));
-}
-else
-{
-     $hidden_fields .=
-     form::hidden(array('type'),$_POST['type']).
-     form::hidden(array('author'),$_POST['author']).
-     form::hidden(array('status'),$_POST['status']).
-     form::hidden(array('sortby'),$_POST['sortby']).
-     form::hidden(array('ip'),$_POST['ip']).
-     form::hidden(array('order'),$_POST['order']).
-     form::hidden(array('page'),$_POST['page']).
-     form::hidden(array('nb'),$_POST['nb']);
-}
-
-# --BEHAVIOR-- adminCommentsActionsContent
-$core->callBehavior('adminCommentsActionsContent',$core,$action,$hidden_fields);
-
-echo '<p><a class="back" href="'.str_replace('&','&amp;',$redir).'">'.__('Back to comments list').'</a></p>';
-
-dcPage::close();
 ?>

inc/admin/actions/class.dcaction.php

@@ -38 +38 @@
      /** @var array list of url parameters (usually $_POST) */
      protected $from;
+     /** @var string form field name for "entries" (usually "entries") */
+     protected $field_entries;
      
      /** @var string title for checkboxes list, if displayed */
@@ -63 +65 @@
           $this->entries = array();
           $this->from = new ArrayObject($_POST);
+          $this->field_entries = 'entries';
      }
      
@@ -88 +91 @@
                     $this->combo[$k] = array_merge ($this->combo[$k],$a);
                } elseif ($a instanceof formSelectOption) {
-                    $values = $a->value;
+                    $values = array($a->value);
                     $this->combo[$k] = $a->value;
                } else {
-                    $values = $a;
+                    $values = array($a);
                     $this->combo[$k] = $a;
                }
@@ -135 +138 @@
           $ret = '';
           foreach  ($this->entries as $id->$v) {
-               $ret .= form::hidden('entries[]',$id);
+               $ret .= form::hidden($this->field_entries.'[]',$id);
           }
           return $ret;
@@ -206 +209 @@
           $redir_args = array_merge($params,$this->redir_args);
           if ($with_selected_entries) {
-               $redir_args['entries'] = array_keys($this->entries);
+               $redir_args[$this->field_entries] = array_keys($this->entries);
           }
           return $this->uri.'?'.http_build_query($redir_args);
@@ -282 +285 @@
                $ret .= 
                     '<tr><td>'.
-                    form::checkbox(array('entries[]'),$id,true,'','').'</td>'.
+                    form::checkbox(array($this->field_entries.'[]'),$id,true,'','').'</td>'.
                     '<td>'.   $title.'</td></tr>';
           }

inc/admin/lib.pager.php

@@ -257 +257 @@
                $pager->html_next = $this->html_next;
                $pager->var_page = 'page';
-               
+               $comments = array();
+               if (isset($_REQUEST['comments'])) {
+                    foreach ($_REQUEST['comments'] as $v) {
+                         $comments[(integer)$v]=true;
+                    }
+               }              
                $html_block =
                '<table><caption class="hidden">'.__('Comments and trackbacks list').'</caption><tr>'.
@@ -279 +284 @@
                while ($this->rs->fetch())
                {
-                    echo $this->commentLine();
+                    echo $this->commentLine(isset($comments[$this->rs->comment_id]));
                }
                
@@ -288 +293 @@
      }
      
-     private function commentLine()
+     private function commentLine($checked)
      {
           global $author, $status, $sortby, $order, $nb_per_page;
@@ -336 +341 @@
           $res .=
           '<td class="nowrap">'.
-          form::checkbox(array('comments[]'),$this->rs->comment_id,'','','',0).'</td>'.
+          form::checkbox(array('comments[]'),$this->rs->comment_id,$checked,'','',0).'</td>'.
           '<td class="nowrap" abbr="'.__('Type and author').'" scope="raw">'.
                '<a href="'.$comment_url.'" title="'.$comment_title.'">'.

inc/prepend.php

@@ -65 +65 @@
 $__autoload['dcUrlHandlers']            = dirname(__FILE__).'/public/lib.urlhandlers.php';
 $__autoload['dcPostsActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcactionposts.php';
+$__autoload['dcCommentsActionsPage']              = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php';
 $__autoload['dcActionsPage']            = dirname(__FILE__).'/admin/actions/class.dcaction.php';
 

plugins/dclegacy/_admin.php

@@ -13 +13 @@
 
 $GLOBALS['core']->addBehavior('adminPostsActionsPage',array('dcLegacyPosts','adminPostsActionsPage'));
+$GLOBALS['core']->addBehavior('adminCommentsActionsPage',array('dcLegacyComments','adminCommentsActionsPage'));
 
 /* Handle deprecated behaviors : 
@@ -40 +41 @@
      }
 }
-?>
+
+
+/* Handle deprecated behaviors : 
+    * adminCommentsActionsCombo
+     * adminCommentsActionsHeaders
+     * adminCommentsActionsContent
+*/
+class dcLegacyComments
+{
+     public static function adminCommentsActionsPage($core, dcCommentsActionsPage $as) {
+          $stub_actions = new ArrayObject();
+          $core->callBehavior('adminCommentsActionsCombo',array($stub_actions));
+          if (!empty($stub_actions)) {
+               $as->addAction($stub_actions,array('dcLegacyComments','onActionLegacy'));
+          }
+     }
+     
+     public static function onActionLegacy($core, dcCommentsActionsPage $as, $Comment) {
+          $core->callBehavior('adminCommentsActions',$core,$as->getRS(),$as->getAction(),$as->getRedirection());
+          $as->beginPage('',
+               dcPage::jsLoad('js/jquery/jquery.autocomplete.js').
+               dcPage::jsMetaEditor().
+               $core->callBehavior('adminCommentsActionsHeaders'),'');
+          $core->callBehavior('adminCommentsActionsContent',$core,$as->getAction(),$as->getHiddenFields(true));
+          $as->endPage();
+     
+     }
+}