Changeset 9854 for extensions/NBC_UserAdvManager

Timestamp:

Mar 25, 2011, 6:15:08 PM (13 years ago)

Author:

Eric

Message:

merging r9827, r9846 and r9853 from trunk to branch 2.20

Location:

extensions/NBC_UserAdvManager/branches/2.20

Files:

• admin.php (added)
• include/functions.inc.php (modified) (1 diff)
• include/upgradedb.inc.php (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (3 diffs)

extensions/NBC_UserAdvManager/branches/2.20/include/functions.inc.php

@@ -19 +19 @@
     array(
       'NAME' => $name,
-      'URL'  => get_admin_plugin_menu_link(UAM_PATH.'/admin/UAM_admin.php')
+      'URL' => get_root_url().'admin.php?page=plugin-'.basename(UAM_PATH)
     )
   );

extensions/NBC_UserAdvManager/branches/2.20/include/upgradedb.inc.php

@@ -11 +11 @@
 {
   define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-}
-if (!defined('UAM_ROOT'))
-{
-  define('UAM_ROOT', dirname(__FILE__).'/');
 }
 
@@ -358 +354 @@
 LIMIT 1
 ;';
-  
-  pwg_query($query);
+
+  pwg_query($query);
+
+  // Create new UAM entry in plugins table 
+  $query = '
+INSERT INTO '.PLUGINS_TABLE.' (id, state, version)
+VALUES ("UserAdvManager","active","'.$uam_new_version.'")
+;';
+  
+  pwg_query($query);
+
+  // Delete old plugin entry in plugins table 
+  $query = '
+DELETE FROM '.PLUGINS_TABLE.'
+WHERE id="NBC_UserAdvManager"
+LIMIT 1
+;';
+  
+  pwg_query($query);
+
+  // rename directory
+  if (!rename(PHPWG_PLUGINS_PATH.'NBC_UserAdvManager', PHPWG_PLUGINS_PATH.'UserAdvManager'))
+  {
+    die('Fatal error on plugin upgrade process : Unable to rename directory ! Please, rename manualy the plugin directory name from ../plugins/NBC_UserAdvManager to ../plugins/UserAdvManager.');
+  }
 }
 ?>

extensions/NBC_UserAdvManager/branches/2.20/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: UserAdvManager
-Version: 2.20.0-RC
+Version: 2.20.0-RC3
 Description: Renforcer la gestion des utilisateurs - Enforce users management
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216
@@ -17 +17 @@
 
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-if (!defined('UAM_DIR')) define('UAM_DIR' , basename(dirname(__FILE__)));
 if (!defined('UAM_PATH')) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
 

extensions/NBC_UserAdvManager/branches/2.20/maintain.inc.php

@@ -4 +4 @@
 {
   define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-}
-if (!defined('UAM_ROOT'))
-{
-  define('UAM_ROOT', dirname(__FILE__).'/');
 }
 
@@ -28 +24 @@
 The admin of the gallery.','false','false','false','false','false','Sorry [username], your account has been deleted due to a too long time passed since your last visit at [mygallery].','Sorry [username], your account has been deprecated due to a too long time passed since your last visit at [mygallery]. Please, use the following link to revalidate your account.',-1,-1,'Thank you for registering at [mygallery]. Your account has been manually validated by _admin_. You may now log in at _link_to_site_ and make any appropriate changes to your profile. Welcome to _name_of_site_!','false','You have requested a password reset on our gallery. Please, find below your new connection settings.','false','Sorry, your account has been deleted because you have not validated your registration in requested time. Please, try registration with a valid and non blocked email account.','false');
 
-  $q = '
+        $query = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "UserAdvManager"
+;';
+  $count = pwg_db_num_rows(pwg_query($query));
+  
+  if ($count == 0)
+  {
+    $q = '
 INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
 VALUES ("UserAdvManager","'.addslashes(serialize($default1)).'","UAM parameters")
   ;';
-  pwg_query($q);
+    pwg_query($q);
+  }
 
 
@@ -45 +51 @@
 Note: After this period, your account will be permanently deleted.','You have confirmed that you are human and may now use [mygallery]! Welcome [username]!','Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.');
 
-  $q = '
+        $query = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "UserAdvManager_ConfirmMail"
+;';
+  $count = pwg_db_num_rows(pwg_query($query));
+  
+  if ($count == 0)
+  {
+    $q = '
 INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
 VALUES ("UserAdvManager_ConfirmMail","'.addslashes(serialize($default2)).'","UAM ConfirmMail parameters")
   ;';
-  pwg_query($q);
-  
-  $q = '
+    pwg_query($q);
+  }
+
+        $query = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "UserAdvManager_Redir"
+;';
+  $count = pwg_db_num_rows(pwg_query($query));
+  
+  if ($count == 0)
+  {
+    $q = '
 INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
 VALUES ("UserAdvManager_Redir","0","UAM Redirections")
   ;';
-  pwg_query($q);
+    pwg_query($q);
+  }
+
+// Set current plugin version in config table
+  $plugin =  PluginInfos(UAM_PATH);
+  $version = $plugin['version'];
+
+        $query = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "UserAdvManager_Redir"
+;';
+  $count = pwg_db_num_rows(pwg_query($query));
+  
+  if ($count == 0)
+  {
+    $q = '
+INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
+VALUES ("UserAdvManager_Version","'.$version.'","UAM version check")
+  ;';
+    pwg_query($q);
+  }