Changeset 9254 for extensions/NBC_UserAdvManager/branches/2.20/del_account.php

Timestamp:

Feb 16, 2011, 8:48:57 PM (13 years ago)

Author:

Eric

Message:

r9253 merged from trunk to branch 2.20

File:

• extensions/NBC_UserAdvManager/branches/2.20/del_account.php (modified) (2 diffs)

extensions/NBC_UserAdvManager/branches/2.20/del_account.php

@@ -4 +4 @@
 
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
-include_once( PHPWG_ROOT_PATH.'include/functions_mail.inc.php' );
 
 include_once (UAM_PATH.'include/constants.php');
@@ -17 +16 @@
 
 
-  global $user, $lang, $conf, $errors;
+global $user, $lang, $conf, $errors;
   
 
-  $conf_UAM = unserialize($conf['UserAdvManager']);
+$conf_UAM = unserialize($conf['UserAdvManager']);
 
-  if (isset($conf_UAM[24]) and $conf_UAM[24] <> '')
+if (isset($conf_UAM[24]) and $conf_UAM[24] <> '')
+{
+  // Management of Extension flags ([mygallery], [myurl]) - [username] flag can't be used here
+  $patterns[] = '#\[mygallery\]#i';
+  $replacements[] = $conf['gallery_title'];
+  $patterns[] = '#\[myurl\]#i';
+  $replacements[] = $conf['gallery_url'];
+
+  if (function_exists('get_user_language_desc'))
   {
-    // Management of Extension flags ([username], [mygallery], [myurl])
-    $patterns[] = '#\[username\]#i';
-    $replacements[] = $username;
-    $patterns[] = '#\[mygallery\]#i';
-    $replacements[] = $conf['gallery_title'];
-    $patterns[] = '#\[myurl\]#i';
-    $replacements[] = $conf['gallery_url'];
-      
-    if (function_exists('get_user_language_desc'))
-    {
-      $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[24]));
-    }
-    else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[24]));
+    $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[24]));
   }
+  else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[24]));
+}
     
-  $template->assign(
-    array(
-      'GALLERY_URL'          => make_index_url(),
-                        'CUSTOM_REDIR_MSG'     => $custom_text,
-                )
-  );
+$template->assign(
+  array(
+    'GALLERY_URL'          => make_index_url(),
+        'CUSTOM_REDIR_MSG'     => $custom_text,
+  )
+);
 
 if (isset($lang['Theme: '.$user['theme']]))