feature 2920 added: change admin screen "pending comments" to "all comments".

Now the administrator can filter on "all" or "pending" with a single click.

In the admin menu, we display the number of pending comments.


git-svn-id: http://piwigo.org/svn/trunk@25084 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 62 insertions, 7 deletions

diff --git a/admin/comments.php b/admin/comments.php
index 637790353..e22771a78 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -97,17 +97,73 @@ $tabsheet->assign();
 // |                           comments display                            |
 // +-----------------------------------------------------------------------+
 
-$list = array();
+$nb_total = 0;
+$nb_pending = 0;
 
 $query = '
-SELECT c.id, c.image_id, c.date, c.author, '.
-$conf['user_fields']['username'].' AS username, c.content, i.path, i.representative_ext
+SELECT
+    COUNT(*) AS counter,
+    validated
+  FROM '.COMMENTS_TABLE.'
+  GROUP BY validated
+;';
+$result = pwg_query($query);
+while ($row = pwg_db_fetch_assoc($result))
+{
+  $nb_total+= $row['counter'];
+
+  if ('false' == $row['validated'])
+  {
+    $nb_pending = $row['counter'];
+  }
+}
+
+if (!isset($_GET['filter']) and $nb_pending > 0)
+{
+  $page['filter'] = 'pending';
+}
+else
+{
+  $page['filter'] = 'all';
+}
+
+if (isset($_GET['filter']) and 'pending' == $_GET['filter'])
+{
+  $page['filter'] = $_GET['filter'];
+}
+
+$template->assign(
+  array(
+    'nb_total' => $nb_total,
+    'nb_pending' => $nb_pending,
+    'filter' => $page['filter'],
+    )
+  );
+
+$where_clauses = array('1=1');
+
+if ('pending' == $page['filter'])
+{
+  $where_clauses[] = 'validated=\'false\'';
+}
+
+$query = '
+SELECT
+    c.id,
+    c.image_id,
+    c.date,
+    c.author,
+    '.$conf['user_fields']['username'].' AS username,
+    c.content,
+    i.path,
+    i.representative_ext,
+    validated
   FROM '.COMMENTS_TABLE.' AS c
     INNER JOIN '.IMAGES_TABLE.' AS i
       ON i.id = c.image_id
     LEFT JOIN '.USERS_TABLE.' AS u
       ON u.'.$conf['user_fields']['id'].' = c.author_id
-  WHERE validated = \'false\'
+  WHERE '.implode(' AND ', $where_clauses).'
   ORDER BY c.date DESC
 ;';
 $result = pwg_query($query);
@@ -135,15 +191,14 @@ while ($row = pwg_db_fetch_assoc($result))
       'TN_SRC' => $thumb,
       'AUTHOR' => trigger_event('render_comment_author', $author_name),
       'DATE' => format_date($row['date'], true),
-      'CONTENT' => trigger_event('render_comment_content',$row['content'])
+      'CONTENT' => trigger_event('render_comment_content',$row['content']),
+      'IS_PENDING' => ('false' == $row['validated']),
       )
     );
 
   $list[] = $row['id'];
 }
 
-$template->assign('LIST', implode(',', $list) );
-
 // +-----------------------------------------------------------------------+
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+