Changeset 9634

Timestamp:

Mar 12, 2011, 10:56:58 PM (13 years ago)

Author:

mistic100

Message:

[plugins] Comments on Albums

• corrections
• public list available

Location:

extensions/Comments_on_Albums

Files:

• changelog.txt (modified) (1 diff)
• include/coa_admin_comments.php (modified) (1 diff)
• include/coa_admin_intro.php (modified) (2 diffs)
• include/coa_albums.php (modified) (4 diffs)
• include/coa_comments_page.php (added)
• include/functions_comment.inc.php (modified) (6 diffs)
• main.inc.php (modified) (4 diffs)
• maintain.inc.php (modified) (1 diff)
• template/coa_admin.tpl (deleted)
• template/coa_admin_comments.tpl (added)
• template/coa_admin_intro.tpl (added)
• template/coa_albums.tpl (modified) (1 diff)
• template/coa_comments_page.tpl (added)
• template/coa_intro.tpl (deleted)
• template/s26 (added)
• template/s26/outline_005e89.png (added)
• template/s26/outline_808060.png (added)
• template/s26/outline_808080.png (added)
• template/s26/outline_ff3363.png (added)
• template/s26/outline_ff7700.png (added)
• template/s26/outline_ffff80.png (added)
• template/s26/outline_ffffff.png (added)
• template/style.css (deleted)
• template/style_albums.css (added)

extensions/Comments_on_Albums/changelog.txt

@@ -1 @@
-0.1.a
+0.2
+- Test version
 - bug corrected on coa_admin_comments.php
+- public listing is available
+- table is created in utf8
 
 0.1

extensions/Comments_on_Albums/include/coa_admin_comments.php

@@ -127 +127 @@
 
         // template
-        $template->set_filename('comments', dirname(__FILE__) .'/../template/coa_admin.tpl');
+        $template->set_filename('comments', dirname(__FILE__) .'/../template/coa_admin_comments.tpl');
         $template->assign(array(
                 'F_ACTION' => get_root_url().'admin.php?page=comments&section=albums',

extensions/Comments_on_Albums/include/coa_admin_intro.php

@@ -10 +10 @@
 list($nb_comments) = pwg_db_fetch_row(pwg_query($query));
 
-$template->assign('NB_COMMENTS', l10n_dec('%d comment', '%d comments', $nb_comments) .' ('. l10n('Albums') .')');
+$template->assign('DB_COMMENTS_ALBUMS', l10n_dec('%d comment', '%d comments', $nb_comments));
 
 // unvalidated comments
@@ -28 +28 @@
 
 // template
-$template->set_filename('comments_on_albums', dirname(__FILE__) .'/../template/coa_intro.tpl');
+$template->set_filename('comments_on_albums', dirname(__FILE__) .'/../template/coa_admin_intro.tpl');
 $template->concat('ADMIN_CONTENT', $template->parse('comments_on_albums', true));
 

extensions/Comments_on_Albums/include/coa_albums.php

@@ -27 +27 @@
                         include_once(COA_PATH.'include/functions_comment.inc.php'); // custom fonctions
                         check_input_parameter('comment_to_edit', $_GET, false, PATTERN_ID);
-                        $author_id = get_comment_author_id($_GET['comment_to_edit']);
+                        $author_id = get_comment_author_id_albums($_GET['comment_to_edit']);
 
                         if (can_manage_comment('edit', $author_id)) {
                                 if (!empty($_POST['content'])) {
-                                        update_user_comment(array(
+                                        update_user_comment_albums(array(
                                                 'comment_id' => $_GET['comment_to_edit'],
                                                 'image_id' => $category['id'],
@@ -49 +49 @@
                         include_once(COA_PATH.'include/functions_comment.inc.php');
                         check_input_parameter('comment_to_delete', $_GET, false, PATTERN_ID);
-                        $author_id = get_comment_author_id($_GET['comment_to_delete']);
+                        $author_id = get_comment_author_id_albums($_GET['comment_to_delete']);
 
                         if (can_manage_comment('delete', $author_id)) {
-                                delete_user_comment($_GET['comment_to_delete']);
+                                delete_user_comment_albums($_GET['comment_to_delete']);
                         }
 
@@ -62 +62 @@
                         include_once(COA_PATH.'include/functions_comment.inc.php');
                         check_input_parameter('comment_to_validate', $_GET, false, PATTERN_ID);
-                        $author_id = get_comment_author_id($_GET['comment_to_validate']);
+                        $author_id = get_comment_author_id_albums($_GET['comment_to_validate']);
 
                         if (can_manage_comment('validate', $author_id)) {
-                                validate_user_comment($_GET['comment_to_validate']);
+                                validate_user_comment_albums($_GET['comment_to_validate']);
                         }
 
@@ -124 +124 @@
         }
 
-        // number of comments for this picture
+        // number of comments for this category
         $query = 'SELECT COUNT(*) AS nb_comments
                 FROM '.COA_TABLE.'

extensions/Comments_on_Albums/include/functions_comment.inc.php

@@ -3 +3 @@
 
 //returns string action to perform on a new comment: validate, moderate, reject
-function user_comment_check($action, $comment)
-{
-  global $conf,$user;
-
-  if ($action=='reject')
-    return $action;
-
-  $my_action = $conf['comment_spam_reject'] ? 'reject':'moderate';
-
-  if ($action==$my_action)
-    return $action;
-
-  // we do here only BASIC spam check (plugins can do more)
-  if ( !is_a_guest() )
-    return $action;
-
-  $link_count = preg_match_all( '/https?:\/\//',
-    $comment['content'], $matches);
-
-  if ( strpos($comment['author'], 'http://')!==false )
-  {
-    $link_count++;
-  }
-
-  if ( $link_count>$conf['comment_spam_max_links'] )
-    return $my_action;
-
-  return $action;
+if (!function_exists('user_comment_check')) {
+        function user_comment_check($action, $comment)
+        {
+          global $conf,$user;
+
+          if ($action=='reject')
+                return $action;
+
+          $my_action = $conf['comment_spam_reject'] ? 'reject':'moderate';
+
+          if ($action==$my_action)
+                return $action;
+
+          // we do here only BASIC spam check (plugins can do more)
+          if ( !is_a_guest() )
+                return $action;
+
+          $link_count = preg_match_all( '/https?:\/\//',
+                $comment['content'], $matches);
+
+          if ( strpos($comment['author'], 'http://')!==false )
+          {
+                $link_count++;
+          }
+
+          if ( $link_count>$conf['comment_spam_max_links'] )
+                return $my_action;
+
+          return $action;
+        }
 }
 
@@ -44 +46 @@
  * @param array infos out array of messages
  */
-function insert_user_comment( &$comm, $key, &$infos )
+function insert_user_comment_albums( &$comm, $key, &$infos )
 {
   global $conf, $user;
@@ -185 +187 @@
  * @param comment_id
  */
-function delete_user_comment($comment_id) {
+function delete_user_comment_albums($comment_id) {
   $user_where_clause = '';
   if (!is_admin())
@@ -216 +218 @@
  */
 
-function update_user_comment($comment, $post_key)
+function update_user_comment_albums($comment, $post_key)
 {
   global $conf;
@@ -259 +261 @@
 }
 
-function email_admin($action, $comment)
-{
-  global $conf;
-
-  if (!in_array($action, array('edit', 'delete'))
-      or (($action=='edit') and !$conf['email_admin_on_comment_edition'])
-      or (($action=='delete') and !$conf['email_admin_on_comment_deletion']))
-  {
-    return;
-  }
-
-  include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
-
-  $keyargs_content = array();
-  $keyargs_content[] = get_l10n_args('Author: %s', $comment['author']);
-  if ($action=='delete')
-  {
-    $keyargs_content[] = get_l10n_args('This author removed the comment with id %d',
-                                       $comment['comment_id']
-                                       );
-  }
-  else
-  {
-    $keyargs_content[] = get_l10n_args('This author modified following comment:', '');
-    $keyargs_content[] = get_l10n_args('Comment: %s', $comment['content']);
-  }
-
-  pwg_mail_notification_admins(get_l10n_args('Comment by %s',
-                                             $comment['author']),
-                               $keyargs_content
-                               );
-}
-
-function get_comment_author_id($comment_id, $die_on_error=true)
+if (!function_exists('email_admin')) {
+        function email_admin($action, $comment)
+        {
+          global $conf;
+
+          if (!in_array($action, array('edit', 'delete'))
+                  or (($action=='edit') and !$conf['email_admin_on_comment_edition'])
+                  or (($action=='delete') and !$conf['email_admin_on_comment_deletion']))
+          {
+                return;
+          }
+
+          include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+
+          $keyargs_content = array();
+          $keyargs_content[] = get_l10n_args('Author: %s', $comment['author']);
+          if ($action=='delete')
+          {
+                $keyargs_content[] = get_l10n_args('This author removed the comment with id %d',
+                                                   $comment['comment_id']
+                                                   );
+          }
+          else
+          {
+                $keyargs_content[] = get_l10n_args('This author modified following comment:', '');
+                $keyargs_content[] = get_l10n_args('Comment: %s', $comment['content']);
+          }
+
+          pwg_mail_notification_admins(get_l10n_args('Comment by %s',
+                                                         $comment['author']),
+                                           $keyargs_content
+                                           );
+        }
+}
+
+function get_comment_author_id_albums($comment_id, $die_on_error=true)
 {
   $query = '
@@ -318 +322 @@
 }
 
-function validate_user_comment($comment_id)
+function validate_user_comment_albums($comment_id)
 {
   $query = '

extensions/Comments_on_Albums/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Comment on Albums
-Version: 0.1.a
+Version: 0.2
 Description: Allows users to comment albums
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=512
@@ -17 +17 @@
 // +-----------------------------------------------------------------------+
 define('COA_NAME' , 'Comment on Albums');
-define('COA_VERSION', '0.1.a');
+define('COA_VERSION', '0.2');
 define('COA_DIR' , basename(dirname(__FILE__)));
 define('COA_PATH' , PHPWG_PLUGINS_PATH . COA_DIR . '/');
@@ -27 +27 @@
 // +-----------------------------------------------------------------------+
 add_event_handler('loc_end_index', 'COA_index');
+add_event_handler('loc_after_page_header', 'COA_comments_page');
 add_event_handler('loc_end_admin', 'COA_admin');
 
 
 // +-----------------------------------------------------------------------+
-//                                      Fonctions
+//                                      Functions
 // +-----------------------------------------------------------------------+
 
@@ -39 +40 @@
         if ($page['section'] == 'categories' AND isset($page['category'])) {    
                 include(COA_PATH . 'include/coa_albums.php');
+        }
+}
+
+function COA_comments_page() {
+        global $template, $page, $conf;
+        
+        if ($page['body_id'] == 'theCommentsPage') {
+                include(COA_PATH . 'include/coa_comments_page.php');
         }
 }

extensions/Comments_on_Albums/maintain.inc.php

@@ -16 +16 @@
                 `validation_date` datetime DEFAULT NULL,
                 PRIMARY KEY (`id`)
-        );");
+        ) DEFAULT CHARSET=utf8;");
 }
 

extensions/Comments_on_Albums/template/coa_albums.tpl

@@ -1 +1 @@
 {combine_script id="jquery"}
-{combine_css path=$COA_PATH|@cat:'template/style.css'}
+{combine_css path=$COA_PATH|@cat:'template/style_albums.css'}
 
-{footer_script equire="jquery"}{literal}
+{footer_script require="jquery"}{literal}
         // cancel all color changements and set default color to comments
         jQuery('.thumbnailCategory').css('color', jQuery('body').css('color'));