Changeset 6754 for extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

Timestamp:

Aug 14, 2010, 12:28:53 AM (14 years ago)

Author:

Eric

Message:

• Bug 1656 fixed: New ability to manually validate new registers
• Language files updated - Some DE, ES and IT translation are missing

File:

• extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php (modified) (8 diffs)

extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

@@ -28 +28 @@
 $UAM_Password_Test_Score = 0;
 $UAM_Exclusionlist_Error = false;
-
 
 // +-----------------------------------------------------------------------+
@@ -119 +118 @@
       $UAM_Exclusionlist_Error = true;
     }
-                
+
                 $newconf_UAM = array(
       $_POST['UAM_Mail_Info'],
@@ -154 +153 @@
                 pwg_query($query);
 
-
 /* Email confirmation settings */
     $_POST['UAM_ConfirmMail_ReMail_Txt1'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt1'])));
@@ -163 +161 @@
     
     $_POST['UAM_ConfirmMail_Custom_Txt2'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt2'])));
-
-
+    
           $newconf_UAM_ConfirmMail = array (
       $_POST['UAM_ConfirmMail_TimeOut'],
@@ -310 +307 @@
                 'UAM_CONFIRM_MAIL_TRUE'          => $conf_UAM[1]=='true' ?  'checked="checked"' : '' ,
                 'UAM_CONFIRM_MAIL_FALSE'         => $conf_UAM[1]=='false' ?  'checked="checked"' : '' ,
+    'UAM_CONFIRM_MAIL_LOCAL'         => $conf_UAM[1]=='local' ?  'checked="checked"' : '' ,
                 'UAM_CONFIRMMAIL_TEXT'           => $conf_UAM[10],
                 'UAM_No_Confirm_Group'           => $conf_UAM[2],
@@ -626 +624 @@
   $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
         
-  if (isset($conf_UAM[1]) and $conf_UAM[1]=='true' and ((isset($conf_UAM[2]) and $conf_UAM[2] <> '-1') or (isset($conf_UAM[8]) and $conf_UAM[8] <> '-1')))
-  {
+  if (isset($conf_UAM[1]) and ($conf_UAM[1]=='true' or $conf_UAM[1]=='local') and ((isset($conf_UAM[2]) and $conf_UAM[2] <> '-1') or (isset($conf_UAM[8]) and $conf_UAM[8] <> '-1')))
+  {   
 // +-----------------------------------------------------------------------+
 // |                           initialization                              |
@@ -1112 +1110 @@
 
                         $expiration = expiration($local_user['id']);
-
+      
                 $template->append(
                 'users',
@@ -1135 +1133 @@
                                 )
                         );
-                }
+                }   
+
+    // Check if validation of register is made by admin or visitor 
+    // If visitor, $Confirm_Local is used to mask useless buttons
+    $Confirm_Local = "";
+    
+    if ($conf_UAM[1] == 'local')
+    {
+      $Confirm_Local = $conf_UAM[1];
+    }
+    else
+    {
+      $Confirm_Local = "";
+    } 
+    
     /* Plugin version inserted */
     $template->assign(
       array(
+        'CONFIRM_LOCAL'=> $Confirm_Local,
         'UAM_VERSION'  => $version,
         'UAM_PATH'     => UAM_PATH,