Changeset 10958 for extensions/UserAdvManager/branches/2.20/admin

Timestamp:

May 20, 2011, 10:22:18 PM (13 years ago)

Author:

Eric

Message:

r10957 merged from trunk to branch 2.20

Location:

extensions/UserAdvManager/branches/2.20/admin

Files:

• UAM_admin.php (modified) (6 diffs)
• template/global.tpl (modified) (1 diff)

extensions/UserAdvManager/branches/2.20/admin/UAM_admin.php

@@ -106 +106 @@
   case 'global':
 
-        if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']) and isset($_POST['UAM_GTAutoMail']) and isset($_POST['UAM_CustomPasswRetr']) and isset($_POST['UAM_USRAuto']) and isset($_POST['UAM_USRAutoMail']) and isset($_POST['UAM_Stuffs']) and isset($_POST['UAM_HidePassw']))
+        if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']) and isset($_POST['UAM_GTAutoMail']) and isset($_POST['UAM_CustomPasswRetr']) and isset($_POST['UAM_USRAuto']) and isset($_POST['UAM_USRAutoMail']) and isset($_POST['UAM_Stuffs']) and isset($_POST['UAM_HidePassw']) and isset($_POST['UAM_GroupComm']))
   {
 
@@ -179 +179 @@
       $_POST['UAM_USRAutoMail'],
       $_POST['UAM_Stuffs'],
-      $_POST['UAM_HidePassw']
+      $_POST['UAM_HidePassw'],
+      $_POST['UAM_GroupComm'],
+      (isset($_POST['UAM_AllowComm_Group'])?$_POST['UAM_AllowComm_Group']:''),
       );
 
@@ -257 +259 @@
   $Valid = -1;
   $Downgrade = -1;
+  $AllowComm = -1;
         
   //Check groups list in database 
@@ -284 +287 @@
                 {
                 $Downgrade = $row['id'];
+                }
+    //configuration value for users group allowed to post comments
+    if (isset($conf_UAM[37]) and $conf_UAM[37] == $row['id'])
+                {
+                $AllowComm = $row['id'];
                 }
   }
@@ -309 +317 @@
       'group_options'=> $groups,
       'group_selected' => $Downgrade
+                        )
+        );
+  //Template initialization for allowed group for comments
+  $template->assign(
+    'AllowComm_Group',
+                array(
+      'group_options'=> $groups,
+      'group_selected' => $AllowComm
                         )
         );
@@ -449 +465 @@
     'UAM_HIDEPASSW_TRUE'             => $conf_UAM[35]=='true' ?  'checked="checked"' : '' ,
     'UAM_HIDEPASSW_FALSE'            => $conf_UAM[35]=='false' ?  'checked="checked"' : '' ,
+    'UAM_GROUPCOMM_TRUE'             => $conf_UAM[36]=='true' ?  'checked="checked"' : '' ,
+    'UAM_GROUPCOMM_FALSE'            => $conf_UAM[36]=='false' ?  'checked="checked"' : '' ,
+    'UAM_ALLOWCOMM_GROUP'            => $conf_UAM[37],
                 'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score,
     'UAM_ERROR_REPORTS4'             => $UAM_Exclusionlist_Error,

extensions/UserAdvManager/branches/2.20/admin/template/global.tpl

@@ -679 +679 @@
 
             <li>
+              <label class="cluetip" title="{'UAM_GroupCommTitle'|translate}|{'UAM_GroupCommTitle_d'|translate}">
+                {'UAM_Group_Comments'|@translate}
+              </label>
+            <br><br>
+              <input type="radio" value="false" {$UAM_GROUPCOMM_FALSE} name="UAM_GroupComm">
+                {'UAM_Disable'|@translate}
+            <br>
+              <input type="radio" value="true" {$UAM_GROUPCOMM_TRUE} name="UAM_GroupComm">
+                {'UAM_Enable'|@translate}
+            <br><br>
+              <ul>
+                <li>
+                  <label>
+                    {'UAM_AllowedComm_Group'|@translate}
+                  </label>
+                <br><br>
+                  <div id="uam_leftmargin">
+                    {html_options name="UAM_AllowComm_Group" options=$AllowComm_Group.group_options selected=$AllowComm_Group.group_selected}
+                  </div>
+                </li>
+              </ul>
+            <br><br>
+            </li>
+
+            <li>
               <label class="cluetip" title="{'UAM_RedirTitle'|translate}|{'UAM_RedirTitle_d'|translate}">
                 {'UAM_RedirToProfile'|@translate}