Changeset 12562 for extensions/Comments_on_Albums

Timestamp:

Nov 6, 2011, 7:38:13 PM (12 years ago)

Author:

mistic100

Message:

minor changes for Piwigo 2.3.1 and Subscribe To Comments plugin

Location:

extensions/Comments_on_Albums

Files:

• include/coa_albums.php (modified) (4 diffs)
• include/coa_comments_page.php (modified) (1 diff)
• include/functions_comment.inc.php (modified) (6 diffs)
• stuffs_module/main.inc.php (modified) (1 diff)

extensions/Comments_on_Albums/include/coa_albums.php

@@ -42 +42 @@
             array(
               'comment_id' => $_GET['comment_to_edit'],
-              'image_id' => $category['id'],
+              'category_id' => $category['id'],
               'content' => $_POST['content']
               ),
@@ -130 +130 @@
     'author' => trim( @$_POST['author'] ),
     'content' => trim( $_POST['content'] ),
-    'image_id' => $category['id'],
+    'category_id' => $category['id'],
   );
 
@@ -356 +356 @@
   {
     $template->set_prefilter('index', 'coa_messages');
-    
-    function coa_messages($content, &$smarty) 
-    {
-      $search = '{if !empty($PLUGIN_INDEX_CONTENT_BEFORE)}{$PLUGIN_INDEX_CONTENT_BEFORE}{/if}';
-
-  $replacement = $search.'
+  }
+  
+  function coa_messages($content, &$smarty) 
+  {
+    $replacement = '
 {if isset($errors)}
 <div class="errors">
@@ -381 +380 @@
 {/if}';
 
-      return str_replace($search, $replacement, $content);
-    }
+    return $replacement.$content;
   }
 }

extensions/Comments_on_Albums/include/coa_comments_page.php

@@ -117 +117 @@
             array(
               'comment_id' => $_GET['edit_albums'],
-              'image_id' => $_POST['image_id'],
+              'category_id' => $_POST['image_id'],
               'content' => $_POST['content']
               ), 

extensions/Comments_on_Albums/include/functions_comment.inc.php

@@ -43 +43 @@
  * Tries to insert a user comment in the database and returns one of :
  * validate, moderate, reject
- * @param array comm contains author, content, image_id
+ * @param array comm contains author, content, category_id
  * @param string key secret key sent back to the browser
  * @param array infos out array of messages
@@ -103 +103 @@
   }
 
-  if ( !verify_ephemeral_key(@$key, $comm['image_id']) )
+  if ( !verify_ephemeral_key(@$key, $comm['category_id']) )
   {
     $comment_action='reject';
@@ -141 +141 @@
     \''.($comment_action=='validate' ? 'true':'false').'\',
     '.($comment_action=='validate' ? 'NOW()':'NULL').',
-    '.$comm['image_id'].'
+    '.$comm['category_id'].'
   )
 ';
@@ -207 +207 @@
                   ));
   }
+  
+  trigger_action('user_comment_deletion', $comment_id, 'category');
 }
 
@@ -225 +227 @@
   $comment_action = 'validate';
 
-  if ( !verify_ephemeral_key($post_key, $comment['image_id']) )
+  if ( !verify_ephemeral_key($post_key, $comment['category_id']) )
   {
     $comment_action='reject';
@@ -373 +375 @@
 ;';
   pwg_query($query);
+  
+  trigger_action('user_comment_validation', $comment_id, 'category');
 }
 ?>

extensions/Comments_on_Albums/stuffs_module/main.inc.php

@@ -46 +46 @@
 $clauses[] = get_sql_condition_FandF (
     array ('forbidden_categories' => 'category_id',
-        'visible_categories' => 'category_id',
-        'visible_images' => 'ic.image_id'), '', true);
+        'visible_categories' => 'category_id'), '', true);
 
 $query = '