Changeset 5085


Ignore:
Timestamp:
Mar 8, 2010, 11:00:14 PM (11 years ago)
Author:
Eric
Message:

[NBC_UserAdvManager] Pre-2.14.0

  • Code and old language tags cleaning
Location:
extensions/NBC_UserAdvManager/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

    r5084 r5085  
    2727
    2828$UAM_Password_Test_Score = 0;
    29 $UAM_MailInfo_Error_Txt = false;
    30 $UAM_ConfirmMail_Error_Txt = false;
    31 $UAM_Reminder_Error_Txt = false;
    32 $UAM_ConfirmMail_Error_Txt1 = false;
    33 $UAM_ConfirmMail_Error_Txt2 = false;
    3429$UAM_Exclusionlist_Error = false;
    3530
     
    118113
    119114
    120 /* Control of semicolons - Replaced by dots - Warning message is displayed */   
    121 /*    if ((preg_match($pattern, $_POST['UAM_MailInfo_Text'])) or (preg_match($pattern, $_POST['UAM_GhostTracker_ReminderText'])) or (preg_match($pattern, $_POST['UAM_ConfirmMail_Text'])))
    122     {
    123       if (preg_match($pattern, $_POST['UAM_MailInfo_Text']))
    124       {
    125         $_POST['UAM_MailInfo_Text'] = preg_replace($pattern, $replacement, $_POST['UAM_MailInfo_Text']);
    126         $UAM_MailInfo_Error_Txt = true;
    127       }
    128      
    129       if (preg_match($pattern, $_POST['UAM_ConfirmMail_Text']))
    130       {
    131         $_POST['UAM_ConfirmMail_Text'] = preg_replace($pattern, $replacement, $_POST['UAM_ConfirmMail_Text']);
    132         $UAM_ConfirmMail_Error_Txt = true;
    133       }
    134      
    135       if (preg_match($pattern, $_POST['UAM_GhostTracker_ReminderText']))
    136       {
    137         $_POST['UAM_GhostTracker_ReminderText'] = preg_replace($pattern, $replacement, $_POST['UAM_GhostTracker_ReminderText']);
    138         $UAM_Reminder_Error_Txt = true;
    139       }
    140      
    141       array_push($page['errors'], l10n('mail_text_error'));
    142     }*/
    143 
    144     /* Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them */
     115/* Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them */
    145116    if (preg_match('/^[\s]+/', $_POST['UAM_MailExclusion_List']))
    146117    {
     
    190161    $_POST['UAM_ConfirmMail_ReMail_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt2']));
    191162
    192 /* Control of semicolons - Replaced by dots - Warning message displayed */
    193 /*    if ((preg_match($pattern, $_POST['UAM_ConfirmMail_ReMail_Txt1'])) or (preg_match($pattern, $_POST['UAM_ConfirmMail_ReMail_Txt2'])))
    194     {
    195       if ((preg_match($pattern, $_POST['UAM_ConfirmMail_ReMail_Txt1'])))
    196       {
    197         $_POST['UAM_ConfirmMail_ReMail_Txt1'] = preg_replace($pattern, $replacement, $_POST['UAM_ConfirmMail_ReMail_Txt1']);
    198         $UAM_ConfirmMail_Error_Txt1 = true;
    199       }
    200      
    201       if ((preg_match($pattern, $_POST['UAM_ConfirmMail_ReMail_Txt2'])))
    202       {
    203         $_POST['UAM_ConfirmMail_ReMail_Txt2'] = preg_replace($pattern, $replacement, $_POST['UAM_ConfirmMail_ReMail_Txt2']);
    204        
    205         $UAM_ConfirmMail_Error_Txt2 = true;
    206       }
    207      
    208       array_push($page['errors'], l10n('mail_text_error'));
    209     }*/
    210163
    211164          $newconf_UAM_ConfirmMail = array (
     
    378331    'UAM_ADMINCONFMAIL_FALSE'        => $conf_UAM[21]=='false' ?  'checked="checked"' : '' ,
    379332                'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score,
    380     'UAM_ERROR_REPORTS1'             => $UAM_MailInfo_Error_Txt,
    381     'UAM_ERROR_REPORTS2'             => $UAM_ConfirmMail_Error_Txt,
    382     'UAM_ERROR_REPORTS3'             => $UAM_Reminder_Error_Txt,
    383333    'UAM_ERROR_REPORTS4'             => $UAM_Exclusionlist_Error,
    384334                'UAM_CONFIRMMAIL_TIMEOUT_TRUE'   => $conf_UAM_ConfirmMail[0]=='true' ?  'checked="checked"' : '' ,
     
    389339    'UAM_CONFIRMMAIL_REMAIL_TXT1'                => $conf_UAM_ConfirmMail[2],
    390340    'UAM_CONFIRMMAIL_REMAIL_TXT2'                => $conf_UAM_ConfirmMail[4],
    391     'UAM_ERROR_REPORTS1'             => $UAM_ConfirmMail_Error_Txt1,
    392     'UAM_ERROR_REPORTS2'             => $UAM_ConfirmMail_Error_Txt2,
    393341    )
    394342  );
  • extensions/NBC_UserAdvManager/trunk/admin/global.tpl

    r5084 r5085  
    109109        <ul>
    110110{if $UAM_MAIL_INFO_TRUE}
    111   {if $UAM_ERROR_REPORTS1}     
    112           <li><label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">{'UAM_MailInfo_Text'|@translate}</label><br><br>
    113             <textarea name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" cols="80" style="color: red"  {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea><br><br>
    114           </li>
    115   {else}
    116           <li><label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">{'UAM_MailInfo_Text'|@translate}</label><br><br>
    117             <textarea name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea><br><br>
    118           </li>
    119   {/if}
     111        <li><label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">{'UAM_MailInfo_Text'|@translate}</label><br><br>
     112          <textarea name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea><br><br>
     113        </li>
    120114{else}
    121115          <li><label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">{'UAM_MailInfo_Text'|@translate}</label><br><br>
     
    143137          </li>
    144138{if $UAM_CONFIRM_MAIL_TRUE}
    145   {if $UAM_ERROR_REPORTS2}     
    146           <li><label class="cluetip" title="{'UAM_confirmtxtTitle'|translate}|{'UAM_confirmtxtTitle_d'|translate}">{'UAM_ConfirmMail_Text'|@translate}</label><br><br>
    147             <textarea name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea><br><br>
    148           </li>
    149   {else}
    150139          <li><label class="cluetip" title="{'UAM_confirmtxtTitle'|translate}|{'UAM_confirmtxtTitle_d'|translate}">{'UAM_ConfirmMail_Text'|@translate}</label><br><br>
    151140            <textarea name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea><br><br>
    152141          </li>
    153   {/if}
    154142{else}
    155143          <li><label class="cluetip" title="{'UAM_confirmtxtTitle'|translate}|{'UAM_confirmtxtTitle_d'|translate}">{'UAM_ConfirmMail_Text'|@translate}</label><br><br>
     
    214202        <ul>
    215203{if $UAM_CONFIRMMAIL_REMAIL_TRUE}
    216   {if $UAM_ERROR_REPORTS1}
    217         <li><label class="cluetip" title="{'UAM_remailtxt1Title'|translate}|{'UAM_remailtxt1Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt1'|@translate}</label><br><br>
    218           <textarea name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea><br><br>
    219         </li>
    220   {else}
    221204        <li><label class="cluetip" title="{'UAM_remailtxt1Title'|translate}|{'UAM_remailtxt1Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt1'|@translate}</label><br><br>
    222205          <textarea name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea><br><br>
    223206        </li>
    224   {/if}
    225207{else}
    226208        <li><label class="cluetip" title="{'UAM_remailtxt1Title'|translate}|{'UAM_remailtxt1Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt1'|@translate}</label><br><br>
     
    237219
    238220{if $UAM_CONFIRMMAIL_REMAIL_TRUE}
    239   {if $UAM_ERROR_REPORTS2}
    240         <li><label class="cluetip" title="{'UAM_remailtxt2Title'|translate}|{'UAM_remailtxt2Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt2'|@translate}</label><br><br>
    241           <textarea name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea><br>
    242         </li>
    243   {else}               
    244221        <li><label class="cluetip" title="{'UAM_remailtxt2Title'|translate}|{'UAM_remailtxt2Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt2'|@translate}</label><br><br>
    245222          <textarea name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea><br>
    246223        </li>
    247   {/if}
    248224{else}
    249225        <li><label class="cluetip" title="{'UAM_remailtxt2Title'|translate}|{'UAM_remailtxt2Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt2'|@translate}</label><br><br>
     
    281257        <ul>
    282258{if $UAM_GHOSTRACKER_TRUE}
    283   {if $UAM_ERROR_REPORTS3}
    284           <li><label class="cluetip" title="{'UAM_gttextTitle'|translate}|{'UAM_gttextTitle_d'|translate}">{'UAM_GhostTracker_ReminderText'|@translate}</label><br><br>
    285             <textarea name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
    286           </li>
    287   {else}
    288259          <li><label class="cluetip" title="{'UAM_gttextTitle'|translate}|{'UAM_gttextTitle_d'|translate}">{'UAM_GhostTracker_ReminderText'|@translate}</label><br><br>
    289260            <textarea name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
    290261          </li>
    291   {/if}
    292262{else}
    293263          <li><label class="cluetip" title="{'UAM_gttextTitle'|translate}|{'UAM_gttextTitle_d'|translate}">{'UAM_GhostTracker_ReminderText'|@translate}</label><br><br>
  • extensions/NBC_UserAdvManager/trunk/language/de_DE/plugin.lang.php

    r5073 r5085  
    9595$lang['GT_Reset'] = 'Geist Tracker neu stellen';
    9696// --------- End: New or revised $lang ---- from version 2.12.2
    97 
    98 
    99 // --------- Starting below: New or revised $lang ---- from version 2.12.7
    100 /* Errors and Warnings */
    101 $lang['mail_text_error'] = '<b>Warnung!</b> - Semikolon (;) sind nicht im addtionnal E-Mail-Text erlaubt. Diese Zeichen wurden automatisch durch einen Punkt ersetzt (.). Für Informationen, ist der geänderte Text (n) (sind) in Rot in das entsprechende Feld (s dargestellt). Sie bitte, ob es (sie) aus.';
    102 // --------- End: New or revised $lang ---- from version 2.12.7
    10397
    10498
  • extensions/NBC_UserAdvManager/trunk/language/en_UK/plugin.lang.php

    r5073 r5085  
    9595$lang['GT_Reset'] = 'Reset Ghost Tracker';
    9696// --------- End: New or revised $lang ---- from version 2.12.2
    97 
    98 
    99 // --------- Starting below: New or revised $lang ---- from version 2.12.7
    100 /* Errors and Warnings */
    101 $lang['mail_text_error'] = '<b>Warning!</b> - Semicolons (;) are not allowed in addtionnal email text. This Character have been automatically replaced by a dot (.). For information, the amended text(s) is(are) shown in red in the corresponding field(s). Please, check it(them) out.';
    102 // --------- End: New or revised $lang ---- from version 2.12.7
    10397
    10498
  • extensions/NBC_UserAdvManager/trunk/language/es_ES/plugin.lang.php

    r5073 r5085  
    9595$lang['GT_Reset'] = 'Perdí Ghost Tracker';
    9696// --------- End: New or revised $lang ---- from version 2.12.2
    97 
    98 
    99 // --------- Starting below: New or revised $lang ---- from version 2.12.7
    100 /* Errors and Warnings */
    101 $lang['mail_text_error'] = '<b>¡Advertencia!</b> - Punto y coma (;) no están permitidos en el texto del mensaje addtionnal. Este carácter se han sustituido automáticamente por un punto (.). Para más información, el texto modificado(s) es(son) se muestra en rojo en el campo correspondiente(s). Por favor, compruebe que (ellos) hacia fuera.';
    102 // --------- End: New or revised $lang ---- from version 2.12.7
    10397
    10498
  • extensions/NBC_UserAdvManager/trunk/language/fr_FR/plugin.lang.php

    r5073 r5085  
    9595$lang['GT_Reset'] = 'Initialisation Ghost Tracker';
    9696// --------- End: New or revised $lang ---- from version 2.12.2
    97 
    98 
    99 // --------- Starting below: New or revised $lang ---- from version 2.12.7
    100 /* Errors and Warnings */
    101 $lang['mail_text_error'] = '<b>Attention!</b> - Le point-virgule (;) n\'est pas autorisé dans le texte additionnel des emails. Ce caractère a été automatiquement remplacé par un point (.). Pour information, le(s) texte(s) modifié(s) est(sont) affiché(s) en rouge dans le(s) champ(s) correspondant(s). Veuillez le(s) vérifier.';
    102 // --------- End: New or revised $lang ---- from version 2.12.7
    10397
    10498
  • extensions/NBC_UserAdvManager/trunk/language/it_IT/plugin.lang.php

    r5083 r5085  
    9595$lang['GT_Reset'] = 'Reset del GhostTracker';
    9696// --------- End: New or revised $lang ---- from version 2.12.2
    97 
    98 
    99 // --------- Starting below: New or revised $lang ---- from version 2.12.7
    100 /* Errors and Warnings */
    101 $lang['mail_text_error'] = '<b>Attenzione!</b> - Il punto e virgola (;) non è ammesso nel testo addizionale della e-mail. Questo carattere è stato automaticamente sostituito da un punto (.). Per informazione, il(i) testo(i) modificato(i) è(sono) visualzzato(i) in rosso nel(nei) campo(i) corrispondente(i). Vi preghiamo di controllarlo(li).';
    102 // --------- End: New or revised $lang ---- from version 2.12.7
    10397
    10498
Note: See TracChangeset for help on using the changeset viewer.