Changeset 6785

Timestamp:

Aug 21, 2010, 10:44:33 PM (14 years ago)

Author:

Eric

Message:

• Bug 1693 fixed - Multi-languages are available for ConfirmMail customization (using Extended Description plugin)

• Bug 1810 partially fixed - Auto login is not performed after visitors have validated their registration but the "home" button changes his link to redirect to identification page when the redirection option is set. Note: The redirection to profile.php doesn't work because I was unable to use the log_user() function on ConfirmMail page. This feature is still under investigation to perform the best way.

Location:

extensions/NBC_UserAdvManager/trunk

Files:

• ConfirmMail.php (modified) (4 diffs)
• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (4 diffs)
• template/ConfirmMail.tpl (modified) (2 diffs)

extensions/NBC_UserAdvManager/trunk/ConfirmMail.php

@@ -8 +8 @@
 include_once (UAM_PATH.'include/functions.inc.php');
 
-// +-----------------------------------------------------------------------+
-// | Check Access and exit when user status is not ok                      |
-// +-----------------------------------------------------------------------+
-//check_status(ACCESS_NONE);
-load_language('plugin.lang', UAM_PATH);
-
 $title= l10n('confirm_mail_page_title');
 $page['body_id'] = 'theAboutPage';
@@ -22 +16 @@
 
 
-if (isset($_GET['key']))
+if (isset($_GET['key']) and isset($_GET['userid']))
 {
 
-  global $conf;
+  global $user, $lang, $conf, $errors;
+  
+  $key = $_GET['key'];
+  $userid = $_GET['userid'];
+  $redirect = false;
   
   $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
 
-  if (VerifyConfirmMail($_GET['key']))
+  if (VerifyConfirmMail($key))
   {
     $status = true;
     
+    log_user($userid, false);
+
+/* We have to get the user's language in database */
+    $query = '
+SELECT '.USER_INFOS_TABLE.'.language
+FROM '.USER_INFOS_TABLE.','.USER_CONFIRM_MAIL_TABLE.'
+WHERE (('.USER_INFOS_TABLE.'.user_id ='.$userid.') AND ('.USER_INFOS_TABLE.'.user_id = '.USER_CONFIRM_MAIL_TABLE.'.user_id))
+;';
+    $data = pwg_db_fetch_assoc(pwg_query($query));
+
+/* Check if user is already registered (profile changing) - If not (new registration), language is set to current gallery language */
+    if (empty($data))
+    {
+/* And switch gallery to this language before using personalized and multilangual contents */
+      $language = pwg_get_session_var('lang_switch', $user['language']);
+      switch_lang_to($language);
+    }
+    else
+    {
+/* And switch gallery to this language before using personalized and multilangual contents */
+      switch_lang_to($data['language']);
+      load_language('plugin.lang', UAM_PATH);
+    }
+
+    if (function_exists('get_user_language_desc'))
+    {
+      $custom_text = get_user_language_desc($conf_UAM_ConfirmMail[5]);
+    }
+    else $custom_text = l10n($conf_UAM_ConfirmMail[5]);
+
+    if (isset($conf_UAM[21]) and $conf_UAM[21] == 'true')
+    {
+      $user_idsOK = array();
+      if (!check_consult($userid, $user_idsOK))
+      {
+        $redirect = true;
+      }
+    }
+    
     $template->assign(
                         array(
+        'REDIRECT'             => $redirect,
         'STATUS'               => $status,
-                                'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[5],
+                                'CONFIRM_MAIL_MESSAGE' => $custom_text,
                         )
                 );
@@ -43 +82 @@
   {
     $status = false;
+    if (function_exists('get_user_language_desc'))
+    {
+      $custom_text = get_user_language_desc($conf_UAM_ConfirmMail[6]);
+    }
+    else $custom_text = l10n($conf_UAM_ConfirmMail[6]);
+    
     $template->assign(
                         array(
+        'REDIRECT'             => $redirect,
         'STATUS'               => $status,
-                                'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[6],
+                                'CONFIRM_MAIL_MESSAGE' => $custom_text,
                         )
                 );
@@ -60 +106 @@
 
 if ( isset($conf['gallery_url']) )
-        {
+{
         $template->assign(
                 array(

extensions/NBC_UserAdvManager/trunk/changelog.txt.php

@@ -186 +186 @@
             Bug 1795 fixed - Fixes rules using email information and/or email of validation
 
--- 2.15.5 : Bug 1727 fixed - The redirection does not appli to admins, webmaster and generic users.
+-- 2.15.5 : Bug 1693 fixed - Multi-languages are available for ConfirmMail customization (using Extended Description plugin)
+            Bug 1727 fixed - The redirection does not appli to admins, webmaster and generic users.
             Bug 1807 fixed - Textareas are resized according the screen resolution
             Bug 1808 fixed - The Tracking users table is ordered by default on "LastVisit" field (last in at top) 
             Bug 1809 fixed - Addition of a direct link to user's profile in all UAM tables. The link gives a new window
+            Bug 1810 partially fixed - Auto login is not performed after visitors have validated their registration but the "home" button changes his link to redirect to identification page when the redirection option is set. Note: The redirection to profile.php doesn't work because I was unable to use the log_user() function on ConfirmMail page). This feature is still under investigation to perform the best way. 
 */
 ?>

extensions/NBC_UserAdvManager/trunk/include/functions.inc.php

@@ -387 +387 @@
     }
     
-    return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;
+    return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID.'&userid='.$user_id;
   }
 }
@@ -458 +458 @@
                 pwg_query($query);
     
-    return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;
+    return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID.'&userid='.$user_id;
   }
 }
@@ -505 +505 @@
   $tab = array();
 
-  $query = "
+  $query = '
 SELECT value
-FROM ".CONFIG_TABLE."
-WHERE param = 'UserAdvManager_Redir'
-;";
+FROM '.CONFIG_TABLE.'
+WHERE param = "UserAdvManager_Redir"
+;';
 
   $tab = pwg_db_fetch_row(pwg_query($query));
@@ -527 +527 @@
 
 /* Function called from ConfirmMail.php to verify validation key used by user according time limit */
+/* Return true is key validation is OK else return false */
 function VerifyConfirmMail($id)
 {

extensions/NBC_UserAdvManager/trunk/template/ConfirmMail.tpl

@@ -5 +5 @@
     <ul class="categoryActions">
       <li>
+    {if $REDIRECT}
+        <a href="{$ROOT_URL}identification.php" title="{'return to homepage'|@translate}">
+          <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
+        </a>
+    {else}
       {if isset($GALLERY_URL)}
         <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
@@ -14 +19 @@
         </a>
       {/if}
+    {/if}
       </li>
     </ul>