Changeset 25093 for extensions/UserAdvManager/branches/2.51/maintain.inc.php

Timestamp:

Oct 23, 2013, 6:04:53 PM (10 years ago)

Author:

Eric

Message:

r25092 merged from trunk to branch 2.51 :
Bug 1109 fixed - Password enforcement features have been removed from UAM and set in a new dedicated plugin : Password Policy

Language files cleanup

Bug 2984 fixed - Display issue in Miscellaneous options
Bug 2986 fixed - Status for unvalidated users can not be "Guest" and is forced to "-------"
Bug 2987 fixed - New registered users have to follow a link on confirmation page before log in

File:

• extensions/UserAdvManager/branches/2.51/maintain.inc.php (modified) (5 diffs)

extensions/UserAdvManager/branches/2.51/maintain.inc.php

@@ -35 +35 @@
     'MAILEXCLUSION'               => 'false',
     'MAILEXCLUSION_LIST'          => '',
-    'PASSWORDENF'                 => 'false',
-    'PASSWORD_SCORE'              => '100',
     'ADMINPASSWENF'               => 'false',
     'GHOSTRACKER'                 => 'false',
@@ -61 +59 @@
     'VALID_LEVEL'                 => '-1',
     'DOWNGRADE_LEVEL'             => '-1',
-    'PWDRESET'                    => 'false',
     'REJECTCONNECT'               => 'false',
     'REJECTCONNECT_TEXT'          => l10n('UAM_Default_RejectConnexion_Txt'),
@@ -198 +195 @@
   pwg_query($q);
 
-  // Piwigo's native tables modifications for password reset function - Add pwdreset column if not already exists
-  // ------------------------------------------------------------------------------------------------------------
-  $query = '
-SHOW COLUMNS FROM '.USERS_TABLE.'
-LIKE "UAM_pwdreset"
-;';
-  
-  $result = pwg_query($query);
-
-  if(!pwg_db_fetch_row($result))
-  {
-    $q = '
-ALTER TABLE '.USERS_TABLE.'
-ADD UAM_pwdreset enum("true","false") 
-;';
-    pwg_query($q);
-  }
 
   // Piwigo's native tables modifications for validation status
@@ -420 +400 @@
       upgrade_2500_25011();
     }
+
+    if (version_compare($conf['UserAdvManager_Version'], '2.51.0') < 0)
+    {
+    /* upgrade from version 2.50.x to 2.51.0 */
+    /* *************************************** */
+      upgrade_2500_2510();
+    }
   }
 
@@ -486 +473 @@
   $q = '
 ALTER TABLE '.USERS_TABLE.'
-DROP UAM_pwdreset 
-;';
-  pwg_query($q);
-
-  $q = '
-ALTER TABLE '.USERS_TABLE.'
 DROP UAM_validated 
 ;';