Changeset 11069

Timestamp:

May 26, 2011, 7:00:46 PM (13 years ago)

Author:

Eric

Message:

Add new feature : Users in a specified group can post comments without admin validation when "Comments for all" is enabled and admin validation is enabled.
New version 2.2.1 hard coded for publication

Location:

extensions/Comments_Access_Manager

Files:

• admin.php (modified) (6 diffs)
• changelog.txt (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• include/upgradedb.inc.php (modified) (1 diff)
• language/en_UK/help/plugin.lang.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/help/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (2 diffs)
• template/admin.tpl (modified) (4 diffs)
• template/cm.css (modified) (1 diff)

extensions/Comments_Access_Manager/admin.php

@@ -33 +33 @@
 // *************************************************************************
 
-        if (isset($_POST['submit']) and isset($_POST['CM_No_Comment_Anonymous']) and isset($_POST['CM_GroupComm']))
+        if (isset($_POST['submit']) and isset($_POST['CM_No_Comment_Anonymous']) and isset($_POST['CM_GroupComm']) and isset($_POST['CM_GroupValid']))
   {
 
@@ -41 +41 @@
       $_POST['CM_GroupComm'],
       (isset($_POST['CM_AllowComm_Group'])?$_POST['CM_AllowComm_Group']:''),
+      $_POST['CM_GroupValid'],
+      (isset($_POST['CM_ValidComm_Group'])?$_POST['CM_ValidComm_Group']:''),
       );
 
@@ -56 +58 @@
   $groups[-1] = '---------';
   $AllowComm = -1;
+  $ValidComm = -1;
         
   //Check groups list in database 
@@ -75 +78 @@
                 $AllowComm = $row['id'];
                 }
+
+    //configuration value for users group allowed to post comments
+    if (isset($conf_CM[5]) and $conf_CM[5] == $row['id'])
+                {
+                $ValidComm = $row['id'];
+                }
   }
 
@@ -83 +92 @@
       'group_options'=> $groups,
       'group_selected' => $AllowComm
+                        )
+        );
+  //Template initialization for validated group for comments
+  $template->assign(
+    'ValidComm_Group',
+                array(
+      'group_options'=> $groups,
+      'group_selected' => $ValidComm
                         )
         );
@@ -100 +117 @@
     'CM_GROUPCOMM_FALSE'            => $conf_CM[2]=='false' ?  'checked="checked"' : '' ,
     'CM_ALLOWCOMM_GROUP'            => $conf_CM[3],
+    'CM_GROUPVALID_TRUE'            => $conf_CM[4]=='true' ?  'checked="checked"' : '' ,
+    'CM_GROUPVALID_FALSE'           => $conf_CM[4]=='false' ?  'checked="checked"' : '' ,
+    'CM_VALIDCOMM_GROUP'            => $conf_CM[5],
     )
   );

extensions/Comments_Access_Manager/changelog.txt

@@ -2 +2 @@
 ** Change log **
 
--- 2011-05-23 : 2.2.0 - Initial Release
+-- 2011-05-23
+      2.2.0 - Initial Release
+
+-- 2011-05-26
+      2.2.1 - Add new feature : Users in a specified group can post comments without admin validation when "Comments for all" is enabled and admin validation is enabled.

extensions/Comments_Access_Manager/include/functions.inc.php

@@ -52 +52 @@
   }
 
-
-// Do not allow comments if user is not in an allowed group
-  if (isset($conf_CM[2]) and $conf_CM[2] == 'true' and !$conf['comments_forall'] and !is_admin())
-  {
-    if (!CM_CheckAuthor($comm['author']))
-    {
-      $comment_action = 'reject';
-
+// Rules on comments NOT for all
+  if (!$conf['comments_forall'] and !is_admin())
+  {
+    if ((isset($conf_CM[2]) and $conf_CM[2] == 'true') and (isset($conf_CM[4]) and $conf_CM[4] == 'false') and !CM_CheckAuthor($comm['author'])) // Comments authorized group set - Auto validation group unset 
+    {
+      $comment_action = 'reject'; // Comment rejected if author is not in the allowed group
       array_push($infos, l10n('CM_Not_Allowed_Author'));
+    }
+    elseif ((isset($conf_CM[2]) and $conf_CM[2] == 'false') and (isset($conf_CM[4]) and $conf_CM[4] == 'true') and $conf['comments_validation']) // Comments authorized group unset - Auto validation group set
+    {
+      if (CM_CheckValidGroup($comm['author']))
+      {
+        $comment_action = 'validate'; // Comment is validated if author is not in the validated group
+      }
+      else
+      {
+        $comment_action = 'moderate'; // Comment needs moderation if author is not in the validated group
+      }
+    }
+    elseif ((isset($conf_CM[2]) and $conf_CM[2] == 'true') and (isset($conf_CM[4]) and $conf_CM[4] == 'true') and $conf['comments_validation']) // Comments authorized group set - Auto validation group set
+    {
+      if (!CM_CheckAuthor($comm['author']))
+      {
+        $comment_action = 'reject'; // Comment rejected if author is not in the allowed group
+        array_push($infos, l10n('CM_Not_Allowed_Author'));
+      }
+      elseif (CM_CheckValidGroup($comm['author']))
+      {
+        $comment_action = 'validate'; // Comment is validated if author is not in the validated group
+      }
+      else
+        $comment_action = 'moderate'; // Comment needs moderation if author is not in the validated group
     }
   }
@@ -110 +133 @@
 
 /**
+ * Checks if comment's author name is in the admin's pre-validated group
+ * avoid admins to validate comments for the members of this group
+ * 
+ * @author   : author's name
+ * 
+ * @returns  : Boolean (true if user's comment doesn't need validation / false if user's comment is moderated)
+ * 
+ */
+function CM_CheckValidGroup($author)
+{
+  global $conf;
+  
+        // Get CM configuration
+  $conf_CM = unserialize($conf['CommentsManager']);
+  
+  if (isset($conf_CM[5]) and $conf_CM[5] <> -1)
+  {
+    $query = '
+SELECT u.id,
+       u.username,
+       ug.user_id,
+       ug.group_id
+FROM '.USERS_TABLE.' AS u
+  INNER JOIN '.USER_GROUP_TABLE.' AS ug
+    ON u.id = ug.user_id
+WHERE u.username LIKE "'.$author.'"
+  AND ug.group_id = '.$conf_CM[5].'
+;';
+
+    $count = pwg_db_num_rows(pwg_query($query));
+
+    if (is_null($count) or $count == 0)
+    {
+      return false;
+    }
+    else
+      return true;
+  }
+}
+
+
+/**
  * Get the plugin version and name
  *

extensions/Comments_Access_Manager/include/upgradedb.inc.php

@@ -74 +74 @@
   }
 }
+
+
+/* upgrade from 2.2.0 to 2.2.1 */
+/* *************************** */
+function upgradeCM_220_221()
+{
+  global $conf;
+
+  // Upgrading options
+  $query = '
+SELECT value
+  FROM '.CONFIG_TABLE.'
+WHERE param = "CommentsManager"
+;';
+
+  $result = pwg_query($query);
+  $conf_CM = pwg_db_fetch_assoc($result);
+    
+  $Newconf_CM = unserialize($conf_CM['value']);
+  
+  $Newconf_CM[4] = 'false';
+  $Newconf_CM[5] = '-1';
+  
+  $update_conf = serialize($Newconf_CM);
+
+  conf_update_param('CommentsManager', pwg_db_real_escape_string($update_conf));
+}
 ?>

extensions/Comments_Access_Manager/language/en_UK/help/plugin.lang.php

@@ -6 +6 @@
 <br><br>
 By default, when <b>&quot;comments for all&quot;</b> option is disabled, only registered users can post comments. With this option, you can restrict this behavior by specifying a user group. Thus, only registered users and members of this group may post comments.';
+
+// --------- Starting below: New or revised $lang ---- from version 2.2.1
+$lang['CM_ValidCommTitle'] = 'Allow comments without validation by an administrator';
+$lang['CM_ValidCommTitle_d'] = 'This option lets you specify a group of users whose comments will be provided without validation by the administrator when the gallery is configured to not allow comments to all and that the validation of comments by an administrator is required.
+<br><br>
+By default, when <b>&quot;comments all&quot;</b> are off and the validation of comments is enabled, the comments of all registered users are subject to validation by an administrator before being visible on the gallery. With this option, you can allow members of a group of your choice to post comments without such prior approval is required.';
+// --------- End: New or revised $lang ---- from version 2.2.1
 ?>

extensions/Comments_Access_Manager/language/en_UK/plugin.lang.php

@@ -14 +14 @@
 Also available, the project\'s bugtracker: <a href="http://piwigo.org/bugs/" onclick="window.open(this.href);return false;">http://piwigo.org/bugs/</a>';
 $lang['CM_Empty Author'] = 'Comments author nickname is mandatory !';
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.2.1
+$lang['CM_Validation_For_Group'] = 'Allow comments without validation by an administrator';
+$lang['CM_ValidComm_Group'] = 'Select the group of users allowed to post comments without validation:';
+$lang['CM_CommentsForAll'] = '"Comments for all" option <b style="color:red;">enabled</b>';
+$lang['CM_CommentsForRegistered'] = '"Comments for all" option <b style="color:red;">disabled</b>';
+// --------- End: New or revised $lang ---- from version 2.2.1
 ?>

extensions/Comments_Access_Manager/language/fr_FR/help/plugin.lang.php

@@ -1 +1 @@
 <?php
-$lang['CM_commentTitle'] = 'Commentaires : pseudo obligatoire pour les non-inscrits.';
 $lang['CM_commentTitle_d'] = 'Lorsque les visiteurs non inscrits sont autorisés à poster des commentaires (<b>&quot;Commentaires pour tous&quot;</b> actif), cette option oblige le visiteur non inscrit à saisir un pseudo pour que le commentaire soit accepté.';
 $lang['CM_GroupCommTitle'] = 'Autoriser les commentaires pour un groupe d\'utilisateurs';
@@ -6 +5 @@
 <br><br>
 Par défaut, lorsque les <b>&quot;commentaires pour tous&quot;</b> sont désactivés, seuls les utilisateurs inscrits peuvent poster des commentaires. Avec cette option, vous pouvez restreindre d\'avantage ce fonctionnement en précisant un groupe d\'utilisateurs. Ainsi, seuls les utilisateurs inscrits et faisant partie de ce groupe pourront poster des commentaires.';
+
+// --------- Starting below: New or revised $lang ---- from version 2.2.1
+$lang['CM_commentTitle'] = 'Pseudo obligatoire pour les non-inscrits.';
+$lang['CM_ValidCommTitle'] = 'Autoriser les commentaires sans validation par un administrateur';
+$lang['CM_ValidCommTitle_d'] = 'Cette option permet de spécifier un groupe d\'utilisateurs dont les commentaires seront dispensés de validation par l\'administrateur lorsque la galerie est configurée pour ne pas autoriser les commentaires pour tous et que la validation des commentaires par un administrateur est requise.
+<br><br>
+Par défaut, lorsque les <b>&quot;commentaires pour tous&quot;</b> sont désactivés et que la validation des commentaires est activée, les commentaires de tous les utilisateurs inscrits sont soumis à validation par un administrateur avant d\'être visibles sur la galerie. Avec cette option, vous pouvez autoriser les membres d\'un groupe de votre choix à poster des commentaires sans que cette validation préalable ne soit nécessaire.';
+// --------- End: New or revised $lang ---- from version 2.2.1
 ?>

extensions/Comments_Access_Manager/language/fr_FR/plugin.lang.php

@@ -6 +6 @@
 $lang['CM_Disable'] = ' Désactiver (valeur par défaut)';
 $lang['CM_Enable'] = ' Activer ';
-$lang['CM_No_Anonymous_Comments'] = 'Commentaires : Pseudo obligatoire pour les non-inscrits';
 $lang['CM_Comments_For_Group'] = 'Autoriser les commentaires pour un groupe d\'utilisateurs';
 $lang['CM_AllowedComm_Group'] = 'Sélectionnez le groupe d\'utilisateurs autorisé à poster des commentaires :';
@@ -15 +14 @@
 Egalement disponible, le bugtracker du projet: <a href="http://piwigo.org/bugs/" onclick="window.open(this.href);return false;">http://piwigo.org/bugs/</a>';
 $lang['CM_Empty Author'] = 'Le nom de l\'auteur du commentaire est obligatoire !';
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.2.1
+$lang['CM_No_Anonymous_Comments'] = 'Pseudo obligatoire pour les non-inscrits';
+$lang['CM_Validation_For_Group'] = 'Autoriser les commentaires sans validation par un administrateur';
+$lang['CM_ValidComm_Group'] = 'Sélectionnez le groupe d\'utilisateurs autorisé à poster des commentaires sans validation :';
+$lang['CM_CommentsForAll'] = 'Option "Commentaires pour tous" <b style="color:red;">activé</b>';
+$lang['CM_CommentsForRegistered'] = 'Option "Commentaires pour tous" <b style="color:red;">désactivé</b>';
+// --------- End: New or revised $lang ---- from version 2.2.1
 ?>

extensions/Comments_Access_Manager/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: Comments Access Manager
-Version: 2.2.0
+Version: 2.2.1
 Description: Gérer l'accès aux commentaites - Manage comments access
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=
@@ -18 +18 @@
 include_once (CM_PATH.'include/functions.inc.php');
 
-load_language('plugin.lang', CM_PATH);
-$conf_CM = unserialize($conf['CommentsManager']);
-
-
 // Plugin administration panel
 add_event_handler('get_admin_plugin_menu_links', 'CM_admin_menu');

extensions/Comments_Access_Manager/maintain.inc.php

@@ -16 +16 @@
   $version = $plugin['version'];
         
-  $default = array($version,'false','false',-1);
+  $default = array($version,'false','false',-1,'false',-1);
 
         $query = '
@@ -46 +46 @@
   include_once (CM_PATH.'include/upgradedb.inc.php');
 
+  // Database upgrade process
+  if (isset($conf['CommentsManager']))
+  {
+    $conf_CM = unserialize($conf['CommentsManager']);
+    
+    // upgrade from 2.2.0 to 2.2.1
+    if (version_compare($conf_CM[0], '2.2.1') < 0)
+    {
+      upgradeCM_220_221();
+    }
+  }
+  
   // Update plugin version number in #_config table and check consistency of #_plugins table
   CM_version_update();
 
-  load_conf_from_db('param like \'UserAdvManager\\_%\'');
+  load_conf_from_db('param like \'CommentsManager\'');
 }
 

extensions/Comments_Access_Manager/template/admin.tpl

@@ -9 +9 @@
   jQuery('.cluetip').cluetip(
   {ldelim}
-    width: 550,
+    width: 500,
     splitTitle: '|'
   {rdelim});
@@ -26 +26 @@
 
   <fieldset>
+    <fieldset>
+    <div class="FieldTitle">
+      {'CM_CommentsForAll'|@translate}
+    </div>
+    <br>
     <ul>
       <li>
@@ -39 +44 @@
       <br><br>
       </li>
-
+    </ul>
+    </fieldset>
+    
+    <fieldset>
+    <div class="FieldTitle">
+      {'CM_CommentsForRegistered'|@translate}
+    </div>
+    <br>
+    <ul>
       <li>
         <label class="cluetip" title="{'CM_GroupCommTitle'|translate}|{'CM_GroupCommTitle_d'|translate}">
@@ -63 +76 @@
       <br><br>
       </li>
+
+      <li>
+        <label class="cluetip" title="{'CM_ValidCommTitle'|translate}|{'CM_ValidCommTitle_d'|translate}">
+          {'CM_Validation_For_Group'|@translate}
+        </label>
+      <br><br>
+        <input type="radio" value="false" {$CM_GROUPVALID_FALSE} name="CM_GroupValid">
+          {'CM_Disable'|@translate}
+      <br>
+        <input type="radio" value="true" {$CM_GROUPVALID_TRUE} name="CM_GroupValid">
+          {'CM_Enable'|@translate}
+      <br><br>
+
+      <ul>
+        <li>
+          <label>
+            {'CM_ValidComm_Group'|@translate}
+          </label>
+        <br><br>
+            {html_options name="CM_ValidComm_Group" options=$ValidComm_Group.group_options selected=$ValidComm_Group.group_selected}
+        </li>
+      </ul>
+      <br><br>
+      </li>
     </ul>
+    </fieldset>
   </fieldset>
 

extensions/Comments_Access_Manager/template/cm.css

@@ -4 +4 @@
   font-weight:bold;
 }
+
+/* CM instructions */
+div.FieldTitle
+{
+  text-align:center;
+  text-decoration: underline;
+  font-weight:bolder;
+}