Changeset 4927 for extensions/NBC_UserAdvManager/trunk/main.inc.php

Timestamp:

Feb 21, 2010, 4:44:14 PM (14 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager] Pre-2.13.4 for testing only:

• Bug 1303 and 1387 fixed : There is a bug in Piwigo 2.0.8 about switch_lang() function. This may be fixed in the next Piwigo release. These UAM fix are available only for Piwigo 2.0.8 and have to be recoded for the next Piwigo release. (Thx to Rub and cljosse for their usefull help).

• Bug 1444 fixed

• Bug 1445 pre-fixed : Begining of plugin's admin panel improvement. Add of new help language files (FR for the moment), deletion of ConfirmMail tab, mix all config in one tab, add of cuetips. This is for testing !

File:

• extensions/NBC_UserAdvManager/trunk/main.inc.php (modified) (11 diffs)

extensions/NBC_UserAdvManager/trunk/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: NBC UserAdvManager
-Version: 2.13.3
+Version: 2.13.4
 Description: Renforcer les possibilités de gestion des utilisateurs - Enforce users management
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
@@ -9 +9 @@
 */
 
-/* History:  NBC_UserAdvManager_PATH.'Changelog.txt.php' */
+/* History:  NBC_UAM_PATH.'Changelog.txt.php' */
 
 /*
@@ -37 +37 @@
 */
 
-
-if (!defined('PHPWG_ROOT_PATH'))
-{
-  die('Hacking attempt!');
-}
-
-define('NBC_UserAdvManager_DIR' , basename(dirname(__FILE__)));
-define('NBC_UserAdvManager_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-
-include_once (NBC_UserAdvManager_PATH.'include/constants.php');
-include_once (NBC_UserAdvManager_PATH.'include/functions_UserAdvManager.inc.php');
-
-load_language('plugin.lang', NBC_UserAdvManager_PATH);
+if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+if (!defined('NBC_UAM_DIR')) define('NBC_UAM_DIR' , basename(dirname(__FILE__)));
+if (!defined('NBC_UAM_PATH')) define('NBC_UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
+
+include_once (NBC_UAM_PATH.'include/constants.php');
+include_once (NBC_UAM_PATH.'include/functions_UserAdvManager.inc.php');
+
+load_language('plugin.lang', NBC_UAM_PATH);
 
 
@@ -60 +55 @@
     array(
       'NAME' => 'UserAdvManager',
-      'URL'  => get_admin_plugin_menu_link(NBC_UserAdvManager_PATH.'/admin/UserAdvManager_admin.php')
+      'URL'  => get_admin_plugin_menu_link(NBC_UAM_PATH.'/admin/UserAdvManager_admin.php')
     )
   );
@@ -67 +62 @@
 }
 
-
+/* Lastvisit table feed for Ghost Tracker */
 add_event_handler('loc_begin_index', 'UserAdvManager_GhostTracker');
 
@@ -124 +119 @@
   
   /* Sending registration confirmation by email */
-  if ((isset($conf_nbc_UserAdvManager[0]) and $conf_nbc_UserAdvManager[0] == 'true') or (isset($conf_nbc_UserAdvManager[2]) and $conf_nbc_UserAdvManager[2] == 'true'))
+  if ((isset($conf_nbc_UserAdvManager[0]) and $conf_nbc_UserAdvManager[0] == 'true' and !is_admin()) or (isset($conf_nbc_UserAdvManager[2]) and $conf_nbc_UserAdvManager[2] == 'true' and !is_admin()))
   {
     $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
@@ -267 +262 @@
 
   /* Username without forbidden keys */
-  if (isset($conf_nbc_UserAdvManager[7]) and $conf_nbc_UserAdvManager[7] == 'true' and !empty($_POST['login']) and ValidateUsername($_POST['login']))
+  if (isset($conf_nbc_UserAdvManager[7]) and $conf_nbc_UserAdvManager[7] == 'true' and !empty($_POST['login']) and ValidateUsername($_POST['login']) and !is_admin())
   {
     $_POST['login'] = '';
@@ -274 +269 @@
 
   /* Email without forbidden domains */
-  if (isset($conf_nbc_UserAdvManager[12]) and $conf_nbc_UserAdvManager[12] == 'true' and !empty($_POST['mail_address']) and ValidateEmailProvider($_POST['mail_address']))
+  if (isset($conf_nbc_UserAdvManager[12]) and $conf_nbc_UserAdvManager[12] == 'true' and !empty($_POST['mail_address']) and ValidateEmailProvider($_POST['mail_address']) and !is_admin())
   {
     $_POST['mail_address'] = '';
@@ -292 +287 @@
     $conf_nbc_UserAdvManager = isset($conf['nbc_UserAdvManager']) ? explode(";" , $conf['nbc_UserAdvManager']) : array();
 
-    if (isset($_POST['validate']))
+    if (isset($_POST['validate']) and !is_admin())
     {
       /* Email without forbidden domains */
@@ -367 +362 @@
 function UserAdvManager_InitPage()
 {
-  load_language('plugin.lang', NBC_UserAdvManager_PATH);
+  load_language('plugin.lang', NBC_UAM_PATH);
   global $conf, $template, $page, $lang, $errors;
 
@@ -392 +387 @@
 function UserAdvManager_CheckEmptyCommentAuthor($comment_action, $comm)
 {
-  load_language('plugin.lang', NBC_UserAdvManager_PATH);
+  load_language('plugin.lang', NBC_UAM_PATH);
   global $infos, $conf, $template;