Ignore:
Timestamp:
Dec 23, 2010, 7:13:31 PM (13 years ago)
Author:
Eric
Message:

bug 2066 first step fix : Add customized email text field - New LCAS configuration item.
Translation files updated
admin/template/global.tpl improved : Display of $confinsensitive_case_logon state should be to a more useful place now (no ?)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/LCAS/trunk/admin/LCAS_admin.php

    r8214 r8257  
    1414//ini_set('display_errors', true);
    1515
    16 //include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
    1716include_once(PHPWG_ROOT_PATH.'include/constants.php');
    1817include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     
    3433
    3534/* General configuration settings */
    36 
    37 /* Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them */
     35                $_POST['LCAS_MailText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['LCAS_MailText'])));
     36
    3837                $newconf_LCAS= array(
    3938      $_POST['LCAS_Case_Sensitive'],
    40       $_POST['LCAS_Accent_Sensitive']);
     39      $_POST['LCAS_Accent_Sensitive'],
     40      $_POST['LCAS_MailText']);
    4141
    4242    $conf['LoginCaseAccentsSensitivity'] = serialize($newconf_LCAS);
     
    5151                pwg_query($query);
    5252
    53                 array_push($page['infos'], l10n('LCAS_save_config'));
     53    // $conf['insensitive_case_logon'] have to be True for a full LCAS use
     54    if ($conf['insensitive_case_logon'])
     55    {
     56                  array_push($page['infos'], l10n('LCAS_save_config'));
     57    }
     58    else
     59    {
     60      array_push($page['infos'], l10n('LCAS_save_config'));
     61      array_push($page['errors'], l10n('LCAS_warning'));
     62    }
    5463  }
    5564
     
    133142                        );
    134143                }
    135     /* Plugin version inserted */
     144    /* Plugin version insert */
    136145    $template->assign(
    137146      array(
     
    165174                'LCAS_Case_Sensitive_FALSE'      => $conf_LCAS[0]=='false'         ? 'checked="checked"' : '' ,
    166175                'LCAS_Accent_Sensitive_TRUE'     => $conf_LCAS[1]=='true'          ? 'checked="checked"' : '' ,
    167                 'LCAS_Accent_Sensitive_FALSE'    => $conf_LCAS[1]=='false'         ? 'checked="checked"' : ''
     176                'LCAS_Accent_Sensitive_FALSE'    => $conf_LCAS[1]=='false'         ? 'checked="checked"' : '' ,
     177    'LCAS_MAILTEXT'                  => $conf_LCAS[2]
    168178    )
    169179  );
Note: See TracChangeset for help on using the changeset viewer.