Changeset 5181 for extensions/NBC_UserAdvManager/trunk

Timestamp:

Mar 18, 2010, 11:08:28 PM (14 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager]

• Bug 1474 fixed : Customizable text for ConfirmMail.tpl
• Bug 1467 fixed : FCK Editor's functionnalities are available on registration's confirmation return page customization fields
• Bug 1508 fixed : Plugin's name'll now be UserAdvManager (deletion of "nbc_" in code and PEM). Plugin's name is correctly displayed in plugins manager.

Location:

extensions/NBC_UserAdvManager/trunk

Files:

• ConfirmMail.php (modified) (3 diffs)
• ConfirmMail.tpl (modified) (1 diff)
• admin/UAM_admin.php (modified) (19 diffs)
• admin/ghosttracker.tpl (modified) (1 diff)
• admin/global.tpl (modified) (9 diffs)
• admin/userlist.tpl (modified) (1 diff)
• admin/usermanager.tpl (modified) (1 diff)
• changelog.txt.php (modified) (2 diffs)
• include/functions.inc.php (modified) (21 diffs)
• language/de_DE/plugin.lang.php (modified) (4 diffs)
• language/en_UK/plugin.lang.php (modified) (7 diffs)
• language/es_ES/plugin.lang.php (modified) (4 diffs)
• language/fr_FR/help/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (7 diffs)
• language/it_IT/plugin.lang.php (modified) (5 diffs)
• main.inc.php (modified) (10 diffs)
• maintain.inc.php (modified) (7 diffs)

extensions/NBC_UserAdvManager/trunk/ConfirmMail.php

@@ -3 +3 @@
 define('PHPWG_ROOT_PATH','./../../');
 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
-include_once (NBC_UAM_PATH.'include/constants.php');
-include_once (NBC_UAM_PATH.'include/functions.inc.php');
+include_once (UAM_PATH.'include/constants.php');
+include_once (UAM_PATH.'include/functions.inc.php');
 
 // +-----------------------------------------------------------------------+
@@ -10 +10 @@
 // +-----------------------------------------------------------------------+
 //check_status(ACCESS_NONE);
-load_language('plugin.lang', NBC_UAM_PATH);
+load_language('plugin.lang', UAM_PATH);
 
 if (isset($_GET['key']))
 {
 
+  global $conf;
+  
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
+
   if (VerifyConfirmMail($_GET['key']))
+  {
     $template->assign(
                         array(
-                                'CONFIRM_MAIL_MESSAGE' => l10n('confirm_mail_ok'),
+                                'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[5],
                         )
                 );
-  else  
+  }  
+  else
+  {  
     $template->assign(
                         array(
-                                'CONFIRM_MAIL_MESSAGE' => l10n('confirm_mail_bad'),
+                                'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[6],
                         )
-                );        
-//    redirect(make_index_url());
+                );
+  }
+
+  //$refresh_txt = l10n('ConfirmMail_redirection');
+  //$refresh_time = '10';
+  //redirect(make_index_url(),'',$refresh_time);
 }
 
@@ -50 +61 @@
 $template->set_filenames(
   array(
-        'confirm_mail'=>NBC_UAM_PATH.'ConfirmMail.tpl',
+        'confirm_mail'=>UAM_PATH.'ConfirmMail.tpl',
         )
 );

extensions/NBC_UserAdvManager/trunk/ConfirmMail.tpl

@@ -4 +4 @@
     <ul class="categoryActions">
       <li>
-      {if isset($GALLERY_URL) }
+      {if isset($GALLERY_URL)}
         <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}">
           <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">

extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

@@ -9 +9 @@
 check_status(ACCESS_ADMINISTRATOR);
 
-if (!defined('NBC_UAM_PATH')) define('NBC_UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
+if (!defined('UAM_PATH')) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
 
 //ini_set('error_reporting', E_ALL);
@@ -18 +18 @@
 $my_base_url = get_admin_plugin_menu_link(__FILE__);
 
-load_language('plugin.lang', NBC_UAM_PATH);
-load_language('help/plugin.lang', NBC_UAM_PATH);
+load_language('plugin.lang', UAM_PATH);
+load_language('help/plugin.lang', UAM_PATH);
 
 $page['global'] = array();
@@ -58 +58 @@
 // |                      Getting plugin version                           |
 // +-----------------------------------------------------------------------+
-$plugin =  PluginVer(NBC_UAM_PATH);
+$plugin =  PluginInfos(UAM_PATH);
 $version = $plugin['version'] ;
 
@@ -66 +66 @@
 // +----------------------------------------------------------+
 
-/* Pending because this may cause problems with special characters in emails */
-/*$toolbar = 'Basic';
+/* Available only for ConfirmMail return page customization */
+$toolbar = 'Basic';
 $width = '750px';
 $height = '300px';
 $areas = array();
-array_push( $areas,'UAM_MailInfo_Text','UAM_ConfirmMail_Text','UAM_GhostTracker_ReminderText','UAM_ConfirmMail_ReMail_Txt1','UAM_ConfirmMail_ReMail_Txt2');
+array_push( $areas,'UAM_ConfirmMail_Custom_Txt1','UAM_ConfirmMail_Custom_Txt2');
 
 if (function_exists('set_fckeditor_instance'))
@@ -86 +86 @@
 
   set_fckeditor_instance($areas, $toolbar, $width, $height);
-}*/
+}
 
 
@@ -144 +144 @@
       $_POST['UAM_Admin_ConfMail']);
 
-    $conf['nbc_UserAdvManager'] = serialize($newconf_UAM);
+    $conf['UserAdvManager'] = serialize($newconf_UAM);
 
                 $query = '
                 UPDATE '.CONFIG_TABLE.'
-                SET value="'.addslashes($conf['nbc_UserAdvManager']).'"
-                WHERE param="nbc_UserAdvManager"
+                SET value="'.addslashes($conf['UserAdvManager']).'"
+                WHERE param="UserAdvManager"
                 LIMIT 1
                 ;';
@@ -160 +160 @@
 
     $_POST['UAM_ConfirmMail_ReMail_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt2']));
+    
+    $_POST['UAM_ConfirmMail_Custom_Txt1'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt1']));
+    
+    $_POST['UAM_ConfirmMail_Custom_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt2']));
 
 
@@ -167 +171 @@
       $_POST['UAM_ConfirmMail_ReMail_Txt1'],
       $_POST['UAM_ConfirmMail_Remail'],
-      $_POST['UAM_ConfirmMail_ReMail_Txt2']);
-
-    $conf['nbc_UserAdvManager_ConfirmMail'] = serialize($newconf_UAM_ConfirmMail);
+      $_POST['UAM_ConfirmMail_ReMail_Txt2'],
+      $_POST['UAM_ConfirmMail_Custom_Txt1'],
+      $_POST['UAM_ConfirmMail_Custom_Txt2']);
+
+    $conf['UserAdvManager_ConfirmMail'] = serialize($newconf_UAM_ConfirmMail);
     
           $query = '
       UPDATE '.CONFIG_TABLE.'
-                        SET value="'.addslashes($conf['nbc_UserAdvManager_ConfirmMail']).'"
-                        WHERE param="nbc_UserAdvManager_ConfirmMail"
+                        SET value="'.addslashes($conf['UserAdvManager_ConfirmMail']).'"
+                        WHERE param="UserAdvManager_ConfirmMail"
                         LIMIT 1
                 ;';
@@ -194 +200 @@
   }
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
 
 /* Group setting for unvalidated and validated users */
@@ -289 +295 @@
   $nb_para2=(isset($_POST["nb_para2"])) ? $_POST["nb_para2"]:"";
 
-  $conf_UAM_ConfirmMail = unserialize($conf['nbc_UserAdvManager_ConfirmMail']);
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
   
   $template->assign(
@@ -296 +302 @@
     'nb_para2'                       => $nb_para2,
     'UAM_VERSION'                    => $version,
-    'NBC_UAM_PATH'                   => NBC_UAM_PATH,
+    'UAM_PATH'                       => UAM_PATH,
                 'UAM_MAIL_INFO_TRUE'             => $conf_UAM[0]=='true' ?  'checked="checked"' : '' ,
                 'UAM_MAIL_INFO_FALSE'            => $conf_UAM[0]=='false' ?  'checked="checked"' : '' ,
@@ -339 +345 @@
     'UAM_CONFIRMMAIL_REMAIL_TXT1'                => $conf_UAM_ConfirmMail[2],
     'UAM_CONFIRMMAIL_REMAIL_TXT2'                => $conf_UAM_ConfirmMail[4],
+    'UAM_CONFIRMMAIL_CUSTOM_TXT1'                => $conf_UAM_ConfirmMail[5],
+    'UAM_CONFIRMMAIL_CUSTOM_TXT2'                => $conf_UAM_ConfirmMail[6],
     )
   );
@@ -401 +409 @@
                   while($row = mysql_fetch_assoc($result))
                   {
-                          $conf_nbc_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]);
-                          for ($i = 0 ; $i < count($conf_nbc_MailExclusion) ; $i++)
+                          $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]);
+                          for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
                           {
-                                        $pattern = '/'.$conf_nbc_MailExclusion[$i].'/';
+                                        $pattern = '/'.$conf_MailExclusion[$i].'/';
                                   if (preg_match($pattern, $row['mail_address']))
                                   {
@@ -457 +465 @@
   case 'userlist':
   
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
   
   if (isset($conf_UAM[20]) and $conf_UAM[20]=='true')
@@ -570 +578 @@
         array(
           'UAM_VERSION' => $version,
-          'NBC_UAM_PATH'=> NBC_UAM_PATH,
+          'UAM_PATH'    => UAM_PATH,
           )
         );
@@ -618 +626 @@
   case 'usermanager':
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
-
-  $conf_UAM_ConfirmMail = unserialize($conf['nbc_UserAdvManager_ConfirmMail']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
+
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
         
   if (isset($conf_UAM[2]) and $conf_UAM[2]=='true' and ((isset($conf_UAM[3]) and $conf_UAM[3] <> '-1') or (isset($conf_UAM[9]) and $conf_UAM[9] <> '-1')) and isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0]=='true')
@@ -1135 +1143 @@
     $template->assign(
       array(
-        'UAM_VERSION'      => $version,
-        'NBC_UAM_PATH'     => NBC_UAM_PATH,
+        'UAM_VERSION'  => $version,
+        'UAM_PATH'     => UAM_PATH,
       )
     );
@@ -1172 +1180 @@
   case 'ghosttracker':
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
         
   if (isset($conf_UAM[17]) and $conf_UAM[17]=='true')
@@ -1491 +1499 @@
       $template->assign(
         array(
-          'UAM_VERSION'      => $version,
-          'NBC_UAM_PATH'     => NBC_UAM_PATH,
+          'UAM_VERSION'  => $version,
+          'UAM_PATH'     => UAM_PATH,
         )
       );

extensions/NBC_UserAdvManager/trunk/admin/ghosttracker.tpl

@@ -2 +2 @@
 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
 
-{html_head}<link rel="stylesheet" type="text/css" href="{$NBC_UAM_PATH}admin/uam.css">{/html_head}
+{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/uam.css">{/html_head}
 
 <script type="text/javascript">

extensions/NBC_UserAdvManager/trunk/admin/global.tpl

@@ -2 +2 @@
 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
 
-{html_head}<link rel="stylesheet" type="text/css" href="{$NBC_UAM_PATH}admin/uam.css">{/html_head}
+{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/uam.css">{/html_head}
 
 <script type="text/javascript">
@@ -14 +14 @@
 
 <script type="text/javascript">
-function nbc_blockToggleDisplay( headerId, contentId )
+function uam_blockToggleDisplay( headerId, contentId )
 {ldelim}
   if (typeof(headerId)=='string')
@@ -38 +38 @@
 <div id="instructionConfig1" class="instructionBlock" >
 
-  <div id="config1_header" class="instructionBlockHeaderCollapsed" onclick="nbc_blockToggleDisplay('config1_header', 'Config1')">
+  <div id="config1_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('config1_header', 'Config1')">
     <span class="cluetip" title="{'UAM_restricTitle'|translate}|{'UAM_restricTitle_d'|translate}">{'UAM_Title1'|@translate}</span>
   </div>
@@ -96 +96 @@
 <div id="instructionConfig2" class="instructionBlock" >
     
-  <div id="config2_header" class="instructionBlockHeaderCollapsed" onclick="nbc_blockToggleDisplay('config2_header', 'Config2')">
+  <div id="config2_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('config2_header', 'Config2')">
     <span class="cluetip" title="{'UAM_confirmTitle'|translate}|{'UAM_confirmTitle_d'|translate}">{'UAM_Title2'|@translate}</span>
   </div>
@@ -235 +235 @@
 -->
         </ul>
+<br><hr><br>
+
+{if $UAM_CONFIRM_MAIL_TRUE}
+        <li><label class="cluetip" title="{'UAM_confirmmail_custom1'|translate}|{'UAM_confirmmail_custom1_d'|translate}">{'UAM_confirmmail_custom_Txt1'|@translate}</label><br><br>
+          <textarea name="UAM_ConfirmMail_Custom_Txt1" id="UAM_ConfirmMail_Custom_Txt1" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT1}</textarea><br>
+        </li>
+{if 'FCK_PATH'|@defined}
+  <div style="text-align:right;">
+    <a href="#" onClick="toogleEditor('UAM_ConfirmMail_Custom_Txt1'); return false;">FCK Editor On/Off</a>
+  </div>
+{/if}
+        
+        <li><label class="cluetip" title="{'UAM_confirmmail_custom2'|translate}|{'UAM_confirmmail_custom2_d'|translate}">{'UAM_confirmmail_custom_Txt2'|@translate}</label><br><br>
+          <textarea name="UAM_ConfirmMail_Custom_Txt2" id="UAM_ConfirmMail_Custom_Txt2" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT2}</textarea><br>
+        </li>
+{if 'FCK_PATH'|@defined}
+  <div style="text-align:right;">
+    <a href="#" onClick="toogleEditor('UAM_ConfirmMail_Custom_Txt2'); return false;">FCK Editor On/Off</a>
+  </div>
+{/if}
+{else}
+        <li><label class="cluetip" title="{'UAM_confirmmail_custom1'|translate}|{'UAM_confirmmail_custom1_d'|translate}">{'UAM_confirmmail_custom_Txt1'|@translate}</label><br><br>
+          <textarea name="UAM_ConfirmMail_Custom_Txt1" id="UAM_ConfirmMail_Custom_Txt1" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT1}</textarea><br><br>
+        </li>
+
+        <li><label class="cluetip" title="{'UAM_confirmmail_custom2'|translate}|{'UAM_confirmmail_custom2_d'|translate}">{'UAM_confirmmail_custom_Txt2'|@translate}</label><br><br>
+          <textarea name="UAM_ConfirmMail_Custom_Txt2" id="UAM_ConfirmMail_Custom_Txt2" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT2}</textarea><br><br>
+        </li>
+{/if}
       </ul>
     </fieldset>
@@ -243 +272 @@
 <div id="instructionConfig3" class="instructionBlock" >
 
-  <div id="config3_header" class="instructionBlockHeaderCollapsed" onclick="nbc_blockToggleDisplay('config3_header', 'Config3')">
+  <div id="config3_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('config3_header', 'Config3')">
     <span class="cluetip" title="{'UAM_miscTitle'|translate}|{'UAM_miscTitle_d'|translate}">{'UAM_Title3'|@translate}</span>
   </div>
@@ -292 +321 @@
 <div id="instructionTips" class="instructionBlock" >
     
-  <div id="Tips_header" class="instructionBlockHeaderCollapsed" onclick="nbc_blockToggleDisplay('Tips_header', 'Tips')">
+  <div id="Tips_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('Tips_header', 'Tips')">
     <span class="cluetip" title="{'UAM_tipsTitle'|translate}|{'UAM_tipsTitle_d'|translate}">{'UAM_Title4'|@translate}</span>
   </div>
@@ -298 +327 @@
   <div id="Tips" class="instructionBlockContent" style="display:none">
     <fieldset>
-      <div id="Tips1_header" class="instructionBlockHeaderCollapsed" onclick="nbc_blockToggleDisplay('Tips1_header', 'Tips1')">
+      <div id="Tips1_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('Tips1_header', 'Tips1')">
         <span>{'UAM_Tips1'|@translate}</span>
       </div>
@@ -314 +343 @@
   var n1=document.getElementById("nb_para").value ;
   var n2=document.getElementById("nb_para2").value;
-   nbc_blockToggleDisplay(n1,n2 );
+   uam_blockToggleDisplay(n1,n2 );
 </script>

extensions/NBC_UserAdvManager/trunk/admin/userlist.tpl

@@ -2 +2 @@
 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
 
-{html_head}<link rel="stylesheet" type="text/css" href="{$NBC_UAM_PATH}admin/uam.css">{/html_head}
+{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/uam.css">{/html_head}
 
 <script type="text/javascript">

extensions/NBC_UserAdvManager/trunk/admin/usermanager.tpl

@@ -2 +2 @@
 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"}
 
-{html_head}<link rel="stylesheet" type="text/css" href="{$NBC_UAM_PATH}admin/uam.css">{/html_head}
+{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/uam.css">{/html_head}
 
 <script type="text/javascript">

extensions/NBC_UserAdvManager/trunk/changelog.txt.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: NBC_UserAdvManager
+Plugin Name: UserAdvManager
 ** Change log **
 ***************************************
@@ -152 +152 @@
 
 -- 2.14.1 : Bug 1497 fixed - Using users tracker without Ghost Tracker is now OK
+
+-- 2.14.2 : Bug 1474 fixed - Messages on registration's confirmation return page (ConfirmMail.tpl) are customizable 
+            Bug 1467 fixed - FCK Editor's functionnalities are available on registration's confirmation return page customization fields
+            Bug 1508 fixed - Plugin's name is now UserAdvManager (deletion of "nbc_" in code and PEM)
 */
 ?>

extensions/NBC_UserAdvManager/trunk/include/functions.inc.php

@@ -1 +1 @@
 <?php
-include_once (NBC_UAM_PATH.'include/constants.php');
-load_language('plugin.lang', NBC_UAM_PATH);
+include_once (UAM_PATH.'include/constants.php');
+load_language('plugin.lang', UAM_PATH);
 
 /* Function called from main.inc.php to send validation email */
@@ -9 +9 @@
   global $conf;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
   
         include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
@@ -36 +36 @@
     $language = $data['language']; /* Usefull for debugging */
     switch_lang_to($data['language']);
-    load_language('plugin.lang', NBC_UAM_PATH);
+    load_language('plugin.lang', UAM_PATH);
   }
 
@@ -151 +151 @@
   global $conf;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
-
-  $conf_UAM_ConfirmMail = unserialize($conf['nbc_UserAdvManager_ConfirmMail']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
+
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
   
         include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
@@ -172 +172 @@
   switch_lang_to($data['language']);
    
-  load_language('plugin.lang', NBC_UAM_PATH);
+  load_language('plugin.lang', UAM_PATH);
 
   switch($typemail)
@@ -253 +253 @@
   global $conf;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
   
         include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
@@ -271 +271 @@
   switch_lang_to($data['language']);
    
-  load_language('plugin.lang', NBC_UAM_PATH);
+  load_language('plugin.lang', UAM_PATH);
   
   $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Ghost_reminder_of_%s', $username));     
@@ -333 +333 @@
   global $conf;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
   $Confirm_Mail_ID = FindAvailableConfirmMailID();
 
@@ -387 +387 @@
     }
     
-    return get_absolute_root_url().NBC_UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;
+    return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;
   }
 }
@@ -417 +417 @@
                 pwg_query($query);
     
-    return get_absolute_root_url().NBC_UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;
+    return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;
   }
 }
@@ -465 +465 @@
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
   
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
-
-  $conf_UAM_ConfirmMail = unserialize($conf['nbc_UserAdvManager_ConfirmMail']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
+
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
 
   $query = "
@@ -633 +633 @@
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
         
   $query = "
@@ -736 +736 @@
   global $conf;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
 
   if (isset($login) and isset($conf_UAM[8]) and $conf_UAM[8] <> '')
   {
-    $conf_nbc_CharExclusion = preg_split("/,/",$conf_UAM[8]);
-    for ($i = 0 ; $i < count($conf_nbc_CharExclusion) ; $i++)
-    {
-      $pattern = '/'.$conf_nbc_CharExclusion[$i].'/i';
+    $conf_CharExclusion = preg_split("/,/",$conf_UAM[8]);
+    for ($i = 0 ; $i < count($conf_CharExclusion) ; $i++)
+    {
+      $pattern = '/'.$conf_CharExclusion[$i].'/i';
       if (preg_match($pattern, $login))
       {
@@ -763 +763 @@
   global $conf;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
   
         if (isset($email) and isset($conf_UAM[13]) and $conf_UAM[13] <> '')
         {
                 //$ncsemail = strtolower($email);
-                $conf_nbc_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]);
-                for ($i = 0 ; $i < count($conf_nbc_MailExclusion) ; $i++)
+                $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]);
+                for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
                 {
-                        $pattern = '/'.$conf_nbc_MailExclusion[$i].'/i';
+                        $pattern = '/'.$conf_MailExclusion[$i].'/i';
                         if (preg_match($pattern, $email))
       {
@@ -791 +791 @@
           
         /* Get ConfirmMail configuration */
-  $conf_UAM_ConfirmMail = unserialize($conf['nbc_UserAdvManager_ConfirmMail']);
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
   /* Get UAM configuration */
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
   
   $users = array();
@@ -882 +882 @@
         global $conf, $page;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
   
   $users = array();
@@ -967 +967 @@
           
         /* Get ConfirmMail configuration */
-  $conf_UAM_ConfirmMail = unserialize($conf['nbc_UserAdvManager_ConfirmMail']);
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
           
         /* Get UAM configuration */
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
         
         $query = "
@@ -1092 +1092 @@
 
 /* Email sending debugger function */
-function MailLog  ($to, $subject, $content, $language)
-{
-   $fo=fopen (NBC_UAM_PATH.'admin/maillog.txt','a') ;
+function MailLog($to, $subject, $content, $language)
+{
+   $fo=fopen (UAM_PATH.'admin/maillog.txt','a') ;
    fwrite($fo,"======================\n") ;
    fwrite($fo,'le ' . date('D, d M Y H:i:s') . "\r\n");
@@ -1105 +1105 @@
 
 
-/* Function called from UAM_admin.php to get the plugin version */
-function PluginVer($dir)
+/* Function called from UAM_admin.php and main.inc.php to get the plugin version and name */
+function PluginInfos($dir)
 {
   $path = $dir;
@@ -1153 +1153 @@
 function clean_obsolete_files()
 {
-  if (file_exists(NBC_UAM_PATH.'obsolete.list')
-    and $old_files = file(NBC_UAM_PATH.'obsolete.list', FILE_IGNORE_NEW_LINES)
+  if (file_exists(UAM_PATH.'obsolete.list')
+    and $old_files = file(UAM_PATH.'obsolete.list', FILE_IGNORE_NEW_LINES)
     and !empty($old_files))
   {
@@ -1160 +1160 @@
     foreach($old_files as $old_file)
     {
-      $path = NBC_UAM_PATH.$old_file;
+      $path = UAM_PATH.$old_file;
       if (is_file($path))
       {

extensions/NBC_UserAdvManager/trunk/language/de_DE/plugin.lang.php

@@ -3 +3 @@
 global $lang,$conf;
 
-$conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+$conf_UAM = unserialize($conf['UserAdvManager']);
 
 
@@ -221 +221 @@
 - Eine Galerie mit allen oder einigen privaten Kategorien, sichtbar nur durch registrierte Benutzer<br>
 - Mindestens 2 der folgenden Piwigo Nutzergruppen: "Warten", ohne die Erlaubnis der privaten Gruppen und "Validiert" mit allen Berechtigungen für den privaten Kategorien<br>
-- NBC_UAM plugin<br>
+- UAM plugin<br>
 - PWG Stuffs plugin, für das Hinzufügen eines Moduls Art "Personal Block"<br>
 - Optional können Sie das Plugin Extended Description Multi-Sprachen<br>
@@ -227 +227 @@
               <li>
 Etappen:<br><br>
-A. In plugin NBC_UAM:
+A. In plugin UAM:
               <ol>
                 <li>Aktivieren Sie Anmeldebestätigung</li>
@@ -240 +240 @@
                 <li>Fügen Sie ein neues Modul Typ "Personal-Block: Zeigt einen Block Personal (z. B. eine redaktionelle)"</li>
                 <li>Konfigurieren Sie das Modul unter Angabe der Titel (zB "Anmeldung bis Validierung") und seine Beschreibung, und aktivieren Sie nur "Warten" in der Liste der Gruppen erlaubt</li>
-                <li>Kompletten Inhalt des Moduls mit der Meldung Informationen, die den Benutzern angezeigt werden nicht validiert. Als NBC_UAM kann Markup-Sprachen verwendet werden, wenn das Plugin Extended Description aktiviert ist</li>
+                <li>Kompletten Inhalt des Moduls mit der Meldung Informationen, die den Benutzern angezeigt werden nicht validiert. Als UAM kann Markup-Sprachen verwendet werden, wenn das Plugin Extended Description aktiviert ist</li>
                 <li>Check "Display das Modul auf der Homepage der Website"</li>
                 <li>Überprüfen Sie die Konfiguration des Moduls</li>

extensions/NBC_UserAdvManager/trunk/language/en_UK/plugin.lang.php

@@ -3 +3 @@
 global $lang,$conf;
 
-$conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+$conf_UAM = unserialize($conf['UserAdvManager']);
 
 
@@ -20 +20 @@
 $lang['title_confirm_mail'] = 'Validate your registration';
 $lang['confirm_mail_page_title'] = 'Validate your registration';
-$lang['confirm_mail_ok'] = '<br><br><br>Thank you to have confirmed your email address and your registration on the gallery. Have fun !<br><br><br><br>';
 
 
@@ -192 +191 @@
 $lang['Add of %s'] = 'Profile created for %s';
 $lang['Update of %s'] = 'Profile %s updated';
-/* Email confirmation page */
-$lang['confirm_mail_bad'] = '<br><br><br>Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.<br><br><br><br>';
+
 /* Mailing */
 $lang['Ghost_reminder_of_%s'] = '%s, this is a reminder email';
@@ -222 +220 @@
 - A gallery with all or some private categories, visible only by registered users<br>
 - At least 2 following Piwigo\'s users groups: "Waiting," without permission on private categories, and "Validated" with all the permissions on the private categories<br>
-- NBC_UAM plugin<br>
+- UAM plugin<br>
 - PWG Stuffs plugin, for adding a module type "Personal Block"<br>
 - Optionally, the plugin Extended Description to support multi-languages<br>
@@ -228 +226 @@
               <li>
 Stages:<br><br>
-A. In plugin NBC_UAM:
+A. In plugin UAM:
               <ol>
                 <li>Enable registration confirmation</li>
@@ -241 +239 @@
                 <li>Add a new module type "Personal block: Shows a block staff (eg an editorial)"</li>
                 <li>Configure the module, indicating the title (eg "Registration pending validation") and its description, and only check "Waiting" in the list of groups allowed</li>
-                <li>Complete content of the module with the message information to be displayed to users not validated. As NBC_UAM, languages markup may be used if the plugin is enabled Extended Description</li>
+                <li>Complete content of the module with the message information to be displayed to users not validated. As UAM, languages markup may be used if the plugin is enabled Extended Description</li>
                 <li>Check "Display the module on the homepage of the site"</li>
                 <li>Validate the configuration of the module</li>
@@ -247 +245 @@
           </ul>';
 // --------- End: New or revised $lang ---- from version 2.14.0
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.14.2
+$lang['UAM_confirmmail_custom_Txt'] = 'Validation page customization';
+/* Email confirmation page */
+// --------- End: New or revised $lang ---- from version 2.14.2
 ?>

extensions/NBC_UserAdvManager/trunk/language/es_ES/plugin.lang.php

@@ -3 +3 @@
 global $lang,$conf;
 
-$conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+$conf_UAM = unserialize($conf['UserAdvManager']);
 
 
@@ -222 +222 @@
 - Una galería con todas o algunas categorías privado, visible sólo por los usuarios registrados<br>
 - Al menos 2 siguientes Piwigo grupos de usuarios: "Espera," sin permiso en las categorías de privados, y "Validado" con todos los permisos en las categorías de privados<br>
-- NBC_UAM plugin<br>
+- UAM plugin<br>
 - PWG Stuffs plugin, para agregar un tipo de módulo "Personal Block"<br>
 - Opcionalmente, la Extended Description plugin para soportar múltiples idiomas<br>
@@ -228 +228 @@
               <li>
 Etapas:<br><br>
-A. En plugin NBC_UAM:
+A. En plugin UAM:
               <ol>
                 <li>Activar la confirmación de registro</li>
@@ -241 +241 @@
                 <li>Añadir un tipo de módulo nuevo "bloque de Personal: Muestra una plantilla de bloque (por ejemplo, un editorial)"</li>
                 <li>Configurar el módulo, lo que indica el título (por ejemplo, "en espera de la validación de Registro") y su descripción, y solamente "Espera" en la lista de grupos permitido</li>
-                <li>El contenido completo del módulo con la información del mensaje que se mostrará a los usuarios no validados. Como NBC_UAM, lenguajes de marcas pueden ser utilizados si el plugin Extended Description está activado</li>
+                <li>El contenido completo del módulo con la información del mensaje que se mostrará a los usuarios no validados. Como UAM, lenguajes de marcas pueden ser utilizados si el plugin Extended Description está activado</li>
                 <li>Active la casilla "Mostrar el módulo en la página principal del sitio"</li>
                 <li>Validar la configuración del módulo</li>

extensions/NBC_UserAdvManager/trunk/language/fr_FR/help/plugin.lang.php

@@ -145 +145 @@
 <b>A NOTER</b> : La liste n\'affiche pas les inscrits qui n\'auraient pas validé leur inscription (si l\'option de validation de l\'inscription est activée). Ces utilisateurs sont alors gérés de manière particulière dans l\'onglet &quot;Suivi des validations&quot;.';
 // --------- End: New or revised $lang ---- from version 2.14.1
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.14.2
+$lang['UAM_confirmmail_custom1'] = 'Personnalisation du retour de confirmation - Confirmation acceptée';
+$lang['UAM_confirmmail_custom1_d'] = 'Lorque l\'option &quot;Confirmation d\'inscription&quot; est active, ce champ permet de personnaliser <b><u>le texte d\'acceptation</u></b> de la confirmation d\'inscription sur la page affichée lorsqu\'un utilisateur clique sur le lien de confirmation qu\'il a reçu par email.<br><br>
+A l\'installation du plugin, un texte standard est donnée en exemple.<br><br>
+Ce champ est compatible avec l\'extension FCK Editor et, pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.<br><br>
+<b style=&quot;color: red;&quot;>La modification du texte n\'est possible QUE si l\'option &quot;Confirmation d\'inscription&quot; est activée.</b>';
+$lang['UAM_confirmmail_custom2'] = 'Personnalisation du retour de confirmation - Confirmation rejetée';
+$lang['UAM_confirmmail_custom2_d'] = 'Lorque l\'option &quot;Confirmation d\'inscription&quot; est active, ce champ permet de personnaliser <b><u>le texte de rejet</u></b> de la confirmation d\'inscription sur la page affichée lorsqu\'un utilisateur clique sur le lien de confirmation qu\'il a reçu par email.<br><br>
+A l\'installation du plugin, un texte standard est donnée en exemple.<br><br>
+Ce champ est compatible avec l\'extension FCK Editor et, pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.<br><br>
+<b style=&quot;color: red;&quot;>La modification du texte n\'est possible QUE si l\'option &quot;Confirmation d\'inscription&quot; est activée.</b>';
+// --------- End: New or revised $lang ---- from version 2.14.2
 ?>

extensions/NBC_UserAdvManager/trunk/language/fr_FR/plugin.lang.php

@@ -3 +3 @@
 global $lang,$conf;
 
-$conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+$conf_UAM = unserialize($conf['UserAdvManager']);
 
 
@@ -20 +20 @@
 $lang['title_confirm_mail'] = 'Confirmation de votre inscription';
 $lang['confirm_mail_page_title'] = 'Confirmation d\'inscription';
-$lang['confirm_mail_ok'] = '<br><br><br>Merci d\'avoir confirmé votre mail et aussi et surtout votre inscription sur le site, profitez bien des photos ...<br><br><br><br>';
 
 
@@ -192 +191 @@
 $lang['Add of %s'] = 'Profil créé pour %s';
 $lang['Update of %s'] = 'Mise à jour du profil de %s';
-/* Email confirmation page */
-$lang['confirm_mail_bad'] = '<br><br><br>Votre clef d\'activation unique est erronée ou expirée ou vous avez déjà validé votre compte, veuillez contacter le webmaster pour régler ce problème.<br><br><br><br>';
 /* Mailing */
 $lang['Ghost_reminder_of_%s'] = '%s, ceci est un email de rappel.';
@@ -222 +219 @@
 - Une galerie avec tout ou partie des catégories privées, visibles par les seuls utilisateurs inscrits<br>
 - Au moins les 2 groupes d\'utilisateurs Piwigo suivants : &quot;Attente&quot;, sans aucune permission sur les catégories privées, et &quot;Validés&quot;, avec toutes les permissions sur les catégories privées<br>
-- Le plugin NBC_UAM<br>
+- Le plugin UAM<br>
 - Le plugin PWG Stuffs, pour l\'ajout d\'un module de type &quot;Bloc personnel&quot;<br>
 - En option, le plugin Extended Description, pour le support multi-langues<br>
@@ -228 +225 @@
               <li>
 Réalisation:<br><br>
-A. Dans le plugin NBC_UAM:
+A. Dans le plugin UAM:
               <ol>
                 <li>Activer la confirmation d\'inscription</li>
@@ -241 +238 @@
                 <li>Ajouter un nouveau module de type &quot;Bloc personnel : Affiche un bloc personnel (un édito par exemple)&quot;</li>
                 <li>Configurer le module, en indiquant son titre (ex : &quot;Inscription en attente de validation&quot;) et sa description, et cocher uniquement&quot;Attente&quot; dans la liste des groupes autorisés</li>
-                <li>Compléter le contenu du module avec le texte du message d\'information qui sera affiché aux utilisateurs non validés. Comme dans NBC_UAM, les balises de langues peuvent être utilisées si le plugin Extended Description est activé</li>
+                <li>Compléter le contenu du module avec le texte du message d\'information qui sera affiché aux utilisateurs non validés. Comme dans UAM, les balises de langues peuvent être utilisées si le plugin Extended Description est activé</li>
                 <li>Cocher &quot;Afficher le module sur la page d\'accueil du site&quot;</li>
                 <li>Valider la configuration du module</li>
@@ -247 +244 @@
           </ul>';
 // --------- End: New or revised $lang ---- from version 2.14.0
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.14.0
+$lang['UAM_confirmmail_custom_Txt1'] = 'Personnalisation du retour de confirmation - Confirmation acceptée';
+$lang['UAM_confirmmail_custom_Txt2'] = 'Personnalisation du retour de confirmation - Confirmation rejetée';
+/* Email confirmation page */
+//$lang['ConfirmMail_redirection'] = 'Redirection automatique vers l\'accueil.';
+// --------- End: New or revised $lang ---- from version 2.14.2
 ?>

extensions/NBC_UserAdvManager/trunk/language/it_IT/plugin.lang.php

@@ -3 +3 @@
 global $lang,$conf;
 
-$conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+$conf_UAM = unserialize($conf['UserAdvManager']);
 
 
@@ -106 +106 @@
 /* UserList Tab */
 $lang['UserList_Title'] = 'Monitoraggio degli utenti registrati';
-$lang['Tab_UserList'] = 'Monitoraggio degli utenti';
 $lang['Nb_Days'] = 'Numero di giorni<br>dall\'ultima visita';
 // --------- End: New or revised $lang ---- from version 2.13.0
@@ -148 +147 @@
 $lang['UAM_Confirm_Mail_false'] = ' Disattivare (di default)';
 $lang['UAM_ConfirmMail_Text'] = ' Personalizzare il testo dell\'Email di conferma:';
+$lang['UAM_Confirm_grpstat_notice'] = 'ATTENZIONE: Si consiglia di utilizzare o il gruppo o lo statuto di convalida ma non entrambi simultaneamente.';
 $lang['UAM_Confirm_Group'] = 'Gruppi di convalida<br>(------- per non assegnare nessun gruppo)';
 $lang['UAM_Confirm_Status'] = 'Convalida Statuti<br>(Invia ------- per mantenere il valore di default di Piwigo)';
-$lang['UAM_Confirm_grpstat_notice'] = 'ATTENZIONE: Si consiglia di utilizzare o il gruppo o lo statuto di convalida ma non entrambi simultaneamente.';
 $lang['UAM_No_Confirm_Group'] = 'Gruppo per gli utenti che non hanno convalidato la loro iscrizione<br>';
 $lang['UAM_Validated_Group'] = 'Gruppo per gli utenti che hanno convalidato la loro iscrizione<br>';
@@ -171 +170 @@
 $lang['UAM_LastVisit_true'] = ' Attivare';
 $lang['UAM_LastVisit_false'] = ' Disattivare (di default)';
-$lang['UAM_No_Comment_Anonymous'] = 'Commenti : Pesudo obbligatorio per gli ospiti';
+$lang['UAM_No_Comment_Anonymous'] = 'Commenti : Pseudo obbligatorio per gli ospiti';
 $lang['UAM_No_Comment_Anonymous_true'] = ' Attivare';
 $lang['UAM_No_Comment_Anonymous_false'] = ' Disattivare (di default)';
@@ -189 +188 @@
 /* UserList Tab */
 $lang['SubTitle5'] = 'Infos sugli utenti';
+$lang['Tab_UserList'] = 'Monitoraggio degli utenti';
 /* Mailing */
 $lang['Add of %s'] = 'Profilo creato per %s';

extensions/NBC_UserAdvManager/trunk/main.inc.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: NBC UserAdvManager
-Version: 2.14.1
+Plugin Name: UserAdvManager
+Version: 2.14.2
 Description: Renforcer la gestion des utilisateurs - Enforce users management
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
@@ -9 +9 @@
 */
 
-/* History:  NBC_UAM_PATH.'Changelog.txt.php' */
+/* History:  UAM_PATH.'Changelog.txt.php' */
 
 /*
@@ -38 +38 @@
 
 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.inc.php');
-
-load_language('plugin.lang', NBC_UAM_PATH);
+if (!defined('UAM_DIR')) define('UAM_DIR' , basename(dirname(__FILE__)));
+if (!defined('UAM_PATH')) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
+
+include_once (UAM_PATH.'include/constants.php');
+include_once (UAM_PATH.'include/functions.inc.php');
+
+load_language('plugin.lang', UAM_PATH);
 
 
@@ -52 +52 @@
 function UAM_admin_menu($menu)
 {
+// +-----------------------------------------------------------------------+
+// |                      Getting plugin name                              |
+// +-----------------------------------------------------------------------+
+  $plugin =  PluginInfos(UAM_PATH);
+  $name = $plugin['name'];
+  
   array_push($menu,
     array(
-      'NAME' => 'UserAdvManager',
-      'URL'  => get_admin_plugin_menu_link(NBC_UAM_PATH.'/admin/UAM_admin.php')
+      'NAME' => $name,
+      'URL'  => get_admin_plugin_menu_link(UAM_PATH.'/admin/UAM_admin.php')
     )
   );
@@ -69 +75 @@
   global $conf, $user;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
 
   /* Admins and Guests are not tracked for Ghost Tracker or Users Tracker */
@@ -120 +126 @@
   global $conf;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
   
   /* Sending registration confirmation by email */
@@ -244 +250 @@
   $PasswordCheck = 0;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
 
   /* Password enforcement control */
@@ -301 +307 @@
     global $conf, $user, $template;
 
-    $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+    $conf_UAM = unserialize($conf['UserAdvManager']);
 
     if (isset($_POST['validate']) and !is_admin())
@@ -378 +384 @@
 function UAM_InitPage()
 {
-  load_language('plugin.lang', NBC_UAM_PATH);
+  load_language('plugin.lang', UAM_PATH);
   global $conf, $template, $page, $lang, $errors;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
 
 /* Admin user management */
@@ -403 +409 @@
 function UAM_CheckEmptyCommentAuthor($comment_action, $comm)
 {
-  load_language('plugin.lang', NBC_UAM_PATH);
+  load_language('plugin.lang', UAM_PATH);
   global $infos, $conf, $template;
 
-  $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
+  $conf_UAM = unserialize($conf['UserAdvManager']);
 
 /* User creation OR update */

extensions/NBC_UserAdvManager/trunk/maintain.inc.php

@@ -1 +1 @@
 <?php
 
-if(!defined("NBC_UAM_PATH")) define('NBC_UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-if (!defined('NBC_UAM_ROOT')) {
-  define('NBC_UAM_ROOT',     dirname(__FILE__).'/');
-}
-
-include_once (NBC_UAM_PATH.'include/constants.php');
-include_once (NBC_UAM_PATH.'include/functions.inc.php');
+if(!defined("UAM_PATH")) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
+if (!defined('UAM_ROOT')) {
+  define('UAM_ROOT',     dirname(__FILE__).'/');
+}
+
+include_once (UAM_PATH.'include/constants.php');
+include_once (UAM_PATH.'include/functions.inc.php');
 
 
@@ -26 +26 @@
   $q = '
 INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
-VALUES ("nbc_UserAdvManager","'.addslashes(serialize($default1)).'","NBC_UAM parameters")
+VALUES ("UserAdvManager","'.addslashes(serialize($default1)).'","UAM parameters")
   ;';
   pwg_query($q);
@@ -39 +39 @@
 This is a reminder message because you registered on our gallery but you do not validate your registration and your validation key will expire. To allow you access to our gallery, you have 2 days to confirm your registration by clicking on the link in the message you should have received when you registered.
 
-Note: After this period, your account will be permanently deleted.');
+Note: After this period, your account will be permanently deleted.','Thank you to have confirmed your email address and your registration on the gallery. Have fun !','Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.');
 
   $q = '
 INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
-VALUES ("nbc_UserAdvManager_ConfirmMail","'.addslashes(serialize($default2)).'","NBC_UAM ConfirmMail parameters")
+VALUES ("UserAdvManager_ConfirmMail","'.addslashes(serialize($default2)).'","UAM ConfirmMail parameters")
   ;';
   pwg_query($q);
@@ -136 +136 @@
     upgrade_213();
   }
+
+
+/* Check for upgrade from 2.14.1 to 2.14.2 */
+/* *************************************** */
+        $query1 = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "nbc_UserAdvManager_ConfirmMail"
+;';
+  $count1 = mysql_num_rows(pwg_query($query1));
+  
+        $query1 = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "nbc_UserAdvManager_ConfirmMail"
+;';
+  $count2 = mysql_num_rows(pwg_query($query1)); 
+  
+        if ($count1 == 1 or $count2 == 1)
+        {
+  /* upgrade from branch 2.14.1 to 2.14.2 */
+  /* ************************************ */
+                upgrade_214_1();
+        }
 }
 
@@ -143 +167 @@
   global $conf;
 
-  if (isset($conf['nbc_UserAdvManager']))
+  if (isset($conf['UserAdvManager']))
   {
     $q = '
 DELETE FROM '.CONFIG_TABLE.'
-WHERE param="nbc_UserAdvManager"
+WHERE param="UserAdvManager"
 ;';
 
@@ -153 +177 @@
   }
 
-  if (isset($conf['nbc_UserAdvManager_ConfirmMail']))
+  if (isset($conf['UserAdvManager_ConfirmMail']))
   {
     $q = '
 DELETE FROM '.CONFIG_TABLE.'
-WHERE param="nbc_UserAdvManager_ConfirmMail"
+WHERE param="UserAdvManager_ConfirmMail"
 ;';
 
@@ -303 +327 @@
 ;';
     pwg_query($query);
-  }
+    
+    upgrade_214_1();
+  }
+}
+
+function upgrade_214_1()
+{
+  global $conf;
+
+/* Changing parameter name */
+  $q = '
+UPDATE '.CONFIG_TABLE.'
+SET param = "UserAdvManager"
+WHERE param = "nbc_UserAdvManager"
+;';
+  pwg_query($q);
+  
+  $q = '
+UPDATE '.CONFIG_TABLE.'
+SET param = "UserAdvManager_ConfirmMail"
+WHERE param = "nbc_UserAdvManager_ConfirmMail"
+;';
+  pwg_query($q);
+
+/* Upgrading ConfirmMail options */
+  $conf_UAM2 = explode(';', $conf['UserAdvManager_ConfirmMail']);
+
+  $upgrade_UAM2 = array($conf_UAM2[0],$conf_UAM2[1],$conf_UAM2[2],$conf_UAM2[3],$conf_UAM2[4],'Thank you to have confirmed your email address and your registration on the gallery. Have fun !','Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.');
+
+  $query = '
+UPDATE '.CONFIG_TABLE.'
+  SET value = "'.addslashes(serialize($upgrade_UAM2)).'"
+  WHERE param = "UserAdvManager_ConfirmMail"
+;';
+  pwg_query($query);
 }
 ?>