Changeset 10213

Timestamp:

Apr 9, 2011, 6:40:27 PM (13 years ago)

Author:

mistic100

Message:

compatibility with 'rv_tscroller' & comments revalidation

Location:

extensions/Comments_on_Albums

Files:

• include/coa_albums.php (modified) (1 diff)
• include/functions_comment.inc.php (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)

extensions/Comments_on_Albums/include/coa_albums.php

@@ -31 +31 @@
                         if (can_manage_comment('edit', $author_id)) {
                                 if (!empty($_POST['content'])) {
-                                        update_user_comment_albums(array(
-                                                'comment_id' => $_GET['comment_to_edit'],
-                                                'image_id' => $category['id'],
-                                                'content' => $_POST['content']
-                                        ), $_POST['key']);
-
-                                        redirect($url_self);
+                                        $comment_action = update_user_comment_albums(
+                                                array(
+                                                        'comment_id' => $_GET['comment_to_edit'],
+                                                        'image_id' => $category['id'],
+                                                        'content' => $_POST['content']
+                                                ),
+                                                $_POST['key']
+                                        );
+                                        
+                                        $infos = array();
+                                        
+                                        switch ($comment_action)
+                                        {
+                                                case 'moderate':
+                                                        array_push($infos, l10n('An administrator must authorize your comment before it is visible.'));
+                                                case 'validate':
+                                                        array_push($infos, l10n('Your comment has been registered'));
+                                                        break;
+                                                case 'reject':
+                                                        set_status_header(403);
+                                                        array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules'));
+                                                        break;
+                                                default:
+                                                        trigger_error('Invalid comment action '.$comment_action, E_USER_WARNING);
+                                        }
+
+                                        $template->assign(
+                                                ($comment_action=='reject') ? 'errors' : 'infos',
+                                                $infos
+                                        );
+
+                                        unset($_POST['content']);
+                                        break;
                                 } else {
                                         $edit_comment = $_GET['comment_to_edit'];

extensions/Comments_on_Albums/include/functions_comment.inc.php

@@ -217 +217 @@
  * @param content
  */
-
 function update_user_comment_albums($comment, $post_key)
+{
+  global $conf;
+
+  $comment_action = 'validate';
+
+  if ( !verify_ephemeral_key($post_key, $comment['image_id']) )
+  {
+    $comment_action='reject';
+  }
+
+  // perform more spam check
+  $comment_action =
+    trigger_event('user_comment_check',
+                  $comment_action,
+                  array_merge($comment,
+                              array('author' => $GLOBALS['user']['username'])
+                              )
+                  );
+
+  if ( $comment_action!='reject' )
+  {
+    $user_where_clause = '';
+    if (!is_admin())
+    {
+      $user_where_clause = '   AND author_id = \''.
+        $GLOBALS['user']['id'].'\'';
+    }
+    
+    // should the updated comment must be validated
+    if (!$conf['comments_validation'] or is_admin())
+    {
+      $comment_action='validate'; //one of validate, moderate, reject
+    }
+    else
+    {
+      $comment_action='moderate'; //one of validate, moderate, reject
+    }
+
+    $query = '
+UPDATE '.COA_TABLE.'
+  SET content = \''.$comment['content'].'\',
+      validated = \''.($comment_action=='validate' ? 'true':'false').'\',
+      validation_date = '.($comment_action=='validate' ? 'NOW()':'NULL').'
+  WHERE id = '.$comment['comment_id'].
+$user_where_clause.'
+;';
+    $result = pwg_query($query);
+    
+    // mail admin and ask to validate the comment
+    if ($result and $conf['email_admin_on_comment_validation'] and 'moderate' == $comment_action) 
+    {
+      include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+
+      $comment_url = get_absolute_root_url().'comments.php?display_mode=albums&comment_id='.$comment['comment_id'];
+
+      $keyargs_content = array
+      (
+        get_l10n_args('Author: %s', stripslashes($GLOBALS['user']['username']) ),
+        get_l10n_args('Comment: %s', stripslashes($comment['content']) ),
+        get_l10n_args('', ''),
+        get_l10n_args('Manage this user comment: %s', $comment_url),
+        get_l10n_args('', ''),
+        get_l10n_args('(!) This comment requires validation', ''),
+      );
+
+      pwg_mail_notification_admins
+      (
+        get_l10n_args('Comment by %s', stripslashes($GLOBALS['user']['username']) ),
+        $keyargs_content
+      );
+    }
+    // just mail admin
+    else if ($result)
+    {
+      email_admin('edit', array('author' => $GLOBALS['user']['username'],
+                                'content' => stripslashes($comment['content'])) );
+    }
+  }
+  
+  return $comment_action;
+}
+
+/* function update_user_comment_albums($comment, $post_key)
 {
   global $conf;
@@ -259 +341 @@
     }
   }
-}
+}*/
 
 if (!function_exists('email_admin')) {

extensions/Comments_on_Albums/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Comments on Albums
-Version: 1.0
+Version: 1.1
 Description: Activate comments on albums pages
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=512
@@ -40 +40 @@
         global $template, $page, $conf, $pwg_loaded_plugins;
         
-        if ($page['section'] == 'categories' AND isset($page['category'])) {    
+        if ($page['section'] == 'categories' AND isset($page['category']) 
+                AND (!isset($pwg_loaded_plugins['rv_tscroller']) OR count($page['navigation_bar']) == 0)) 
+        {       
+                
                 if (isset($pwg_loaded_plugins['bbcode_bar']) AND !isset($_GET['comment_to_edit'])) set_bbcode_bar();
                 else if (isset($pwg_loaded_plugins['SmiliesSupport']) AND !isset($_GET['comment_to_edit'])) set_smiliessupport();