Changeset 3044:f2f9dfea9272

Timestamp:

07/05/15 12:39:27 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add IP and antispam filter columns when displaying spams, closes #1816

Files:

• admin/comments.php (modified) (3 diffs)
• inc/admin/lib.pager.php (modified) (6 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/comments.php

@@ -52 +52 @@
 );
 
-
 /* Get comments
 -------------------------------------------------------- */
@@ -110 +109 @@
      $params['comment_ip'] = $ip;
      $show_filters = true;
+}
+
+// Add some sort order if spams displayed
+if ($with_spam || ($status == -2)) {
+     $sortby_combo[__('IP')] = 'comment_ip';
+     $sortby_combo[__('Spam filter')] = 'comment_spam_filter';
 }
 
@@ -274 +279 @@
 
      '</form>',
-     $show_filters
+     $show_filters,
+     ($with_spam || ($status == -2))
      );
 }

inc/admin/lib.pager.php

@@ -374 +374 @@
 class adminCommentList extends adminGenericList
 {
-     public function display($page,$nb_per_page,$enclose_block='',$filter=false)
+     public function display($page,$nb_per_page,$enclose_block='',$filter=false,$spam=false)
      {
           if ($this->rs->isEmpty())
@@ -386 +386 @@
           else
           {
+               // Get antispam filters' name
+               $filters = array();
+               if ($spam) {
+                    if (class_exists(dcAntispam)) {
+                         dcAntispam::initFilters();
+                         $fs = dcAntispam::$filters->getFilters();
+                         foreach ($fs as $fid => $f)
+                         {
+                              $filters[$fid] = $f->name;
+                         }
+                    }
+               }
+
                $pager = new dcPager($page,$this->rs_count,$nb_per_page,10);
 
@@ -413 +426 @@
                '<th scope="col">'.__('Author').'</th>'.
                '<th scope="col">'.__('Date').'</th>'.
-               '<th scope="col" class="txt-center">'.__('Status').'</th>'.
+               '<th scope="col" class="txt-center">'.__('Status').'</th>';
+               if ($spam) {
+                    $html_block .=
+                    '<th scope="col">'.__('IP').'</th>'.
+                    '<th scope="col">'.__('Spam filter').'</th>';
+               }
+               $html_block .=
                '<th scope="col" abbr="entry">'.__('Entry').'</th>'.
                '</tr>%s</table></div>';
@@ -429 +448 @@
                while ($this->rs->fetch())
                {
-                    echo $this->commentLine(isset($comments[$this->rs->comment_id]));
+                    echo $this->commentLine(isset($comments[$this->rs->comment_id]),$spam,$filters);
                }
 
@@ -438 +457 @@
      }
 
-     private function commentLine($checked=false)
-     {
-          global $author, $status, $sortby, $order, $nb_per_page;
+     private function commentLine($checked=false,$spam=false,$filters=array())
+     {
+          global $core, $author, $status, $sortby, $order, $nb_per_page;
 
           $author_url =
@@ -495 +514 @@
           '<td class="nowrap maximal"><a href="'.$author_url.'">'.html::escapeHTML($this->rs->comment_author).'</a></td>'.
           '<td class="nowrap count">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->comment_dt).'</td>'.
-          '<td class="nowrap status txt-center">'.$img_status.'</td>'.
+          '<td class="nowrap status txt-center">'.$img_status.'</td>';
+          if ($spam) {
+               $filter_name = '';
+               if ($this->rs->comment_spam_filter) {
+                    if (isset($filters[$this->rs->comment_spam_filter])) {
+                         $filter_name = $filters[$this->rs->comment_spam_filter];
+                    } else {
+                         $filter_name = $this->rs->comment_spam_filter;
+                    }
+               }
+               $res .=
+               '<td class="nowrap"><a href="'.$core->adminurl->get("admin.comments",array('ip' => $this->rs->comment_ip)).'">'.$this->rs->comment_ip.'</a></td>'.
+               '<td class="nowrap">'.$filter_name.'</td>';
+          }
+          $res .=
           '<td class="nowrap discrete"><a href="'.$post_url.'">'.
           $post_title.'</a>'.

locales/fr/main.po

@@ -907 +907 @@
 msgstr "Type :"
 
+msgid "Spam filter"
+msgstr "Filtre antispam"
+
 msgid "comments per page"
 msgstr "commentaires par page"