Ignore:
Timestamp:
Feb 28, 2013, 10:47:05 PM (11 years ago)
Author:
Eric
Message:

Compliance with Piwigo 2.5
Bug 2764 fixed - Code refactory : Change config variables to assoc array and $_POST vars control before writing conf in database - Thx to flop25 for his advices ;-)
Update fr_FR

File:
1 edited

Legend:

Unmodified
Added
Removed

  • extensions/UserAdvManager/trunk/admin/UAM_admin.php

    r20591 r21075  
    179179    // Check if [Kdays] flag is used in a legal way (ConfirmMail Time out have to be set)
    180180    // ----------------------------------------------------------------------------------
    181     if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'false' and preg_match('#\[Kdays\]#i',$_POST['UAM_ConfirmMail_Text']) != 0)
     181    if (isset($conf_UAM_ConfirmMail['CONFIRMMAIL_TIMEOUT']) and $conf_UAM_ConfirmMail['CONFIRMMAIL_TIMEOUT'] == 'false' and preg_match('#\[Kdays\]#i',$_POST['UAM_ConfirmMail_Text']) != 0)
    182182    {
    183183      $UAM_Illegal_Flag_Error1 = true;
    … …  
    187187    // Save global UAM configuration
    188188    // -----------------------------
    189     $newconf_UAM = array(
    190       $_POST['UAM_Mail_Info'],
    191       $_POST['UAM_Confirm_Mail'],
    192       (isset($_POST['UAM_No_Confirm_Group'])?$_POST['UAM_No_Confirm_Group']:''),
    193       (isset($_POST['UAM_Validated_Group'])?$_POST['UAM_Validated_Group']:''),
    194       (isset($_POST['UAM_Validated_Status'])?$_POST['UAM_Validated_Status']:''),
    195       $_POST['UAM_Username_Char'],
    196       $_POST['UAM_Username_List'],
    197       (isset($_POST['UAM_No_Confirm_Status'])?$_POST['UAM_No_Confirm_Status']:''),
    198       $_POST['UAM_MailInfo_Text'],
    199       $_POST['UAM_ConfirmMail_Text'],
    200       $_POST['UAM_MailExclusion'],
    201       $_POST['UAM_MailExclusion_List'],
    202       $_POST['UAM_Password_Enforced'],
    203       $_POST['UAM_Password_Score'],
    204       $_POST['UAM_AdminPassword_Enforced'],
    205       $_POST['UAM_GhostUser_Tracker'],
    206       $_POST['UAM_GhostTracker_DayLimit'],
    207       $_POST['UAM_GhostTracker_ReminderText'],
    208       $_POST['UAM_Add_LastVisit_Column'],
    209       $_POST['UAM_Admin_ConfMail'],
    210       $_POST['UAM_RedirToProfile'],
    211       $_POST['UAM_GTAuto'],
    212       $_POST['UAM_GTAutoMail'],
    213       $_POST['UAM_GTAutoDelText'],
    214       $_POST['UAM_GTAutoMailText'],
    215       (isset($_POST['UAM_Downgrade_Group'])?$_POST['UAM_Downgrade_Group']:''),
    216       (isset($_POST['UAM_Downgrade_Status'])?$_POST['UAM_Downgrade_Status']:''),
    217       $_POST['UAM_AdminValidationMail_Text'],
    218       $_POST['UAM_CustomPasswRetr'],
    219       $_POST['UAM_CustomPasswRetr_Text'],
    220       $_POST['UAM_USRAuto'],
    221       $_POST['UAM_USRAutoDelText'],
    222       $_POST['UAM_USRAutoMail'],
    223       $_POST['UAM_Stuffs'],
    224       $_POST['UAM_HidePassw'],
    225       (isset($_POST['UAM_No_Valid_Level'])?$_POST['UAM_No_Valid_Level']:''),
    226       (isset($_POST['UAM_Valid_Level'])?$_POST['UAM_Valid_Level']:''),
    227       (isset($_POST['UAM_Downgrade_Level'])?$_POST['UAM_Downgrade_Level']:''),
    228       $_POST['UAM_PwdReset'],
    229       $_POST['UAM_RejectConnexion'],
    230       $_POST['UAM_CustomRejectConnexion_Text'],
    231       $_POST['UAM_ConfirmMail_Subject'],
    232       $_POST['UAM_ConfirmMail_Remail_Subject'],
    233       $_POST['UAM_InfoMail_Subject'],
    234       $_POST['UAM_GTAutoMail_Subject'],
    235       $_POST['UAM_GTReminder_Subject'],
    236       $_POST['UAM_AdminValidationMail_Subject'],
    237     );
     189    $newconf_UAM['MAIL_INFO'] = (isset($_POST['UAM_Mail_Info']) ? $_POST['UAM_Mail_Info'] : 'false');
     190    $newconf_UAM['CONFIRM_MAIL'] = (isset($_POST['UAM_Confirm_Mail']) ? $_POST['UAM_Confirm_Mail'] : 'false');
     191    $newconf_UAM['NO_CONFIRM_GROUP'] = (isset($_POST['UAM_No_Confirm_Group']) ? $_POST['UAM_No_Confirm_Group'] : '');
     192    $newconf_UAM['VALIDATED_GROUP'] = (isset($_POST['UAM_Validated_Group']) ? $_POST['UAM_Validated_Group'] : '');
     193    $newconf_UAM['VALIDATED_STATUS'] = (isset($_POST['UAM_Validated_Status'])?$_POST['UAM_Validated_Status'] : '');
     194    $newconf_UAM['USERNAME_CHAR'] = $_POST['UAM_Username_Char'];
     195    $newconf_UAM['USERNAME_CHAR_LIST'] = (isset($_POST['UAM_Username_List']) ? $_POST['UAM_Username_List'] : '');
     196    $newconf_UAM['NO_CONFIRM_STATUS'] = (isset($_POST['UAM_No_Confirm_Status']) ? $_POST['UAM_No_Confirm_Status'] : '');
     197    $newconf_UAM['MAILINFO_TEXT'] = (isset($_POST['UAM_MailInfo_Text']) ? $_POST['UAM_MailInfo_Text'] : l10n('UAM_Default_InfoMail_Txt'));
     198    $newconf_UAM['CONFIRMMAIL_TEXT'] = (isset($_POST['UAM_ConfirmMail_Text']) ? $_POST['UAM_ConfirmMail_Text'] : l10n('UAM_Default_ConfirmMail_Txt'));
     199    $newconf_UAM['MAILEXCLUSION'] = (isset($_POST['UAM_MailExclusion']) ? $_POST['UAM_MailExclusion'] : 'false');
     200    $newconf_UAM['MAILEXCLUSION_LIST'] = (isset($_POST['UAM_MailExclusion_List']) ? $_POST['UAM_MailExclusion_List'] : '');
     201    $newconf_UAM['PASSWORDENF'] = (isset($_POST['UAM_Password_Enforced']) ? $_POST['UAM_Password_Enforced'] : 'false');
     202    $newconf_UAM['PASSWORD_SCORE'] = (isset($_POST['UAM_Password_Score']) ? $_POST['UAM_Password_Score'] : '100');
     203    $newconf_UAM['ADMINPASSWENF'] = (isset($_POST['UAM_AdminPassword_Enforced']) ? $_POST['UAM_AdminPassword_Enforced'] : 'false');
     204    $newconf_UAM['GHOSTRACKER'] = (isset($_POST['UAM_GhostUser_Tracker']) ? $_POST['UAM_GhostUser_Tracker'] : 'false');
     205    $newconf_UAM['GHOSTRACKER_DAYLIMIT'] = (isset($_POST['UAM_GhostTracker_DayLimit']) ? $_POST['UAM_GhostTracker_DayLimit'] : '10');
     206    $newconf_UAM['GHOSTRACKER_REMINDERTEXT'] = (isset($_POST['UAM_GhostTracker_ReminderText']) ? $_POST['UAM_GhostTracker_ReminderText'] : l10n('UAM_Default_GhstReminder_Txt'));
     207    $newconf_UAM['ADDLASTVISIT'] = (isset($_POST['UAM_Add_LastVisit_Column']) ? $_POST['UAM_Add_LastVisit_Column'] : 'false');
     208    $newconf_UAM['ADMINCONFMAIL'] = (isset($_POST['UAM_Admin_ConfMail']) ? $_POST['UAM_Admin_ConfMail'] : 'false');
     209    $newconf_UAM['REDIRTOPROFILE'] = (isset($_POST['UAM_RedirToProfile']) ? $_POST['UAM_RedirToProfile'] : 'false');
     210    $newconf_UAM['GTAUTO'] = (isset($_POST['UAM_GTAuto']) ? $_POST['UAM_GTAuto'] : 'false');
     211    $newconf_UAM['GTAUTOMAIL'] = (isset($_POST['UAM_GTAutoMail']) ? $_POST['UAM_GTAutoMail'] : 'false');
     212    $newconf_UAM['GTAUTODEL'] = (isset($_POST['UAM_GTAutoDelText']) ? $_POST['UAM_GTAutoDelText'] : l10n('UAM_Default_GhstDeletion_Txt'));
     213    $newconf_UAM['GTAUTOMAILTEXT'] = (isset($_POST['UAM_GTAutoMailText']) ? $_POST['UAM_GTAutoMailText'] : l10n('UAM_Default_GhstDemotion_Txt'));
     214    $newconf_UAM['DOWNGRADE_GROUP'] = (isset($_POST['UAM_Downgrade_Group']) ? $_POST['UAM_Downgrade_Group'] : '');
     215    $newconf_UAM['DOWNGRADE_STATUS'] = (isset($_POST['UAM_Downgrade_Status']) ? $_POST['UAM_Downgrade_Status'] : '');
     216    $newconf_UAM['ADMINVALIDATIONMAIL'] = (isset($_POST['UAM_AdminValidationMail_Text']) ? $_POST['UAM_AdminValidationMail_Text'] : l10n('UAM_Default_AdminValidation_Txt'));
     217    $newconf_UAM['CUSTOMPASSWRETR'] = (isset($_POST['UAM_CustomPasswRetr']) ? $_POST['UAM_CustomPasswRetr'] : 'false');
     218    $newconf_UAM['CUSTOMPASSWRETR_TEXT'] = (isset($_POST['UAM_CustomPasswRetr_Text']) ? $_POST['UAM_CustomPasswRetr_Text'] : l10n('UAM_Default_PwdRequest_Txt'));
     219    $newconf_UAM['USRAUTO'] = (isset($_POST['UAM_USRAuto']) ? $_POST['UAM_USRAuto'] : 'false');
     220    $newconf_UAM['USRAUTODEL'] = (isset($_POST['UAM_USRAutoDelText']) ? $_POST['UAM_USRAutoDelText'] : l10n('UAM_Default_ValidationTimeout_Txt'));
     221    $newconf_UAM['USRAUTOMAIL'] = (isset($_POST['UAM_USRAutoMail']) ? $_POST['UAM_USRAutoMail'] : 'false');
     222    $newconf_UAM['STUFFS'] = (isset($_POST['UAM_Stuffs']) ? $_POST['UAM_Stuffs'] : 'false');
     223    $newconf_UAM['HIDEPASSW'] = (isset($_POST['UAM_HidePassw']) ? $_POST['UAM_HidePassw'] : 'false');
     224    $newconf_UAM['NO_VALID_LEVEL'] = (isset($_POST['UAM_No_Valid_Level']) ? $_POST['UAM_No_Valid_Level'] : '');
     225    $newconf_UAM['VALID_LEVEL'] = (isset($_POST['UAM_Valid_Level']) ? $_POST['UAM_Valid_Level'] : '');
     226    $newconf_UAM['DOWNGRADE_LEVEL'] = (isset($_POST['UAM_Downgrade_Level']) ? $_POST['UAM_Downgrade_Level'] : '');
     227    $newconf_UAM['PWDRESET'] = (isset($_POST['UAM_PwdReset']) ? $_POST['UAM_PwdReset'] : 'false');
     228    $newconf_UAM['REJECTCONNECT'] = (isset($_POST['UAM_RejectConnexion']) ? $_POST['UAM_RejectConnexion'] : 'false');
     229    $newconf_UAM['REJECTCONNECT_TEXT'] = (isset($_POST['UAM_CustomRejectConnexion_Text']) ? $_POST['UAM_CustomRejectConnexion_Text'] : l10n('UAM_Default_RejectConnexion_Txt'));
     230    $newconf_UAM['CONFIRMMAIL_SUBJECT'] = (isset($_POST['UAM_ConfirmMail_Subject']) ? $_POST['UAM_ConfirmMail_Subject'] : l10n('UAM_Default_ConfirmMail_Subject'));
     231    $newconf_UAM['CONFIRMMAIL_REMAIL_SUBJECT'] = (isset($_POST['UAM_ConfirmMail_Remail_Subject']) ? $_POST['UAM_ConfirmMail_Remail_Subject'] : l10n('UAM_Default_ConfirmMail_Remail_Subject'));
     232    $newconf_UAM['INFOMAIL_SUBJECT'] = (isset($_POST['UAM_InfoMail_Subject']) ? $_POST['UAM_InfoMail_Subject'] : l10n('UAM_Default_InfoMail_Subject'));
     233    $newconf_UAM['GTAUTOMAIL_SUBJECT'] = (isset($_POST['UAM_GTAutoMail_Subject']) ? $_POST['UAM_GTAutoMail_Subject'] : l10n('UAM_Default_GTAutoMail_Subject'));
     234    $newconf_UAM['GTREMINDER_SUBJECT'] = (isset($_POST['UAM_GTReminder_Subject']) ? $_POST['UAM_GTReminder_Subject'] : l10n('UAM_Default_GTReminder_Subject'));
     235    $newconf_UAM['ADMINVALIDATIONMAIL_SUBJECT'] = (isset($_POST['UAM_AdminValidationMail_Subject']) ? $_POST['UAM_AdminValidationMail_Subject'] : l10n('UAM_Default_AdminValidationMail_Subject'));
    238236
    239237    $conf['UserAdvManager'] = serialize($newconf_UAM);
    240238
    241     conf_update_param('UserAdvManager', pwg_db_real_escape_string($conf['UserAdvManager']));
     239    conf_update_param('UserAdvManager', pwg_db_real_escape_string($conf['UserAdvManager'])); 
    242240
    243241    // Email confirmation settings
    … …  
    253251    // Check if [Kdays] flag is used in a legal way (ConfirmMail Time out have to be set)
    254252    // ----------------------------------------------------------------------------------
    255     if (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'false' and preg_match('#\[Kdays\]#i',$_POST['UAM_ConfirmMail_ReMail_Txt1']) == 1)
     253    if (isset($conf_UAM_ConfirmMail['CONFIRMMAIL_TIMEOUT']) and $conf_UAM_ConfirmMail['CONFIRMMAIL_TIMEOUT'] == 'false' and preg_match('#\[Kdays\]#i',$_POST['UAM_ConfirmMail_ReMail_Txt1']) == 1)
    256254    {
    257255      $UAM_Illegal_Flag_Error2 = true;
    258256      array_push($page['errors'], l10n('UAM_Error_Using_illegal_flag'));
    259257    }
    260     elseif (isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0] == 'false' and preg_match('#\[Kdays\]#i',$_POST['UAM_ConfirmMail_ReMail_Txt2']) == 1)
     258    elseif (isset($conf_UAM_ConfirmMail['CONFIRMMAIL_TIMEOUT']) and $conf_UAM_ConfirmMail['CONFIRMMAIL_TIMEOUT'] == 'false' and preg_match('#\[Kdays\]#i',$_POST['UAM_ConfirmMail_ReMail_Txt2']) == 1)
    261259    {
    262260      $UAM_Illegal_Flag_Error3 = true;
    … …  
    266264    // Save ConfirmMail settings
    267265    // -------------------------
    268     $newconf_UAM_ConfirmMail = array (
    269       $_POST['UAM_ConfirmMail_TimeOut'],
    270       $_POST['UAM_ConfirmMail_Delay'],
    271       $_POST['UAM_ConfirmMail_ReMail_Txt1'],
    272       $_POST['UAM_ConfirmMail_Remail'],
    273       $_POST['UAM_ConfirmMail_ReMail_Txt2'],
    274       $_POST['UAM_ConfirmMail_Custom_Txt1'],
    275       $_POST['UAM_ConfirmMail_Custom_Txt2']
    276     );
     266    $newconf_UAM_ConfirmMail['CONFIRMMAIL_TIMEOUT'] = (isset($_POST['UAM_ConfirmMail_TimeOut']) ? $_POST['UAM_ConfirmMail_TimeOut'] : 'false');
     267    $newconf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'] = (isset($_POST['UAM_ConfirmMail_Delay']) ? $_POST['UAM_ConfirmMail_Delay'] : '5');
     268    $newconf_UAM_ConfirmMail['CONFIRMMAIL_REMAIL_TXT1'] = (isset($_POST['UAM_ConfirmMail_ReMail_Txt1']) ? $_POST['UAM_ConfirmMail_ReMail_Txt1'] : l10n('UAM_Default_CfmMail_Remail_Txt1'));
     269    $newconf_UAM_ConfirmMail['CONFIRMMAIL_REMAIL'] = (isset($_POST['UAM_ConfirmMail_Remail']) ? $_POST['UAM_ConfirmMail_Remail'] : 'false');
     270    $newconf_UAM_ConfirmMail['CONFIRMMAIL_REMAIL_TXT2'] = (isset($_POST['UAM_ConfirmMail_ReMail_Txt2']) ? $_POST['UAM_ConfirmMail_ReMail_Txt2'] : l10n('UAM_Default_CfmMail_Remail_Txt2'));
     271    $newconf_UAM_ConfirmMail['CONFIRMMAIL_CUSTOM_TXT1'] = (isset($_POST['UAM_ConfirmMail_Custom_Txt1']) ? $_POST['UAM_ConfirmMail_Custom_Txt1'] : l10n('UAM_Default_CfmMail_Custom_Txt1'));
     272    $newconf_UAM_ConfirmMail['CONFIRMMAIL_CUSTOM_TXT2'] = (isset($_POST['UAM_ConfirmMail_Custom_Txt2']) ? $_POST['UAM_ConfirmMail_Custom_Txt2'] : l10n('UAM_Default_CfmMail_Custom_Txt2'));
    277273
    278274    $conf['UserAdvManager_ConfirmMail'] = serialize($newconf_UAM_ConfirmMail);
    … …  
    363359    $groups[$row['id']] = $row['name'];
    364360    //configuration value for unvalidated users
    365     if (isset($conf_UAM[2]) and $conf_UAM[2] == $row['id'])
     361    if (isset($conf_UAM['NO_CONFIRM_GROUP']) and $conf_UAM['NO_CONFIRM_GROUP'] == $row['id'])
    366362    {
    367363      $No_Valid = $row['id'];
    368364    }
    369365    //configuration value for validated users
    370     if (isset($conf_UAM[3]) and $conf_UAM[3] == $row['id'])
     366    if (isset($conf_UAM['VALIDATED_GROUP']) and $conf_UAM['VALIDATED_GROUP'] == $row['id'])
    371367    {
    372368      $Valid = $row['id'];
    373369    }
    374370    //configuration value for downgrade users
    375     if (isset($conf_UAM[25]) and $conf_UAM[25] == $row['id'])
     371    if (isset($conf_UAM['DOWNGRADE_GROUP']) and $conf_UAM['DOWNGRADE_GROUP'] == $row['id'])
    376372    {
    377373      $Downgrade = $row['id'];
    … …  
    421417  {
    422418          $status_options[$status] = l10n('user_status_'.$status);
    423           if (isset($conf_UAM[7]) and $conf_UAM[7] == $status)
     419          if (isset($conf_UAM['NO_CONFIRM_STATUS']) and $conf_UAM['NO_CONFIRM_STATUS'] == $status)
    424420          {
    425421            $No_Valid_Status = $status;
    … …  
    442438  {
    443439    $status_options[$status] = l10n('user_status_'.$status);
    444     if (isset($conf_UAM[4]) and $conf_UAM[4] == $status)
     440    if (isset($conf_UAM['VALIDATED_STATUS']) and $conf_UAM['VALIDATED_STATUS'] == $status)
    445441    {
    446442      $Valid_Status = $status;
    … …  
    463459  {
    464460    $status_options[$status] = l10n('user_status_'.$status);
    465     if (isset($conf_UAM[26]) and $conf_UAM[26] == $status)
     461    if (isset($conf_UAM['DOWNGRADE_STATUS']) and $conf_UAM['DOWNGRADE_STATUS'] == $status)
    466462    {
    467463      $Downgrade_Status = $status;
    … …  
    492488  {
    493489    $level_options[$level] = l10n(sprintf('Level %d', $level));
    494     if (isset($conf_UAM[35]) and $conf_UAM[35] == $level)
     490    if (isset($conf_UAM['NO_VALID_LEVEL']) and $conf_UAM['NO_VALID_LEVEL'] == $level)
    495491    {
    496492      $No_Valid_Level = $level;
    … …  
    513509  {
    514510    $level_options[$level] = l10n(sprintf('Level %d', $level));
    515     if (isset($conf_UAM[36]) and $conf_UAM[36] == $level)
     511    if (isset($conf_UAM['VALID_LEVEL']) and $conf_UAM['VALID_LEVEL'] == $level)
    516512    {
    517513      $Valid_Level = $level;
    … …  
    534530  {
    535531    $level_options[$level] = l10n(sprintf('Level %d', $level));
    536     if (isset($conf_UAM[37]) and $conf_UAM[37] == $level)
     532    if (isset($conf_UAM['DOWNGRADE_LEVEL']) and $conf_UAM['DOWNGRADE_LEVEL'] == $level)
    537533    {
    538534      $Downgrade_Level = $level;
    … …  
    578574            'UAM_DUMP_DOWNLOAD'                 => $dump_download,
    579575            'UAM_THEME'                         => $UAM_theme,
    580                                                 'UAM_MAIL_INFO_TRUE'                => $conf_UAM[0]=='true' ? 'checked="checked"' : '' ,
    581                                                 'UAM_MAIL_INFO_FALSE'               => $conf_UAM[0]=='false' ? 'checked="checked"' : '' ,
    582                                                 'UAM_MAILINFO_TEXT'                 => $conf_UAM[8],
    583                                                 'UAM_USERNAME_CHAR_TRUE'            => $conf_UAM[5]=='true' ? 'checked="checked"' : '' ,
    584                                                 'UAM_USERNAME_CHAR_FALSE'           => $conf_UAM[5]=='false' ? 'checked="checked"' : '' ,
    585                                                 'UAM_USERNAME_CHAR_LIST'            => $conf_UAM[6],
    586                                                 'UAM_CONFIRM_MAIL_TRUE'             => $conf_UAM[1]=='true' ? 'checked="checked"' : '' ,
    587                                                 'UAM_CONFIRM_MAIL_FALSE'            => $conf_UAM[1]=='false' ? 'checked="checked"' : '' ,
    588             'UAM_CONFIRM_MAIL_LOCAL'            => $conf_UAM[1]=='local' ? 'checked="checked"' : '' ,
    589                                                 'UAM_CONFIRMMAIL_TEXT'              => $conf_UAM[9],
    590                                                 'UAM_No_Confirm_Group'              => $conf_UAM[2],
    591                                                 'UAM_Validated_Group'               => $conf_UAM[3],
    592                                                 'UAM_No_Confirm_Status'             => $conf_UAM[7],
    593                                                 'UAM_Validated_Status'              => $conf_UAM[4],
    594                                                 'UAM_MAILEXCLUSION_TRUE'            => $conf_UAM[10]=='true' ? 'checked="checked"' : '' ,
    595                                                 'UAM_MAILEXCLUSION_FALSE'           => $conf_UAM[10]=='false' ? 'checked="checked"' : '' ,
    596                                                 'UAM_MAILEXCLUSION_LIST'            => $conf_UAM[11],
    597                                                 'UAM_PASSWORDENF_TRUE'              => $conf_UAM[12]=='true' ? 'checked="checked"' : '' ,
    598                                                 'UAM_PASSWORDENF_FALSE'             => $conf_UAM[12]=='false' ? 'checked="checked"' : '' ,
    599                                                 'UAM_PASSWORD_SCORE'                => $conf_UAM[13],
    600             'UAM_ADMINPASSWENF_TRUE'            => $conf_UAM[14]=='true' ? 'checked="checked"' : '' ,
    601                                                 'UAM_ADMINPASSWENF_FALSE'           => $conf_UAM[14]=='false' ? 'checked="checked"' : '' ,
    602             'UAM_GHOSTRACKER_TRUE'              => $conf_UAM[15]=='true' ? 'checked="checked"' : '' ,
    603                                                 'UAM_GHOSTRACKER_FALSE'             => $conf_UAM[15]=='false' ? 'checked="checked"' : '' ,
    604             'UAM_GHOSTRACKER_DAYLIMIT'          => $conf_UAM[16],
    605             'UAM_GHOSTRACKER_REMINDERTEXT'      => $conf_UAM[17],
    606             'UAM_ADDLASTVISIT_TRUE'             => $conf_UAM[18]=='true' ? 'checked="checked"' : '' ,
    607             'UAM_ADDLASTVISIT_FALSE'            => $conf_UAM[18]=='false' ? 'checked="checked"' : '' ,
    608             'UAM_ADMINCONFMAIL_TRUE'            => $conf_UAM[19]=='true' ? 'checked="checked"' : '' ,
    609             'UAM_ADMINCONFMAIL_FALSE'           => $conf_UAM[19]=='false' ? 'checked="checked"' : '' ,
    610             'UAM_REDIRTOPROFILE_TRUE'           => $conf_UAM[20]=='true' ? 'checked="checked"' : '' ,
    611             'UAM_REDIRTOPROFILE_FALSE'          => $conf_UAM[20]=='false' ? 'checked="checked"' : '' ,
    612             'UAM_GTAUTO_TRUE'                   => $conf_UAM[21]=='true' ? 'checked="checked"' : '' ,
    613             'UAM_GTAUTO_FALSE'                  => $conf_UAM[21]=='false' ? 'checked="checked"' : '' ,
    614             'UAM_GTAUTOMAIL_TRUE'               => $conf_UAM[22]=='true' ? 'checked="checked"' : '' ,
    615             'UAM_GTAUTOMAIL_FALSE'              => $conf_UAM[22]=='false' ? 'checked="checked"' : '' ,
    616             'UAM_GTAUTODEL_TEXT'                => $conf_UAM[23],
    617             'UAM_GTAUTOMAILTEXT'                => $conf_UAM[24],
    618                                                 'UAM_Downgrade_Group'               => $conf_UAM[25],
    619                                                 'UAM_Downgrade_Status'              => $conf_UAM[26],
    620             'UAM_ADMINVALIDATIONMAIL_TEXT'      => $conf_UAM[27],
    621             'UAM_CUSTOMPASSWRETR_TRUE'          => $conf_UAM[28]=='true' ? 'checked="checked"' : '' ,
    622             'UAM_CUSTOMPASSWRETR_FALSE'         => $conf_UAM[28]=='false' ? 'checked="checked"' : '' ,
    623             'UAM_CUSTOMPASSWRETR_TEXT'          => $conf_UAM[29],
    624             'UAM_USRAUTO_TRUE'                  => $conf_UAM[30]=='true' ? 'checked="checked"' : '' ,
    625             'UAM_USRAUTO_FALSE'                 => $conf_UAM[30]=='false' ? 'checked="checked"' : '' ,
    626             'UAM_USRAUTODEL_TEXT'               => $conf_UAM[31],
    627             'UAM_USRAUTOMAIL_TRUE'              => $conf_UAM[32]=='true' ? 'checked="checked"' : '' ,
    628             'UAM_USRAUTOMAIL_FALSE'             => $conf_UAM[32]=='false' ? 'checked="checked"' : '' ,
    629             'UAM_STUFFS_TRUE'                   => $conf_UAM[33]=='true' ? 'checked="checked"' : '' ,
    630             'UAM_STUFFS_FALSE'                  => $conf_UAM[33]=='false' ? 'checked="checked"' : '' ,
    631             'UAM_HIDEPASSW_TRUE'                => $conf_UAM[34]=='true' ? 'checked="checked"' : '' ,
    632             'UAM_HIDEPASSW_FALSE'               => $conf_UAM[34]=='false' ? 'checked="checked"' : '' ,
    633                                                 'UAM_NO_VALID_LEVEL'                => $conf_UAM[35],
    634                                                 'UAM_VALID_LEVEL'                   => $conf_UAM[36],
    635             'UAM_DOWNGRADE_LEVEL'               => $conf_UAM[37],
    636             'UAM_PWDRESET_TRUE'                 => $conf_UAM[38]=='true' ? 'checked="checked"' : '' ,
    637             'UAM_PWDRESET_FALSE'                => $conf_UAM[38]=='false' ? 'checked="checked"' : '' ,
    638             'UAM_REJECTCONNECT_TRUE'            => $conf_UAM[39]=='true' ? 'checked="checked"' : '' ,
    639             'UAM_REJECTCONNECT_FALSE'           => $conf_UAM[39]=='false' ? 'checked="checked"' : '' ,
    640             'UAM_REJECTCONNECT_TEXT'            => $conf_UAM[40],
    641             'UAM_CONFIRMMAIL_SUBJECT'           => $conf_UAM[41],
    642             'UAM_CONFIRMMAIL_REMAIL_SUBJECT'    => $conf_UAM[42],
    643             'UAM_INFOMAIL_SUBJECT'              => $conf_UAM[43],
    644             'UAM_GTAUTOMAIL_SUBJECT'            => $conf_UAM[44],
    645             'UAM_GTREMINDER_SUBJECT'            => $conf_UAM[45],
    646             'UAM_ADMINVALIDATIONMAIL_SUBJECT'   => $conf_UAM[46],
     576                                                'UAM_MAIL_INFO_TRUE'                => $conf_UAM['MAIL_INFO']=='true' ? 'checked="checked"' : '' ,
     577                                                'UAM_MAIL_INFO_FALSE'               => $conf_UAM['MAIL_INFO']=='false' ? 'checked="checked"' : '' ,
     578                                                'UAM_MAILINFO_TEXT'                 => $conf_UAM['MAILINFO_TEXT'],
     579                                                'UAM_USERNAME_CHAR_TRUE'            => $conf_UAM['USERNAME_CHAR']=='true' ? 'checked="checked"' : '' ,
     580                                                'UAM_USERNAME_CHAR_FALSE'           => $conf_UAM['USERNAME_CHAR']=='false' ? 'checked="checked"' : '' ,
     581                                                'UAM_USERNAME_CHAR_LIST'            => $conf_UAM['USERNAME_CHAR_LIST'],
     582                                                'UAM_CONFIRM_MAIL_TRUE'             => $conf_UAM['CONFIRM_MAIL']=='true' ? 'checked="checked"' : '' ,
     583                                                'UAM_CONFIRM_MAIL_FALSE'            => $conf_UAM['CONFIRM_MAIL']=='false' ? 'checked="checked"' : '' ,
     584            'UAM_CONFIRM_MAIL_LOCAL'            => $conf_UAM['CONFIRM_MAIL']=='local' ? 'checked="checked"' : '' ,
     585                                                'UAM_CONFIRMMAIL_TEXT'              => $conf_UAM['CONFIRMMAIL_TEXT'],
     586                                                'UAM_No_Confirm_Group'              => $conf_UAM['NO_CONFIRM_GROUP'],
     587                                                'UAM_Validated_Group'               => $conf_UAM['VALIDATED_GROUP'],
     588                                                'UAM_No_Confirm_Status'             => $conf_UAM['NO_CONFIRM_STATUS'],
     589                                                'UAM_Validated_Status'              => $conf_UAM['VALIDATED_STATUS'],
     590                                                'UAM_MAILEXCLUSION_TRUE'            => $conf_UAM['MAILEXCLUSION']=='true' ? 'checked="checked"' : '' ,
     591                                                'UAM_MAILEXCLUSION_FALSE'           => $conf_UAM['MAILEXCLUSION']=='false' ? 'checked="checked"' : '' ,
     592                                                'UAM_MAILEXCLUSION_LIST'            => $conf_UAM['MAILEXCLUSION_LIST'],
     593                                                'UAM_PASSWORDENF_TRUE'              => $conf_UAM['PASSWORDENF']=='true' ? 'checked="checked"' : '' ,
     594                                                'UAM_PASSWORDENF_FALSE'             => $conf_UAM['PASSWORDENF']=='false' ? 'checked="checked"' : '' ,
     595                                                'UAM_PASSWORD_SCORE'                => $conf_UAM['PASSWORD_SCORE'],
     596            'UAM_ADMINPASSWENF_TRUE'            => $conf_UAM['ADMINPASSWENF']=='true' ? 'checked="checked"' : '' ,
     597                                                'UAM_ADMINPASSWENF_FALSE'           => $conf_UAM['ADMINPASSWENF']=='false' ? 'checked="checked"' : '' ,
     598            'UAM_GHOSTRACKER_TRUE'              => $conf_UAM['GHOSTRACKER']=='true' ? 'checked="checked"' : '' ,
     599                                                'UAM_GHOSTRACKER_FALSE'             => $conf_UAM['GHOSTRACKER']=='false' ? 'checked="checked"' : '' ,
     600            'UAM_GHOSTRACKER_DAYLIMIT'          => $conf_UAM['GHOSTRACKER_DAYLIMIT'],
     601            'UAM_GHOSTRACKER_REMINDERTEXT'      => $conf_UAM['GHOSTRACKER_REMINDERTEXT'],
     602            'UAM_ADDLASTVISIT_TRUE'             => $conf_UAM['ADDLASTVISIT']=='true' ? 'checked="checked"' : '' ,
     603            'UAM_ADDLASTVISIT_FALSE'            => $conf_UAM['ADDLASTVISIT']=='false' ? 'checked="checked"' : '' ,
     604            'UAM_ADMINCONFMAIL_TRUE'            => $conf_UAM['ADMINCONFMAIL']=='true' ? 'checked="checked"' : '' ,
     605            'UAM_ADMINCONFMAIL_FALSE'           => $conf_UAM['ADMINCONFMAIL']=='false' ? 'checked="checked"' : '' ,
     606            'UAM_REDIRTOPROFILE_TRUE'           => $conf_UAM['REDIRTOPROFILE']=='true' ? 'checked="checked"' : '' ,
     607            'UAM_REDIRTOPROFILE_FALSE'          => $conf_UAM['REDIRTOPROFILE']=='false' ? 'checked="checked"' : '' ,
     608            'UAM_GTAUTO_TRUE'                   => $conf_UAM['GTAUTO']=='true' ? 'checked="checked"' : '' ,
     609            'UAM_GTAUTO_FALSE'                  => $conf_UAM['GTAUTO']=='false' ? 'checked="checked"' : '' ,
     610            'UAM_GTAUTOMAIL_TRUE'               => $conf_UAM['GTAUTOMAIL']=='true' ? 'checked="checked"' : '' ,
     611            'UAM_GTAUTOMAIL_FALSE'              => $conf_UAM['GTAUTOMAIL']=='false' ? 'checked="checked"' : '' ,
     612            'UAM_GTAUTODEL_TEXT'                => $conf_UAM['GTAUTODEL'],
     613            'UAM_GTAUTOMAILTEXT'                => $conf_UAM['GTAUTOMAILTEXT'],
     614                                                'UAM_Downgrade_Group'               => $conf_UAM['DOWNGRADE_GROUP'],
     615                                                'UAM_Downgrade_Status'              => $conf_UAM['DOWNGRADE_STATUS'],
     616            'UAM_ADMINVALIDATIONMAIL_TEXT'      => $conf_UAM['ADMINVALIDATIONMAIL'],
     617            'UAM_CUSTOMPASSWRETR_TRUE'          => $conf_UAM['CUSTOMPASSWRETR']=='true' ? 'checked="checked"' : '' ,
     618            'UAM_CUSTOMPASSWRETR_FALSE'         => $conf_UAM['CUSTOMPASSWRETR']=='false' ? 'checked="checked"' : '' ,
     619            'UAM_CUSTOMPASSWRETR_TEXT'          => $conf_UAM['CUSTOMPASSWRETR_TEXT'],
     620            'UAM_USRAUTO_TRUE'                  => $conf_UAM['USRAUTO']=='true' ? 'checked="checked"' : '' ,
     621            'UAM_USRAUTO_FALSE'                 => $conf_UAM['USRAUTO']=='false' ? 'checked="checked"' : '' ,
     622            'UAM_USRAUTODEL_TEXT'               => $conf_UAM['USRAUTODEL'],
     623            'UAM_USRAUTOMAIL_TRUE'              => $conf_UAM['USRAUTOMAIL']=='true' ? 'checked="checked"' : '' ,
     624            'UAM_USRAUTOMAIL_FALSE'             => $conf_UAM['USRAUTOMAIL']=='false' ? 'checked="checked"' : '' ,
     625            'UAM_STUFFS_TRUE'                   => $conf_UAM['STUFFS']=='true' ? 'checked="checked"' : '' ,
     626            'UAM_STUFFS_FALSE'                  => $conf_UAM['STUFFS']=='false' ? 'checked="checked"' : '' ,
     627            'UAM_HIDEPASSW_TRUE'                => $conf_UAM['HIDEPASSW']=='true' ? 'checked="checked"' : '' ,
     628            'UAM_HIDEPASSW_FALSE'               => $conf_UAM['HIDEPASSW']=='false' ? 'checked="checked"' : '' ,
     629                                                'UAM_NO_VALID_LEVEL'                => $conf_UAM['NO_VALID_LEVEL'],
     630                                                'UAM_VALID_LEVEL'                   => $conf_UAM['VALID_LEVEL'],
     631            'UAM_DOWNGRADE_LEVEL'               => $conf_UAM['DOWNGRADE_LEVEL'],
     632            'UAM_PWDRESET_TRUE'                 => $conf_UAM['PWDRESET']=='true' ? 'checked="checked"' : '' ,
     633            'UAM_PWDRESET_FALSE'                => $conf_UAM['PWDRESET']=='false' ? 'checked="checked"' : '' ,
     634            'UAM_REJECTCONNECT_TRUE'            => $conf_UAM['REJECTCONNECT']=='true' ? 'checked="checked"' : '' ,
     635            'UAM_REJECTCONNECT_FALSE'           => $conf_UAM['REJECTCONNECT']=='false' ? 'checked="checked"' : '' ,
     636            'UAM_REJECTCONNECT_TEXT'            => $conf_UAM['REJECTCONNECT_TEXT'],
     637            'UAM_CONFIRMMAIL_SUBJECT'           => $conf_UAM['CONFIRMMAIL_SUBJECT'],
     638            'UAM_CONFIRMMAIL_REMAIL_SUBJECT'    => $conf_UAM['CONFIRMMAIL_REMAIL_SUBJECT'],
     639            'UAM_INFOMAIL_SUBJECT'              => $conf_UAM['INFOMAIL_SUBJECT'],
     640            'UAM_GTAUTOMAIL_SUBJECT'            => $conf_UAM['GTAUTOMAIL_SUBJECT'],
     641            'UAM_GTREMINDER_SUBJECT'            => $conf_UAM['GTREMINDER_SUBJECT'],
     642            'UAM_ADMINVALIDATIONMAIL_SUBJECT'   => $conf_UAM['ADMINVALIDATIONMAIL_SUBJECT'],
    647643                                                'UAM_PASSWORD_TEST_SCORE'           => $UAM_Password_Test_Score,
    648644            'UAM_ERROR_REPORTS1'                => $UAM_Exclusionlist_Error,
    … …  
    651647            'UAM_ERROR_REPORTS4'                => $UAM_Illegal_Flag_Error3,
    652648            'UAM_EMAIL_MANDATORY'               => $UAM_Email_Mandatory_Check,
    653                                                 'UAM_CONFIRMMAIL_TIMEOUT_TRUE'      => $conf_UAM_ConfirmMail[0]=='true' ? 'checked="checked"' : '' ,
    654                                                 'UAM_CONFIRMMAIL_TIMEOUT_FALSE'     => $conf_UAM_ConfirmMail[0]=='false' ? 'checked="checked"' : '' ,
    655                                                 'UAM_CONFIRMMAIL_DELAY'             => $conf_UAM_ConfirmMail[1],
    656             'UAM_CONFIRMMAIL_REMAIL_TRUE'       => $conf_UAM_ConfirmMail[3]=='true' ? 'checked="checked"' : '',
    657             'UAM_CONFIRMMAIL_REMAIL_FALSE'      => $conf_UAM_ConfirmMail[3]=='false' ? 'checked="checked"' : '',
    658             'UAM_CONFIRMMAIL_REMAIL_TXT1'       => $conf_UAM_ConfirmMail[2],
    659             'UAM_CONFIRMMAIL_REMAIL_TXT2'       => $conf_UAM_ConfirmMail[4],
    660             'UAM_CONFIRMMAIL_CUSTOM_TXT1'       => $conf_UAM_ConfirmMail[5],
    661             'UAM_CONFIRMMAIL_CUSTOM_TXT2'       => $conf_UAM_ConfirmMail[6],
     649                                                'UAM_CONFIRMMAIL_TIMEOUT_TRUE'      => $conf_UAM_ConfirmMail['CONFIRMMAIL_TIMEOUT']=='true' ? 'checked="checked"' : '' ,
     650                                                'UAM_CONFIRMMAIL_TIMEOUT_FALSE'     => $conf_UAM_ConfirmMail['CONFIRMMAIL_TIMEOUT']=='false' ? 'checked="checked"' : '' ,
     651                                                'UAM_CONFIRMMAIL_DELAY'             => $conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'],
     652            'UAM_CONFIRMMAIL_REMAIL_TRUE'       => $conf_UAM_ConfirmMail['CONFIRMMAIL_REMAIL']=='true' ? 'checked="checked"' : '',
     653            'UAM_CONFIRMMAIL_REMAIL_FALSE'      => $conf_UAM_ConfirmMail['CONFIRMMAIL_REMAIL']=='false' ? 'checked="checked"' : '',
     654            'UAM_CONFIRMMAIL_REMAIL_TXT1'       => $conf_UAM_ConfirmMail['CONFIRMMAIL_REMAIL_TXT1'],
     655            'UAM_CONFIRMMAIL_REMAIL_TXT2'       => $conf_UAM_ConfirmMail['CONFIRMMAIL_REMAIL_TXT2'],
     656            'UAM_CONFIRMMAIL_CUSTOM_TXT1'       => $conf_UAM_ConfirmMail['CONFIRMMAIL_CUSTOM_TXT1'],
     657            'UAM_CONFIRMMAIL_CUSTOM_TXT2'       => $conf_UAM_ConfirmMail['CONFIRMMAIL_CUSTOM_TXT2'],
    662658    )
    663659  );
    … …  
    669665    // Username without forbidden keys
    670666    // -------------------------------
    671     if ( isset($conf_UAM[5]) and $conf_UAM[5] == 'true' )
     667    if ( isset($conf_UAM['USERNAME_CHAR']) and $conf_UAM['USERNAME_CHAR'] == 'true' )
    672668          {
    673669      $query = '
    … …  
    689685    // Email without forbidden domain
    690686    // ------------------------------
    691     if ( isset($conf_UAM[10]) and $conf_UAM[10] == 'true' )
     687    if ( isset($conf_UAM['MAILEXCLUSION']) and $conf_UAM['MAILEXCLUSION'] == 'true' )
    692688    {
    693689      $query = '
    … …  
    700696      while($row = pwg_db_fetch_assoc($result))
    701697      {
    702         $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[11]);
     698        $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM['MAILEXCLUSION_LIST']);
    703699        for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
    704700        {
    … …  
    755751  $conf_UAM = unserialize($conf['UserAdvManager']);
    756752 
    757   if (isset($conf_UAM[18]) and $conf_UAM[18]=='true')
     753  if (isset($conf_UAM['ADDLASTVISIT']) and $conf_UAM['ADDLASTVISIT']=='true')
    758754  {
    759755// +-----------------------------------------------------------------------+
    … …  
    805801                $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
    806802 
    807         if (isset($conf_UAM[15]) and $conf_UAM[15]=='true' and !empty($conf_UAM[16]))
     803        if (isset($conf_UAM['GHOSTRACKER']) and $conf_UAM['GHOSTRACKER']=='true' and !empty($conf_UAM['GHOSTRACKER_DAYLIMIT']))
    808804                {
    809           if ($deltadays <= ($conf_UAM[16]/2))
     805          if ($deltadays <= ($conf_UAM['GHOSTRACKER_DAYLIMIT']/2))
    810806                {
    811807            $display = 'green';
    812808                }
    813809
    814           if (($deltadays > ($conf_UAM[16]/2)) and ($deltadays < $conf_UAM[16]))
     810          if (($deltadays > ($conf_UAM['GHOSTRACKER_DAYLIMIT']/2)) and ($deltadays < $conf_UAM['GHOSTRACKER_DAYLIMIT']))
    815811                {
    816812            $display = 'orange';
    817813                }
    818814
    819                 if ($deltadays >= $conf_UAM[16])
     815                if ($deltadays >= $conf_UAM['GHOSTRACKER_DAYLIMIT'])
    820816                {
    821817            $display = 'red';
    … …  
    885881  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
    886882       
    887   if (isset($conf_UAM[1]) and ($conf_UAM[1]=='true' or $conf_UAM[1]=='local'))
     883  if (isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL']=='true' or $conf_UAM['CONFIRM_MAIL']=='local'))
    888884  {
    889885// +-----------------------------------------------------------------------+
    … …  
    13511347    $Confirm_Local = "";
    13521348   
    1353     if ($conf_UAM[1] == 'local')
    1354     {
    1355       $Confirm_Local = $conf_UAM[1];
     1349    if ($conf_UAM['CONFIRM_MAIL'] == 'local')
     1350    {
     1351      $Confirm_Local = $conf_UAM['CONFIRM_MAIL'];
    13561352    }
    13571353    else
    … …  
    14041400  $conf_UAM = unserialize($conf['UserAdvManager']);
    14051401       
    1406   if (isset($conf_UAM[16]) and $conf_UAM[15]=='true')
     1402  if (isset($conf_UAM['GHOSTRACKER_DAYLIMIT']) and $conf_UAM['GHOSTRACKER']=='true')
    14071403  {
    14081404// +-----------------------------------------------------------------------+
Note: See TracChangeset for help on using the changeset viewer.