Changeset 12887

Timestamp:

Jan 14, 2012, 11:29:10 PM (12 years ago)

Author:

mistic100

Message:

feature:2549 Allow to disable comments for everybody

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/cat_modify.php (modified) (3 diffs)
• admin/cat_options.php (modified) (1 diff)
• admin/configuration.php (modified) (1 diff)
• admin/intro.php (modified) (4 diffs)
• admin/themes/default/template/admin.tpl (modified) (1 diff)
• admin/themes/default/template/cat_modify.tpl (modified) (2 diffs)
• admin/themes/default/template/configuration.tpl (modified) (2 diffs)
• admin/themes/default/template/intro.tpl (modified) (2 diffs)
• admin/themes/default/template/profile_content.tpl (modified) (3 diffs)
• admin/themes/default/template/user_list.tpl (modified) (2 diffs)
• admin/user_list.php (modified) (2 diffs)
• comments.php (modified) (1 diff)
• include/category_default.inc.php (modified) (1 diff)
• include/menubar.inc.php (modified) (1 diff)
• install/config.sql (modified) (1 diff)
• install/db/114-database.php (added)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_CA/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• profile.php (modified) (2 diffs)
• themes/default/template/profile_content.tpl (modified) (1 diff)

trunk/admin.php

@@ -190 +190 @@
     'U_ADD_PHOTOS' => $link_start.'photos_add',
     'U_CHANGE_THEME' => $change_theme_url,
-    'U_PENDING_COMMENTS' => $link_start.'comments',
     'U_UPDATES' => $link_start.'updates',
     )
   );
+  
+if ($conf['activate_comments'])
+{
+  $template->assign('U_PENDING_COMMENTS', $link_start.'comments');
+}
 
 // +-----------------------------------------------------------------------+

trunk/admin/cat_modify.php

@@ -49 +49 @@
       'id' => $_GET['cat_id'],
       'name' => @$_POST['name'],
-      'commentable' => isset($_POST['commentable'])?$_POST['commentable']:'false',
       'comment' =>
         $conf['allow_html_descriptions'] ?
           @$_POST['comment'] : strip_tags(@$_POST['comment']),
       );
+     
+  if ($conf['activate_comments'])
+  {
+    $data['commentable'] = isset($_POST['commentable'])?$_POST['commentable']:'false';
+  }
 
   mass_updates(
@@ -223 +227 @@
     'CAT_STATUS'        => $category['status'],
     'CAT_VISIBLE'       => boolean_to_string($category['visible']),
-    'CAT_COMMENTABLE'   => boolean_to_string($category['commentable']),
 
     'U_JUMPTO' => make_index_url(
@@ -239 +242 @@
     )
   );
+ 
+if ($conf['activate_comments'])
+{
+  $template->assign('CAT_COMMENTABLE', boolean_to_string($category['commentable']));
+}
 
 

trunk/admin/cat_options.php

@@ -143 +143 @@
 $tabsheet->add('status', l10n('Public / Private'), $opt_link.'status');
 $tabsheet->add('visible', l10n('Lock'), $opt_link.'visible');
-$tabsheet->add('comments', l10n('Comments'), $opt_link.'comments');
+if ($conf['activate_comments'])
+{
+  $tabsheet->add('comments', l10n('Comments'), $opt_link.'comments');
+}
 if ($conf['allow_random_representative'])
 {

trunk/admin/configuration.php

@@ -67 +67 @@
 
 $comments_checkboxes = array(
+    'activate_comments',
     'comments_forall',
     'comments_validation',

trunk/admin/intro.php

@@ -185 +185 @@
 ;';
 list($nb_groups) = pwg_db_fetch_row(pwg_query($query));
-
-$query = '
-SELECT COUNT(*)
-  FROM '.COMMENTS_TABLE.'
-;';
-list($nb_comments) = pwg_db_fetch_row(pwg_query($query));
 
 $query = '
@@ -219 +213 @@
     'DB_USERS' => l10n_dec('%d user', '%d users', $nb_users),
     'DB_GROUPS' => l10n_dec('%d group', '%d groups', $nb_groups),
-    'DB_COMMENTS' => l10n_dec('%d comment', '%d comments', $nb_comments),
                 'DB_RATES' => sprintf('%d rates', $nb_rates),
     'U_CHECK_UPGRADE' => PHPWG_ROOT_PATH.'admin.php?action=check_upgrade',
@@ -227 +220 @@
     )
   );
+  
+if ($conf['activate_comments'])
+{
+  $query = '
+SELECT COUNT(*)
+  FROM '.COMMENTS_TABLE.'
+;';
+  list($nb_comments) = pwg_db_fetch_row(pwg_query($query));
+  $template->assign('DB_COMMENTS', l10n_dec('%d comment', '%d comments', $nb_comments));
+  
+  // unvalidated comments
+  $query = '
+SELECT COUNT(*)
+  FROM '.COMMENTS_TABLE.'
+  WHERE validated=\'false\'
+;';
+  list($nb_comments) = pwg_db_fetch_row(pwg_query($query));
+
+  if ($nb_comments > 0)
+  {
+    $template->assign(
+      'unvalidated',
+      array(
+        'URL' => PHPWG_ROOT_PATH.'admin.php?page=comments',
+        'INFO' => sprintf(l10n('%d waiting for validation'), $nb_comments)
+        )
+      );
+  }
+}
 
 if ($nb_elements > 0)
@@ -248 +270 @@
 }
 
-// unvalidated comments
-$query = '
-SELECT COUNT(*)
-  FROM '.COMMENTS_TABLE.'
-  WHERE validated=\'false\'
-;';
-list($nb_comments) = pwg_db_fetch_row(pwg_query($query));
-
-if ($nb_comments > 0)
-{
-  $template->assign(
-    'unvalidated',
-    array(
-      'URL' => PHPWG_ROOT_PATH.'admin.php?page=comments',
-      'INFO' => sprintf(l10n('%d waiting for validation'), $nb_comments)
-      )
-    );
-}
-
 // graphics library
 switch (pwg_image::get_library())

trunk/admin/themes/default/template/admin.tpl

@@ -75 +75 @@
 {/if}
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
+{if isset($U_PENDING_COMMENTS)}
         <li><a href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>
+{/if}
         <li><a href="{$U_UPDATES}">{'Updates'|@translate}</a></li>
       </ul>

trunk/admin/themes/default/template/cat_modify.tpl

@@ -83 +83 @@
       </td>
     </tr>
+  {if isset($CAT_COMMENTABLE)}
     <tr>
       <td><strong>{'Comments'|@translate}</strong>
@@ -89 +90 @@
       </td>
     </tr>
+  {/if}
   </table>
 </fieldset>

trunk/admin/themes/default/template/configuration.tpl

@@ -184 +184 @@
     <li>
       <label>
+        <span class="property">{'Activate comments'|@translate}</span>
+        <input type="checkbox" name="activate_comments" id="activate_comments"{if ($comments.activate_comments)}checked="checked"{/if}>
+      </label>
+    </li>
+  </ul>
+  
+  <ul id="comments_param_warp"{if not ($comments.activate_comments)} style="display:none;"{/if}>
+    <li>
+      <label>
         <span class="property">{'Comments for all'|@translate}</span>
         <input type="checkbox" name="comments_forall" {if ($comments.comments_forall)}checked="checked"{/if}>
@@ -244 +253 @@
   </ul>
 </fieldset>
+{footer_script}{literal}
+$(document).ready(function(){
+  $("#activate_comments").change(function(){
+    if ($(this).attr('checked')) {
+      $("#comments_param_warp").css('display', '');
+    } else {
+      $("#comments_param_warp").css('display', 'none');
+    }
+  });
+});
+{/literal}{/footer_script}
 {/if}
 

trunk/admin/themes/default/template/intro.tpl

@@ -73 +73 @@
       <li>{$DB_USERS}</li>
       <li>{$DB_GROUPS}</li>
+    {if isset($DB_COMMENTS)}
       <li>
         {$DB_COMMENTS}
@@ -79 +80 @@
         {/if}
       </li>
+    {/if}
                         <li>{$DB_RATES}</li>
     </ul>

trunk/admin/themes/default/template/profile_content.tpl

@@ -48 +48 @@
         <input type="text" size="4" maxlength="3" name="nb_image_page" id="nb_image_page" value="{$NB_IMAGE_PAGE}">
       </li>
-{if not $SPECIAL_USER}
+    {if not $SPECIAL_USER}
       <li>
         <span class="property">
@@ -61 +61 @@
         {html_options id=language name=language options=$language_options selected=$language_selection}
       </li>
-{/if}
+    {/if}
       <li>
         <span class="property">
@@ -72 +72 @@
         {html_radios name='expand' options=$radio_options selected=$EXPAND}
       </li>
+    {if $ACTIVATE_COMMENTS}
       <li>
         <span class="property">{'Show number of comments'|@translate}</span>
         {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
       </li>
+    {/if}
       <li>
         <span class="property">{'Show number of hits'|@translate}</span>

trunk/admin/themes/default/template/user_list.tpl

@@ -236 +236 @@
   </tr>
 
+{if $ACTIVATE_COMMENTS}
   <tr>
     <td>{'Show number of comments'|@translate}</td>
@@ -245 +246 @@
     </td>
   </tr>
+{/if}
 
   <tr>

trunk/admin/user_list.php

@@ -416 +416 @@
   $dbfields = array('primary' => array('user_id'), 'update' => array());
 
-  $formfields =
-    array('nb_image_page', 'theme', 'language',
-          'recent_period', 'expand', 'show_nb_comments',
-          'show_nb_hits', 'status', 'enabled_high',
-          'level');
-
-  $true_false_fields = array('expand', 'show_nb_comments',
-                       'show_nb_hits', 'enabled_high');
+  $formfields = array(
+          'nb_image_page', 'theme', 'language',
+          'recent_period', 'expand', 'show_nb_hits', 
+          'status', 'enabled_high', 'level'
+          );
+  
+  $true_false_fields = array('expand', 'show_nb_hits', 'enabled_high');
+  
+  if ($conf['activate_comments'])
+  {
+    array_push($formfields, 'show_nb_comments');
+    array_push($true_false_fields, 'show_nb_comments');
+  }
 
   foreach ($formfields as $formfield)
@@ -556 +561 @@
     'F_ADD_ACTION' => $base_url,
     'F_USERNAME' => @htmlentities($_GET['username'], ENT_COMPAT, 'UTF-8'),
-    'F_FILTER_ACTION' => get_root_url().'admin.php'
+    'F_FILTER_ACTION' => get_root_url().'admin.php',
+    
+    'ACTIVATE_COMMENTS' => $conf['activate_comments'],
     ));
 

trunk/comments.php

@@ -28 +28 @@
 include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
 include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
+
+if (!$conf['activate_comments'])
+{
+  page_not_found(null);
+}
 
 // +-----------------------------------------------------------------------+

trunk/include/category_default.inc.php

@@ -75 +75 @@
     );
 
-  if ($user['show_nb_comments'])
+  if ($conf['activate_comments'] and $user['show_nb_comments'])
   {
     $query = '

trunk/include/menubar.inc.php

@@ -258 +258 @@
       );
 
-    // comments link
-    $block->data['comments'] =
-      array(
-        'TITLE'=>l10n('display last user comments'),
-        'NAME'=>l10n('Comments'),
-        'URL'=> get_root_url().'comments.php',
-      );
+    if ($conf['activate_comments'])
+    {
+      // comments link
+      $block->data['comments'] =
+        array(
+          'TITLE'=>l10n('display last user comments'),
+          'NAME'=>l10n('Comments'),
+          'URL'=> get_root_url().'comments.php',
+        );
+    }
 
     // about link

trunk/install/config.sql

@@ -1 +1 @@
 -- initial configuration for Piwigo
 
+INSERT INTO piwigo_config (param,value,comment) VALUES ('activate_comments','true','Global parameter for usage of comments system');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('nb_comment_page','10','number of comments to display on each page');
 INSERT INTO piwigo_config (param,value,comment) VALUES ('log','true','keep an history of visits on your website');

trunk/language/en_UK/admin.lang.php

@@ -102 +102 @@
 $lang['Activate Navigation Bar'] = 'Activate navigation bar';
 $lang['Activate Navigation Thumbnails'] = 'Activate navigation thumbnails';
+$lang['Activate comments'] = 'Activate comments';
 $lang['Activate'] = "Activate";
 $lang['Active Languages'] = 'Active Languages';

trunk/language/fr_CA/admin.lang.php

@@ -846 +846 @@
 $lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo ne peut pas récupérer le fichier de mise à jour depuis le serveur';
 $lang['Send connection settings by email'] = 'Envoyer les identifiants par email';
+$lang['Activate comments'] = 'Activate comments';
 
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -845 +845 @@
 $lang['Original Size'] = 'Taille originale';
 $lang['Send connection settings by email'] = 'Envoyer les identifiants par email';
+$lang['Activate comments'] = 'Activate comments';
 
 ?>

trunk/picture.php

@@ -966 +966 @@
 
 include(PHPWG_ROOT_PATH.'include/picture_rate.inc.php');
-include(PHPWG_ROOT_PATH.'include/picture_comment.inc.php');
+if ($conf['activate_comments'])
+{
+  include(PHPWG_ROOT_PATH.'include/picture_comment.inc.php');
+}
 if ($metadata_showable and pwg_get_session_var('show_metadata') <> null )
 {

trunk/profile.php

@@ -257 +257 @@
       $fields = array(
         'nb_image_page', 'language',
-        'expand', 'show_nb_comments', 'show_nb_hits', 'recent_period', 'theme'
+        'expand', 'show_nb_hits', 'recent_period', 'theme'
         );
+        
+      if ($conf['activate_comments'])
+      {
+        array_push($fields, 'show_nb_comments');
+      }
 
       $data = array();
@@ -301 +306 @@
       'EMAIL'=>get_email_address_as_display_text(@$userdata['email']),
       'ALLOW_USER_CUSTOMIZATION'=>$conf['allow_user_customization'],
+      'ACTIVATE_COMMENTS'=>$conf['activate_comments'],
       'NB_IMAGE_PAGE'=>$userdata['nb_image_page'],
       'RECENT_PERIOD'=>$userdata['recent_period'],

trunk/themes/default/template/profile_content.tpl

@@ -71 +71 @@
         {html_radios name='expand' options=$radio_options selected=$EXPAND}
       </li>
+    {if $ACTIVATE_COMMENTS}
       <li>
         <span class="property">{'Show number of comments'|@translate}</span>
         {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
       </li>
+    {/if}
       <li>
         <span class="property">{'Show number of hits'|@translate}</span>