Changeset 8841 for extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

Timestamp:

Jan 22, 2011, 6:14:15 PM (14 years ago)

Author:

Eric

Message:

Set compatibility for Piwigo 2.2-RC
Note : Little display bug remains on Piwigo's left menu due to sortable tables (userlist.tpl, usermanager.tpl and ghosttracker.tpl) when no user is listed.

File:

• extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php (modified) (6 diffs)

extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

@@ -105 +105 @@
   case 'global':
 
-        if (isset($_POST['submit']) and !is_adviser() and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']))
+        if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']))
   {
 
@@ -215 +215 @@
 
   //Testing password enforcement
-  if (isset($_POST['PasswordTest']) and !is_adviser() and isset($_POST['UAM_Password_Test']) and !empty($_POST['UAM_Password_Test']))
+  if (isset($_POST['PasswordTest']) and isset($_POST['UAM_Password_Test']) and !empty($_POST['UAM_Password_Test']))
   {
     $UAM_Password_Test_Score = testpassword($_POST['UAM_Password_Test']);
   }
-  else if (isset($_POST['PasswordTest']) and !is_adviser() and empty($_POST['UAM_Password_Test']))
+  else if (isset($_POST['PasswordTest']) and empty($_POST['UAM_Password_Test']))
   {
     array_push($page['errors'], l10n('reg_err_login3'));
@@ -1002 +1002 @@
     }
 
-    //Hide radio-button if not allow to assign adviser
-                if ($conf['allow_adviser'])
-        {
-        $template->assign('adviser', true);
-        }
-
 // +-----------------------------------------------------------------------+
 // |                               user list                               |
@@ -1086 +1080 @@
                                   ? '<BR>['.l10n('is_the_default').']' : ''),
                                   'STATUS' => l10n('user_status_'
-                                  .$local_user['status']).(($local_user['adviser'] == 'true')
-                                  ? '<BR>['.l10n('adviser').']' : ''),
+                                  .$local_user['status']),
                                         'EMAIL'            => get_email_address_as_display_text($local_user['email']),
                 'GROUPS'           => $groups_string,
@@ -1344 +1337 @@
     {
       //Reset is only allowed for admins !
-      if (is_admin() and !is_adviser())
+      if (is_admin())
       {
         $query1 = '
@@ -1412 +1405 @@
     }
 
-    //Hide radio-button if not allow to assign adviser
-                if ($conf['allow_adviser'])
-    {
-      $template->assign('adviser', true);
-        }
-
 // +-----------------------------------------------------------------------+
 // |                               user list                               |