Changeset 11069 for extensions/Comments_Access_Manager/include

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/include

Files:

• functions.inc.php (modified) (2 diffs)
• upgradedb.inc.php (modified) (1 diff)

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));
+}
 ?>