Changeset 6784 for extensions/NBC_UserAdvManager

Timestamp:

Aug 21, 2010, 6:31:47 PM (14 years ago)

Author:

Eric

Message:

Bug 1727 fixed - The redirection does not appli to admins, webmaster and generic users.
W3C HTML 4.0 strict compliance

Location:

extensions/NBC_UserAdvManager/trunk

Files:

• admin/UAM_admin.php (modified) (4 diffs)
• changelog.txt.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

@@ -370 +370 @@
                   while($row = pwg_db_fetch_assoc($result))
                 {
-                                $msg_error1 .= (($msg_error1 <> '') ? '<br/>' : '') . l10n('Err_audit_no_casse').stripslashes($row['username']);
+                                $msg_error1 .= (($msg_error1 <> '') ? '<br>' : '') . l10n('Err_audit_no_casse').stripslashes($row['username']);
                         }
                 }
@@ -389 +389 @@
                         {
                                 if (!ValidateUsername(stripslashes($row['username'])))
-                                        $msg_error2 .= (($msg_error2 <> '') ? '<br/>' : '') . l10n('Err_audit_username_char').stripslashes($row['username']);
+                                        $msg_error2 .= (($msg_error2 <> '') ? '<br>' : '') . l10n('Err_audit_username_char').stripslashes($row['username']);
                         }
                 }
@@ -413 +413 @@
                                   if (preg_match($pattern, $row['mail_address']))
                                   {
-                                                $msg_error3 .=  (($msg_error3 <> '') ? '<br/>' : '') . l10n('Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
+                                                $msg_error3 .=  (($msg_error3 <> '') ? '<br>' : '') . l10n('Err_audit_email_forbidden').stripslashes($row['username']).' ('.$row['mail_address'].')';
                                         }
                                 }
@@ -420 +420 @@
                 
     if ($msg_error1 <> '')
-                        $errors[] = $msg_error1.'<br/><br/>';
+                        $errors[] = $msg_error1.'<br><br>';
                 
                 if ($msg_error2 <> '')
-                        $errors[] = $msg_error2.'<br/><br/>';
+                        $errors[] = $msg_error2.'<br><br>';
                 
                 if ($msg_error3 <> '')
-                $errors[] = $msg_error3.'<br/><br/>';
+                $errors[] = $msg_error3.'<br><br>';
                 
                 if ($msg_error1 <> '' or $msg_error2 <> '' or $msg_error3 <> '')

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 1807 fixed - Textareas are resized according the screen resolution
+-- 2.15.5 : 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

extensions/NBC_UserAdvManager/trunk/main.inc.php

@@ -397 +397 @@
 
 // RedirectToProfile - Thx to LucMorizur
-// redirects a visitor (not generic (forbidden) neither admin) to his
+// redirects a visitor (except for admins, webmasters and generic statuses) to his
 // profile.php page
 //
@@ -408 +408 @@
   
   $conf_UAM = unserialize($conf['UserAdvManager']);
-
-  if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true'))
-  {
-    $user_idsOK = array();
-    if (!check_consult($user['id'], $user_idsOK))
-      redirect(PHPWG_ROOT_PATH.'profile.php');
+  
+  $query ='
+SELECT user_id, status
+FROM '.USER_INFOS_TABLE.'
+WHERE user_id = '.$user['id'].'
+;';
+  $data = pwg_db_fetch_assoc(pwg_query($query));
+  
+  if ($data['status'] <> "admin" and $data['status'] <> "webmaster" and $data['status'] <> "generic")
+  {
+    if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true'))
+    {
+      $user_idsOK = array();
+      if (!check_consult($user['id'], $user_idsOK))
+        redirect(PHPWG_ROOT_PATH.'profile.php');
+    }
   }
 }