Ignore:
Timestamp:
Nov 19, 2009, 10:54:46 PM (14 years ago)
Author:
Eric
Message:

[NBC_UserAdvManager] Merged from trunk to branch 2.12
Bug 1238 fixed - Simple custom email text wasn't send when Extended Description plugin wasn't set
Bug 1245 fixed - Semicolons (;) are no longer allowed in text areas (mail info text, ConfirmMail text, reminder text,...). They'll be replaced by dots (.).
Bug 1248 fixed - Php notice on user registration with a forbidden email domain
Bug 1250 fixed - Email provider didn't work after the third exclusion in list

File:
1 edited

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/branches/2.12/include/functions_UserAdvManager.inc.php

    r4188 r4317  
    1818  {
    1919    case 1:
    20       $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Add of %s', $username));
     20      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Add of %s', stripslashes($username)));
    2121      $password = $password <> '' ? $password : l10n('UserAdvManager_empty_pwd');
    2222     
    23       if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager[10]) and $conf_nbc_UserAdvManager[10] <> '')
    24         $infos1_perso = get_user_language_desc($conf_nbc_UserAdvManager[10])."\n\n";
     23      if (isset($conf_nbc_UserAdvManager[10]) and $conf_nbc_UserAdvManager[10] <> '')
     24      {
     25        if (function_exists('get_user_language_desc'))
     26        {
     27          $infos1_perso = get_user_language_desc($conf_nbc_UserAdvManager[10])."\n\n";
     28        }
     29        else $infos1_perso = l10n($conf_nbc_UserAdvManager[10])."\n\n";
     30      }
    2531     
    2632      break;
    2733     
    2834    case 2:
    29       $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', $username));
     35      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', stripslashes($username)));
    3036      $password = $password <> '' ? $password : l10n('UserAdvManager_empty_pwd');
    3137
    … …  
    3339       
    3440    case 3:
    35       $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', $username));
     41      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Update of %s', stripslashes($username)));
    3642      $password = $password <> '' ? $password : l10n('UserAdvManager_no_update_pwd');
    3743
    … …  
    4248  {
    4349    $infos1 = array(
    44       get_l10n_args('infos_mail %s', $username),
    45       get_l10n_args('User: %s', $username),
     50      get_l10n_args('infos_mail %s', stripslashes($username)),
     51      get_l10n_args('User: %s', stripslashes($username)),
    4652      get_l10n_args('Password: %s', $password),
    4753      get_l10n_args('Email: %s', $email),
    … …  
    5965    );
    6066
    61     if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager[11]) and $conf_nbc_UserAdvManager[11] <> '')
    62       $infos2_perso = get_user_language_desc($conf_nbc_UserAdvManager[11])."\n\n";
     67    if (isset($conf_nbc_UserAdvManager[11]) and $conf_nbc_UserAdvManager[11] <> '')
     68    {
     69      if (function_exists('get_user_language_desc'))
     70      {
     71        $infos2_perso = get_user_language_desc($conf_nbc_UserAdvManager[11])."\n\n";
     72      }
     73      else $infos2_perso = l10n($conf_nbc_UserAdvManager[11])."\n\n";
     74    }
    6375  }
    6476
    … …  
    108120      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Reminder_with_key_of_%s', $username));
    109121     
    110       if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager_ConfirmMail[2]) and $conf_nbc_UserAdvManager_ConfirmMail[2] <> '' and isset($conf_nbc_UserAdvManager_ConfirmMail[3]) and $conf_nbc_UserAdvManager_ConfirmMail[3] == 'true' and $confirm)
     122      if (isset($conf_nbc_UserAdvManager_ConfirmMail[2]) and $conf_nbc_UserAdvManager_ConfirmMail[2] <> '' and isset($conf_nbc_UserAdvManager_ConfirmMail[3]) and $conf_nbc_UserAdvManager_ConfirmMail[3] == 'true' and $confirm)
    111123      {
    112                                 $infos1 = get_user_language_desc($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
    113                        
    114                                 $infos2 = array
    115                                 (
    116                                         get_l10n_args('Link: %s', ResetConfirmMail($user_id)),
    117                                         get_l10n_args('', ''),
    118                                 );
     124        if (function_exists('get_user_language_desc'))
     125        {
     126          $infos1 = get_user_language_desc($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
     127        }
     128                                else $infos1 = l10n($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
     129
     130        $infos2 = array
     131        (
     132          get_l10n_args('Link: %s', ResetConfirmMail($user_id)),
     133          get_l10n_args('', ''),
     134        );       
    119135                        }
     136     
    120137                break;
    121138     
    122139    case 2:
    123       $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Reminder_without_key_of_%s', $username));
    124      
    125       if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager_ConfirmMail[2]) and $conf_nbc_UserAdvManager_ConfirmMail[2] <> '' and isset($conf_nbc_UserAdvManager_ConfirmMail[3]) and $conf_nbc_UserAdvManager_ConfirmMail[3] == 'true' and !$confirm)
     140      $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Reminder_without_key_of_%s',$username));
     141     
     142      if (isset($conf_nbc_UserAdvManager_ConfirmMail[2]) and $conf_nbc_UserAdvManager_ConfirmMail[2] <> '' and isset($conf_nbc_UserAdvManager_ConfirmMail[3]) and $conf_nbc_UserAdvManager_ConfirmMail[3] == 'true' and !$confirm)
    126143      {
    127                                 $infos1 = get_user_language_desc($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
     144        if (function_exists('get_user_language_desc'))
     145        {
     146          $infos1 = get_user_language_desc($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";
     147        }
     148        else $infos1 = l10n($conf_nbc_UserAdvManager_ConfirmMail[2])."\n\n";                           
    128149      }
     150     
    129151    break;
    130152        }
     153 
    131154  pwg_mail($email, array(
    132155    'subject' => $subject,
    … …  
    157180  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Ghost_remainder_of_%s', $username));
    158181     
    159   if (function_exists('get_user_language_desc') and isset($conf_nbc_UserAdvManager[19]) and $conf_nbc_UserAdvManager[19] <> '' and isset($conf_nbc_UserAdvManager[17]) and $conf_nbc_UserAdvManager[17] == 'true')
    160   {
    161     $infos1 = get_user_language_desc($conf_nbc_UserAdvManager[19])."\n\n";
     182  if (isset($conf_nbc_UserAdvManager[19]) and $conf_nbc_UserAdvManager[19] <> '' and isset($conf_nbc_UserAdvManager[17]) and $conf_nbc_UserAdvManager[17] == 'true')
     183  {
     184    if (function_exists('get_user_language_desc'))
     185    {
     186      $infos1 = get_user_language_desc($conf_nbc_UserAdvManager[19])."\n\n";
     187    }
     188    else $infos1 = l10n($conf_nbc_UserAdvManager[19])."\n\n";
     189   
    162190    resetlastvisit($user_id);
    163191  }
    … …  
    351379WHERE id = '".$id."'
    352380;";
    353     $data = mysql_fetch_array(pwg_query($query));
     381    $data = mysql_fetch_assoc(pwg_query($query));
    354382       
    355383    if (!empty($data) and isset($data['user_id']) and !isset($data['date_check']))
    … …  
    517545WHERE user_id = '".$id."'
    518546;";
    519     $data = mysql_fetch_array(pwg_query($query));
     547    $data = mysql_fetch_assoc(pwg_query($query));
    520548
    521549    if (!empty($data) and isset($data['user_id']) and !isset($data['date_check']))
    … …  
    588616    list($username) = mysql_fetch_row(pwg_query($query));
    589617
    590     return isset($username) ? $username : '';
     618    return isset($username) ? stripslashes($username) : '';
    591619  }
    592620}
    … …  
    616644
    617645/* Function called from main.inc.php - Check if user's email is in excluded email providers list */
     646/* Doesn't work on call - Must be copied in main.inc.php to work */
    618647function ValidateEmailProvider($email)
    619648{
    … …  
    629658                        $pattern = '/'.$conf_nbc_MailExclusion[$i].'/';
    630659                        if (preg_match($pattern, $ncsemail))
     660      {
    631661                        return false;
    632                 else
     662      }
     663      else
     664      {
    633665                        return true;
     666      }
    634667                }
    635668        }
    … …  
    690723        $result = pwg_query($query);
    691724     
    692   while ($row = mysql_fetch_array($result))
     725  while ($row = mysql_fetch_assoc($result))
    693726  {
    694727        $user = $row;
    … …  
    717750                $result = pwg_query($query);
    718751       
    719     while ($row = mysql_fetch_array($result))
     752    while ($row = mysql_fetch_assoc($result))
    720753    {
    721754        array_push(
    … …  
    755788        $result = pwg_query($query);
    756789     
    757   while ($row = mysql_fetch_array($result))
     790  while ($row = mysql_fetch_assoc($result))
    758791  {
    759792        $user = $row;
Note: See TracChangeset for help on using the changeset viewer.