Changeset 9161 for extensions/NBC_UserAdvManager/branches/2.20/ConfirmMail.php

Timestamp:

Feb 10, 2011, 10:13:30 PM (13 years ago)

Author:

Eric

Message:

r9160 merged from trunk to branch 2.20

File:

• extensions/NBC_UserAdvManager/branches/2.20/ConfirmMail.php (modified) (3 diffs)

extensions/NBC_UserAdvManager/branches/2.20/ConfirmMail.php

@@ -29 +29 @@
   $conf_UAM = unserialize($conf['UserAdvManager']);
 
+  $query = '
+SELECT '.USERS_TABLE.'.username
+FROM '.USERS_TABLE.'
+WHERE ('.USERS_TABLE.'.id ='.$userid.')
+;';
+  $result = pwg_db_fetch_assoc(pwg_query($query));
+
   if (VerifyConfirmMail($key))
   {
@@ -57 +64 @@
     }
 
-    if (function_exists('get_user_language_desc'))
+    if (isset($conf_UAM_ConfirmMail[5]) and $conf_UAM_ConfirmMail[5] <> '')
     {
-      $custom_text = get_user_language_desc($conf_UAM_ConfirmMail[5]);
+      // Management of Extension flags ([username], [mygallery])
+      $patterns[] = '#\[username\]#i';
+      $replacements[] = $username;
+      $patterns[] = '#\[mygallery\]#i';
+      $replacements[] = $conf['gallery_title'];
+   
+      if (function_exists('get_user_language_desc'))
+      {
+        $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM_ConfirmMail[5]));
+      }
+      else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM_ConfirmMail[5]));
     }
-    else $custom_text = l10n($conf_UAM_ConfirmMail[5]);
-
+    
     $redirect = true;
     
@@ -77 +93 @@
     $status = false;
     $redirect = false;
-    if (function_exists('get_user_language_desc'))
+    
+    if (isset($conf_UAM_ConfirmMail[6]) and $conf_UAM_ConfirmMail[6] <> '')
     {
-      $custom_text = get_user_language_desc($conf_UAM_ConfirmMail[6]);
+      // Management of Extension flags ([username], [mygallery])
+      $patterns[] = '#\[username\]#i';
+      $replacements[] = $username;
+      $patterns[] = '#\[mygallery\]#i';
+      $replacements[] = $conf['gallery_title'];
+   
+      if (function_exists('get_user_language_desc'))
+      {
+        $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM_ConfirmMail[6]));
+      }
+      else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM_ConfirmMail[6]));
     }
-    else $custom_text = l10n($conf_UAM_ConfirmMail[6]);
     
     $template->assign(