Show
Ignore:
Timestamp:
02/16/11 19:28:44 (2 years ago)
Author:
Eric
Message:

Bug 2192 fixed
Bug 2045 improvement

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • extensions/NBC_UserAdvManager/trunk/del_account.php

    r9197 r9253  
    44 
    55include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); 
    6 include_once( PHPWG_ROOT_PATH.'include/functions_mail.inc.php' ); 
    76 
    87include_once (UAM_PATH.'include/constants.php'); 
    … …  
    1716 
    1817 
    19   global $user, $lang, $conf, $errors; 
     18global $user, $lang, $conf, $errors; 
    2019   
    2120 
    22   $conf_UAM = unserialize($conf['UserAdvManager']); 
     21$conf_UAM = unserialize($conf['UserAdvManager']); 
    2322 
    24   if (isset($conf_UAM[24]) and $conf_UAM[24] <> '') 
     23if (isset($conf_UAM[24]) and $conf_UAM[24] <> '') 
     24{ 
     25  // Management of Extension flags ([mygallery], [myurl]) - [username] flag can't be used here 
     26  $patterns[] = '#\[mygallery\]#i'; 
     27  $replacements[] = $conf['gallery_title']; 
     28  $patterns[] = '#\[myurl\]#i'; 
     29  $replacements[] = $conf['gallery_url']; 
     30 
     31  if (function_exists('get_user_language_desc')) 
    2532  { 
    26     // Management of Extension flags ([username], [mygallery], [myurl]) 
    27     $patterns[] = '#\[username\]#i'; 
    28     $replacements[] = $username; 
    29     $patterns[] = '#\[mygallery\]#i'; 
    30     $replacements[] = $conf['gallery_title']; 
    31     $patterns[] = '#\[myurl\]#i'; 
    32     $replacements[] = $conf['gallery_url']; 
    33        
    34     if (function_exists('get_user_language_desc')) 
    35     { 
    36       $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[24])); 
    37     } 
    38     else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[24])); 
     33    $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[24])); 
    3934  } 
     35  else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[24])); 
     36} 
    4037     
    41   $template->assign( 
    42     array( 
    43       'GALLERY_URL'          => make_index_url(), 
    44                         'CUSTOM_REDIR_MSG'     => $custom_text, 
    45                 ) 
    46   ); 
     38$template->assign( 
     39  array( 
     40    'GALLERY_URL'          => make_index_url(), 
     41        'CUSTOM_REDIR_MSG'     => $custom_text, 
     42  ) 
     43); 
    4744 
    4845if (isset($lang['Theme: '.$user['theme']]))