Changeset 18160 for extensions/UserAdvManager

Timestamp:

Sep 22, 2012, 5:39:31 PM (12 years ago)

Author:

Eric

Message:

r17807 to r18159 merged from trunk to branch 2.40 - Thx to flop25 for his really appreciated and usefull help ;-)

Location:

extensions/UserAdvManager/branches/2.40

Files:

• ConfirmMail.php (modified) (2 diffs)
• admin/UAM_admin.php (modified) (50 diffs)
• admin/template/global.tpl (modified) (12 diffs)
• admin/template/usermanager.tpl (modified) (1 diff)
• changelog.txt.php (modified) (2 diffs)
• include/functions.inc.php (modified) (82 diffs)
• include/upgradedb.inc.php (modified) (2 diffs)
• language/de_DE/plugin.lang.php (modified) (1 diff)
• language/el_GR/plugin.lang.php (modified) (3 diffs)
• language/en_UK/help.lang.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (3 diffs)
• language/es_ES/plugin.lang.php (modified) (1 diff)
• language/fr_FR/help.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (3 diffs)
• language/hu_HU/plugin.lang.php (modified) (1 diff)
• language/it_IT/plugin.lang.php (modified) (1 diff)
• language/lv_LV/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (3 diffs)

extensions/UserAdvManager/branches/2.40/ConfirmMail.php

@@ -39 +39 @@
   {
     $status = true;
-    
     log_user($userid, false);
-
+    if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')
+    {
+      validation_mail($userid);
+    }
 // We have to get the user's language in database
 // ----------------------------------------------
@@ -119 +121 @@
       'REDIRECT'             => $redirect,
       'STATUS'               => $status,
-                  'CONFIRM_MAIL_MESSAGE' => $custom_text,
+                                'CONFIRM_MAIL_MESSAGE' => $custom_text,
     )
   );

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

@@ -46 +46 @@
         $page['tab'] = 'global';
 else
-  $page['tab'] = $_GET['tab'];
+ $page['tab'] = $_GET['tab'];
 
 $tabsheet = new tabsheet();
@@ -52 +52 @@
                l10n('UAM_Tab_Global'),
                $my_base_url.'&tab=global');
-  $tabsheet->add('userlist',
-                 l10n('UAM_Tracking registered users'),
-                 $my_base_url.'&tab=userlist');
+$tabsheet->add('userlist',
+               l10n('UAM_Tracking registered users'),
+               $my_base_url.'&tab=userlist');
 $tabsheet->add('usermanager',
                l10n('UAM_Tracking confirmations'),
@@ -83 +83 @@
 if (function_exists('set_fckeditor_instance'))
 {
-  $fcke_config = unserialize($conf['FCKEditor']);
+                $fcke_config = unserialize($conf['FCKEditor']);
   foreach($areas as $area)
   {
-    if (!isset($fcke_config[$area]))
+                                if (!isset($fcke_config[$area]))
     {
       $fcke_config[$area] = false;
     }
   }
-  $conf['FCKEditor'] = serialize($fcke_config);
-
-  set_fckeditor_instance($areas, $toolbar, $width, $height);
+                $conf['FCKEditor'] = serialize($fcke_config);
+
+                set_fckeditor_instance($areas, $toolbar, $width, $height);
 }
 
@@ -108 +108 @@
 // +-----------------------------------------------------------------------+
 // *************************************************************************
-  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_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_PwdReset']) and isset($_POST['UAM_RejectConnexion']))
-  {
+                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_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_PwdReset']) and isset($_POST['UAM_RejectConnexion']))
+                {
 
     // Render email contents fields
     // ----------------------------
-                $_POST['UAM_MailInfo_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_MailInfo_Text'])));
-
-    $_POST['UAM_ConfirmMail_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Text'])));
-
-    $_POST['UAM_GhostTracker_ReminderText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GhostTracker_ReminderText'])));
-
-    $_POST['UAM_GTAutoDelText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoDelText'])));
-
-    $_POST['UAM_GTAutoMailText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoMailText'])));
-
-    $_POST['UAM_AdminValidationMail_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_AdminValidationMail_Text'])));
-
-    $_POST['UAM_CustomPasswRetr_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomPasswRetr_Text'])));
-
-    $_POST['UAM_USRAutoDelText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoDelText'])));
-
-    $_POST['UAM_CustomRejectConnexion_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomRejectConnexion_Text'])));
-
-    // Render email subjects fields
+                                $_POST['UAM_MailInfo_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_MailInfo_Text'])));
+
+                                $_POST['UAM_ConfirmMail_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Text'])));
+
+                                $_POST['UAM_GhostTracker_ReminderText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GhostTracker_ReminderText'])));
+
+                                $_POST['UAM_GTAutoDelText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoDelText'])));
+
+                                $_POST['UAM_GTAutoMailText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoMailText'])));
+
+                                $_POST['UAM_AdminValidationMail_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_AdminValidationMail_Text'])));
+
+                                $_POST['UAM_CustomPasswRetr_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomPasswRetr_Text'])));
+
+                                $_POST['UAM_USRAutoDelText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoDelText'])));
+
+                                $_POST['UAM_CustomRejectConnexion_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomRejectConnexion_Text'])));
+
+                                // Render email subjects fields
     // ---------------------------
-    $_POST['UAM_ConfirmMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Subject'])));
-
-    $_POST['UAM_ConfirmMail_Remail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Remail_Subject'])));
-
-  $_POST['UAM_InfoMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_InfoMail_Subject'])));
-
-  $_POST['UAM_GTAutoMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoMail_Subject'])));
-
-  $_POST['UAM_GTReminder_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTReminder_Subject'])));
-
-  $_POST['UAM_AdminValidationMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_AdminValidationMail_Subject'])));
-
-
-  // Check if emails are mandatory for registrations (needed for email exclusion option)
-  // -----------------------------------------------------------------------------------
-  if ($conf['obligatory_user_mail_address'])
-  {
-    // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
-    // --------------------------------------------------------------------------------------
-    if (preg_match('/^[\s]+/', $_POST['UAM_MailExclusion_List']))
-    {
-      array_push($page['errors'], l10n('UAM_mail_exclusionlist_error'));
-      $UAM_Exclusionlist_Error = true;
-    }
-  }
-  elseif (!$conf['obligatory_user_mail_address'])
-  {
-    $_POST['UAM_MailExclusion_List'] = '';
-  }
+                                $_POST['UAM_ConfirmMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Subject'])));
+
+                                $_POST['UAM_ConfirmMail_Remail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Remail_Subject'])));
+
+                                $_POST['UAM_InfoMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_InfoMail_Subject'])));
+
+                                $_POST['UAM_GTAutoMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoMail_Subject'])));
+
+                                $_POST['UAM_GTReminder_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTReminder_Subject'])));
+
+                                $_POST['UAM_AdminValidationMail_Subject'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_AdminValidationMail_Subject'])));
+
+
+                                // Check if emails are mandatory for registrations (needed for email exclusion option)
+                                // -----------------------------------------------------------------------------------
+                                if ($conf['obligatory_user_mail_address'])
+                                {
+                                                        // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
+                // --------------------------------------------------------------------------------------
+                if (preg_match('/^[\s]+/', $_POST['UAM_MailExclusion_List']))
+                {
+                array_push($page['errors'], l10n('UAM_mail_exclusionlist_error'));
+                $UAM_Exclusionlist_Error = true;
+                }
+                }
+                elseif (!$conf['obligatory_user_mail_address'])
+                {
+                $_POST['UAM_MailExclusion_List'] = '';
+                }
 
     // Consistency check between ConfirmMail and AutoMail - We cannot use GTAutoMail if ConfirmMail is disabled
@@ -172 +172 @@
     if (((isset($conf_UAM['1']) and ($conf_UAM['1'] == 'false' or $conf_UAM['1'] == 'local')) or ($_POST['UAM_Confirm_Mail'] == 'false' or $_POST['UAM_Confirm_Mail'] == 'local')) and $_POST['UAM_GTAutoMail'] == 'true')
     {
-      $newvalue = 'false';
+                $newvalue = 'false';
       $_POST['UAM_GTAutoMail'] = $newvalue;
       array_push($page['errors'], l10n('UAM_Error_GTAutoMail_cannot_be_set_without_ConfirmMail'));
@@ -187 +187 @@
     // Save global UAM configuration
     // -----------------------------
-                $newconf_UAM = array(
-      $_POST['UAM_Mail_Info'],
+                                $newconf_UAM = array(
+                $_POST['UAM_Mail_Info'],
       $_POST['UAM_Confirm_Mail'],
       (isset($_POST['UAM_No_Confirm_Group'])?$_POST['UAM_No_Confirm_Group']:''),
@@ -246 +246 @@
 
     $_POST['UAM_ConfirmMail_ReMail_Txt2'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt2'])));
-    
+
     $_POST['UAM_ConfirmMail_Custom_Txt1'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt1'])));
-    
+
     $_POST['UAM_ConfirmMail_Custom_Txt2'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt2'])));
 
@@ -266 +266 @@
     // Save ConfirmMail settings
     // -------------------------
-          $newconf_UAM_ConfirmMail = array (
+                $newconf_UAM_ConfirmMail = array (
       $_POST['UAM_ConfirmMail_TimeOut'],
       $_POST['UAM_ConfirmMail_Delay'],
@@ -279 +279 @@
     conf_update_param('UserAdvManager_ConfirmMail', pwg_db_real_escape_string($conf['UserAdvManager_ConfirmMail']));
 
-                array_push($page['infos'], l10n('UAM_save_config'));
+                                array_push($page['infos'], l10n('UAM_save_config'));
   }
 
@@ -352 +352 @@
   $query = '
 SELECT id, name
-FROM '.GROUPS_TABLE.'
+                FROM '.GROUPS_TABLE.'
 ORDER BY name ASC
 ;';
@@ -364 +364 @@
     if (isset($conf_UAM[2]) and $conf_UAM[2] == $row['id'])
     {
-                $No_Valid = $row['id'];
-                }
+                                $No_Valid = $row['id'];
+                                }
     //configuration value for validated users
     if (isset($conf_UAM[3]) and $conf_UAM[3] == $row['id'])
-                {
-                $Valid = $row['id'];
-                }
+                                {
+                                $Valid = $row['id'];
+                                }
     //configuration value for downgrade users
     if (isset($conf_UAM[25]) and $conf_UAM[25] == $row['id'])
-                {
-                $Downgrade = $row['id'];
-                }
+                                {
+                                $Downgrade = $row['id'];
+                                }
   }
         
@@ -381 +381 @@
   // ---------------------------------------------------
   $template->assign(
-    'No_Confirm_Group',
-        array(
-                'group_options'=> $groups,
-                'group_selected' => $No_Valid
-                        )
+                'No_Confirm_Group',
+                        array(
+                                'group_options'=> $groups,
+                                'group_selected' => $No_Valid
+                                        )
                 );
 
@@ -391 +391 @@
   // -------------------------------------------------
   $template->assign(
-    'Validated_Group',
-                array(
-      'group_options'=> $groups,
-      'group_selected' => $Valid
-                        )
+                'Validated_Group',
+                                                array(
+                'group_options'=> $groups,
+                'group_selected' => $Valid
+                                        )
         );
 
@@ -402 +402 @@
   $template->assign(
     'Downgrade_Group',
-                array(
-      'group_options'=> $groups,
-      'group_selected' => $Downgrade
-                        )
+                                                array(
+                'group_options'=> $groups,
+                'group_selected' => $Downgrade
+                                        )
         );
         
@@ -428 +428 @@
     // ----------------------------------------------------
     $template->assign(
-      'No_Confirm_Status',
-      array(
-        'Status_options' => $status_options,
-        'Status_selected' => $No_Valid_Status
-                        )
-          );
+                'No_Confirm_Status',
+                                array(
+                        'Status_options' => $status_options,
+                        'Status_selected' => $No_Valid_Status
+                                                        )
+                        );
   }
   
@@ -439 +439 @@
   // --------------------------
   foreach (get_enums(USER_INFOS_TABLE, 'status') as $status)
-  {
-          $status_options[$status] = l10n('user_status_'.$status);
-          if (isset($conf_UAM[4]) and $conf_UAM[4] == $status)
                 {
-                  $Valid_Status = $status;
-                }
+                                $status_options[$status] = l10n('user_status_'.$status);
+                                if (isset($conf_UAM[4]) and $conf_UAM[4] == $status)
+                                {
+                                $Valid_Status = $status;
+                                }
                 
     // Template initialization for validated users status
     // --------------------------------------------------
     $template->assign(
-          'Confirm_Status',
-          array(
-                  'Status_options' => $status_options,
-                  'Status_selected' => $Valid_Status
-                  )
-          );
-        }
+                                                'Confirm_Status',
+                                                array(
+                                                                'Status_options' => $status_options,
+                                                                'Status_selected' => $Valid_Status
+                                                )
+                                );
+                }
 
   // Get downgrade status values
@@ -461 +461 @@
   foreach (get_enums(USER_INFOS_TABLE, 'status') as $status)
   {
-          $status_options[$status] = l10n('user_status_'.$status);
-          if (isset($conf_UAM[26]) and $conf_UAM[26] == $status)
-                {
-                  $Downgrade_Status = $status;
-                }
+                                $status_options[$status] = l10n('user_status_'.$status);
+                                if (isset($conf_UAM[26]) and $conf_UAM[26] == $status)
+                                {
+                                $Downgrade_Status = $status;
+                                }
                 
     // Template initialization for validated users status
     // --------------------------------------------------
     $template->assign(
-          'Downgrade_Status',
-          array(
-                  'Status_options' => $status_options,
-                  'Status_selected' => $Downgrade_Status
-                  )
-          );
-        }
+                                                'Downgrade_Status',
+                                                                array(
+                                                                                'Status_options' => $status_options,
+                                                                                'Status_selected' => $Downgrade_Status
+                                                                )
+                                );
+                }
 
 
@@ -490 +490 @@
   foreach ($conf['available_permission_levels'] as $level)
   {
-    $level_options[$level] = l10n(sprintf('Level %d', $level));
-          if (isset($conf_UAM[35]) and $conf_UAM[35] == $level)
-          {
-            $No_Valid_Level = $level;
-          }
+                                $level_options[$level] = l10n(sprintf('Level %d', $level));
+                                if (isset($conf_UAM[35]) and $conf_UAM[35] == $level)
+                                {
+                                                $No_Valid_Level = $level;
+                                }
 
     // Template initialization for unvalidated users level
     // ---------------------------------------------------
     $template->assign(
-      'No_Valid_Level',
-      array(
-        'Level_options' => $level_options,
-        'Level_selected' => $No_Valid_Level
-                        )
-          );
+                                                'No_Valid_Level',
+                                                                array(
+                                                                                'Level_options' => $level_options,
+                                                                                'Level_selected' => $No_Valid_Level
+                                                                )
+                                );
   }
 
@@ -511 +511 @@
   foreach ($conf['available_permission_levels'] as $level)
   {
-    $level_options[$level] = l10n(sprintf('Level %d', $level));
-          if (isset($conf_UAM[36]) and $conf_UAM[36] == $level)
-          {
-            $Valid_Level = $level;
-          }
+                                $level_options[$level] = l10n(sprintf('Level %d', $level));
+                                if (isset($conf_UAM[36]) and $conf_UAM[36] == $level)
+                                {
+                                                $Valid_Level = $level;
+                                }
 
     // Template initialization for unvalidated users level
     // ---------------------------------------------------
     $template->assign(
-      'Valid_Level',
-      array(
-        'Level_options' => $level_options,
-        'Level_selected' => $Valid_Level
-                        )
-          );
+                                                'Valid_Level',
+                                                                array(
+                                                                                'Level_options' => $level_options,
+                                                                                'Level_selected' => $Valid_Level
+                                                                )
+                                );
   }
 
@@ -532 +532 @@
   foreach ($conf['available_permission_levels'] as $level)
   {
-    $level_options[$level] = l10n(sprintf('Level %d', $level));
-          if (isset($conf_UAM[37]) and $conf_UAM[37] == $level)
-          {
-            $Downgrade_Level = $level;
-          }
+                                $level_options[$level] = l10n(sprintf('Level %d', $level));
+                                if (isset($conf_UAM[37]) and $conf_UAM[37] == $level)
+                                {
+                                                $Downgrade_Level = $level;
+                                }
 
     // Template initialization for unvalidated users level
     // ---------------------------------------------------
     $template->assign(
-      'Downgrade_Level',
-      array(
-        'Level_options' => $level_options,
-        'Level_selected' => $Downgrade_Level
-                        )
-          );
+                                                'Downgrade_Level',
+                                                                array(
+                                                                                'Level_options' => $level_options,
+                                                                                'Level_selected' => $Downgrade_Level
+                                                                )
+                                );
   }
 
@@ -570 +570 @@
 
   $template->assign(
-    array(
-    'nb_para'                           => $nb_para,
-    'nb_para2'                          => $nb_para2,
-    'UAM_VERSION'                       => $version,
-    'UAM_PATH'                          => UAM_PATH,
-    'UAM_DUMP_DOWNLOAD'                 => $dump_download,
-    'UAM_THEME'                         => $UAM_theme,
-                'UAM_MAIL_INFO_TRUE'                => $conf_UAM[0]=='true' ?  'checked="checked"' : '' ,
-                'UAM_MAIL_INFO_FALSE'               => $conf_UAM[0]=='false' ?  'checked="checked"' : '' ,
-                'UAM_MAILINFO_TEXT'                 => $conf_UAM[8],
-                'UAM_USERNAME_CHAR_TRUE'            => $conf_UAM[5]=='true' ?  'checked="checked"' : '' ,
-                'UAM_USERNAME_CHAR_FALSE'           => $conf_UAM[5]=='false' ?  'checked="checked"' : '' ,
-                'UAM_USERNAME_CHAR_LIST'            => $conf_UAM[6],
-                '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[9],
-                'UAM_No_Confirm_Group'              => $conf_UAM[2],
-                'UAM_Validated_Group'               => $conf_UAM[3],
-                'UAM_No_Confirm_Status'             => $conf_UAM[7],
-                'UAM_Validated_Status'              => $conf_UAM[4],
-                'UAM_MAILEXCLUSION_TRUE'            => $conf_UAM[10]=='true' ?  'checked="checked"' : '' ,
-                'UAM_MAILEXCLUSION_FALSE'           => $conf_UAM[10]=='false' ?  'checked="checked"' : '' ,
-                'UAM_MAILEXCLUSION_LIST'            => $conf_UAM[11],
-                'UAM_PASSWORDENF_TRUE'              => $conf_UAM[12]=='true' ?  'checked="checked"' : '' ,
-                'UAM_PASSWORDENF_FALSE'             => $conf_UAM[12]=='false' ?  'checked="checked"' : '' ,
-                'UAM_PASSWORD_SCORE'                => $conf_UAM[13],
-    'UAM_ADMINPASSWENF_TRUE'            => $conf_UAM[14]=='true' ?  'checked="checked"' : '' ,
-                'UAM_ADMINPASSWENF_FALSE'           => $conf_UAM[14]=='false' ?  'checked="checked"' : '' ,
-    'UAM_GHOSTRACKER_TRUE'              => $conf_UAM[15]=='true' ?  'checked="checked"' : '' ,
-                'UAM_GHOSTRACKER_FALSE'             => $conf_UAM[15]=='false' ?  'checked="checked"' : '' ,
-    'UAM_GHOSTRACKER_DAYLIMIT'          => $conf_UAM[16],
-    'UAM_GHOSTRACKER_REMINDERTEXT'      => $conf_UAM[17],
-    'UAM_ADDLASTVISIT_TRUE'             => $conf_UAM[18]=='true' ?  'checked="checked"' : '' ,
-    'UAM_ADDLASTVISIT_FALSE'            => $conf_UAM[18]=='false' ?  'checked="checked"' : '' ,
-    'UAM_ADMINCONFMAIL_TRUE'            => $conf_UAM[19]=='true' ?  'checked="checked"' : '' ,
-    'UAM_ADMINCONFMAIL_FALSE'           => $conf_UAM[19]=='false' ?  'checked="checked"' : '' ,
-    'UAM_REDIRTOPROFILE_TRUE'           => $conf_UAM[20]=='true' ?  'checked="checked"' : '' ,
-    'UAM_REDIRTOPROFILE_FALSE'          => $conf_UAM[20]=='false' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTO_TRUE'                   => $conf_UAM[21]=='true' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTO_FALSE'                  => $conf_UAM[21]=='false' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTOMAIL_TRUE'               => $conf_UAM[22]=='true' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTOMAIL_FALSE'              => $conf_UAM[22]=='false' ?  'checked="checked"' : '' ,
-    'UAM_GTAUTODEL_TEXT'                => $conf_UAM[23],
-    'UAM_GTAUTOMAILTEXT'                => $conf_UAM[24],
-                'UAM_Downgrade_Group'               => $conf_UAM[25],
-                'UAM_Downgrade_Status'              => $conf_UAM[26],
-    'UAM_ADMINVALIDATIONMAIL_TEXT'      => $conf_UAM[27],
-    'UAM_CUSTOMPASSWRETR_TRUE'          => $conf_UAM[28]=='true' ?  'checked="checked"' : '' ,
-    'UAM_CUSTOMPASSWRETR_FALSE'         => $conf_UAM[28]=='false' ?  'checked="checked"' : '' ,
-    'UAM_CUSTOMPASSWRETR_TEXT'          => $conf_UAM[29],
-    'UAM_USRAUTO_TRUE'                  => $conf_UAM[30]=='true' ?  'checked="checked"' : '' ,
-    'UAM_USRAUTO_FALSE'                 => $conf_UAM[30]=='false' ?  'checked="checked"' : '' ,
-    'UAM_USRAUTODEL_TEXT'               => $conf_UAM[31],
-    'UAM_USRAUTOMAIL_TRUE'              => $conf_UAM[32]=='true' ?  'checked="checked"' : '' ,
-    'UAM_USRAUTOMAIL_FALSE'             => $conf_UAM[32]=='false' ?  'checked="checked"' : '' ,
-    'UAM_STUFFS_TRUE'                   => $conf_UAM[33]=='true' ?  'checked="checked"' : '' ,
-    'UAM_STUFFS_FALSE'                  => $conf_UAM[33]=='false' ?  'checked="checked"' : '' ,
-    'UAM_HIDEPASSW_TRUE'                => $conf_UAM[34]=='true' ?  'checked="checked"' : '' ,
-    'UAM_HIDEPASSW_FALSE'               => $conf_UAM[34]=='false' ?  'checked="checked"' : '' ,
-                'UAM_NO_VALID_LEVEL'                => $conf_UAM[35],
-                'UAM_VALID_LEVEL'                   => $conf_UAM[36],
-    'UAM_DOWNGRADE_LEVEL'               => $conf_UAM[37],
-    'UAM_PWDRESET_TRUE'                 => $conf_UAM[38]=='true' ?  'checked="checked"' : '' ,
-    'UAM_PWDRESET_FALSE'                => $conf_UAM[38]=='false' ?  'checked="checked"' : '' ,
-    'UAM_REJECTCONNECT_TRUE'            => $conf_UAM[39]=='true' ?  'checked="checked"' : '' ,
-    'UAM_REJECTCONNECT_FALSE'           => $conf_UAM[39]=='false' ?  'checked="checked"' : '' ,
-    'UAM_REJECTCONNECT_TEXT'            => $conf_UAM[40],
-    'UAM_CONFIRMMAIL_SUBJECT'           => $conf_UAM[41],
-    'UAM_CONFIRMMAIL_REMAIL_SUBJECT'    => $conf_UAM[42],
-    'UAM_INFOMAIL_SUBJECT'              => $conf_UAM[43],
-    'UAM_GTAUTOMAIL_SUBJECT'            => $conf_UAM[44],
-    'UAM_GTREMINDER_SUBJECT'            => $conf_UAM[45],
-    'UAM_ADMINVALIDATIONMAIL_SUBJECT'   => $conf_UAM[46],
-                'UAM_PASSWORD_TEST_SCORE'           => $UAM_Password_Test_Score,
-    'UAM_ERROR_REPORTS1'                => $UAM_Exclusionlist_Error,
-    'UAM_ERROR_REPORTS2'                => $UAM_Illegal_Flag_Error1,
-    'UAM_ERROR_REPORTS3'                => $UAM_Illegal_Flag_Error2,
-    'UAM_ERROR_REPORTS4'                => $UAM_Illegal_Flag_Error3,
-    'UAM_EMAIL_MANDATORY'               => $UAM_Email_Mandatory_Check,
-                'UAM_CONFIRMMAIL_TIMEOUT_TRUE'      => $conf_UAM_ConfirmMail[0]=='true' ?  'checked="checked"' : '' ,
-                'UAM_CONFIRMMAIL_TIMEOUT_FALSE'     => $conf_UAM_ConfirmMail[0]=='false' ?  'checked="checked"' : '' ,
-                'UAM_CONFIRMMAIL_DELAY'                                     => $conf_UAM_ConfirmMail[1],
-    'UAM_CONFIRMMAIL_REMAIL_TRUE'       => $conf_UAM_ConfirmMail[3]=='true' ? 'checked="checked"' : '',
-    'UAM_CONFIRMMAIL_REMAIL_FALSE'      => $conf_UAM_ConfirmMail[3]=='false' ? 'checked="checked"' : '',
-    'UAM_CONFIRMMAIL_REMAIL_TXT1'       => $conf_UAM_ConfirmMail[2],
-    'UAM_CONFIRMMAIL_REMAIL_TXT2'       => $conf_UAM_ConfirmMail[4],
-    'UAM_CONFIRMMAIL_CUSTOM_TXT1'       => $conf_UAM_ConfirmMail[5],
-    'UAM_CONFIRMMAIL_CUSTOM_TXT2'       => $conf_UAM_ConfirmMail[6],
+                                array(
+                                                'nb_para'                           => $nb_para,
+                'nb_para2'                          => $nb_para2,
+                'UAM_VERSION'                       => $version,
+                'UAM_PATH'                          => UAM_PATH,
+                'UAM_DUMP_DOWNLOAD'                 => $dump_download,
+                'UAM_THEME'                         => $UAM_theme,
+                                                'UAM_MAIL_INFO_TRUE'                => $conf_UAM[0]=='true' ?  'checked="checked"' : '' ,
+                                                'UAM_MAIL_INFO_FALSE'               => $conf_UAM[0]=='false' ?  'checked="checked"' : '' ,
+                                                'UAM_MAILINFO_TEXT'                 => $conf_UAM[8],
+                                                'UAM_USERNAME_CHAR_TRUE'            => $conf_UAM[5]=='true' ?  'checked="checked"' : '' ,
+                                                'UAM_USERNAME_CHAR_FALSE'           => $conf_UAM[5]=='false' ?  'checked="checked"' : '' ,
+                                                'UAM_USERNAME_CHAR_LIST'            => $conf_UAM[6],
+                                                '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[9],
+                                                'UAM_No_Confirm_Group'              => $conf_UAM[2],
+                                                'UAM_Validated_Group'               => $conf_UAM[3],
+                                                'UAM_No_Confirm_Status'             => $conf_UAM[7],
+                                                'UAM_Validated_Status'              => $conf_UAM[4],
+                                                'UAM_MAILEXCLUSION_TRUE'            => $conf_UAM[10]=='true' ?  'checked="checked"' : '' ,
+                                                'UAM_MAILEXCLUSION_FALSE'           => $conf_UAM[10]=='false' ?  'checked="checked"' : '' ,
+                                                'UAM_MAILEXCLUSION_LIST'            => $conf_UAM[11],
+                                                'UAM_PASSWORDENF_TRUE'              => $conf_UAM[12]=='true' ?  'checked="checked"' : '' ,
+                                                'UAM_PASSWORDENF_FALSE'             => $conf_UAM[12]=='false' ?  'checked="checked"' : '' ,
+                                                'UAM_PASSWORD_SCORE'                => $conf_UAM[13],
+                        'UAM_ADMINPASSWENF_TRUE'            => $conf_UAM[14]=='true' ?  'checked="checked"' : '' ,
+                                                'UAM_ADMINPASSWENF_FALSE'           => $conf_UAM[14]=='false' ?  'checked="checked"' : '' ,
+                'UAM_GHOSTRACKER_TRUE'              => $conf_UAM[15]=='true' ?  'checked="checked"' : '' ,
+                                                'UAM_GHOSTRACKER_FALSE'             => $conf_UAM[15]=='false' ?  'checked="checked"' : '' ,
+                'UAM_GHOSTRACKER_DAYLIMIT'          => $conf_UAM[16],
+                'UAM_GHOSTRACKER_REMINDERTEXT'      => $conf_UAM[17],
+                'UAM_ADDLASTVISIT_TRUE'             => $conf_UAM[18]=='true' ?  'checked="checked"' : '' ,
+                'UAM_ADDLASTVISIT_FALSE'            => $conf_UAM[18]=='false' ?  'checked="checked"' : '' ,
+                'UAM_ADMINCONFMAIL_TRUE'            => $conf_UAM[19]=='true' ?  'checked="checked"' : '' ,
+                'UAM_ADMINCONFMAIL_FALSE'           => $conf_UAM[19]=='false' ?  'checked="checked"' : '' ,
+                'UAM_REDIRTOPROFILE_TRUE'           => $conf_UAM[20]=='true' ?  'checked="checked"' : '' ,
+                'UAM_REDIRTOPROFILE_FALSE'          => $conf_UAM[20]=='false' ?  'checked="checked"' : '' ,
+                'UAM_GTAUTO_TRUE'                   => $conf_UAM[21]=='true' ?  'checked="checked"' : '' ,
+                'UAM_GTAUTO_FALSE'                  => $conf_UAM[21]=='false' ?  'checked="checked"' : '' ,
+                'UAM_GTAUTOMAIL_TRUE'               => $conf_UAM[22]=='true' ?  'checked="checked"' : '' ,
+                'UAM_GTAUTOMAIL_FALSE'              => $conf_UAM[22]=='false' ?  'checked="checked"' : '' ,
+                'UAM_GTAUTODEL_TEXT'                => $conf_UAM[23],
+                'UAM_GTAUTOMAILTEXT'                => $conf_UAM[24],
+                                                'UAM_Downgrade_Group'               => $conf_UAM[25],
+                                                'UAM_Downgrade_Status'              => $conf_UAM[26],
+                'UAM_ADMINVALIDATIONMAIL_TEXT'      => $conf_UAM[27],
+                'UAM_CUSTOMPASSWRETR_TRUE'          => $conf_UAM[28]=='true' ?  'checked="checked"' : '' ,
+                'UAM_CUSTOMPASSWRETR_FALSE'         => $conf_UAM[28]=='false' ?  'checked="checked"' : '' ,
+                'UAM_CUSTOMPASSWRETR_TEXT'          => $conf_UAM[29],
+                'UAM_USRAUTO_TRUE'                  => $conf_UAM[30]=='true' ?  'checked="checked"' : '' ,
+                'UAM_USRAUTO_FALSE'                 => $conf_UAM[30]=='false' ?  'checked="checked"' : '' ,
+                'UAM_USRAUTODEL_TEXT'               => $conf_UAM[31],
+                'UAM_USRAUTOMAIL_TRUE'              => $conf_UAM[32]=='true' ?  'checked="checked"' : '' ,
+                'UAM_USRAUTOMAIL_FALSE'             => $conf_UAM[32]=='false' ?  'checked="checked"' : '' ,
+                'UAM_STUFFS_TRUE'                   => $conf_UAM[33]=='true' ?  'checked="checked"' : '' ,
+                'UAM_STUFFS_FALSE'                  => $conf_UAM[33]=='false' ?  'checked="checked"' : '' ,
+                'UAM_HIDEPASSW_TRUE'                => $conf_UAM[34]=='true' ?  'checked="checked"' : '' ,
+                'UAM_HIDEPASSW_FALSE'               => $conf_UAM[34]=='false' ?  'checked="checked"' : '' ,
+                                                'UAM_NO_VALID_LEVEL'                => $conf_UAM[35],
+                                                'UAM_VALID_LEVEL'                   => $conf_UAM[36],
+                'UAM_DOWNGRADE_LEVEL'               => $conf_UAM[37],
+                'UAM_PWDRESET_TRUE'                 => $conf_UAM[38]=='true' ?  'checked="checked"' : '' ,
+                'UAM_PWDRESET_FALSE'                => $conf_UAM[38]=='false' ?  'checked="checked"' : '' ,
+                'UAM_REJECTCONNECT_TRUE'            => $conf_UAM[39]=='true' ?  'checked="checked"' : '' ,
+                'UAM_REJECTCONNECT_FALSE'           => $conf_UAM[39]=='false' ?  'checked="checked"' : '' ,
+                'UAM_REJECTCONNECT_TEXT'            => $conf_UAM[40],
+                'UAM_CONFIRMMAIL_SUBJECT'           => $conf_UAM[41],
+                'UAM_CONFIRMMAIL_REMAIL_SUBJECT'    => $conf_UAM[42],
+                'UAM_INFOMAIL_SUBJECT'              => $conf_UAM[43],
+                'UAM_GTAUTOMAIL_SUBJECT'            => $conf_UAM[44],
+                'UAM_GTREMINDER_SUBJECT'            => $conf_UAM[45],
+                'UAM_ADMINVALIDATIONMAIL_SUBJECT'   => $conf_UAM[46],
+                                                'UAM_PASSWORD_TEST_SCORE'           => $UAM_Password_Test_Score,
+                'UAM_ERROR_REPORTS1'                => $UAM_Exclusionlist_Error,
+                'UAM_ERROR_REPORTS2'                => $UAM_Illegal_Flag_Error1,
+                'UAM_ERROR_REPORTS3'                => $UAM_Illegal_Flag_Error2,
+                'UAM_ERROR_REPORTS4'                => $UAM_Illegal_Flag_Error3,
+                'UAM_EMAIL_MANDATORY'               => $UAM_Email_Mandatory_Check,
+                                                'UAM_CONFIRMMAIL_TIMEOUT_TRUE'          => $conf_UAM_ConfirmMail[0]=='true' ?  'checked="checked"' : '' ,
+                                                'UAM_CONFIRMMAIL_TIMEOUT_FALSE'     => $conf_UAM_ConfirmMail[0]=='false' ?  'checked="checked"' : '' ,
+                                                'UAM_CONFIRMMAIL_DELAY'                                                                                                 => $conf_UAM_ConfirmMail[1],
+                'UAM_CONFIRMMAIL_REMAIL_TRUE'       => $conf_UAM_ConfirmMail[3]=='true' ? 'checked="checked"' : '',
+                'UAM_CONFIRMMAIL_REMAIL_FALSE'      => $conf_UAM_ConfirmMail[3]=='false' ? 'checked="checked"' : '',
+                'UAM_CONFIRMMAIL_REMAIL_TXT1'       => $conf_UAM_ConfirmMail[2],
+                'UAM_CONFIRMMAIL_REMAIL_TXT2'       => $conf_UAM_ConfirmMail[4],
+                'UAM_CONFIRMMAIL_CUSTOM_TXT1'       => $conf_UAM_ConfirmMail[5],
+                'UAM_CONFIRMMAIL_CUSTOM_TXT2'       => $conf_UAM_ConfirmMail[6],
     )
   );
 
   if (isset($_POST['audit']))
-        {
-                $msg_error1 = '';
+                {
+                                $msg_error1 = '';
                 
     // Username without forbidden keys
     // -------------------------------
     if ( isset($conf_UAM[5]) and $conf_UAM[5] == 'true' )
-          {
-                        $query = "
-SELECT ".$conf['user_fields']['username'].", ".$conf['user_fields']['email']."
-  FROM ".USERS_TABLE."
-;";
+                {
+                                                $query = '
+SELECT '.$conf['user_fields']['username'].', '.$conf['user_fields']['email'].'
+                FROM '.USERS_TABLE.'
+;';
                           
-                        $result = pwg_query($query);
+                                                $result = pwg_query($query);
                         
-                        while($row = pwg_db_fetch_assoc($result))
-                        {
-                                if (!ValidateUsername(stripslashes($row['username'])))
-                                        $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '').l10n('UAM_Err_audit_username_char').stripslashes($row['username']);
-                        }
-                }
-
-                $msg_error2 = '';
+                                                while($row = pwg_db_fetch_assoc($result))
+                                                {
+                                                                if (!ValidateUsername(stripslashes($row['username'])))
+                                                                                $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '').l10n('UAM_Err_audit_username_char').stripslashes($row['username']);
+                                                }
+                                }
+
+                                $msg_error2 = '';
                 
     // Email without forbidden domain
     // ------------------------------
     if ( isset($conf_UAM[10]) and $conf_UAM[10] == 'true' )
-          {
-                        $query = "
-SELECT ".$conf['user_fields']['username'].", ".$conf['user_fields']['email']."
-  FROM ".USERS_TABLE."
-;";
+                                                {
+                                                                $query = '
+SELECT '.$conf['user_fields']['username'].', '.$conf['user_fields']['email'].'
+  FROM '.USERS_TABLE.'
+;';
                           
-                  $result = pwg_query($query);
+                                                $result = pwg_query($query);
                         
-                  while($row = pwg_db_fetch_assoc($result))
-                  {
-                          $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[11]);
-                          for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
-                          {
-                                        $pattern = '/'.$conf_MailExclusion[$i].'/';
-                                  if (preg_match($pattern, $row['mail_address']))
-                                  {
-                                                $msg_error2 .=  (($msg_error2 <> '') ? '<br>' : '').l10n('UAM_Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
-                                        }
-                                }
-                        }
-                }
+                                                while($row = pwg_db_fetch_assoc($result))
+                                                {
+                                                                $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[11]);
+                                                                for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
+                                                                {
+                                                                                                $pattern = '/'.$conf_MailExclusion[$i].'/';
+                                                                                if (preg_match($pattern, $row['mail_address']))
+                                                                                {
+                                                                                                                $msg_error2 .=  (($msg_error2 <> '') ? '<br>' : '').l10n('UAM_Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
+                                                                                                }
+                                                                                }
+                                                                }
+                                                }
                 
-    if ($msg_error1 <> '')
-                        $errors[] = $msg_error1.'<br><br>';
+                if ($msg_error1 <> '')
+                                                                $errors[] = $msg_error1.'<br><br>';
                 
-                if ($msg_error2 <> '')
-                        $errors[] = $msg_error2.'<br><br>';
+                                                if ($msg_error2 <> '')
+                                                                $errors[] = $msg_error2.'<br><br>';
                 
-                if ($msg_error1 <> '' or $msg_error2 <> '')
-                array_push($page['errors'], l10n('UAM_Err_audit_advise'));
-                else
-        array_push($page['infos'], l10n('UAM_audit_ok'));
-        }
+                                                if ($msg_error1 <> '' or $msg_error2 <> '')
+                                                array_push($page['errors'], l10n('UAM_Err_audit_advise'));
+                                                else
+                                array_push($page['infos'], l10n('UAM_audit_ok'));
+  }
 
 
@@ -727 +727 @@
 // |                             errors display                            |
 // +-----------------------------------------------------------------------+
-  if (isset ($errors) and count($errors) != 0)
+                if (isset ($errors) and count($errors) != 0)
   {
-          $template->assign('errors',array());
-          foreach ($errors as $error)
-          {
-                  array_push($page['errors'], $error);
-                }
-        }  
+                                $template->assign('errors',array());
+                foreach ($errors as $error)
+                {
+                                array_push($page['errors'], $error);
+                                }
+                }  
 
 // +-----------------------------------------------------------------------+
@@ -760 +760 @@
 // +-----------------------------------------------------------------------+
 
-                if (!defined('PHPWG_ROOT_PATH'))
-    {
-        die('Hacking attempt!');
-    }
+                                if (!defined('PHPWG_ROOT_PATH'))
+                {
+                                die('Hacking attempt!');
+                }
           
-    include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+                include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
 // +-----------------------------------------------------------------------+
 // | Check Access and exit when user status is not ok                      |
 // +-----------------------------------------------------------------------+
-                check_status(ACCESS_ADMINISTRATOR);
+                                check_status(ACCESS_ADMINISTRATOR);
 
 
@@ -777 +777 @@
 // +-----------------------------------------------------------------------+
 
-                $page['filtered_users'] = get_user_list();
+                                $page['filtered_users'] = get_user_list();
 
 // +-----------------------------------------------------------------------+
@@ -783 +783 @@
 // +-----------------------------------------------------------------------+
 
-    $visible_user_list = array();
-    foreach ($page['filtered_users'] as $num => $local_user)
-    {
-      $visible_user_list[] = $local_user;
+                                $visible_user_list = array();
+                foreach ($page['filtered_users'] as $num => $local_user)
+                {
+                                $visible_user_list[] = $local_user;
+                                }
+
+                                foreach ($visible_user_list as $local_user)
+        {
+                                // dates formating and compare
+                // ---------------------------
+                $today = date("d-m-Y"); // Get today's date
+                list($day, $month, $year) = explode('-', $today); // explode date of today                                               
+                $daytimestamp = mktime(0, 0, 0, $month, $day, $year);// Generate UNIX timestamp
+
+                list($regdate, $regtime) = explode(' ', $local_user['lastvisit']); // Explode date and time from registration date
+                list($regyear, $regmonth, $regday) = explode('-', $regdate); // Explode date from registration date
+                $regtimestamp = mktime(0, 0, 0, $regmonth, $regday, $regyear);// Generate UNIX timestamp
+
+                                                $deltasecs = $daytimestamp - $regtimestamp;// Compare the 2 UNIX timestamps     
+                $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
+  
+                                                if (isset($conf_UAM[15]) and $conf_UAM[15]=='true' and $conf_UAM[16] <> '')
+                {
+                                if ($deltadays <= ($conf_UAM[16]/2))
+                {
+                                $display = 'green';
+                }
+
+                                                                if (($deltadays > ($conf_UAM[16]/2)) and ($deltadays < $conf_UAM[16]))
+                {
+                                $display = 'orange';
+                }
+
+                if ($deltadays >= $conf_UAM[16])
+                {
+                                $display = 'red';
+                        }
+                                                }
+                else $display = '';
+
+                // Template initialization
+                // -----------------------
+                        $template->append(
+                                'users',
+                                array(
+                                        'ID'          => $local_user['id'],
+                                'USERNAME'    => stripslashes($local_user['username']),
+                                                                                                'EMAIL'       => get_email_address_as_display_text($local_user['email']),
+                        'LASTVISIT'   => $local_user['lastvisit'],
+                        'DAYS'        => $deltadays,
+                        'DISPLAY'     => $display,
+                                                                                )
+                                                );
+                                }
+
+                                // Plugin version inserted
+                // -----------------------
+                $template->assign(
+                                array(
+                                'UAM_VERSION'  => $version,
+                'UAM_PATH'     => UAM_PATH,
+                )
+                );
+    
+// +-----------------------------------------------------------------------+
+// |                             errors display                            |
+// +-----------------------------------------------------------------------+
+                                if ( isset ($errors) and count($errors) != 0)
+                                {
+                                                $template->assign('errors',array());
+                                                foreach ($errors as $error)
+                                {
+                                                                array_push($page['errors'], $error);
+                                }
+                                }  
+
+// +-----------------------------------------------------------------------+
+// |                           templates display                           |
+// +-----------------------------------------------------------------------+
+                                $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/userlist.tpl');
+                $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');             
                 }
-
-                foreach ($visible_user_list as $local_user)
-    {
-      // dates formating and compare
-      // ---------------------------
-      $today = date("d-m-Y"); // Get today's date
-      list($day, $month, $year) = explode('-', $today); // explode date of today                                                 
-      $daytimestamp = mktime(0, 0, 0, $month, $day, $year);// Generate UNIX timestamp
-                
-      list($regdate, $regtime) = explode(' ', $local_user['lastvisit']); // Explode date and time from registration date
-      list($regyear, $regmonth, $regday) = explode('-', $regdate); // Explode date from registration date
-      $regtimestamp = mktime(0, 0, 0, $regmonth, $regday, $regyear);// Generate UNIX timestamp
-                        
-      $deltasecs = $daytimestamp - $regtimestamp;// Compare the 2 UNIX timestamps       
-      $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
-      
-      if (isset($conf_UAM[15]) and $conf_UAM[15]=='true' and $conf_UAM[16] <> '')
-      {
-        if ($deltadays <= ($conf_UAM[16]/2))
-        {
-          $display = 'green';
-        }
-        
-        if (($deltadays > ($conf_UAM[16]/2)) and ($deltadays < $conf_UAM[16]))
-        {
-          $display = 'orange';
-        }
-        
-        if ($deltadays >= $conf_UAM[16])
-        {
-          $display = 'red';
-        }
-      }
-      else $display = '';
-
-      // Template initialization
-      // -----------------------
-                $template->append(
-                'users',
-        array(
-                'ID'          => $local_user['id'],
-                'USERNAME'    => stripslashes($local_user['username']),
-                                        'EMAIL'       => get_email_address_as_display_text($local_user['email']),
-          'LASTVISIT'   => $local_user['lastvisit'],
-          'DAYS'        => $deltadays,
-          'DISPLAY'     => $display,
-                                )
-                        );
+                else
+                {
+                                array_push($page['errors'], l10n('UAM_Err_Userlist_Settings'));
                 }
-    // Plugin version inserted
-    // -----------------------
-    $template->assign(
-      array(
-        'UAM_VERSION'  => $version,
-        'UAM_PATH'     => UAM_PATH,
-      )
-    );    
-// +-----------------------------------------------------------------------+
-// |                             errors display                            |
-// +-----------------------------------------------------------------------+
-                if ( isset ($errors) and count($errors) != 0)
-                {
-                $template->assign('errors',array());
-                        foreach ($errors as $error)
-                {
-                                array_push($page['errors'], $error);
-                }
-                }  
-
-// +-----------------------------------------------------------------------+
-// |                           templates display                           |
-// +-----------------------------------------------------------------------+
-                $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/userlist.tpl');
-    $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');         
-  }
-  else
-  {
-                array_push($page['errors'], l10n('UAM_Err_Userlist_Settings'));
-  }
-  break;
+
+break;
 
 
@@ -881 +884 @@
   $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
         
-  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[7]) and $conf_UAM[7] <> '-1')))
+  if (isset($conf_UAM[1]) and ($conf_UAM[1]=='true' or $conf_UAM[1]=='local'))
   {
 // +-----------------------------------------------------------------------+
@@ -887 +890 @@
 // +-----------------------------------------------------------------------+
 
-                if (!defined('PHPWG_ROOT_PATH'))
+                                if (!defined('PHPWG_ROOT_PATH'))
     {
-        die('Hacking attempt!');
+                die('Hacking attempt!');
     }
 
@@ -897 +900 @@
 // | Check Access and exit when user status is not ok                      |
 // +-----------------------------------------------------------------------+
-                check_status(ACCESS_ADMINISTRATOR);
+                                check_status(ACCESS_ADMINISTRATOR);
 
 // +-----------------------------------------------------------------------+
@@ -903 +906 @@
 // +-----------------------------------------------------------------------+
 
-                $page['filtered_users'] = get_unvalid_user_list();
+                                $page['filtered_users'] = get_unvalid_user_list();
 
 // +-----------------------------------------------------------------------+
 // |                            selected users                             |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Del_Selected']))
-                {
-                $collection = array();
-
-                        switch ($_POST['target'])
-        {
-                case 'all' :
-        {
-                foreach($page['filtered_users'] as $local_user)
-                {
-                        array_push($collection, $local_user['id']);
-                }
-                                        break;
-                                }
-        case 'selection' :
-        {
-                if (isset($_POST['selection']))
-                {
-                        $collection = $_POST['selection'];
-                }
-                break;
-        }
-                        }
-
-                        if (count($collection) == 0)
-        {
-                array_push($page['errors'], l10n('Select at least one user'));
-                }
-                }
+                                if (isset($_POST['Del_Selected']))
+                                {
+                                $collection = array();
+
+                                                switch ($_POST['target'])
+                                                {
+                                                case 'all' :
+                {
+                                        foreach($page['filtered_users'] as $local_user)
+                        {
+                                        array_push($collection, $local_user['id']);
+                        }
+                                                                break;
+                                                                }
+                case 'selection' :
+                {
+                                if (isset($_POST['selection']))
+                        {
+                                        $collection = $_POST['selection'];
+                        }
+                break;
+                }
+                                                }
+
+                                                if (count($collection) == 0)
+                {
+                                array_push($page['errors'], l10n('Select at least one user'));
+                        }
+                                }
 
 // +-----------------------------------------------------------------------+
 // |                             delete users                              |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Del_Selected']) and count($collection) > 0)
-        {
-                if (in_array($conf['guest_id'], $collection))
-                {
-                array_push($page['errors'], l10n('Guest cannot be deleted'));
-        }
-        if (($conf['guest_id'] != $conf['default_user_id']) and
-                in_array($conf['default_user_id'], $collection))
-        {
-                array_push($page['errors'], l10n('Default user cannot be deleted'));
-        }
-        if (in_array($conf['webmaster_id'], $collection))
-        {
-                array_push($page['errors'], l10n('Webmaster cannot be deleted'));
-        }
-        if (in_array($user['id'], $collection))
-        {
-                array_push($page['errors'], l10n('You cannot delete your account'));
-        }
-
-                        if (count($page['errors']) == 0)
-        {
-                foreach ($collection as $user_id)
-        {
-                delete_user($user_id);
-        }
-                array_push(
-                $page['infos'],
-                l10n_dec(
-                '%d user deleted', '%d users deleted',
-                count($collection)
-                )
-        );
-
-        foreach ($page['filtered_users'] as $filter_key => $filter_user)
-        {
-                if (in_array($filter_user['id'], $collection))
-                {
-                        unset($page['filtered_users'][$filter_key]);
-                }
-                }
-                        }
-                }
+                                if (isset($_POST['Del_Selected']) and count($collection) > 0)
+                {
+                                        if (in_array($conf['guest_id'], $collection))
+                        {
+                                array_push($page['errors'], l10n('Guest cannot be deleted'));
+                }
+                        if (($conf['guest_id'] != $conf['default_user_id']) and
+                                in_array($conf['default_user_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('Default user cannot be deleted'));
+                }
+                if (in_array($conf['webmaster_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('Webmaster cannot be deleted'));
+                }
+                if (in_array($user['id'], $collection))
+                {
+                                array_push($page['errors'], l10n('You cannot delete your account'));
+                }
+
+                                                if (count($page['errors']) == 0)
+                {
+                                        foreach ($collection as $user_id)
+                {
+                                delete_user($user_id);
+                        }
+                                                                array_push(
+                                $page['infos'],
+                        l10n_dec(
+                                        '%d user deleted', '%d users deleted',
+                        count($collection)
+                        )
+                );
+
+                foreach ($page['filtered_users'] as $filter_key => $filter_user)
+                {
+                                        if (in_array($filter_user['id'], $collection))
+                        {
+                                        unset($page['filtered_users'][$filter_key]);
+                        }
+                        }
+                                                }
+                                }
 
 // +-----------------------------------------------------------------------+
@@ -991 +994 @@
 // |                            selected users                             |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Mail_With_Key']))
-                {
-                $collection = array();
-
-                        switch ($_POST['target'])
-        {
-                case 'all' :
-        {
-                foreach($page['filtered_users'] as $local_user)
-                {
-                        array_push($collection, $local_user['id']);
-                }
-                break;
-                                }
-        case 'selection' :
-        {
-                if (isset($_POST['selection']))
-                {
-                        $collection = $_POST['selection'];
-                }
-                break;
-        }
-                        }
-
-        if (count($collection) == 0)
-        {
-                array_push($page['errors'], l10n('Select at least one user'));
-        }
-                }
+                                if (isset($_POST['Mail_With_Key']))
+                                {
+                                $collection = array();
+
+                                                switch ($_POST['target'])
+                {
+                                case 'all' :
+                {
+                                foreach($page['filtered_users'] as $local_user)
+                        {
+                                        array_push($collection, $local_user['id']);
+                        }
+                break;
+                                                                }
+                case 'selection' :
+                {
+                                if (isset($_POST['selection']))
+                        {
+                                        $collection = $_POST['selection'];
+                        }
+        break;
+                }
+                                                }
+
+                if (count($collection) == 0)
+                {
+                                array_push($page['errors'], l10n('Select at least one user'));
+                }
+                                }
 // +-----------------------------------------------------------------------+
 // |                 Resend new validation key to users                    |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Mail_With_Key']) and count($collection) > 0)
-                {
-                        if (in_array($conf['guest_id'], $collection))
-                {
-                array_push($page['errors'], l10n('UAM_No_validation_for_Guest'));
-        }
-        if (($conf['guest_id'] != $conf['default_user_id']) and
-                in_array($conf['default_user_id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_validation_for_default_user'));
-        }
-                if (in_array($conf['webmaster_id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_validation_for_Webmaster'));
-        }
-        if (in_array($user['id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_validation_for_your_account'));
-        }
-
-        if (count($page['errors']) == 0)
-        {
-                foreach ($collection as $user_id)
-        {       
-                $typemail = 1;
-                                  $query = "
+                                if (isset($_POST['Mail_With_Key']) and count($collection) > 0)
+                                {
+                                                if (in_array($conf['guest_id'], $collection))
+                        {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_Guest'));
+                        }
+                if (($conf['guest_id'] != $conf['default_user_id']) and
+                                in_array($conf['default_user_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_default_user'));
+                        }
+                        if (in_array($conf['webmaster_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_Webmaster'));
+                }
+                if (in_array($user['id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_your_account'));
+                }
+
+                if (count($page['errors']) == 0)
+                {
+                                foreach ($collection as $user_id)
+                {       
+                                $typemail = 1;
+                                                                $query = '
 SELECT id, username, mail_address
-  FROM ".USERS_TABLE."
-WHERE id = '".$user_id."'
-;";
-                                        $data = pwg_db_fetch_assoc(pwg_query($query));
+  FROM '.USERS_TABLE.'
+WHERE id = '.$user_id.'
+;';
+                                                                                $data = pwg_db_fetch_assoc(pwg_query($query));
                                 
-                ResendMail2User($typemail,$user_id,stripslashes($data['username']),$data['mail_address'],true);
-        }
-        array_push(
-                $page['infos'],
-                l10n_dec(
-                        'UAM_%d_Mail_With_Key', 'UAM_%d_Mails_With_Key',
-                count($collection)
-                )
-        );
+                                ResendMail2User($typemail,$user_id,stripslashes($data['username']),$data['mail_address'],true);
+                }
+                array_push(
+                                $page['infos'],
+                                        l10n_dec(
+                                        'UAM_%d_Mail_With_Key', 'UAM_%d_Mails_With_Key',
+                                        count($collection)
+                                        )
+                                );
         
-                                $page['filtered_users'] = get_unvalid_user_list();
-                        }
-                }
+                                                                $page['filtered_users'] = get_unvalid_user_list();
+                                                }
+                                }
 
 // +-----------------------------------------------------------------------+
@@ -1075 +1078 @@
 // |                            selected users                             |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Mail_Without_Key']))
-                {
-                $collection = array();
-
-                        switch ($_POST['target'])
-        {
-                case 'all' :
-        {
-                foreach($page['filtered_users'] as $local_user)
-                {
-                        array_push($collection, $local_user['id']);
-                }
-                break;
-                                }
-        case 'selection' :
-        {
-                if (isset($_POST['selection']))
-                {
-                        $collection = $_POST['selection'];
-                }
-                break;
-        }
-                        }
-
-        if (count($collection) == 0)
-        {
-                array_push($page['errors'], l10n('Select at least one user'));
-        }
-                }
+                                if (isset($_POST['Mail_Without_Key']))
+                                {
+                                $collection = array();
+
+                                                switch ($_POST['target'])
+                {
+                                case 'all' :
+                {
+                                foreach($page['filtered_users'] as $local_user)
+                        {
+                                        array_push($collection, $local_user['id']);
+                        }
+        break;
+                                                                }
+                case 'selection' :
+                {
+                                        if (isset($_POST['selection']))
+                        {
+                                        $collection = $_POST['selection'];
+                        }
+        break;
+                }
+                                                }
+
+                if (count($collection) == 0)
+                {
+                                array_push($page['errors'], l10n('Select at least one user'));
+                        }
+                                }
 // +-----------------------------------------------------------------------+
 // |             Send reminder without new key to users                    |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Mail_Without_Key']) and count($collection) > 0)
-                {
-                        if (in_array($conf['guest_id'], $collection))
-                {
-                array_push($page['errors'], l10n('UAM_No_validation_for_Guest'));
-        }
-        if (($conf['guest_id'] != $conf['default_user_id']) and
-                in_array($conf['default_user_id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_validation_for_default_user'));
-        }
-                if (in_array($conf['webmaster_id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_validation_for_Webmaster'));
-        }
-        if (in_array($user['id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_validation_for_your_account'));
-        }
-
-        if (count($page['errors']) == 0)
-        {
-                foreach ($collection as $user_id)
-        {
-                $typemail = 2;
-                                  $query = "
+                                if (isset($_POST['Mail_Without_Key']) and count($collection) > 0)
+                                {
+                                                if (in_array($conf['guest_id'], $collection))
+                        {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_Guest'));
+                }
+                if (($conf['guest_id'] != $conf['default_user_id']) and
+                                in_array($conf['default_user_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_default_user'));
+                }
+                        if (in_array($conf['webmaster_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_Webmaster'));
+                }
+                if (in_array($user['id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_your_account'));
+                }
+
+                if (count($page['errors']) == 0)
+                {
+                                foreach ($collection as $user_id)
+                {
+                                $typemail = 2;
+                                                                $query = '
 SELECT id, username, mail_address
-  FROM ".USERS_TABLE."
-WHERE id = '".$user_id."'
-;";
+  FROM '.USERS_TABLE.'
+WHERE id = '.$user_id.'
+;';
                                         
-                                        $data = pwg_db_fetch_assoc(pwg_query($query));
+                                                                                $data = pwg_db_fetch_assoc(pwg_query($query));
                                 
-                ResendMail2User($typemail,$user_id,stripslashes($data['username']),$data['mail_address'],false);                                
-        }
-        array_push(
-                $page['infos'],
-                l10n_dec(
-                        'UAM_%d_Reminder_Sent', 'UAM_%d_Reminders_Sent',
-                count($collection)
-                )
-        );
+                                ResendMail2User($typemail,$user_id,stripslashes($data['username']),$data['mail_address'],false);                                
+                }
+                array_push(
+                                $page['infos'],
+                        l10n_dec(
+                        'UAM_%d_Reminder_Sent', 'UAM_%d_Reminders_Sent',
+                        count($collection)
+                        )
+                );
         
-                                $page['filtered_users'] = get_unvalid_user_list();
-                        }
-                }
-
+                                                                $page['filtered_users'] = get_unvalid_user_list();
+                                                }
+                                }
+
+// +-----------------------------------------------------------------------+
+// |                                                                             Manual validation      by admins                                                |
+// +-----------------------------------------------------------------------+
+// +-----------------------------------------------------------------------+
+// |                            selected users                             |
+// +-----------------------------------------------------------------------+
+                                if (isset($_POST['Manual_Validation']))
+                                {
+                                $collection = array();
+
+                                                switch ($_POST['target'])
+                {
+                                case 'all' :
+                {
+                                foreach($page['filtered_users'] as $local_user)
+                        {
+                                        array_push($collection, $local_user['id']);
+                        }
+        break;
+                                                                }
+                case 'selection' :
+                {
+                                if (isset($_POST['selection']))
+                        {
+                                        $collection = $_POST['selection'];
+                        }
+                break;
+                }
+                                                }
+
+                                                if (count($collection) == 0)
+                {
+                                array_push($page['errors'], l10n('Select at least one user'));
+                }
+                                }
 // +-----------------------------------------------------------------------+
 // |                                                                            Force validation                                                         |
 // +-----------------------------------------------------------------------+
-// +-----------------------------------------------------------------------+
-// |                            selected users                             |
-// +-----------------------------------------------------------------------+
-                if (isset($_POST['Force_Validation']))
-                {
-                $collection = array();
-
-                        switch ($_POST['target'])
-        {
-                case 'all' :
-        {
-                foreach($page['filtered_users'] as $local_user)
-                {
-                        array_push($collection, $local_user['id']);
-                }
-                break;
-                                }
-        case 'selection' :
-        {
-                if (isset($_POST['selection']))
-                {
-                        $collection = $_POST['selection'];
-                }
-                break;
-        }
-                        }
-
-        if (count($collection) == 0)
-        {
-                array_push($page['errors'], l10n('Select at least one user'));
-        }
-                }
-// +-----------------------------------------------------------------------+
-// |                                                                            Force validation                                                         |
-// +-----------------------------------------------------------------------+
-                if (isset($_POST['Force_Validation']) and count($collection) > 0)
-                {
-                        if (in_array($conf['guest_id'], $collection))
-                {
-                array_push($page['errors'], l10n('UAM_No_validation_for_Guest'));
-        }
-        if (($conf['guest_id'] != $conf['default_user_id']) and
-                in_array($conf['default_user_id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_validation_for_default_user'));
-        }
-                if (in_array($conf['webmaster_id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_validation_for_Webmaster'));
-        }
-        if (in_array($user['id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_validation_for_your_account'));
-        }
-
-        if (count($page['errors']) == 0)
-        {
-                foreach ($collection as $user_id)
-        {
-          ForceValidation($user_id);
+                                if (isset($_POST['Manual_Validation']) and count($collection) > 0)
+                                {
+                                                if (in_array($conf['guest_id'], $collection))
+                        {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_Guest'));
+                }
+                if (($conf['guest_id'] != $conf['default_user_id']) and
+                                in_array($conf['default_user_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_default_user'));
+                }
+                                if (in_array($conf['webmaster_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_Webmaster'));
+                }
+                if (in_array($user['id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_validation_for_your_account'));
+                }
+
+                if (count($page['errors']) == 0)
+                {
+                                foreach ($collection as $user_id)
+                {
+                        ManualValidation($user_id);
           validation_mail($user_id);
-        }
-        array_push(
-                $page['infos'],
-                l10n_dec(
+                }
+                array_push(
+                                $page['infos'],
+                        l10n_dec(
                         'UAM_%d_Validated_User', 'UAM_%d_Validated_Users',
-                count($collection)
-                )
-        );
-
-                                $page['filtered_users'] = get_unvalid_user_list();
-                        }
-                }
+                        count($collection)
+                        )
+                );
+
+                                                                $page['filtered_users'] = get_unvalid_user_list();
+                                                }
+                                }
                 
 
@@ -1236 +1239 @@
 // +-----------------------------------------------------------------------+
 
-                $groups[-1] = '------------';
+                                $groups[-1] = '------------';
 
     $query = '
@@ -1244 +1247 @@
 ;';
 
-                $result = pwg_query($query);
+                                $result = pwg_query($query);
           
     while ($row = pwg_db_fetch_assoc($result))
     {
-      $groups[$row['id']] = $row['name'];
+                $groups[$row['id']] = $row['name'];
     }
 
@@ -1255 +1258 @@
 // +-----------------------------------------------------------------------+
 
-                $profile_url = get_root_url().'admin.php?page=profile&amp;user_id=';
-                $perm_url = get_root_url().'admin.php?page=user_perm&amp;user_id=';
+                                $profile_url = get_root_url().'admin.php?page=profile&amp;user_id=';
+                                $perm_url = get_root_url().'admin.php?page=user_perm&amp;user_id=';
 
     $visible_user_list = array();
     foreach ($page['filtered_users'] as $num => $local_user)
     {
-      $visible_user_list[] = $local_user;
-                }
-
-                foreach ($visible_user_list as $local_user)
+                $visible_user_list[] = $local_user;
+                                }
+
+                                foreach ($visible_user_list as $local_user)
     {
-      $groups_string = preg_replace(
-        '/(\d+)/e',
+                $groups_string = preg_replace(
+                '/(\d+)/e',
         "\$groups['$1']",
         implode(
@@ -1273 +1276 @@
             $local_user['groups']
          )
-                        );
+                                                );
 
       $query = '
@@ -1294 +1297 @@
 
 
-                if (isset($_POST['pref_submit'])
-                and isset($_POST['selection'])
-        and in_array($local_user['id'], $_POST['selection']))
-                {
-                                $checked = 'checked="checked"';
-                }
-                        else
-        {
-                $checked = '';
-        }
-
-        $properties = array();
-        if ( $local_user['level'] != 0 )
-                        {
-                $properties[] = l10n( sprintf('Level %d', $local_user['level']) );
-                        }
-        $properties[] =
-                (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
-                ? l10n('is_high_enabled') : l10n('is_high_disabled');
-
-                        $expiration = expiration($local_user['id']);
+                                if (isset($_POST['pref_submit'])
+                                and isset($_POST['selection'])
+                        and in_array($local_user['id'], $_POST['selection']))
+                                {
+                                                                $checked = 'checked="checked"';
+                                }
+                                                else
+                {
+                                $checked = '';
+                        }
+
+                $properties = array();
+                if ( $local_user['level'] != 0 )
+                                                {
+                                $properties[] = l10n( sprintf('Level %d', $local_user['level']) );
+                                                }
+                $properties[] =
+                                (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
+                                ? l10n('is_high_enabled') : l10n('is_high_disabled');
+
+                                                $expiration = expiration($local_user['id']);
 
       // Template initialization
       // -----------------------
-                $template->append(
-                'users',
-        array(
-                'ID'               => $local_user['id'],
-                'CHECKED'          => $checked,
-                'U_PROFILE'        => $profile_url.$local_user['id'],
-                'U_PERM'           => $perm_url.$local_user['id'],
-                'USERNAME'         => stripslashes($local_user['username'])
+                        $template->append(
+                        'users',
+                        array(
+                                                'ID'               => $local_user['id'],
+                                'CHECKED'          => $checked,
+                                'U_PROFILE'        => $profile_url.$local_user['id'],
+                                'U_PERM'           => $perm_url.$local_user['id'],
+                                'USERNAME'         => stripslashes($local_user['username'])
                                   .($local_user['id'] == $conf['guest_id']
                                   ? '<BR>['.l10n('is_the_guest').']' : '')
@@ -1332 +1335 @@
                                   'STATUS' => l10n('user_status_'
                                   .$local_user['status']),
-                                        'EMAIL'            => get_email_address_as_display_text($local_user['email']),
-                'GROUPS'           => $groups_string,
-                'REGISTRATION'     => $local_user['registration_date'],
-          'REMINDER'         => $reminder,    
-                'EXPIRATION'       => $expiration,
-                                )
-                        );
-                }   
+                                                                                                'EMAIL'            => get_email_address_as_display_text($local_user['email']),
+                                'GROUPS'           => $groups_string,
+                                'REGISTRATION'     => $local_user['registration_date'],
+                        'REMINDER'         => $reminder,    
+                                'EXPIRATION'       => $expiration,
+                                                                                )
+                                                );
+                                }   
 
     // Check if validation of register is made by admin or visitor 
@@ -1358 +1361 @@
     // -----------------------
     $template->assign(
-      array(
+                array(
         'CONFIRM_LOCAL'=> $Confirm_Local,
         'UAM_VERSION'  => $version,
@@ -1368 +1371 @@
 // |                             errors display                            |
 // +-----------------------------------------------------------------------+
-                if ( isset ($errors) and count($errors) != 0)
-                {
-                $template->assign('errors',array());
-                        foreach ($errors as $error)
-                {
-                                array_push($page['errors'], $error);
-                }
-                }  
+                                if ( isset ($errors) and count($errors) != 0)
+                                {
+                                $template->assign('errors',array());
+                                                foreach ($errors as $error)
+                                {
+                                                                array_push($page['errors'], $error);
+                                }
+                                }  
 
 // +-----------------------------------------------------------------------+
 // |                           templates display                           |
 // +-----------------------------------------------------------------------+
-                $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/usermanager.tpl');
-    $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');         
-        }
+                                $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/usermanager.tpl');
+                $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');             
+                }
   else
   {
-                array_push($page['errors'], l10n('UAM_Err_UserManager_Settings'));
+                                array_push($page['errors'], l10n('UAM_Err_UserManager_Settings'));
   }
   break;
@@ -1395 +1398 @@
 // +-----------------------------------------------------------------------+
 // *************************************************************************
-  case 'ghosttracker':
+                case 'ghosttracker':
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
@@ -1405 +1408 @@
 // +-----------------------------------------------------------------------+
 
-                if (!defined('PHPWG_ROOT_PATH'))
-    {
-        die('Hacking attempt!');
-    }
+                                if (!defined('PHPWG_ROOT_PATH'))
+                {
+                                die('Hacking attempt!');
+                }
           
-    include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+                include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
 // +-----------------------------------------------------------------------+
 // | Check Access and exit when user status is not ok                      |
 // +-----------------------------------------------------------------------+
-                check_status(ACCESS_ADMINISTRATOR);
+                                check_status(ACCESS_ADMINISTRATOR);
 
 // +-----------------------------------------------------------------------+
@@ -1421 +1424 @@
 // +-----------------------------------------------------------------------+
 
-                $page['filtered_users'] = get_ghost_user_list();
+                                $page['filtered_users'] = get_ghost_user_list();
 
 // +-----------------------------------------------------------------------+
 // |                            selected users                             |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Del_Selected']))
-                {
-                $collection = array();
-
-                        switch ($_POST['target'])
-        {
-                case 'all' :
-        {
-                foreach($page['filtered_users'] as $local_user)
-                {
-                        array_push($collection, $local_user['id']);
-                }
-                                        break;
-                                }
-        case 'selection' :
-        {
-                if (isset($_POST['selection']))
-                {
-                        $collection = $_POST['selection'];
-                }
-                break;
-        }
-                        }
-
-                        if (count($collection) == 0)
-        {
-                array_push($page['errors'], l10n('Select at least one user'));
-                }
-                }
+                                if (isset($_POST['Del_Selected']))
+                                {
+                                $collection = array();
+
+                                                switch ($_POST['target'])
+                {
+                                case 'all' :
+                {
+                                foreach($page['filtered_users'] as $local_user)
+                                {
+                                        array_push($collection, $local_user['id']);
+                        }
+                                                                break;
+                                                                }
+                case 'selection' :
+                {
+                                if (isset($_POST['selection']))
+                        {
+                                        $collection = $_POST['selection'];
+                        }
+                break;
+                }
+                                                }
+
+                                                if (count($collection) == 0)
+                {
+                                array_push($page['errors'], l10n('Select at least one user'));
+                        }
+                                }
 
 // +-----------------------------------------------------------------------+
 // |                             delete users                              |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Del_Selected']) and count($collection) > 0)
-        {
-                if (in_array($conf['guest_id'], $collection))
-                {
-                array_push($page['errors'], l10n('Guest cannot be deleted'));
-        }
-        if (($conf['guest_id'] != $conf['default_user_id']) and
-                in_array($conf['default_user_id'], $collection))
-        {
-                array_push($page['errors'], l10n('Default user cannot be deleted'));
-        }
-        if (in_array($conf['webmaster_id'], $collection))
-        {
-                array_push($page['errors'], l10n('Webmaster cannot be deleted'));
-        }
-        if (in_array($user['id'], $collection))
-        {
-                array_push($page['errors'], l10n('You cannot delete your account'));
-        }
-
-                        if (count($page['errors']) == 0)
-        {
-                foreach ($collection as $user_id)
-        {
-                delete_user($user_id);
-        }
-                array_push(
-                $page['infos'],
-                l10n_dec(
-                '%d user deleted', '%d users deleted',
-                count($collection)
-                )
-        );
-
-        foreach ($page['filtered_users'] as $filter_key => $filter_user)
-        {
-                if (in_array($filter_user['id'], $collection))
-                {
-                        unset($page['filtered_users'][$filter_key]);
-                }
-                }
-                        }
-                }
+                                if (isset($_POST['Del_Selected']) and count($collection) > 0)
+                {
+                                if (in_array($conf['guest_id'], $collection))
+                        {
+                                array_push($page['errors'], l10n('Guest cannot be deleted'));
+                }
+                if (($conf['guest_id'] != $conf['default_user_id']) and
+                                in_array($conf['default_user_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('Default user cannot be deleted'));
+                }
+                if (in_array($conf['webmaster_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('Webmaster cannot be deleted'));
+                }
+                if (in_array($user['id'], $collection))
+                {
+                                array_push($page['errors'], l10n('You cannot delete your account'));
+                }
+
+                                                if (count($page['errors']) == 0)
+                {
+                                foreach ($collection as $user_id)
+                {
+                                delete_user($user_id);
+                }
+                        array_push(
+                                $page['infos'],
+                        l10n_dec(
+                        '%d user deleted', '%d users deleted',
+                        count($collection)
+                        )
+                );
+
+                foreach ($page['filtered_users'] as $filter_key => $filter_user)
+                {
+                                if (in_array($filter_user['id'], $collection))
+                        {
+                                        unset($page['filtered_users'][$filter_key]);
+                        }
+                        }
+                                                }
+                                }
 
 // +-----------------------------------------------------------------------+
@@ -1509 +1512 @@
 // |                            selected users                             |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Reminder_Email']))
-                {
-                $collection = array();
-
-                        switch ($_POST['target'])
-        {
-                case 'all' :
-        {
-                foreach($page['filtered_users'] as $local_user)
-                {
-                        array_push($collection, $local_user['id']);
-                }
-                break;
-                                }
-        case 'selection' :
-        {
-                if (isset($_POST['selection']))
-                {
-                        $collection = $_POST['selection'];
-                }
-                break;
-        }
-                        }
-
-        if (count($collection) == 0)
-        {
-                array_push($page['errors'], l10n('Select at least one user'));
-        }
-                }
+                                if (isset($_POST['Reminder_Email']))
+                                {
+                                $collection = array();
+
+                                                switch ($_POST['target'])
+                {
+                                case 'all' :
+                {
+                                foreach($page['filtered_users'] as $local_user)
+                        {
+                                        array_push($collection, $local_user['id']);
+                        }
+        break;
+                                                                }
+                case 'selection' :
+                {
+                                if (isset($_POST['selection']))
+                        {
+                                        $collection = $_POST['selection'];
+                        }
+                break;
+                }
+                                                }
+
+                if (count($collection) == 0)
+                {
+                                array_push($page['errors'], l10n('Select at least one user'));
+                }
+                                }
 // +-----------------------------------------------------------------------+
 // |                         Send ghost reminder                           |
 // +-----------------------------------------------------------------------+
-                if (isset($_POST['Reminder_Email']) and count($collection) > 0)
-                {
-                        if (in_array($conf['guest_id'], $collection))
-                {
-                array_push($page['errors'], l10n('UAM_No_reminder_for_Guest'));
-        }
-        if (($conf['guest_id'] != $conf['default_user_id']) and
-                in_array($conf['default_user_id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_reminder_for_default_user'));
-        }
-                if (in_array($conf['webmaster_id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_reminder_for_Webmaster'));
-        }
-        if (in_array($user['id'], $collection))
-        {
-                array_push($page['errors'], l10n('UAM_No_reminder_for_your_account'));
-        }
-
-        if (count($page['errors']) == 0)
-        {
-                foreach ($collection as $user_id)
-        {
-                                  $query = "
+                                if (isset($_POST['Reminder_Email']) and count($collection) > 0)
+                                {
+                                                if (in_array($conf['guest_id'], $collection))
+                        {
+                                array_push($page['errors'], l10n('UAM_No_reminder_for_Guest'));
+                        }
+                if (($conf['guest_id'] != $conf['default_user_id']) and
+                                in_array($conf['default_user_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_reminder_for_default_user'));
+                }
+                        if (in_array($conf['webmaster_id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_reminder_for_Webmaster'));
+                }
+                if (in_array($user['id'], $collection))
+                {
+                                array_push($page['errors'], l10n('UAM_No_reminder_for_your_account'));
+                        }
+
+                if (count($page['errors']) == 0)
+                {
+                                foreach ($collection as $user_id)
+                {
+                                                                $query = '
 SELECT id, username, mail_address
-  FROM ".USERS_TABLE."
-WHERE id = '".$user_id."'
-;";
+  FROM '.USERS_TABLE.'
+WHERE id = '.$user_id.'
+;';
                                         
-                                        $data = pwg_db_fetch_assoc(pwg_query($query));
+                                                                                $data = pwg_db_fetch_assoc(pwg_query($query));
                                 
-                ghostreminder($user_id,stripslashes($data['username']),$data['mail_address']);                          
-        }
-        array_push(
-                $page['infos'],
-                l10n_dec(
-                        'UAM_%d_Reminder_Sent', 'UAM_%d_Reminders_Sent',
-                count($collection)
-                )
-        );
-        
-                                $page['filtered_users'] = get_ghost_user_list();
-                        }
-                }
+                                ghostreminder($user_id,stripslashes($data['username']),$data['mail_address']);                          
+                }
+                array_push(
+                                $page['infos'],
+                        l10n_dec(
+                        'UAM_%d_Reminder_Sent', 'UAM_%d_Reminders_Sent',
+                        count($collection)
+                        )
+                );
+
+                                                                $page['filtered_users'] = get_ghost_user_list();
+                                                }
+                                }
     
     if (isset($_POST['GhostTracker_Init']) and is_admin()) //Reset is only allowed for admins !
     {
-      $query1 = '
+                $query1 = '
 SELECT *
   FROM '.USER_LASTVISIT_TABLE.';';
@@ -1597 +1600 @@
       if ($count <> 0)
       {
-        $query = '
+                $query = '
 SELECT DISTINCT u.id,
                 ui.status AS status
@@ -1616 +1619 @@
           list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
             
-          $query = "
-INSERT INTO ".USER_LASTVISIT_TABLE." (user_id, lastvisit, reminder)
-VALUES ('".$row['id']."','".$dbnow."','false')
-;";
+          $query = '
+INSERT INTO '.USER_LASTVISIT_TABLE.'
+                                (user_id, lastvisit, reminder)
+VALUES ('.$row['id'].',"'.$dbnow.'","false")
+;';
           pwg_query($query);
         }
@@ -1643 +1647 @@
           list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
             
-          $query = "
-INSERT INTO ".USER_LASTVISIT_TABLE." (user_id, lastvisit, reminder)
-VALUES ('".$row['id']."','".$dbnow."','false')
-;";
+          $query = '
+INSERT INTO '.USER_LASTVISIT_TABLE.'
+    (user_id, lastvisit, reminder)
+VALUES ('.$row['id'].',"'.$dbnow.'","false")
+;';
           pwg_query($query);
         }
@@ -1662 +1667 @@
     {
       $visible_user_list[] = $local_user;
-                }
+                                }
     
-                foreach ($visible_user_list as $local_user)
-    {
-      $reminder = '';
+                                foreach ($visible_user_list as $local_user)
+        {
+                $reminder = '';
     
       if (isset($local_user['reminder']) and $local_user['reminder'] == 'true')
@@ -1678 +1683 @@
     
       if (isset($_POST['pref_submit']) and isset($_POST['selection']) and in_array($local_user['id'], $_POST['selection']))
-                {
-                                $checked = 'checked="checked"';
-                }
-                        else
-        {
-                $checked = '';
-        }
+                                {
+                                                                $checked = 'checked="checked"';
+                                }
+                                                else
+                {
+                                $checked = '';
+                        }
 
       // Template initialization
@@ -1691 +1696 @@
           'users',
         array(
-                'ID'          => $local_user['id'],
+                        'ID'          => $local_user['id'],
                 'CHECKED'     => $checked,
                 'USERNAME'    => stripslashes($local_user['username']),
-                                        'EMAIL'       => get_email_address_as_display_text($local_user['email']),
+                                                                                'EMAIL'       => get_email_address_as_display_text($local_user['email']),
           'LASTVISIT'   => $local_user['lastvisit'],
           'REMINDER'    => $reminder,
-                                )
-                        );
-                }
+                                                                )
+                                                );
+                                }
 
     // Plugin version inserted
@@ -1713 +1718 @@
 // |                             errors display                            |
 // +-----------------------------------------------------------------------+
-                if ( isset ($errors) and count($errors) != 0)
-                {
-                $template->assign('errors',array());
-                        foreach ($errors as $error)
-                {
-                                array_push($page['errors'], $error);
-                }
-                }  
+                                if ( isset ($errors) and count($errors) != 0)
+                                {
+                                $template->assign('errors',array());
+                                                foreach ($errors as $error)
+                                {
+                                                                array_push($page['errors'], $error);
+                                }
+                                }  
 
 // +-----------------------------------------------------------------------+
 // |                           templates display                           |
 // +-----------------------------------------------------------------------+
-                $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/ghosttracker.tpl');
+                                $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/ghosttracker.tpl');
     $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');         
-        }
+                }
   else
   {
-                array_push($page['errors'], l10n('UAM_Err_GhostTracker_Settings'));
+                                array_push($page['errors'], l10n('UAM_Err_GhostTracker_Settings'));
   }
 

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

@@ -231 +231 @@
           <fieldset>
           <ul>
-            <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>
             <li>
-            <div class="uam_new">
               <label class="cluetip" title="{'UAM_AdminValidationMail_Subject'|translate}|{'UAM_AdminValidationMail_Subject_d'|translate}">
                 {'UAM_AdminValidationMail_Subject'|@translate}
@@ -240 +238 @@
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_AdminValidationMail_Subject" id="UAM_AdminValidationMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_ADMINVALIDATIONMAIL_SUBJECT}</textarea>
             <br><br>
-            </div>
             </li>
 
@@ -256 +253 @@
 
           <ul>
-            <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>
             <li>
-            <div class="uam_new">
               <label class="cluetip" title="{'UAM_ConfirmMail_Subject'|translate}|{'UAM_ConfirmMail_Subject_d'|translate}">
                 {'UAM_ConfirmMail_Subject'|@translate}
@@ -265 +260 @@
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_ConfirmMail_Subject" id="UAM_ConfirmMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_SUBJECT}</textarea>
             <br><br>
-            </div>
             </li>
 
@@ -485 +479 @@
 
               <ul>
-                <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>
                 <li>
-                <div class="uam_new">
                   <label class="cluetip" title="{'UAM_ConfirmMail_ReMail_Subject'|translate}|{'UAM_ConfirmMail_ReMail_Subject_d'|translate}">
                     {'UAM_ConfirmMail_ReMail_Subject'|@translate}
@@ -494 +486 @@
                   &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_ConfirmMail_Remail_Subject" id="UAM_ConfirmMail_Remail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_SUBJECT}</textarea>
                 <br><br>
-                </div>
                 </li>
 
@@ -632 +623 @@
           <fieldset>
           <ul>
-            <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>
             <li>
-            <div class="uam_new">
               <label class="cluetip" title="{'UAM_GTReminder_Subject'|translate}|{'UAM_GTReminder_Subject_d'|translate}">
                 {'UAM_GTReminder_Subject'|@translate}
@@ -641 +630 @@
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_GTReminder_Subject" id="UAM_GTReminder_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTREMINDER_SUBJECT}</textarea>
             <br><br>
-            </div>
             </li>
 
@@ -746 +734 @@
                           {'UAM_Enable'|@translate}
                       <br><br>
-                        <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>
                         <li>
-                        <div class="uam_new">
                           <label class="cluetip" title="{'UAM_GTAutomail_Subject'|translate}|{'UAM_GTAutomail_Subject_d'|translate}">
                             {'UAM_GTAutomail_Subject'|@translate}
@@ -755 +741 @@
                           &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_GTAutoMail_Subject" id="UAM_GTAutoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_GTAUTOMAIL_SUBJECT}</textarea>
                         <br><br>
-                        </div>
                         </li>
 
@@ -823 +808 @@
             </li>
             
-            <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>
             <li>
-            <div class="uam_new">
               <label class="cluetip" title="{'UAM_MailInfo_Subject'|translate}|{'UAM_MailInfo_Subject_d'|translate}">
                 {'UAM_MailInfo_Subject'|@translate}
@@ -832 +815 @@
               &nbsp;&nbsp;<textarea class="uam_textfields" name="UAM_InfoMail_Subject" id="UAM_InfoMail_Subject" rows="5" {$TAG_INPUT_ENABLED}>{$UAM_INFOMAIL_SUBJECT}</textarea>
             <br><br>
-            </div>
             </li>
 

extensions/UserAdvManager/branches/2.40/admin/template/usermanager.tpl

@@ -96 +96 @@
 {if $CONFIRM_LOCAL == "local"}
   <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
-  <input class="submit" type="submit" value="{'UAM_Force_Validation'|@translate}" name="Force_Validation">
+  <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation">
 {else}
   <input class="submit" type="submit" value="{'UAM_Delete_selected'|@translate}" name="Del_Selected">
   <input class="submit" type="submit" value="{'UAM_Mail_without_key'|@translate}" name="Mail_Without_Key">
   <input class="submit" type="submit" value="{'UAM_Mail_with_key'|@translate}" name="Mail_With_Key">
-  <input class="submit" type="submit" value="{'UAM_Force_Validation'|@translate}" name="Force_Validation">
+  <input class="submit" type="submit" value="{'UAM_Manual_Validation'|@translate}" name="Manual_Validation">
 {/if}
 </p>

extensions/UserAdvManager/branches/2.40/changelog.txt.php

@@ -300 +300 @@
             Bug 2740 fixed - Loggin rejection on unvalidated user connection does not work
 
+-- 2.30.9 : Bug 2744 fixed - User connexion rejection does not work if no group/status/privacy is set
+
 **************************************************************
 ***** Plugin history (branch 2.40 - Piwigo 2.4 compliant)*****
@@ -337 +339 @@
             Update es_ES, thanks to : jpr928
             Update it_IT, thanks to : Ericnet and virgigiole
+
+-- 2.40.6 : Bug 2744 fixed - User connexion rejection does not work if no group/status/privacy is set
+                                                      Bug 2749 fixed - regex meta-characters are usable in character exclusion in usernames
+            New unvalidated user controls more efficient
+            Get admins emails instead of webmaster's for sending validation email
+            TODO - New simplifed administration panel
 */
 ?>

extensions/UserAdvManager/branches/2.40/include/functions.inc.php

@@ -19 +19 @@
   array_push($menu,
     array(
-      'NAME' => $name,
-      'URL' => get_root_url().'admin.php?page=plugin-'.basename(UAM_PATH)
+                'NAME' => $name,
+                'URL' => get_root_url().'admin.php?page=plugin-'.basename(UAM_PATH)
     )
   );
@@ -36 +36 @@
 {
   global $conf, $page;
+  
+  $conf_UAM = unserialize($conf['UserAdvManager']);
  
   // Check mandatory email address for email exclusion
-  $conf_UAM = unserialize($conf['UserAdvManager']);
   if (!$conf['obligatory_user_mail_address'] and $conf_UAM[10] = 'true')
   {
@@ -51 +52 @@
  * Initiating GhostTracker - Perform user logout after registration if not validated
  */
-function UAM_GhostTracker()
+function UAM_Init()
 {
   global $conf, $user;
@@ -66 +67 @@
     {
 
-      $userid = get_userid($user['username']);
+                                                $userid = get_userid($user['username']);
           
       // Looking for existing entry in last visit table
@@ -101 +102 @@
       }
     }
-  }
-
-  // Perform user logout after registration if not validated
-  if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']))
-  {
-    invalidate_user_cache();
-    logout_user();
-    redirect(UAM_PATH.'rejected.php');
+
+    // Perform user logout after registration if not validated
+    if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']) and !is_admin() and !is_webmaster() )
+    {
+      invalidate_user_cache();
+      logout_user();
+      if ( $conf['guest_access'] )
+      {
+        redirect( make_index_url().'?UAM_msg=rejected', 0);
+      }
+      else
+      {
+        redirect( get_root_url().'identification.php?UAM_msg=rejected' , 0);
+      }
+    }
   }
 }
@@ -135 +143 @@
       // ----------------------------------------------------------------------------------------------
       SetPermission($register_user['id']);// Set to "waiting" group or status until admin validation
+      
+      // This is to set UAM_validated field to false in #_users table - Usefull if no "waiting" group or status is set
+      // -------------------------------------------------------------------------------------------------------------
+      SetUnvalidated($register_user['id']);
+
+      // This is to send the validation key by email to admins for their manual validation without having to connect the gallery
+      // -----------------------------------------------------------------------------------------------------------------------
+      SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
     }
     // Sending registration confirmation by email
@@ -261 +277 @@
       $user_idsOK[] = $user['id'];
 
-      $query = "
-UPDATE ".CONFIG_TABLE."
-SET value = \"".implode(',', $user_idsOK)."\"
-WHERE param = 'UserAdvManager_Redir';";
+      $query = '
+UPDATE '.CONFIG_TABLE.'
+SET value = "'.implode(',', $user_idsOK).'"
+WHERE param = "UserAdvManager_Redir";';
           
       pwg_query($query);
@@ -317 +333 @@
     if (!empty($_POST['use_new_pwd']))
     {
-      $typemail = 2; // Confirmation email on user profile update - With information email if checked
+      $typemail = 2; // Confirmation email on user profile update - With information email
 
       // Password enforcement control
@@ -356 +372 @@
         {
           SetPermission($user['id']);// Set to "waiting" group or status until user validation
+          SetUnvalidated($user['id']); // Set UAM_validated field to false in #_users table
           $confirm_mail_need = true;
         }
@@ -364 +381 @@
         {
           SetPermission($user['id']);// Set to "waiting" group or status until admin validation
+          SetUnvalidated($user['id']); // Set UAM_validated field to false in #_users table
           $confirm_mail_need = false;
         }       
@@ -455 +473 @@
     }
   }
-  elseif ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']))
+  elseif ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']) and !is_admin() and !is_webmaster())
   {
     // Logged-in user cleanup, session destruction and redirected to custom page
@@ -461 +479 @@
     invalidate_user_cache();
     logout_user();
-    redirect(UAM_PATH.'rejected.php');
+    if ( $conf['guest_access'] )
+    {
+      redirect( make_index_url().'?UAM_msg=rejected', 0);
+    }
+    else
+    {
+      redirect( get_root_url().'identification.php?UAM_msg=rejected' , 0);
+    }
   }
 }
@@ -512 +537 @@
   }
 
-  // GhostTracker auto group, status or privacy level downgrade with or without information email sending and autodeletion if user already reminded
-  // ----------------------------------------------------------------------------------------------------------------------------------------------
+  // Auto group, status or privacy level downgrade and autodeletion if user already reminded
+  // ---------------------------------------------------------------------------------------
   if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true') and ((isset($conf_UAM[25]) and $conf_UAM[25] <> -1) or (isset($conf_UAM[26]) and $conf_UAM[26] <> -1) or (isset($conf_UAM[37]) and $conf_UAM[37] <> -1)))
   {
     if (count($collection) > 0)
-        {
+         {
       // Process if a non-admin nor webmaster user is logged
       // ---------------------------------------------------
       if (in_array($user['id'], $collection))
-        {
+                        {
         // Check lastvisit reminder state
         // ------------------------------
@@ -554 +579 @@
           redirect(UAM_PATH.'GT_del_account.php');
         }
-        }
+                }
       else // Process if an admin or webmaster user is logged
       {
@@ -585 +610 @@
             list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
 
-                        $query = "
-UPDATE ".USER_LASTVISIT_TABLE."
-SET lastvisit='".$dbnow."'
-WHERE user_id = '".$user_id."'
-;";
+                        $query = '
+UPDATE '.USER_LASTVISIT_TABLE.'
+SET lastvisit="'.$dbnow.'"
+WHERE user_id = '.$user_id.'
+;';
             pwg_query($query);
 
@@ -596 +621 @@
             // Delete user from all groups
             // ---------------------------
-            $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$user_id."'
+            if ($conf_UAM[2] <> -1 and $conf_UAM[3] <> -1)
+            {
+                        $query = '
+DELETE FROM '.USER_GROUP_TABLE.'
+WHERE user_id = '.$user_id.'
   AND (
-    group_id = '".$conf_UAM[2]."'
+    group_id = '.$conf_UAM[2].'
   OR 
-    group_id = '".$conf_UAM[3]."'
+    group_id = '.$conf_UAM[3].'
   )
-;";
-            pwg_query($query);
+;';
+                        pwg_query($query);
+                                                                                                }
 
             // Change user status
@@ -611 +639 @@
             if ($conf_UAM[26] <> -1)
             {
-              $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET status = '".$conf_UAM[26]."'
-WHERE user_id = '".$user_id."'
-;";
+              $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET status = "'.$conf_UAM[26].'"
+WHERE user_id = '.$user_id.'
+;';
               pwg_query($query);
             }
@@ -623 +651 @@
             if ($conf_UAM[25] <> -1)
             {
-              $query = "
-INSERT INTO ".USER_GROUP_TABLE."
+              $query = '
+INSERT INTO '.USER_GROUP_TABLE.'
   (user_id, group_id)
 VALUES
-  ('".$user_id."', '".$conf_UAM[25]."')
-;";
+  ('.$user_id.', "'.$conf_UAM[25].'")
+;';
               pwg_query($query);
             }
@@ -636 +664 @@
             if ($conf_UAM[37] <> -1)
             {
-              $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET level = '".$conf_UAM[37]."'
-WHERE user_id = '".$user_id."'
-;";
+              $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET level = "'.$conf_UAM[37].'"
+WHERE user_id = '.$user_id.'
+;';
               pwg_query($query);
             }
@@ -650 +678 @@
               // Set reminder true
               // -----------------
-              $query = "
-UPDATE ".USER_LASTVISIT_TABLE."
-SET reminder = 'true'
-WHERE user_id = '".$user_id."'
-;";
+              $query = '
+UPDATE '.USER_LASTVISIT_TABLE.'
+SET reminder = "true"
+WHERE user_id = '.$user_id.'
+;';
               pwg_query($query);
             
               // Reset confirmed user status to unvalidated
               // ------------------------------------------
-                                                  $query = '
+                                                                                                $query = '
 UPDATE '.USER_CONFIRM_MAIL_TABLE.'
 SET date_check = NULL
-WHERE user_id = "'.$user_id.'"
-;';
-                                                  pwg_query($query);
+WHERE user_id = '.$user_id.'
+;';
+                                                                                                pwg_query($query);
 
               // Get users information for email notification
               // --------------------------------------------
-                                                  $query = '
+                                                                                                $query = '
 SELECT id, username, mail_address
 FROM '.USERS_TABLE.'
 WHERE id = '.$user_id.'
 ;';
-                                                  $data = pwg_db_fetch_assoc(pwg_query($query));
+                                                                                                $data = pwg_db_fetch_assoc(pwg_query($query));
             
               demotion_mail($user_id, $data['username'], $data['mail_address']);
@@ -725 +753 @@
   {
     if (count($collection) > 0)
-        {
+                {
       // Process if a non-admin nor webmaster user is logged
       // ---------------------------------------------------
       if (in_array($user['id'], $collection))
-        {
+                {
         // Check ConfirmMail reminder state
         // --------------------------------
@@ -752 +780 @@
         if (!$reminder and isset($conf_UAM[32]) and $conf_UAM[32] == 'true')
         {
-                  $typemail = 1;
+                        $typemail = 1;
           
           // Get current user informations
           // -----------------------------
-          $query = "
+          $query = '
 SELECT id, username, mail_address
-FROM ".USERS_TABLE."
-WHERE id = '".$user['id']."'
-;";
+FROM '.USERS_TABLE.'
+WHERE id = '.$user['id'].'
+;';
           $data = pwg_db_fetch_assoc(pwg_query($query));
 
@@ -779 +807 @@
           redirect(UAM_PATH.'USR_del_account.php');
         }
-        }
+                }
       else // Process if an admin or webmaster user is logged
       {
@@ -810 +838 @@
             // Get current user informations
             // -----------------------------
-            $query = "
+            $query = '
 SELECT id, username, mail_address
-FROM ".USERS_TABLE."
-WHERE id = '".$user_id."'
-;";
+FROM '.USERS_TABLE.'
+WHERE id = '.$user_id.'
+;';
             $data = pwg_db_fetch_assoc(pwg_query($query));
 
@@ -861 +889 @@
 }
 
+/**
+ * Triggered on init
+ * 
+ * Display a message according to $_GET['UAM_msg']
+ */
+function UAM_DisplayMsg()
+{
+  if( isset($_GET['UAM_msg']))
+  {
+    global $user, $lang, $conf, $page;
+    $conf_UAM = unserialize($conf['UserAdvManager']);
+    
+    if (isset($conf_UAM[40]) and $conf_UAM[40] <> '' and $_GET['UAM_msg']="rejected")
+    {
+      // Management of Extension flags ([mygallery], [myurl])
+      // ---------------------------------------------------
+      $patterns[] = '#\[mygallery\]#i';
+      $replacements[] = $conf['gallery_title'];
+      $patterns[] = '#\[myurl\]#i';
+      $replacements[] = get_gallery_home_url();
+    
+      if (function_exists('get_user_language_desc'))
+      {
+        $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[40]));
+      }
+      else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[40]));
+      $page["errors"][]=$custom_text;
+    }
+  }
+}
 
 /**
@@ -906 +964 @@
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
-  
-        include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
-  
-        $infos1_perso = "";
+
+                include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+
+                $infos1_perso = "";
   $infos2_perso = "";
   $subject = "";
@@ -961 +1019 @@
       break;
       
-    case 2: // Confirmation email on user profile update - With information email if checked
+    case 2: // Confirmation email on user profile update - With information email if modification done in user profile
       if (isset($conf_UAM[41]) and $conf_UAM[41] <> '')
       {
@@ -1086 +1144 @@
   }
 
-  if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' and $confirm) // Add confirmation link ?
+  if (isset($conf_UAM[1]) and ($conf_UAM[1] == 'true' or $conf_UAM[1] == 'local')  and $confirm) // Add confirmation link ?
   {
     $infos2 = array
@@ -1121 +1179 @@
 // Sending the email with subject and contents
 // -------------------------------------------
-  pwg_mail($email, array(
-    'subject' => $subject,
-    'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(),
-  ));
-
+                if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')
+                {
+                switch_lang_to(get_default_language());
+                
+                load_language('plugin.lang', UAM_PATH);
+                $subject = get_l10n_args('UAM_Subject admin validation for %s',$username);
+
+                  $content = array(
+                get_l10n_args('UAM_Manual_validation_needed_for %s', stripslashes($username)),
+    get_l10n_args('', ''),
+    get_l10n_args('UAM_Link: %s', AddConfirmMail($id, $email)),
+    );
+
+    UAM_mail_notification_admins($subject, $content);
+                }
+                else
+                {
+                pwg_mail($email, array(
+                'subject' => $subject,
+                'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(),
+                ));
+                }
 // Switching back to default language
 // ----------------------------------
@@ -1133 +1208 @@
 
 /**
+ * Function called from SendMail2User in functions.inc.php to notify admins on user registration validation with validation key
+ *
+ * @param:
+ *   - keyargs_subject: mail subject on l10n_args format
+ *   - keyargs_content: mail content on l10n_args format
+ *
+ * @return boolean (Ok or not)
+ */
+function UAM_mail_notification_admins($keyargs_subject, $keyargs_content)
+{
+  global $conf, $user;
+  
+  // Check arguments
+  if (empty($keyargs_subject) or empty($keyargs_content))
+  {
+    return false;
+  }
+
+  $return = true;
+
+  $admins = array();
+
+  $query = '
+SELECT
+    u.'.$conf['user_fields']['username'].' AS username,
+    u.'.$conf['user_fields']['email'].' AS mail_address
+  FROM '.USERS_TABLE.' AS u
+    JOIN '.USER_INFOS_TABLE.' AS i ON i.user_id =  u.'.$conf['user_fields']['id'].'
+  WHERE i.status in (\'webmaster\',  \'admin\')
+    AND '.$conf['user_fields']['email'].' IS NOT NULL
+    AND i.user_id <> '.$user['id'].'
+  ORDER BY username
+;';
+
+  $datas = pwg_query($query);
+  if (!empty($datas))
+  {
+    while ($admin = pwg_db_fetch_assoc($datas))
+    {
+      if (!empty($admin['mail_address']))
+      {
+        array_push($admins, format_email($admin['username'], $admin['mail_address']));
+      }
+    }
+  }
+
+  if (count($admins) > 0)
+  {
+    $content = l10n_args($keyargs_content)."\n";
+
+    $return = pwg_mail(
+      implode(', ', $admins),
+      array(
+        'subject' => '['.$conf['gallery_title'].'] '.l10n_args($keyargs_subject),
+        'content' => $content,
+        'content_format' => 'text/plain',
+        'email_format' => 'text/plain',
+        )
+      );
+  }
+
+  return $return;
+}
+
+
+/**
  * Function called from UAM_admin.php to resend validation email with or without new validation key
  *
@@ -1148 +1289 @@
   $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
   
-        include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+                include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
   
 // We have to get the user's language in database
@@ -1187 +1328 @@
       if (isset($conf_UAM_ConfirmMail[2]) and $conf_UAM_ConfirmMail[2] <> '' and isset($conf_UAM_ConfirmMail[3]) and $conf_UAM_ConfirmMail[3] == 'true' and $confirm)
       {
-        // Management of Extension flags ([username], [mygallery], [myurl], [Kdays])
+                // Management of Extension flags ([username], [mygallery], [myurl], [Kdays])
         // -------------------------------------------------------------------------
         $patterns[] = '#\[username\]#i';
@@ -1213 +1354 @@
           get_l10n_args('', ''),
         );        
-                        }
+                                                }
 
 // Set reminder true 
 // -----------------     
-      $query = "
-UPDATE ".USER_CONFIRM_MAIL_TABLE."
-SET reminder = 'true'
-WHERE user_id = '".$user_id."'
-;";
+      $query = '
+UPDATE '.USER_CONFIRM_MAIL_TABLE.'
+SET reminder = "true"
+WHERE user_id = '.$user_id.'
+;';
       pwg_query($query);
       
-                break;
+                                break;
       
     case 2: //Generating email content for remind without a new key
@@ -1269 +1410 @@
 // Set reminder true
 // -----------------
-      $query = "
-UPDATE ".USER_CONFIRM_MAIL_TABLE."
-SET reminder = 'true'
-WHERE user_id = '".$user_id."'
-;";
+      $query = '
+UPDATE '.USER_CONFIRM_MAIL_TABLE.'
+SET reminder = "true"
+WHERE user_id = '.$user_id.'
+;';
       pwg_query($query);
       
@@ -1284 +1425 @@
   ));
 
-// Switching back to default language
-// ----------------------------------
-switch_lang_back();
+                // Switching back to default language
+                // ----------------------------------
+                switch_lang_back();
 }
 
@@ -1303 +1444 @@
   $subject = "";
   
-        include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+                include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
 
 // We have to get the user's language in database
@@ -1367 +1508 @@
   ));
 
-// Switching back to default language
-// ----------------------------------
-switch_lang_back();
+                // Switching back to default language
+                // ----------------------------------
+                switch_lang_back();
 }
 
@@ -1385 +1526 @@
   $conf_UAM = unserialize($conf['UserAdvManager']);
   
-        include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
-  
-        $custom_txt = "";
-  $subject = "";
+                include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+  
+                $custom_txt = "";
+                $subject = "";
 
 // We have to get the user's language in database
 // ----------------------------------------------
-  $query ='
+  $query = '
 SELECT user_id, language
 FROM '.USER_INFOS_TABLE.'
@@ -1472 +1613 @@
   ));
 
-// Switching back to default language
-// ----------------------------------
-switch_lang_back();
+                // Switching back to default language
+                // ----------------------------------
+                switch_lang_back();
 }
 
@@ -1490 +1631 @@
   $conf_UAM = unserialize($conf['UserAdvManager']);
   
-        include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
-  
-        $custom_txt = "";
+                include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
+  
+                $custom_txt = "";
   $subject = "";
 
@@ -1544 +1685 @@
       $subject = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[46]))."\n\n";
     }
-    else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[46]))."\n\n"; 
+    else $subject = l10n(preg_replace($patterns, $replacements, $conf_UAM[46]))."\n\n";
   }
       
@@ -1557 +1698 @@
     $patterns[] = '#\[myurl\]#i';
     $replacements[] = get_gallery_home_url();
-
     if (function_exists('get_user_language_desc'))
     {
       $custom_txt = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[27]))."\n\n";
     }
-    else $custom_txt = l10n(preg_replace($patterns, $replacements, $conf_UAM[27]))."\n\n"; 
+    else $custom_txt = l10n(preg_replace($patterns, $replacements, $conf_UAM[27]))."\n\n";
   }
 
@@ -1578 +1718 @@
   ));
 
-// Switching back to default language
-// ----------------------------------
-switch_lang_back();
+                // Switching back to default language
+                // ----------------------------------
+                switch_lang_back();
 }
 
@@ -1595 +1735 @@
   {
     $id = generate_key(16);
-    $query = "
+    $query = '
 SELECT COUNT(*)
-  FROM ".USER_CONFIRM_MAIL_TABLE."
-WHERE id = '".$id."'
-;";
+  FROM '.USER_CONFIRM_MAIL_TABLE.'
+WHERE id = "'.$id.'"
+;';
     list($count) = pwg_db_fetch_row(pwg_query($query));
 
@@ -1627 +1767 @@
   if (isset($Confirm_Mail_ID))
   {
-    $query = "
+    $query = '
 SELECT status
-  FROM ".USER_INFOS_TABLE."
-WHERE user_id = '".$user_id."'
-;";
+  FROM '.USER_INFOS_TABLE.'
+WHERE user_id = '.$user_id.'
+;';
     list($status) = pwg_db_fetch_row(pwg_query($query));
     
-    $query = "
-INSERT INTO ".USER_CONFIRM_MAIL_TABLE."
+    $query = '
+INSERT INTO '.USER_CONFIRM_MAIL_TABLE.'
   (id, user_id, mail_address, status, date_check)
 VALUES
-  ('".$Confirm_Mail_ID."', '".$user_id."', '".$email."', '".$status."', null)
-;";
+  ("'.$Confirm_Mail_ID.'", '.$user_id.', "'.$email.'", "'.$status.'", null)
+;';
     pwg_query($query);
 
     // Delete user from all groups
     // ---------------------------
-    $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$user_id."'
+    $query = '
+DELETE FROM '.USER_GROUP_TABLE.'
+WHERE user_id = '.$user_id.'
   AND (
-    group_id = '".$conf_UAM[2]."'
+    group_id = '.$conf_UAM[2].'
   OR 
-    group_id = '".$conf_UAM[3]."'
+    group_id = '.$conf_UAM[3].'
   )
-;";
+;';
     pwg_query($query);
 
@@ -1659 +1799 @@
     if (!is_admin() and $conf_UAM[7] <> -1)
     {
-      $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET status = '".$conf_UAM[7]."'
-WHERE user_id = '".$user_id."'
-;";
+      $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET status = "'.$conf_UAM[7].'"
+WHERE user_id = '.$user_id.'
+;';
       pwg_query($query);
     }
@@ -1671 +1811 @@
     if (!is_admin() and $conf_UAM[2] <> -1)
     {
-      $query = "
-INSERT INTO ".USER_GROUP_TABLE."
+      $query = '
+INSERT INTO '.USER_GROUP_TABLE.'
   (user_id, group_id)
 VALUES
-  ('".$user_id."', '".$conf_UAM[2]."')
-;";
+  ('.$user_id.', '.$conf_UAM[2].')
+;';
       pwg_query($query);
     }
@@ -1684 +1824 @@
     if (!is_admin() and $conf_UAM[35] <> -1)
     {
-      $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET level = '".$conf_UAM[35]."'
-WHERE user_id = '".$user_id."'
-;";
+      $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET level = "'.$conf_UAM[35].'"
+WHERE user_id = '.$user_id.'
+;';
       pwg_query($query);
     }
+    
+    // Set UAM_validated field to false in #_users table
+    // -------------------------------------------------
+    SetUnvalidated($user_id);
     
     return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID.'&userid='.$user_id;
@@ -1712 +1856 @@
 // Groups cleanup
 // --------------
-  $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$user_id."'
+  $query = '
+DELETE FROM '.USER_GROUP_TABLE.'
+WHERE user_id = '.$user_id.'
   AND (
-    group_id = '".$conf_UAM[2]."'
+    group_id = '.$conf_UAM[2].'
   OR 
-    group_id = '".$conf_UAM[3]."'
+    group_id = '.$conf_UAM[3].'
   )
-;";
+;';
   pwg_query($query);
 
   if (!is_admin() and $conf_UAM[7] <> -1) // Set status
   {
-    $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET status = '".$conf_UAM[7]."'
-WHERE user_id = '".$user_id."'
-;";
+    $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET status = "'.$conf_UAM[7].'"
+WHERE user_id = '.$user_id.'
+;';
     pwg_query($query);
   }
@@ -1735 +1879 @@
   if (!is_admin() and $conf_UAM[2] <> -1) // Set group
   {
-    $query = "
-INSERT INTO ".USER_GROUP_TABLE."
+    $query = '
+INSERT INTO '.USER_GROUP_TABLE.'
   (user_id, group_id)
 VALUES
-  ('".$user_id."', '".$conf_UAM[2]."')
-;";
+  ('.$user_id.', '.$conf_UAM[2].')
+;';
     pwg_query($query);
   }
@@ -1746 +1890 @@
   if (!is_admin() and $conf_UAM[35] <> -1) // Set privacy level
   {
-    $query = "
-INSERT INTO ".USER_INFOS_TABLE."
+    $query = '
+INSERT INTO '.USER_INFOS_TABLE.'
   (user_id, level)
 VALUES
-  ('".$user_id."', '".$conf_UAM[35]."')
-;";
+  ('.$user_id.', "'.$conf_UAM[35].'")
+;';
     pwg_query($query);
   }
@@ -1775 +1919 @@
   if (isset($Confirm_Mail_ID))
   { 
-    $query = "
-UPDATE ".USER_CONFIRM_MAIL_TABLE."
-SET id = '".$Confirm_Mail_ID."'
-WHERE user_id = '".$user_id."'
-;";
+    $query = '
+UPDATE '.USER_CONFIRM_MAIL_TABLE.'
+SET id = "'.$Confirm_Mail_ID.'"
+WHERE user_id = '.$user_id.'
+;';
     pwg_query($query);
 
-                $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET registration_date = '".$dbnow."'
-WHERE user_id = '".$user_id."'
-;";
-                pwg_query($query);
+                                $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET registration_date = "'.$dbnow.'"
+WHERE user_id = '.$user_id.'
+;';
+                                pwg_query($query);
     
     return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID.'&userid='.$user_id;
@@ -1806 +1950 @@
   list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
 
-  $query = "
-UPDATE ".USER_LASTVISIT_TABLE."
-SET lastvisit = '".$dbnow."', reminder = 'true'
-WHERE user_id = '".$user_id."'
-;";
+  $query = '
+UPDATE '.USER_LASTVISIT_TABLE.'
+SET lastvisit = "'.$dbnow.'", reminder = "true"
+WHERE user_id = '.$user_id.'
+;';
   pwg_query($query);
 }
@@ -1821 +1965 @@
 function DeleteConfirmMail($user_id)
 {
-  $query = "
-DELETE FROM ".USER_CONFIRM_MAIL_TABLE."
-WHERE user_id = '".$user_id."'
-;";
+  $query = '
+DELETE FROM '.USER_CONFIRM_MAIL_TABLE.'
+WHERE user_id = '.$user_id.'
+;';
   pwg_query($query);
 }
@@ -1834 +1978 @@
 function DeleteLastVisit($user_id)
 {
-  $query = "
-DELETE FROM ".USER_LASTVISIT_TABLE."
-WHERE user_id = '".$user_id."'
-;";
+  $query = '
+DELETE FROM '.USER_LASTVISIT_TABLE.'
+WHERE user_id = '.$user_id.'
+;';
   pwg_query($query);
 }
@@ -1864 +2008 @@
   unset($values[array_search($user_id, $values)]);
      
-  $query = "
-UPDATE ".CONFIG_TABLE."
-SET value = \"".implode(',', $values)."\"
-WHERE param = 'UserAdvManager_Redir';";
+  $query = '
+UPDATE '.CONFIG_TABLE.'
+SET value = "'.implode(',', $values).'"
+WHERE param = "UserAdvManager_Redir";';
 
   pwg_query($query);
@@ -1892 +2036 @@
   $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
 
-  $query = "
+  $query = '
 SELECT COUNT(*)
-FROM ".USER_CONFIRM_MAIL_TABLE."
-WHERE id = '".$id."'
-;";
+FROM '.USER_CONFIRM_MAIL_TABLE.'
+WHERE id = "'.$id.'"
+;';
   list($count) = pwg_db_fetch_row(pwg_query($query));
 
   if ($count == 1)
   {
-    $query = "
+    $query = '
 SELECT user_id, status, date_check
-FROM ".USER_CONFIRM_MAIL_TABLE."
-WHERE id = '".$id."'
-;";
+FROM '.USER_CONFIRM_MAIL_TABLE.'
+WHERE id = "'.$id.'"
+;';
     $data = pwg_db_fetch_assoc(pwg_query($query));
 
     if (!empty($data) and isset($data['user_id']) and is_null($data['date_check']))
     {
-      $query = "
+      $query = '
 SELECT registration_date
-FROM ".USER_INFOS_TABLE."
-WHERE user_id = '".$data['user_id']."'
-;";
+FROM '.USER_INFOS_TABLE.'
+WHERE user_id = '.$data['user_id'].'
+;';
       list($registration_date) = pwg_db_fetch_row(pwg_query($query));
 
@@ -1921 +2065 @@
       if (!empty($registration_date))
       {
-                                // Verify Confirmmail with time limit ON
-        // -------------------------------------
-                                if (isset ($conf_UAM_ConfirmMail[1]))
-                                {
-                                        // Dates formating and compare
-          // ---------------------------
-                                        $today = date("d-m-Y"); // Get today's date
-                                        list($day, $month, $year) = explode('-', $today); // explode date of today                                               
-                                        $daytimestamp = mktime(0, 0, 0, $month, $day, $year);// Generate UNIX timestamp
-                        
-                                list($regdate, $regtime) = explode(' ', $registration_date); // Explode date and time from registration date
-                                        list($regyear, $regmonth, $regday) = explode('-', $regdate); // Explode date from registration date
-                                        $regtimestamp = mktime(0, 0, 0, $regmonth, $regday, $regyear);// Generate UNIX timestamp
-                        
-                                        $deltasecs = $daytimestamp - $regtimestamp;// Compare the 2 UNIX timestamps     
-                                        $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
-
-                                        // Condition with the value set for time limit
-          // -------------------------------------------
-                                        if ($deltadays <= $conf_UAM_ConfirmMail[1]) // If Nb of days is less than the limit set
-                                        {
-                                                list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
-
-            // Update ConfirmMail table
-            // ------------------------
-                                                $query = '
+                                                                // Verify Confirmmail with time limit ON
+                                // -------------------------------------
+                                                                if (isset ($conf_UAM_ConfirmMail[1]))
+                                                                {
+                                                                                // Dates formating and compare
+                                        // ---------------------------
+                                                                                $today = date("d-m-Y"); // Get today's date
+                                                                                list($day, $month, $year) = explode('-', $today); // explode date of today                                               
+                                                                        $daytimestamp = mktime(0, 0, 0, $month, $day, $year);// Generate UNIX timestamp
+
+                                                                list($regdate, $regtime) = explode(' ', $registration_date); // Explode date and time from registration date
+                                                                                list($regyear, $regmonth, $regday) = explode('-', $regdate); // Explode date from registration date
+                                                                                $regtimestamp = mktime(0, 0, 0, $regmonth, $regday, $regyear);// Generate UNIX timestamp
+
+                                                                                $deltasecs = $daytimestamp - $regtimestamp;// Compare the 2 UNIX timestamps     
+                                                                                $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
+
+                                                                                // Condition with the value set for time limit
+                                        // -------------------------------------------
+                                                                                if ($deltadays <= $conf_UAM_ConfirmMail[1]) // If Nb of days is less than the limit set
+                                                                                {
+                                                                                                list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
+
+                                        // Update ConfirmMail table
+                                        // ------------------------
+                                                                                                $query = '
 UPDATE '.USER_CONFIRM_MAIL_TABLE.'
 SET date_check="'.$dbnow.'", reminder="false"
 WHERE id = "'.$id.'"
 ;';
-                                                pwg_query($query);
-
-            // Update LastVisit table - Force reminder field to false
-            // Usefull when a user has been automatically downgraded and revalidate its registration
-            // -------------------------------------------------------------------------------------
-                                                $query = '
+                                                                                                pwg_query($query);
+
+                                        // Update LastVisit table - Force reminder field to false
+                                        // Usefull when a user has been automatically downgraded and revalidate its registration
+                                        // -------------------------------------------------------------------------------------
+                                                                                                $query = '
 UPDATE '.USER_LASTVISIT_TABLE.'
 SET reminder="false"
 WHERE user_id = "'.$data['user_id'].'"
 ;';
-                                                pwg_query($query);
+                                                                                                pwg_query($query);
       
-                                                if ($conf_UAM[2] <> -1) // Delete user from unvalidated users group
-                                                {
-                                                        $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$data['user_id']."'
-  AND group_id = '".$conf_UAM[2]."'
-;";
-                                                        pwg_query($query);
-                                                }
-            
-                                                if ($conf_UAM[3] <> -1) // Add user to validated users group 
-                                                {
-                                                        $query = "
-INSERT INTO ".USER_GROUP_TABLE."
+                                                                                                if ($conf_UAM[2] <> -1) // Delete user from unvalidated users group
+                                                                                                {
+                                                                                                                $query = '
+DELETE FROM '.USER_GROUP_TABLE.'
+WHERE user_id = '.$data['user_id'].'
+  AND group_id = '.$conf_UAM[2].'
+;';
+                                                                                                                pwg_query($query);
+                                                                                                }
+
+                                                                                                if ($conf_UAM[3] <> -1) // Add user to validated users group 
+                                                                                                {
+                                                                                                                $query = '
+INSERT INTO '.USER_GROUP_TABLE.'
   (user_id, group_id)
 VALUES
-  ('".$data['user_id']."', '".$conf_UAM[3]."')
-;";
-                                                        pwg_query($query);
-                                                }
-
-                                                if (($conf_UAM[4] <> -1 or isset($data['status']))) // Change user's status
-                                                {
-                                                        $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET status = '".(isset($data['status']) ? $data['status'] : $conf_UAM[4])."'
-WHERE user_id = '".$data['user_id']."'
-;";
-                                                        pwg_query($query);
-                                                }
-
-                                                if (($conf_UAM[36] <> -1 or isset($data['level']))) // Change user's privacy level
-                                                {
-                                                        $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET level = '".(isset($data['level']) ? $data['level'] : $conf_UAM[36])."'
-WHERE user_id = '".$data['user_id']."'
-;";
-                                                        pwg_query($query);
-                                                }
-
-                                                // Refresh user's category cache
-            // -----------------------------
-                                                invalidate_user_cache();
-  
-                                                return true;
-                                        }
-                                        elseif ($deltadays > $conf_UAM_ConfirmMail[1]) // If timelimit exeeds
-                                        {
-                                                return false;
-                                        }
-                                }
-                                // Verify Confirmmail with time limit OFF
-        // --------------------------------------
-                                else
-                                {
-                                        list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
-
-          // Update ConfirmMail table
-          // ------------------------
-                                        $query = '
+  ('.$data['user_id'].', '.$conf_UAM[3].')
+;';
+                                                                                                                pwg_query($query);
+                                                                                                }
+
+                                                                                                if ($conf_UAM[4] <> -1) // Change user's status
+                                                                                                {
+                                                                                                                $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET status = "'.$conf_UAM[4].'"
+WHERE user_id = '.$data['user_id'].'
+;';
+                                                                                                                pwg_query($query);
+                                                                                                }
+
+                                                                                                if ($conf_UAM[36] <> -1) // Change user's privacy level
+                                                                                                {
+                                                                                                                $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET level = "'.$conf_UAM[36].'"
+WHERE user_id = '.$data['user_id'].'
+;';
+                                                                                                                pwg_query($query);
+                                                                                                }
+
+                                                                                                // Set UAM_validated field to True in #_users table
+                                                                                                $query = '
+UPDATE '.USERS_TABLE.'
+SET UAM_validated = "true"
+WHERE id = '.$data['user_id'].'
+;';
+                                                                                                pwg_query($query);
+
+                                                                                                // Refresh user's category cache
+                                                // -----------------------------
+                                                                                                invalidate_user_cache();
+
+                                                                                                return true;
+                                                                                }
+                                                                                elseif ($deltadays > $conf_UAM_ConfirmMail[1]) // If timelimit exeeds
+                                                                                {
+                                                                                                return false;
+                                                                                }
+                                                                }
+                                                                // Verify Confirmmail with time limit OFF
+                                // --------------------------------------
+                                                                else
+                                                                {
+                                                                                list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
+
+                                // Update ConfirmMail table
+                                // ------------------------
+                                                                                $query = '
 UPDATE '.USER_CONFIRM_MAIL_TABLE.'
 SET date_check="'.$dbnow.'"
 WHERE id = "'.$id.'"
 ;';
-                                        pwg_query($query);
-
-          // Update LastVisit table - Force reminder field to false
-          // Usefull when a user has been automatically downgraded and revalidate its registration
-          // -------------------------------------------------------------------------------------
-                                        $query = '
+                                                                                pwg_query($query);
+
+                                // Update LastVisit table - Force reminder field to false
+                                // Usefull when a user has been automatically downgraded and revalidate its registration
+                                // -------------------------------------------------------------------------------------
+                                                                                $query = '
 UPDATE '.USER_LASTVISIT_TABLE.'
 SET reminder="false"
 WHERE user_id = "'.$data['user_id'].'"
 ;';
-          pwg_query($query);
-      
-                                        if ($conf_UAM[2] <> -1) // Delete user from unvalidated users group
-                                        {
-                                                $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$data['user_id']."'
-AND group_id = '".$conf_UAM[2]."'
-;";
-                                                pwg_query($query);
-                                        }
-    
-                                        if ($conf_UAM[3] <> -1)
-                                        {
-                                                $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$data['user_id']."'
-AND group_id = '".$conf_UAM[3]."'
-;";
-                                                pwg_query($query);
-
-                                                $query = "
-INSERT INTO ".USER_GROUP_TABLE."
+                                pwg_query($query);
+
+                                                                                if ($conf_UAM[2] <> -1) // Delete user from unvalidated users group
+                                                                                {
+                                                                                                $query = '
+DELETE FROM '.USER_GROUP_TABLE.'
+WHERE user_id = '.$data['user_id'].'
+AND group_id = '.$conf_UAM[2].'
+;';
+                                                                                                pwg_query($query);
+                                                                                }
+
+                                                                                if ($conf_UAM[3] <> -1)
+                                                                                {
+                                                                                                $query = '
+DELETE FROM '.USER_GROUP_TABLE.'
+WHERE user_id = '.$data['user_id'].'
+AND group_id = '.$conf_UAM[3].'
+;';
+                                                                                                pwg_query($query);
+
+                                                                                                $query = '
+INSERT INTO '.USER_GROUP_TABLE.'
   (user_id, group_id)
 VALUES
-  ('".$data['user_id']."', '".$conf_UAM[3]."')
-;";
-                                                pwg_query($query);
-                                        }
-
-                                        if (($conf_UAM[4] <> -1 or isset($data['status']))) // Change user's status
-                                        {
-                                                $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET status = '".(isset($data['status']) ? $data['status'] : $conf_UAM[4])."'
-WHERE user_id = '".$data['user_id']."'
-;";
-                                                pwg_query($query);
-                                        }
-
-                                        if (($conf_UAM[36] <> -1 or isset($data['level']))) // Change user's privacy level
-                                        {
-                                                $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET level = '".(isset($data['level']) ? $data['level'] : $conf_UAM[36])."'
-WHERE user_id = '".$data['user_id']."'
-;";
-                                                pwg_query($query);
-                                        }
-
-                                        // Refresh user's category cache
-          // -----------------------------
-                                        invalidate_user_cache();
-  
-                                        return true;
+  ('.$data['user_id'].', '.$conf_UAM[3].')
+;';
+                                                                                                pwg_query($query);
+                                                                                }
+
+                                                                                if ($conf_UAM[4] <> -1) // Change user's status
+                                                                                {
+                                                                                                $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET status = "'.$conf_UAM[4].'"
+WHERE user_id = '.$data['user_id'].'
+;';
+                                                                                                pwg_query($query);
+                                                                                }
+
+                                                                                if ($conf_UAM[36] <> -1) // Change user's privacy level
+                                                                                {
+                                                                                                $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET level = "'.$conf_UAM[36].'"
+WHERE user_id = '.$data['user_id'].'
+;';
+                                                                                                pwg_query($query);
+                                                                                }
+
+                                                                                // Set UAM_validated field to True in #_users table
+                                                                                $query = '
+UPDATE '.USERS_TABLE.'
+SET UAM_validated = "true"
+WHERE id = '.$data['user_id'].'
+;';
+                                                                                pwg_query($query);
+
+                                                                                // Refresh user's category cache
+                                // -----------------------------
+                                                                                invalidate_user_cache();
+
+                                                                                return true;
+                                                                }
+                                                }
                                 }
-                        }
+    else if (!empty($data) and !is_null($data['date_check']))
+    {
+      return false;
+    }
                 }
-    else if (!empty($data) and !is_null($data['date_check']))
-    {
-      return false;
-    }
-        }
   else
     return false;
@@ -2107 +2267 @@
 
 /**
- * Function called from UAM_admin.php to force users validation by admin
+ * Function called from UAM_admin.php for manual validation by admin
  *
  * @param : User id
  * 
  */
-function ForceValidation($id)
-{
-  global $conf;
-
-  $conf_UAM = unserialize($conf['UserAdvManager']);
-
-  if (isset($conf_UAM[1]) and $conf_UAM[1] == 'true')
-  {
-    list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
-
-                $query = "
-UPDATE ".USER_CONFIRM_MAIL_TABLE."
-SET date_check='".$dbnow."'
-WHERE user_id = '".$id."'
-;";
-    pwg_query($query);
-             
-                if ($conf_UAM[2] <> -1)
+function ManualValidation($id)
+{
+                global $conf;
+
+                $conf_UAM = unserialize($conf['UserAdvManager']);
+
+                if (isset($conf_UAM[1]) and $conf_UAM[1] == 'true') // Set date of validation
                 {
-                        $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$id."'
-  AND group_id = '".$conf_UAM[2]."'
-;";
-                        pwg_query($query);
+                                list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
+
+                                $query = '
+UPDATE '.USER_CONFIRM_MAIL_TABLE.'
+SET date_check="'.$dbnow.'"
+WHERE user_id = '.$id.'
+;';
+                                pwg_query($query);
                 }
-  
-                if ($conf_UAM[3] <> -1) // Change user's group
+
+                if ($conf_UAM[2] <> -1) // Delete user from waiting group
                 {
-                        $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$id."'
-  AND group_id = '".$conf_UAM[3]."'
-;";
-      pwg_query($query);
+                                $query = '
+DELETE FROM '.USER_GROUP_TABLE.'
+WHERE user_id = '.$id.'
+                AND group_id = '.$conf_UAM[2].'
+;';
+                                pwg_query($query);
+                }
+  
+                if ($conf_UAM[3] <> -1) // Set user's valid group
+                {
+                                $query = '
+DELETE FROM '.USER_GROUP_TABLE.'
+WHERE user_id = '.$id.'
+                AND group_id = '.$conf_UAM[3].'
+;';
+                                pwg_query($query);
         
-                        $query = "
-INSERT INTO ".USER_GROUP_TABLE."
-  (user_id, group_id)
+                                $query = '
+INSERT INTO '.USER_GROUP_TABLE.'
+                (user_id, group_id)
 VALUES
-  ('".$id."', '".$conf_UAM[3]."')
-;";
-                        pwg_query($query);
-    }
-
-                if ($conf_UAM[4] <> -1) // Change user's status
+                ('.$id.', '.$conf_UAM[3].')
+;';
+                                pwg_query($query);
+                }
+
+                if ($conf_UAM[4] <> -1) // Set user's valid status
                 {
-                        $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET status = '".$conf_UAM[4]."'
-WHERE user_id = '".$id."'
-;";
-                        pwg_query($query);
+                                $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET status = "'.$conf_UAM[4].'"
+WHERE user_id = '.$id.'
+;';
+                                pwg_query($query);
                 }
 
-                if ($conf_UAM[36] <> -1) // Change user's privacy level
+                if ($conf_UAM[36] <> -1) // Set user's valid privacy level
                 {
-                        $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET level = '".$conf_UAM[36]."'
-WHERE user_id = '".$id."'
-;";
-                        pwg_query($query);
+                                $query = '
+UPDATE '.USER_INFOS_TABLE.'
+SET level = "'.$conf_UAM[36].'"
+WHERE user_id = '.$id.'
+;';
+                                pwg_query($query);
                 }
-  }
-  elseif (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')
-  {
-    list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
-
-    if ($conf_UAM[2] <> -1) // Delete user's from waiting group
-    {
-                  $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$id."'
-  AND group_id = '".$conf_UAM[2]."'
-;";
-                  pwg_query($query);
-    }
-
-    if ($conf_UAM[3] <> -1) // Change user's group
-    {
-      $query = "
-DELETE FROM ".USER_GROUP_TABLE."
-WHERE user_id = '".$id."'
-  AND group_id = '".$conf_UAM[3]."'
-;";
-      pwg_query($query);
-        
-                  $query = "
-INSERT INTO ".USER_GROUP_TABLE."
-  (user_id, group_id)
-VALUES
-  ('".$id."', '".$conf_UAM[3]."')
-;";
-                  pwg_query($query);
-    }
-
-    if ($conf_UAM[4] <> -1) // Change user's status
-    {
-                  $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET status = '".$conf_UAM[4]."'
-WHERE user_id = '".$id."'
-;";
-      pwg_query($query);
-    }
-
-    if ($conf_UAM[36] <> -1) // Change user's privacy level
-    {
-                  $query = "
-UPDATE ".USER_INFOS_TABLE."
-SET level = '".$conf_UAM[36]."'
-WHERE user_id = '".$id."'
-;";
-      pwg_query($query);
-    }
-  }
-}
-
-
-/**
- * Function called from functions.inc.php - Check if username matches forbidden caracters
+
+                // Set UAM_validated field to True in #_users table
+                $query = '
+UPDATE '.USERS_TABLE.'
+SET UAM_validated = "true"
+WHERE id = '.$id.'
+;';
+                pwg_query($query);
+}
+
+
+/**
+ * Function called from functions.inc.php - Check if username matches forbidden characters
  *
  * @param : User login
@@ -2251 +2367 @@
     for ($i = 0 ; $i < count($conf_CharExclusion) ; $i++)
     {
-      $pattern = '/'.$conf_CharExclusion[$i].'/i';
+      //Detect meta-characters (# ! ^ $ ( ) [ ] { } ? + * . \ -) for special pattern
+      if ($conf_CharExclusion[$i] == "#"
+       or $conf_CharExclusion[$i] == "$"
+       or $conf_CharExclusion[$i] == "!"
+       or $conf_CharExclusion[$i] == "^"
+       or $conf_CharExclusion[$i] == "*"
+       or $conf_CharExclusion[$i] == "?"
+       or $conf_CharExclusion[$i] == "+"
+       or $conf_CharExclusion[$i] == "."
+       or $conf_CharExclusion[$i] == "\\"
+       or $conf_CharExclusion[$i] == "|"
+       or $conf_CharExclusion[$i] == "["
+       or $conf_CharExclusion[$i] == "]"
+       or $conf_CharExclusion[$i] == "("
+       or $conf_CharExclusion[$i] == ")"
+       or $conf_CharExclusion[$i] == "{"
+       or $conf_CharExclusion[$i] == "}"
+       or $conf_CharExclusion[$i] == "-")
+      {
+        $pattern = '/[][^$.\*+?(){}#|-]/i';
+      }
+      else
+      {
+        $pattern = '/'.$conf_CharExclusion[$i].'/i';
+      }
+
       if (preg_match($pattern, $login))
       {
@@ -2280 +2421 @@
   $conf_UAM = unserialize($conf['UserAdvManager']);
   
-        if (isset($email) and isset($conf_UAM[11]) and $conf_UAM[11] <> '')
-        {
-                $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[11]);
-                for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
+                if (isset($email) and isset($conf_UAM[11]) and $conf_UAM[11] <> '')
                 {
-                        $pattern = '/'.$conf_MailExclusion[$i].'/i';
-                        if (preg_match($pattern, $email))
-      {
-                        return true;
-      }
+                                $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[11]);
+                                for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
+                                {
+                                                $pattern = '/'.$conf_MailExclusion[$i].'/i';
+                                                if (preg_match($pattern, $email))
+      {
+                return true;
+      }
+                                }
                 }
-        }
   else
   {
@@ -2307 +2448 @@
 function get_unvalid_user_list()
 {
-        global $conf, $page;
+                global $conf, $page;
           
-        // Get ConfirmMail configuration
+                // Get ConfirmMail configuration
   // -----------------------------
   $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
@@ -2318 +2459 @@
   $users = array();
 
-        // Search users depending expiration date
+                // Search users depending expiration date
   // --------------------------------------
   $query = '
@@ -2335 +2476 @@
 WHERE u.'.$conf['user_fields']['id'].' >= 3
   AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail[1].'"
-  OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail[1].'")';
-
-        if ($conf_UAM[2] <> '-1' and $conf_UAM[7] == '-1')
-  {
-    $query.= '
-  AND ug.group_id = '.$conf_UAM[2];
-  }
-  if ($conf_UAM[2] == '-1' and $conf_UAM[7] <> '-1')
-  {
-    $query.= '
-  AND ui.status = \''.$conf_UAM[7]."'";
-  }
-  if ($conf_UAM[2] <> '-1' and $conf_UAM[7] <> '-1')
-  {
-    $query.= '
-  AND ug.group_id = \''.$conf_UAM[2]."'";
-  }
-  $query.= '
+  OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail[1].'")
+                AND u.UAM_validated = "false"
 ORDER BY ui.registration_date ASC
 ;';
 
-        $result = pwg_query($query);
+                $result = pwg_query($query);
       
   while ($row = pwg_db_fetch_assoc($result))
   {
-        $user = $row;
+                $user = $row;
     $user['groups'] = array();
 
     array_push($users, $user);
-        }
-
-        // Add groups list
+                }
+
+                // Add groups list
   // ---------------
   $user_ids = array();
   foreach ($users as $i => $user)
   {
-        $user_ids[$i] = $user['id'];
-        }
-        
-        $user_nums = array_flip($user_ids);
+                $user_ids[$i] = $user['id'];
+                }
+
+                $user_nums = array_flip($user_ids);
 
   if (count($user_ids) > 0)
   {
-        $query = '
+                $query = '
 SELECT user_id, group_id
   FROM '.USER_GROUP_TABLE.'
@@ -2384 +2509 @@
 ;';
         
-                $result = pwg_query($query);
+                                $result = pwg_query($query);
         
     while ($row = pwg_db_fetch_assoc($result))
     {
-        array_push(
-        $users[$user_nums[$row['user_id']]]['groups'],
+                array_push(
+                $users[$user_nums[$row['user_id']]]['groups'],
         $row['group_id']
-                        );
+                                                );
+                                }
                 }
-        }
-
-        return $users;
+
+                return $users;
 }
 
@@ -2408 +2533 @@
 function get_unvalid_user_autotasks()
 {
-        global $conf, $page;
+                global $conf, $page;
           
-        // Get ConfirmMail configuration
+                // Get ConfirmMail configuration
   // -----------------------------
   $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
@@ -2416 +2541 @@
   $users = array();
 
-        // search users depending expiration date
+                // search users depending expiration date
   // --------------------------------------
   $query = '
@@ -2428 +2553 @@
 ORDER BY ui.registration_date ASC;';
 
-        $result = pwg_query($query);
-      
+                $result = pwg_query($query);
+
   while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($users, $row);
-        }
-
-        return $users;
+                }
+
+                return $users;
 }
 
@@ -2447 +2572 @@
 function get_ghost_user_list()
 {
-        global $conf, $page;
+                global $conf, $page;
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
-  
+
   $users = array();
 
-        // Search users depending expiration date
+                // Search users depending expiration date
   // --------------------------------------
   $query = '
@@ -2467 +2592 @@
 ORDER BY lv.lastvisit ASC;';
 
-        $result = pwg_query($query);
+                $result = pwg_query($query);
       
   while ($row = pwg_db_fetch_assoc($result))
   {
-        $user = $row;
+                $user = $row;
     $user['groups'] = array();
 
     array_push($users, $user);
-        }
-
-        // Add groups list
+                }
+
+                // Add groups list
   // ---------------
   $user_ids = array();
@@ -2483 +2608 @@
   {
         $user_ids[$i] = $user['id'];
-        }
-
-        return $users;
+                }
+
+                return $users;
 }
 
@@ -2497 +2622 @@
 function get_ghosts_autotasks()
 {
-        global $conf, $page;
+                global $conf, $page;
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
@@ -2503 +2628 @@
   $users = array();
   
-        // Search users depending expiration date and reminder sent
+                // Search users depending expiration date and reminder sent
   // --------------------------------------------------------
   $query = '
@@ -2514 +2639 @@
 ORDER BY lv.lastvisit ASC;';
 
-        $result = pwg_query($query);
+                $result = pwg_query($query);
       
-  while ($row = pwg_db_fetch_assoc($result))
+                while ($row = pwg_db_fetch_assoc($result))
   {
     array_push($users, $row);
-        }
-  
-        return $users;
+                }
+  
+                return $users;
 }
 
@@ -2533 +2658 @@
 function get_user_list()
 {
-        global $conf, $page;
+                global $conf, $page;
   
   $users = array();
 
-        // Search users depending expiration date with exclusion of Adult_Content generic users
+                // Search users depending expiration date with exclusion of Adult_Content generic users
   // ------------------------------------------------------------------------------------
   $query = '
@@ -2553 +2678 @@
 ;';
 
-        $result = pwg_query($query);
+                $result = pwg_query($query);
       
   while ($row = pwg_db_fetch_assoc($result))
   {
-        $user = $row;
+                $user = $row;
     $user['groups'] = array();
 
     array_push($users, $user);
-        }
-
-        // Add groups list
+                }
+
+                // Add groups list
   // ---------------
   $user_ids = array();
   foreach ($users as $i => $user)
   {
-        $user_ids[$i] = $user['id'];
-        }
-
-        return $users;
+                        $user_ids[$i] = $user['id'];
+                }
+
+                return $users;
 }
 
@@ -2587 +2712 @@
         global $conf, $page;
           
-        // Get ConfirmMail configuration
+                // Get ConfirmMail configuration
   // -----------------------------
   $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
           
-        // Get UAM configuration
+                // Get UAM configuration
   // ---------------------
   $conf_UAM = unserialize($conf['UserAdvManager']);
         
-        $query = "
+                $query = '
 SELECT registration_date
-  FROM ".USER_INFOS_TABLE."
-WHERE user_id = '".$id."'
-;";
-        list($registration_date) = pwg_db_fetch_row(pwg_query($query));
+  FROM '.USER_INFOS_TABLE.'
+WHERE user_id = '.$id.'
+;';
+                list($registration_date) = pwg_db_fetch_row(pwg_query($query));
 
 //              Time limit process             
 // ********************************************  
-        if (!empty($registration_date))
-  {
-                // Dates formating and compare
-    // ---------------------------
-                $today = date("d-m-Y"); // Get today's date
-                list($day, $month, $year) = explode('-', $today); // explode date of today                                               
-                $daytimestamp = mktime(0, 0, 0, $month, $day, $year);// Generate UNIX timestamp
+                if (!empty($registration_date))
+  {
+                                // Dates formating and compare
+                // ---------------------------
+                                $today = date("d-m-Y"); // Get today's date
+                                list($day, $month, $year) = explode('-', $today); // explode date of today                                               
+                        $daytimestamp = mktime(0, 0, 0, $month, $day, $year);// Generate UNIX timestamp
                 
-          list($regdate, $regtime) = explode(' ', $registration_date); // Explode date and time from registration date
-                list($regyear, $regmonth, $regday) = explode('-', $regdate); // Explode date from registration date
-                $regtimestamp = mktime(0, 0, 0, $regmonth, $regday, $regyear);// Generate UNIX timestamp
+                list($regdate, $regtime) = explode(' ', $registration_date); // Explode date and time from registration date
+                                list($regyear, $regmonth, $regday) = explode('-', $regdate); // Explode date from registration date
+                                $regtimestamp = mktime(0, 0, 0, $regmonth, $regday, $regyear);// Generate UNIX timestamp
                         
-                $deltasecs = $daytimestamp - $regtimestamp;// Compare the 2 UNIX timestamps     
-                $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
-
-                // Condition with the value set for time limit
+                                $deltasecs = $daytimestamp - $regtimestamp;// Compare the 2 UNIX timestamps     
+                                $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
+
+                                // Condition with the value set for time limit
     // -------------------------------------------
-                if ($deltadays <= $conf_UAM_ConfirmMail[1]) // If Nb of days is less than the limit set
-                {
-                        return false;
+                                if ($deltadays <= $conf_UAM_ConfirmMail[1]) // If Nb of days is less than the limit set
+                                {
+                                                return false;
+                                }
+                                else
+                                {
+                                                return true;
+                                }
                 }
-                else
-                {
-                        return true;
-                }
-        }
 }
 
@@ -2642 +2767 @@
  * Thanx to MathieuGut from http://m-gut.developpez.com
  */
-function testpassword($password) // Le mot de passe passé en paramètre - $password given by user
-{
-
-  // Initialisation des variables - Variables initiation
-  // ---------------------------------------------------
+function testpassword($password) // $password given by user
+{
+
+  // Variables initiation
+  // --------------------
   $points = 0;
   $point_lowercase = 0;
@@ -2653 +2778 @@
   $point_characters = 0;
 
-  // On récupère la longueur du mot de passe - Getting password lengh
-  // ----------------------------------------------------------------
+  // Getting password lengh
+  // ----------------------
   $length = strlen($password);
-  
-  // On fait une boucle pour lire chaque lettre - Loop to read password characters
+
+  // Loop to read password characters
   for($i = 0; $i < $length; $i++)
   {
-    // On sélectionne une à une chaque lettre - Select each letters
-    // $i étant à 0 lors du premier passage de la boucle - $i is 0 at first turn
-    // -------------------------------------------------------------------------
+    // Select each letters
+    // $i is 0 at first turn
+    // ---------------------
     $letters = $password[$i];
 
     if ($letters>='a' && $letters<='z')
     {
-      // On ajoute 1 point pour une minuscule - Adding 1 point to score for a lowercase
-      // ------------------------------------------------------------------------------
-                  $points = $points + 1;
-
-                  // On rajoute le bonus pour une minuscule - Adding bonus points for lowercase
-      // --------------------------------------------------------------------------
+      // Adding 1 point to score for a lowercase
+      // ---------------------------------------
+                                $points = $points + 1;
+
+                                // Adding bonus points for lowercase
+      // ---------------------------------
                   $point_lowercase = 1;
     }
     else if ($letters>='A' && $letters <='Z')
     {
-      // On ajoute 2 points pour une majuscule - Adding 2 points to score for uppercase
-      // ------------------------------------------------------------------------------
+      // Adding 2 points to score for uppercase
+      // --------------------------------------
       $points = $points + 2;
                 
-      // On rajoute le bonus pour une majuscule - Adding bonus points for uppercase
-      // --------------------------------------------------------------------------
+      // Adding bonus points for uppercase
+      // ---------------------------------
       $point_uppercase = 2;
     }
     else if ($letters>='0' && $letters<='9')
     {
-      // On ajoute 3 points pour un chiffre - Adding 3 points to score for numbers
-      // -------------------------------------------------------------------------
+      // Adding 3 points to score for numbers
+      // ------------------------------------
       $points = $points + 3;
                 
-      // On rajoute le bonus pour un chiffre - Adding bonus points for numbers
-      // ---------------------------------------------------------------------
+      // Adding bonus points for numbers
+      // -------------------------------
       $point_numbers = 3;
     }
     else
     {
-      // On ajoute 5 points pour un caractère autre - Adding 5 points to score for special characters
-      // --------------------------------------------------------------------------------------------
+      // Adding 5 points to score for special characters
+      // -----------------------------------------------
       $points = $points + 5;
                 
-      // On rajoute le bonus pour un caractère autre - Adding bonus points for special characters
-      // ----------------------------------------------------------------------------------------
+      // Adding bonus points for special characters
+      // ------------------------------------------
       $point_characters = 5;
     }
   }
 
-  // Calcul du coefficient points/longueur - calculating the coefficient points/length
-  // ---------------------------------------------------------------------------------
+  // Calculating the coefficient points/length
+  // -----------------------------------------
   $step1 = $points / $length;
 
-  // Calcul du coefficient de la diversité des types de caractères... - Calculation of the diversity of character types...
-  // ---------------------------------------------------------------------------------------------------------------------
+  // Calculation of the diversity of character types...
+  // --------------------------------------------------
   $step2 = $point_lowercase + $point_uppercase + $point_numbers + $point_characters;
 
-  // Multiplication du coefficient de diversité avec celui de la longueur - Multiplying the coefficient of diversity with that of the length
-  // --------------------------------------------------------------------------------------------------------------------------------------------
+  // Multiplying the coefficient of diversity with that of the length
+  // ----------------------------------------------------------------
   $score = $step1 * $step2;
 
-  // Multiplication du resultat par la longueur de la chaine - Multiplying the result by the length of the string
-  // ------------------------------------------------------------------------------------------------------------
+  // Multiplying the result by the length of the string
+  // --------------------------------------------------
   $finalscore = $score * $length;
 
@@ -2799 +2924 @@
   global $conf;
 
-        // Get UAM configuration
-  // ---------------------
-  $conf_UAM = unserialize($conf['UserAdvManager']);
-
   $query = '
-SELECT group_id
-  FROM '.USER_GROUP_TABLE.'
-WHERE user_id = '.$user_id.'
-  AND group_id = '.$conf_UAM[2].'
-;';
-
-  $count = pwg_db_num_rows(pwg_query($query));
-  
-  if ($count == 0)
-  {
-    return true; // User is not in a "Waiting" group
-  }
-  else
-  {
-    return false; // User is still in a "Waiting" group
-  }
+SELECT UAM_validated
+FROM '.USERS_TABLE.'
+WHERE id='.$user_id.'
+;';
+
+  $result = pwg_db_fetch_assoc(pwg_query($query));
+
+  if($result['UAM_validated'] == 'true')
+  {
+    return true;
+  }
+  else return false;
+}
+
+
+/**
+ * SetUnvalidated
+ * Set UAM_validated field to false in #_users table
+ * 
+ **/
+function SetUnvalidated($user_id)
+{
+  $query ='
+UPDATE '.USERS_TABLE.'
+SET UAM_validated = "false"
+WHERE id = '.$user_id.'
+LIMIT 1
+;';
+
+  pwg_query($query);
 }
 
@@ -2921 +3056 @@
   $ListTables = array(USER_CONFIRM_MAIL_TABLE, USER_LASTVISIT_TABLE);
   $j=0;
-  
+
   while($j < count($ListTables))
   {
@@ -3230 +3365 @@
    fclose($fo) ;
 }
+
 ?>

extensions/UserAdvManager/branches/2.40/include/upgradedb.inc.php

@@ -137 +137 @@
   // Create missing table
   // --------------------
-  $query = "
-ALTER TABLE ".USER_CONFIRM_MAIL_TABLE."
-ADD reminder ENUM('true', 'false') NULL DEFAULT NULL
-;";
+  $query = '
+ALTER TABLE '.USER_CONFIRM_MAIL_TABLE.'
+ADD reminder ENUM("true", "false") NULL DEFAULT NULL
+;';
   
   pwg_query($query);
@@ -623 +623 @@
   conf_update_param('UserAdvManager', pwg_db_real_escape_string($update_conf));
 }
+
+
+/* upgrade from 2.40.x to 2.40.6 */
+/* ***************************** */
+function upgrade_2400_2406()
+{
+  global $conf;
+  $conf_UAM = unserialize($conf['UserAdvManager']);
+  
+  // Piwigo's native tables modifications for validation status - Add UAM_validated column
+  // -------------------------------------------------------------------------------------
+  $query = '
+SHOW COLUMNS FROM '.USERS_TABLE.'
+LIKE "UAM_validated"
+;';
+  
+  $result = pwg_query($query);
+
+  if(!pwg_db_fetch_row($result))
+  {
+    $q = '
+ALTER TABLE '.USERS_TABLE.'
+ADD UAM_validated enum("true","false") 
+;';
+    pwg_query($q);
+  }
+
+  // Fill UAM_validated column with correct information for registered and validated  users
+  // --------------------------------------------------------------------------------------
+                
+                // It goes for everybody registered in the gallery except for Guest and AC users (16 and 18)
+  $query = '
+SELECT DISTINCT u.id AS id, u.username AS username
+FROM '.USERS_TABLE.' AS u
+                INNER JOIN '.USER_INFOS_TABLE.' AS ui
+                                ON u.id = ui.user_id
+                LEFT JOIN '.USER_GROUP_TABLE.' AS ug
+                                ON u.id = ug.user_id
+WHERE u.id != 2
+                AND u.username != \'16\'
+                AND u.username != \'18\'';
+
+                if ($conf_UAM[3] <> '-1' and $conf_UAM[4] == '-1')
+                {
+                                $query.= '
+AND ug.group_id = '.$conf_UAM[3];
+                }
+                if ($conf_UAM[3] == '-1' and $conf_UAM[4] <> '-1')
+                {
+                                $query.= '
+AND ui.status = \''.$conf_UAM[4]."'";
+                }
+                if ($conf_UAM[3] <> '-1' and $conf_UAM[4] <> '-1')
+                {
+                                $query.= '
+AND ug.group_id = '.$conf_UAM[3];
+                }
+                $query.= ';';
+
+                $result = pwg_query($query);
+
+                while($row = mysql_fetch_array($result))
+                {
+                                $query = '
+UPDATE '.USERS_TABLE.'
+SET UAM_validated=true
+WHERE id = '.$row['id'].'
+;';
+                                pwg_query($query);
+                }
+
+                // It goes to Webmaster too
+                $query = '
+UPDATE '.USERS_TABLE.'
+SET UAM_validated=true
+WHERE id = 1
+;';
+                pwg_query($query);
+}
 ?>

extensions/UserAdvManager/branches/2.40/language/de_DE/plugin.lang.php

@@ -182 +182 @@
 
 // --------- Starting below: New or revised $lang ---- from version 2.15.4
-$lang['UAM_Force_Validation'] = 'Handbuch Validierung';
+$lang['UAM_Manual_Validation'] = 'Handbuch Validierung';
 $lang['UAM_Confirm_Mail_true'] = ' Aktivieren - Validation von Benutzer';
-$lang['UAM_Confirm_Mail_local'] = ' Aktivieren - Validation von admin (keine Validierung Key gesendet)';
+$lang['UAM_Confirm_Mail_local'] = ' Aktivieren - Validation von admin';
 // --------- End: New or revised $lang ---- from version 2.15.4
 

extensions/UserAdvManager/branches/2.40/language/el_GR/plugin.lang.php

@@ -25 +25 @@
 $lang['UAM_Confirm_Status'] = 'Κατάσταση<br>(αφήστε ------- να διατηρηθεί το προεπιλεγμένο του Piwigo)';
 $lang['UAM_Confirm_Mail_true'] = 'Ενεργοποίηση. Επιβεβαίωση από τον χρήστη';
-$lang['UAM_Confirm_Mail_local'] = 'Ενεργοποίηση. Επιβεβαίωση από admin (δεν στέλνετε κλειδί επιβεβαίωσης)';
+$lang['UAM_Confirm_Mail_local'] = 'Ενεργοποίηση. Επιβεβαίωση από admin';
 $lang['UAM_Confirm_Mail'] = 'Επιβεβαίωση της εγγραφής:';
 $lang['UAM_Confirm_Level'] = 'Επίπεδο προστασίας<br>(αφήστε------- να διατηρηθεί το προεπιλεγμένο του Piwigo)';
@@ -116 +116 @@
 $lang['UAM_GTAutoDel'] = 'Αυτόματη διαγραφή των λογαριασμών';
 $lang['UAM_GTAuto'] = 'Αυτόματη διαχείριση των ghosts users';
-$lang['UAM_Force_Validation'] = 'Χειροκίνητη επιβεβαίωση';
+$lang['UAM_Manual_Validation'] = 'Χειροκίνητη επιβεβαίωση';
 $lang['UAM_Expired_Status'] = '<b>Η Κατάσταση</b> για την εγγραφή του χρήστη έχει λήξει<br>';
 $lang['UAM_Expired_Level'] = '<b>Το επίπεδο προστασίας</b> για την εγγραφή του χρήστη έχει λήξει<br>';
@@ -336 +336 @@
 Παρακαλούμε, Επανενεργοποιήσατε την επιλογή του Piwigo "Η διεύθυνση email είναι υποχρεωτική για όλους τους χρήστες" για να είσαστε σε θέση στη συνέχεια να απενεργοποιήσετε την επιλογή του UAM "Αποκλεισμός τομέων email" αν είναι αυτό που θέλετε. <br><br>
 Σημείωση: Αυτό το μήνυμα θα εξαφανιστεί αφού έχετε κάνει την απαραίτητη διόρθωση και την επαναφόρτωση της σελίδας του διαχειριστή.<br><br>';
+$lang['UAM_Subject admin validation for %s'] = 'Η καταχώρηση των %s αναμένει επικύρωση';
+$lang['UAM_Manual_validation_needed_for %s'] = 'Ο χρήστης % καταχωρήθηκε και περιμένει χειροκίνητη επικύρωση από τον διαχειριστή';
 ?>

extensions/UserAdvManager/branches/2.40/language/en_UK/help.lang.php

@@ -219 +219 @@
 <br><br>
 <b>Table Sorting Function</b>: You can sort the data displayed by clicking on the column headers. Hold the SHIFT key to sort up to 4 simultaneous columns.';
-$lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or the administrator to manually activate the registration.<br><br>
-In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the &quot;Tracking confirmations&quot; tab.<br><br>
-In second case, <b><u>there is no confirmation key send by email!</u></b>. Visitors have to wait until an administrator confirm them himself in &quot;confirmation tracking&quot; tab. It\s recommanded to activate the Piwigo\'s option &quot;Email admins when a new user registers&quot; (see in Piwigo\'s configuration options) and to use the &quot;Information email to user&quot; to warn new registers to wait on their account activation.
+$lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or administrators to manually activate the registration.
+<br><br>
+In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the &quot;Tracking confirmations&quot; tab.
+<br><br>
+In second case, the validation link is send to the gallery administrators. Visitors have to wait until an administrator confirm them himself by using the validation link or in &quot;confirmation tracking&quot; tab.
 <br>
 <b style=&quot;color: red;&quot;>NB: Options &quot;Deadline for confirmation of registration limited&quot; and &quot;Remind unconfirmed users  &quot; have to be set to off when admin\'s manual confirmation is enabled.</b>

extensions/UserAdvManager/branches/2.40/language/en_UK/plugin.lang.php

@@ -14 +14 @@
 $lang['UAM_User: %s'] = 'User : %s';
 $lang['UAM_Password: %s'] = 'Password: %s';
-$lang['UAM_Link: %s'] = 'Please, click on this link to confirm your registration : %s';
+$lang['UAM_Link: %s'] = 'Please, click on this link to confirm the registration : %s';
 
 
@@ -155 +155 @@
 
 // --------- Starting below: New or revised $lang ---- from version 2.15.4
-$lang['UAM_Force_Validation'] = 'Manual confirmation';
+$lang['UAM_Manual_Validation'] = 'Manual confirmation';
 $lang['UAM_Confirm_Mail_true'] = ' Enable - Confirmation by user';
-$lang['UAM_Confirm_Mail_local'] = ' Enable - Confirmation by admin (no confirmation key sent)';
+$lang['UAM_Confirm_Mail_local'] = ' Enable - Confirmation by admin';
 // --------- End: New or revised $lang ---- from version 2.15.4
 
@@ -427 +427 @@
 Note: This message will disappear after you have made the necessary correction and reloaded the admin page.<br><br>';
 // --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.41.0
+$lang['UAM_Subject admin validation for %s'] = 'Registration of %s waits for validation';
+$lang['UAM_Manual_validation_needed_for %s'] = 'The user %s has registered and awaits for manual validation by an admin.';
+// --------- End: New or revised $lang ---- from version 2.41.0
 ?>

extensions/UserAdvManager/branches/2.40/language/es_ES/plugin.lang.php

@@ -215 +215 @@
 
 // --------- Starting below: New or revised $lang ---- from version 2.15.4
-$lang['UAM_Force_Validation'] = 'Validación manual';
+$lang['UAM_Manual_Validation'] = 'Validación manual';
 $lang['UAM_Confirm_Mail_true'] = ' Activar - La validación por el usuario';
-$lang['UAM_Confirm_Mail_local'] = ' Activar - La validación por el administrador (sin clave de validación enviado)';
+$lang['UAM_Confirm_Mail_local'] = ' Activar - La validación por el administrador';
 // --------- End: New or revised $lang ---- from version 2.15.4
 

extensions/UserAdvManager/branches/2.40/language/fr_FR/help.lang.php

@@ -249 +249 @@
 Dans le premier cas, le message envoyé comprend une partie fixe, avec le lien d\'activation généré à partir d\'une clef aléatoire (cette clé peut éventuellement être régénérée via l\'onglet "Suivi des confirmations"), et une partie personnalisable par un texte d\'accueil.
 <br><br>
-Dans le second cas, <b><u>il n\'y a pas d\'envoi de clé de confirmation par email</u></b>. Les visiteurs doivent patienter que l\'administrateur valide lui même leur inscription via l\'onglet &quot;Suivi des confirmations&quot;. Il est conseillé d\'activer la notification des administrateurs lors des inscriptions (voir la configuration des options de Piwigo) et d\'utiliser la fonction &quot;Email d\'information à l\'utilisateur&quot; pour avertir les nouveaux inscrits de la nécessité de patienter avant activation de leur compte.
+Dans le second cas, l\'email avec lien de validation est envoyé aux administrateurs de la galerie. Les visiteurs doivent patienter qu\'un administrateur valide lui même leur inscription soit par ce lien, soit par l\'onglet &quot;Suivi des confirmations&quot;.
 <br>
 <b style=&quot;color: red;&quot;>NB: Les options &quot;Limitation du délai de confirmation d\'inscription&quot; et &quot;Mail de rappel aux inscrits non confirmés&quot; doivent être désactivées lorsque la confirmation manuelle est active.</b>

extensions/UserAdvManager/branches/2.40/language/fr_FR/plugin.lang.php

@@ -14 +14 @@
 $lang['UAM_User: %s'] = 'Utilisateur : %s';
 $lang['UAM_Password: %s'] = 'Mot de passe: %s';
-$lang['UAM_Link: %s'] = 'Cliquez sur le lien suivant pour confirmer votre inscription : %s';
+$lang['UAM_Link: %s'] = 'Cliquez sur le lien suivant pour confirmer l\'inscription : %s';
 
 
@@ -167 +167 @@
 
 // --------- Starting below: New or revised $lang ---- from version 2.15.4
-$lang['UAM_Force_Validation'] = 'Confirmation manuelle';
+$lang['UAM_Manual_Validation'] = 'Confirmation manuelle';
 $lang['UAM_Confirm_Mail_true'] = ' Activer - Confirmation par le visiteur';
-$lang['UAM_Confirm_Mail_local'] = ' Activer - Confirmation par l\'administrateur (pas d\'envoi de clé de confirmation)';
+$lang['UAM_Confirm_Mail_local'] = ' Activer - Confirmation par l\'administrateur';
 // --------- End: New or revised $lang ---- from version 2.15.4
 
@@ -432 +432 @@
 Note : Ce message disparaitra après que vous ayez effectué la correction nécessaire et rechargé la page d\'administration.<br><br>';
 // --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7
+
+// --------- Starting below: New or revised $lang ---- from version 2.41.0
+$lang['UAM_Subject admin validation for %s'] = 'Inscription de %s à valider';
+$lang['UAM_Manual_validation_needed_for %s'] = 'L\'utilisateur %s s\'est inscrit et demande une validation manuelle par un administrateur.';
+// --------- End: New or revised $lang ---- from version 2.41.0
 ?>

extensions/UserAdvManager/branches/2.40/language/hu_HU/plugin.lang.php

@@ -176 +176 @@
 
 // --------- Starting below: New or revised $lang ---- from version 2.15.4
-$lang['UAM_Force_Validation'] = 'Kézi érvényesítés';
+$lang['UAM_Manual_Validation'] = 'Kézi érvényesítés';
 $lang['UAM_Confirm_Mail_true'] = ' Bekapcsolva - Érvényesítés a felhasználó által';
-$lang['UAM_Confirm_Mail_local'] = ' Bekapcsolva - Érvényesítés az adminisztrátor által (nincs érvényesítő kulcs küldés)';
+$lang['UAM_Confirm_Mail_local'] = ' Bekapcsolva - Érvényesítés az adminisztrátor által';
 // --------- End: New or revised $lang ---- from version 2.15.4
 

extensions/UserAdvManager/branches/2.40/language/it_IT/plugin.lang.php

@@ -175 +175 @@
 
 // --------- Starting below: New or revised $lang ---- from version 2.15.4
-$lang['UAM_Force_Validation'] = 'Conferma manuale';
+$lang['UAM_Manual_Validation'] = 'Conferma manuale';
 $lang['UAM_Confirm_Mail_true'] = ' Attivare - Validazione da parte dell\'utente';
-$lang['UAM_Confirm_Mail_local'] = ' Attivare - Validazione da parte di un amministratore (nessuna chiave di validazione inviata)';
+$lang['UAM_Confirm_Mail_local'] = ' Attivare - Validazione da parte di un amministratore';
 // --------- End: New or revised $lang ---- from version 2.15.4
 

extensions/UserAdvManager/branches/2.40/language/lv_LV/plugin.lang.php

@@ -213 +213 @@
 
 // --------- Starting below: New or revised $lang ---- from version 2.15.4
-$lang['UAM_Force_Validation'] = 'Manuālā apstiprināšana';
+$lang['UAM_Manual_Validation'] = 'Manuālā apstiprināšana';
 $lang['UAM_Confirm_Mail_true'] = ' Iespējot – Apstiprinājis lietotājs';
-$lang['UAM_Confirm_Mail_local'] = ' Iespējot – Apstiprinājis administrators (netika nosūtīta apstiprināšanas atslēga)';
+$lang['UAM_Confirm_Mail_local'] = ' Iespējot – Apstiprinājis administrators';
 // --------- End: New or revised $lang ---- from version 2.15.4
 

extensions/UserAdvManager/branches/2.40/main.inc.php

@@ -33 +33 @@
 add_event_handler('get_admin_plugin_menu_links', 'UAM_admin_menu');
 
-// Lastvisit table feed for Ghost Tracker
-// --------------------------------------
-add_event_handler('loc_begin_index', 'UAM_GhostTracker');
+// Features and controls on user connexion
+// ---------------------------------------
+add_event_handler('loc_begin_index', 'UAM_Init');
 
 // User creation
@@ -65 +65 @@
 // ----------------------------------------------------------------------------------------------------
 add_event_handler('init', 'UAM_InitPage');
+
+// Display messages about Login rejected, etc
+// ---------------------------
+add_event_handler('init','UAM_DisplayMsg');
+add_event_handler('identification','UAM_DisplayMsg');
 
 // PWG_Stuffs module

extensions/UserAdvManager/branches/2.40/maintain.inc.php

@@ -214 +214 @@
   }
 
+  // Piwigo's native tables modifications for validation status
+  // ----------------------------------------------------------
+  $query = '
+SHOW COLUMNS FROM '.USERS_TABLE.'
+LIKE "UAM_validated"
+;';
+  
+  $result = pwg_query($query);
+
+  if(!pwg_db_fetch_row($result))
+  {
+    $q = '
+ALTER TABLE '.USERS_TABLE.'
+ADD UAM_validated enum("true","false") 
+;';
+    pwg_query($q);
+  }
+
 /* *************************************************************************** */
 /* **************** END - Database actions and initialization **************** */
@@ -379 +397 @@
       upgrade_2300_2400();
     }
+
+    if (version_compare($conf['UserAdvManager_Version'], '2.40.6') < 0)
+    {
+    /* upgrade from version 2.40.x to 2.40.6 */
+    /* ************************************* */
+      upgrade_2400_2406();
+    }
   }
 
@@ -448 +473 @@
 ;';
   pwg_query($q);
+
+  $q = '
+ALTER TABLE '.USERS_TABLE.'
+DROP UAM_validated 
+;';
+  pwg_query($q);
 }
 ?>