Index: /extensions/NBC_UserAdvManager/trunk/ConfirmMail.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/ConfirmMail.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/ConfirmMail.php	(revision 5593)
@@ -35,8 +35,4 @@
 		);
   }
-
-  //$refresh_txt = l10n('ConfirmMail_redirection');
-  //$refresh_time = '10';
-  //redirect(make_index_url(),'',$refresh_time);
 }
 
Index: /extensions/NBC_UserAdvManager/trunk/ConfirmMail.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/ConfirmMail.tpl	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/ConfirmMail.tpl	(revision 5593)
@@ -1,3 +1,2 @@
-{* $Id: ConfirmMail.tpl $ *}
 <div id="content" class="content">
   <div class="titrePage">
Index: /extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php	(revision 5593)
@@ -14,5 +14,5 @@
 //ini_set('display_errors', true);
 
-include_once (PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
 include_once (PHPWG_ROOT_PATH.'/include/constants.php');
 $my_base_url = get_admin_plugin_menu_link(__FILE__);
@@ -452,5 +452,5 @@
 // |                           templates display                           |
 // +-----------------------------------------------------------------------+
-  $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/global.tpl');
+  $template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/global.tpl');
   $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
 
@@ -573,12 +573,4 @@
       }
       else $display = '';
-      
-      /* Plugin version inserted */
-      $template->assign(
-        array(
-          'UAM_VERSION' => $version,
-          'UAM_PATH'    => UAM_PATH,
-          )
-        );
 
    		$template->append(
@@ -594,4 +586,11 @@
 			);
 		}
+    /* Plugin version inserted */
+    $template->assign(
+      array(
+        'UAM_VERSION'  => $version,
+        'UAM_PATH'     => UAM_PATH,
+      )
+    );    
 // +-----------------------------------------------------------------------+
 // |                             errors display                            |
@@ -609,10 +608,10 @@
 // |                           templates display                           |
 // +-----------------------------------------------------------------------+
-		$template->set_filename('plugin_admin_content', dirname(__FILE__) . '/userlist.tpl');
+		$template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/userlist.tpl');
     $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');		
   }
   else
   {
-		array_push($page['infos'], l10n('Err_Userlist_Settings'));
+		array_push($page['errors'], l10n('Err_Userlist_Settings'));
   }
   break;
@@ -1163,10 +1162,10 @@
 // |                           templates display                           |
 // +-----------------------------------------------------------------------+
-		$template->set_filename('plugin_admin_content', dirname(__FILE__) . '/usermanager.tpl');
+		$template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/usermanager.tpl');
     $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');		
 	}
   else
   {
-		array_push($page['infos'], l10n('Err_UserManager_Settings'));
+		array_push($page['errors'], l10n('Err_UserManager_Settings'));
   }
   break;
@@ -1554,10 +1553,10 @@
 // |                           templates display                           |
 // +-----------------------------------------------------------------------+
-		$template->set_filename('plugin_admin_content', dirname(__FILE__) . '/ghosttracker.tpl');
+		$template->set_filename('plugin_admin_content', dirname(__FILE__) . '/template/ghosttracker.tpl');
     $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');		
 	}
   else
   {
-		array_push($page['infos'], l10n('Err_GhostTracker_Settings'));
+		array_push($page['errors'], l10n('Err_GhostTracker_Settings'));
   }
 
Index: tensions/NBC_UserAdvManager/trunk/admin/ghosttracker.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/ghosttracker.tpl	(revision 5592)
+++ 	(revision )
@@ -1,77 +1,0 @@
-﻿{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{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="{$UAM_PATH}admin/uam.css">{/html_head}
-
-<script type="text/javascript">
-jQuery().ready(function(){ldelim}
-  jQuery('.cluetip').cluetip({ldelim}
-    width: 500,
-    splitTitle: '|'
-  });
-});
-</script>
-
-<div class="titrePage">
-  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle4'|@translate}</h2>
-</div>
-
-<form method="post" action="" class="general">
-  <fieldset>
-  	<legend>{'GT_Init'|@translate}</legend>
-    <ul>
-		  <li>
-        <label>{'UAM_GhostTracker_Init'|@translate}</label><br><br>
-      </li>
-    </ul>
-    <p><input class="submit" type="submit" value="{'GT_Reset'|@translate}" name="GhostTracker_Init" ></p>
-  </fieldset>
-  
-  <fieldset>
-    <legend class="cluetip" title="{'UAM_gtTitle'|translate}|{'UAM_gtTitle_d'|translate}">{'GhostTracker_Title'|@translate}</legend>
-      <div class="navigationBar">{$NAVBAR}</div>
-        <table class="table2" width="97%" summary="">
-          <thead>
-            <tr class="throw">
-              <td>&nbsp;</td>
-              <td>{'Username'|@translate}</td>
-              <td>{'Email address'|@translate}</td>
-              <td>{'LastVisit_Date'|@translate}</td>
-              <td>{'Reminder'|@translate}</td>
-            </tr>
-          </thead>
-
-          {foreach from=$users item=user name=users_loop}
-            <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
-              <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" ></td>
-              <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
-              <td>{$user.EMAIL}</td>
-{if $user.REMINDER == l10n('Reminder_Sent_NOK')}
-              <td style="color:orange;text-align:center;">{$user.LASTVISIT}</td>
-              <td style="color:orange;text-align:center;">{$user.REMINDER}</td>
-{else $user.REMINDER == l10n('Reminder_Sent_OK')}
-              <td style="color:red;text-align:center;">{$user.LASTVISIT}</td>
-              <td style="color:red;text-align:center;">{$user.REMINDER}</td>
-{/if}
-              {foreach from=$user.plugin_columns item=data}
-                <td>{$data}</td>
-              {/foreach}    			
-            </tr>
-          {/foreach}
-        </table>
-
-        <div class="navigationBar">{$NAVBAR}</div>
-        <br>
-          
-<p>
-  {'target'|@translate}
-  <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
-  <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
-</p>
-
-<p>
-  <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected" >
-  <input class="submit" type="submit" value="{'Reminder'|@translate}" name="Reminder_Email" >
-</p>
-  </fieldset>
-</form>
Index: tensions/NBC_UserAdvManager/trunk/admin/global.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/global.tpl	(revision 5592)
+++ 	(revision )
@@ -1,346 +1,0 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{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="{$UAM_PATH}admin/uam.css">{/html_head}
-
-<script type="text/javascript">
-jQuery().ready(function(){ldelim}
-  jQuery('.cluetip').cluetip({ldelim}
-    width: 500,
-    splitTitle: '|'
-  });
-});
-</script>
-
-<script type="text/javascript">
-function uam_blockToggleDisplay( headerId, contentId )
-{ldelim}
-  if (typeof(headerId)=='string')
-  {ldelim}
-   if ( headerId.length>  1)
-       blockToggleDisplay(headerId, contentId) ;
-      document.getElementById("nb_para").value =headerId ;
-      document.getElementById("nb_para2").value =contentId;
-} }
-</script>
-
-<div class="titrePage">
-  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle1'|@translate}</h2>
-</div>
-
-<form method="post" action="" class="general">
-
-<p><input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'audit'|@translate}" name="audit"></p>
-
-<input name="nb_para" id="nb_para" type="text" value="{$nb_para}" style="display:none"> 
-<input name="nb_para2" id="nb_para2" type="text" value="{$nb_para2}" style="display:none"> 
-
-<div id="instructionConfig1" class="instructionBlock" >
-
-  <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>
-
-  <div id="Config1" class="instructionBlockContent" style="display:none">
-  <fieldset>
-    <ul>
-    	<li><label class="cluetip" title="{'UAM_casenTitle'|translate}|{'UAM_casenTitle_d'|translate}">{'UAM_No_Casse'|@translate}</label><br><br>
-        <input type="radio" value="false" {$UAM_NO_CASSE_FALSE} name="UAM_No_Casse">{'UAM_No_Casse_false'|@translate}<br>
-        <input type="radio" value="true" {$UAM_NO_CASSE_TRUE} name="UAM_No_Casse">{'UAM_No_Casse_true'|@translate}<br><br>
-   		</li>
-      
-    	<li><label class="cluetip" title="{'UAM_carexcTitle'|translate}|{'UAM_carexcTitle_d'|translate}">{'UAM_Username_Char'|@translate}</label><br><br>
-        <input type="radio" value="false" {$UAM_USERNAME_CHAR_FALSE} name="UAM_Username_Char">{'UAM_Username_Char_false'|@translate}<br>
-        <input type="radio" value="true" {$UAM_USERNAME_CHAR_TRUE} name="UAM_Username_Char">{'UAM_Username_Char_true'|@translate}
-        <div id="uam_leftmargin"><input type="text" name="UAM_Username_List" value="{$UAM_USERNAME_CHAR_LIST}" size="20" style="text-align: center;"></div><br><br>
-    	</li>
-      
-    	<li><label class="cluetip" title="{'UAM_passwTitle'|translate}|{'UAM_passwTitle_d'|translate}">{'UAM_Password_Enforced'|@translate}</label><br><br>
-        <input type="radio" value="false" {$UAM_PASSWORDENF_FALSE} name="UAM_Password_Enforced">{'UAM_Password_Enforced_false'|@translate}<br>
-        <input type="radio" value="true" {$UAM_PASSWORDENF_TRUE} name="UAM_Password_Enforced">{'UAM_Password_Enforced_true'|@translate}&nbsp;<input type="text" name="UAM_Password_Score" value="{$UAM_PASSWORD_SCORE}" size="5" style="text-align: center;"><br><br>
-
-        {'UAM_PasswordTest'|@translate}<input class="cluetip" title="{'UAM_passwtestTitle'|translate}|{'UAM_passwtestTitle_d'|translate}" type="text" name="UAM_Password_Test" value="{$UAM_PASSWORD_TEST}" size="50" style="text-align: left;">&nbsp;&nbsp;&nbsp;
-        <input class="submit" type="submit" value="{'PasswordTest'|@translate}" name="PasswordTest">&nbsp;&nbsp;&nbsp;
-        {'UAM_ScoreTest'|@translate}{$UAM_PASSWORD_TEST_SCORE}<br><br>
-    	</li>
-
-      <ul>
-      <li><label class="cluetip" title="{'UAM_passwadmTitle'|translate}|{'UAM_passwadmTitle_d'|translate}">{'UAM_AdminPassword_Enforced'|@translate}</label><br><br>
-        <input type="radio" value="false" {$UAM_ADMINPASSWENF_FALSE} name="UAM_AdminPassword_Enforced">{'UAM_AdminPassword_Enforced_false'|@translate}<br>        
-        <input type="radio" value="true" {$UAM_ADMINPASSWENF_TRUE} name="UAM_AdminPassword_Enforced">{'UAM_AdminPassword_Enforced_true'|@translate}<br><br>
-      </li>
-      </ul>
-      
-    	<li><label class="cluetip" title="{'UAM_mailexcTitle'|translate}|{'UAM_mailexcTitle_d'|translate}">{'UAM_MailExclusion'|@translate}</label><br><br>
-        <input type="radio" value="false" {$UAM_MAILEXCLUSION_FALSE} name="UAM_MailExclusion">{'UAM_MailExclusion_false'|@translate}<br>
-        <input type="radio" value="true" {$UAM_MAILEXCLUSION_TRUE} name="UAM_MailExclusion">{'UAM_MailExclusion_true'|@translate}<br><br>
-    	</li>
-
-{if $UAM_MAILEXCLUSION_TRUE}
-  {if $UAM_ERROR_REPORTS4}     
-      <div id="uam_leftmargin"><textarea name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea></div><br><br>
-  {else}
-      <div id="uam_leftmargin"><textarea name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea></div><br><br>
-  {/if}
-{else}
-      <div id="uam_leftmargin"><textarea name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea></div><br><br>
-{/if}
-    </ul>
-  </fieldset>
-  </div>
-</div>
-
-
-
-
-<div id="instructionConfig2" class="instructionBlock" >
-    
-  <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>
-  
-  <div id="Config2" class="instructionBlockContent" style="display:none">
-    <fieldset>
-      <ul>
-      	<li><label class="cluetip" title="{'UAM_infomailTitle'|translate}|{'UAM_infomailTitle_d'|translate}">{'UAM_Mail_Info'|@translate}</label><br><br>
-          <input type="radio" value="false" {$UAM_MAIL_INFO_FALSE} name="UAM_Mail_Info">{'UAM_Mail_Info_false'|@translate}<br>
-          <input type="radio" value="true" {$UAM_MAIL_INFO_TRUE} name="UAM_Mail_Info">{'UAM_Mail_Info_true'|@translate}<br><br>
-      	</li>
-        <ul>
-{if $UAM_MAIL_INFO_TRUE}
-        <li><label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">{'UAM_MailInfo_Text'|@translate}</label><br><br>
-          <textarea name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea><br><br>
-        </li>
-{else}
-          <li><label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">{'UAM_MailInfo_Text'|@translate}</label><br><br>
-            <textarea name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea><br><br>
-          </li>
-{/if}
-<!--
-{if 'FCK_PATH'|@defined}
-  <div style="text-align:right;">
-    <a href="#" onClick="toogleEditor('UAM_MailInfo_Text'); return false;">FCK Editor On/Off</a>
-  </div>
-{/if}
--->
-        </ul>
-
-      	<li><label class="cluetip" title="{'UAM_confirmmailTitle'|translate}|{'UAM_confirmmailTitle_d'|translate}">{'UAM_Confirm_Mail'|@translate}</label><br><br>
-          <input type="radio" value="false" {$UAM_CONFIRM_MAIL_FALSE} name="UAM_Confirm_Mail">{'UAM_Confirm_Mail_false'|@translate}<br>
-          <input type="radio" value="true" {$UAM_CONFIRM_MAIL_TRUE} name="UAM_Confirm_Mail">{'UAM_Confirm_Mail_true'|@translate}<br><br>
-      	</li>
-
-        <ul>
-       	  <li><label class="cluetip" title="{'UAM_adminconfmailTitle'|translate}|{'UAM_adminconfmailTitle_d'|translate}">{'UAM_AdminConfMail'|@translate}</label><br><br>
-            <input type="radio" value="false" {$UAM_ADMINCONFMAIL_FALSE} name="UAM_Admin_ConfMail">{'UAM_Admin_ConfMail_false'|@translate}<br>
-            <input type="radio" value="true" {$UAM_ADMINCONFMAIL_TRUE} name="UAM_Admin_ConfMail">{'UAM_Admin_ConfMail_true'|@translate}<br><br>
-          </li>
-{if $UAM_CONFIRM_MAIL_TRUE}
-          <li><label class="cluetip" title="{'UAM_confirmtxtTitle'|translate}|{'UAM_confirmtxtTitle_d'|translate}">{'UAM_ConfirmMail_Text'|@translate}</label><br><br>
-            <textarea name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea><br><br>
-          </li>
-{else}
-          <li><label class="cluetip" title="{'UAM_confirmtxtTitle'|translate}|{'UAM_confirmtxtTitle_d'|translate}">{'UAM_ConfirmMail_Text'|@translate}</label><br><br>
-            <textarea name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea><br><br>
-          </li>
-{/if}
-<!--
-{if 'FCK_PATH'|@defined}
-  <div style="text-align:right;">
-    <a href="#" onClick="toogleEditor('UAM_ConfirmMail_Text'); return false;">FCK Editor On/Off</a>
-  </div>
-{/if}
--->
-        </ul>
-
-        <br><hr><br>
-        
-        <div id="uam_notice">{'UAM_Confirm_grpstat_notice'|@translate}</div>
-        
-        <br>
-        
-        <li>
-          <label class="cluetip" title="{'UAM_confirmgrpTitle'|translate}|{'UAM_confirmgrpTitle_d'|translate}">{'UAM_Confirm_Group'|@translate}</label><br><br>
-        </li>
-
-        <ul>
-          <li><label>{'UAM_No_Confirm_Group'|@translate}</label><br>
-            <div id="uam_leftmargin">{html_options name="UAM_No_Confirm_Group" options=$No_Confirm_Group.group_options selected=$No_Confirm_Group.group_selected}</div><br><br>
-          </li>
-      
-          <li><label>{'UAM_Validated_Group'|@translate}</label><br>
-            <div id="uam_leftmargin">{html_options name="UAM_Validated_Group" options=$Validated_Group.group_options selected=$Validated_Group.group_selected}</div><br><br>
-          </li>
-        </ul>
-
-        <li>
-          <label class="cluetip" title="{'UAM_confirmstatTitle'|translate}|{'UAM_confirmstatTitle_d'|translate}">{'UAM_Confirm_Status'|@translate}</label><br><br>
-        </li>
-
-        <ul>
-          <li><label>{'UAM_No_Confirm_Status'|@translate}</label><br>
-            <div id="uam_leftmargin">{html_options name="UAM_No_Confirm_Status" options=$No_Confirm_Status.Status_options selected=$No_Confirm_Status.Status_selected}</div><br><br>
-          </li>
-
-          <li><label>{'UAM_Validated_Status'|@translate}</label><br>
-            <div id="uam_leftmargin">{html_options name="UAM_Validated_Status" options=$Confirm_Status.Status_options selected=$Confirm_Status.Status_selected}</div><br><br>
-          </li>
-        </ul>
-
-        <br><hr><br>
-
-        <li><label class="cluetip" title="{'UAM_validationlimitTitle'|translate}|{'UAM_validationlimitTitle_d'|translate}">{'UAM_ValidationLimit_Info'|@translate}</label><br><br>
-          <input type="radio" value="false" {$UAM_CONFIRMMAIL_TIMEOUT_FALSE} name="UAM_ConfirmMail_TimeOut"> {'UAM_ConfirmMail_TimeOut_false'|@translate}<br>
-          <input type="radio" value="true" {$UAM_CONFIRMMAIL_TIMEOUT_TRUE} name="UAM_ConfirmMail_TimeOut"> {'UAM_ConfirmMail_TimeOut_true'|@translate}<input type="text" name="UAM_ConfirmMail_Delay" value="{$UAM_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;"><br><br>
-        </li>
-    
-        <li><label class="cluetip" title="{'UAM_remailTitle'|translate}|{'UAM_remailTitle_d'|translate}">{'UAM_ConfirmMail_Remail'|@translate}</label><br><br>
-          <input type="radio" value="false" {$UAM_CONFIRMMAIL_REMAIL_FALSE} name="UAM_ConfirmMail_Remail"> {'UAM_ConfirmMail_Remail_false'|@translate}<br>
-          <input type="radio" value="true" {$UAM_CONFIRMMAIL_REMAIL_TRUE} name="UAM_ConfirmMail_Remail"> {'UAM_ConfirmMail_Remail_true'|@translate}<br><br>
-        </li>
-
-        <ul>
-{if $UAM_CONFIRMMAIL_REMAIL_TRUE}
-        <li><label class="cluetip" title="{'UAM_remailtxt1Title'|translate}|{'UAM_remailtxt1Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt1'|@translate}</label><br><br>
-          <textarea name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea><br><br>
-        </li>
-{else}
-        <li><label class="cluetip" title="{'UAM_remailtxt1Title'|translate}|{'UAM_remailtxt1Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt1'|@translate}</label><br><br>
-          <textarea  name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" cols="80" readonly{$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea><br><br>
-        </li>
-{/if}
-<!--
-{if 'FCK_PATH'|@defined}
-  <div style="text-align:right;">
-    <a href="#" onClick="toogleEditor('UAM_ConfirmMail_ReMail_Txt1'); return false;">FCK Editor On/Off</a>
-  </div>
-{/if}
--->
-
-{if $UAM_CONFIRMMAIL_REMAIL_TRUE}
-        <li><label class="cluetip" title="{'UAM_remailtxt2Title'|translate}|{'UAM_remailtxt2Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt2'|@translate}</label><br><br>
-          <textarea name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea><br>
-        </li>
-{else}
-        <li><label class="cluetip" title="{'UAM_remailtxt2Title'|translate}|{'UAM_remailtxt2Title_d'|translate}">{'UAM_ConfirmMail_ReMail_Txt2'|@translate}</label><br><br>
-          <textarea name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea><br><br>
-        </li>
-{/if}
-<!--
-{if 'FCK_PATH'|@defined}
-  <div style="text-align:right;">
-    <a href="#" onClick="toogleEditor('UAM_ConfirmMail_ReMail_Txt2'); return false;">FCK Editor On/Off</a>
-  </div>
-{/if}
--->
-        </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>
-  </div>
-</div>
-
-
-<div id="instructionConfig3" class="instructionBlock" >
-
-  <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>
-  
-  <div id="Config3" class="instructionBlockContent" style="display:none">
-    <fieldset>
-      <ul>
-        <li><label class="cluetip" title="{'UAM_ghosttrackerTitle'|translate}|{'UAM_ghosttrackerTitle_d'|translate}">{'UAM_GhostTracker'|@translate}</label><br><br>
-          <input type="radio" value="false" {$UAM_GHOSTRACKER_FALSE} name="UAM_GhostUser_Tracker">{'UAM_GhostTracker_false'|@translate}<br>
-          <input type="radio" value="true" {$UAM_GHOSTRACKER_TRUE} name="UAM_GhostUser_Tracker">{'UAM_GhostTracker_true'|@translate}<input type="text" name="UAM_GhostTracker_DayLimit" value="{$UAM_GHOSTRACKER_DAYLIMIT}" size="5" style="text-align: center;"><br><br>
-        </li>
-        
-        <ul>
-{if $UAM_GHOSTRACKER_TRUE}
-          <li><label class="cluetip" title="{'UAM_gttextTitle'|translate}|{'UAM_gttextTitle_d'|translate}">{'UAM_GhostTracker_ReminderText'|@translate}</label><br><br>
-            <textarea name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
-          </li>
-{else}
-          <li><label class="cluetip" title="{'UAM_gttextTitle'|translate}|{'UAM_gttextTitle_d'|translate}">{'UAM_GhostTracker_ReminderText'|@translate}</label><br><br>
-            <textarea name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
-          </li>
-{/if}
-<!--
-{if 'FCK_PATH'|@defined}
-  <div style="text-align:right;">
-    <a href="#" onClick="toogleEditor('UAM_GhostTracker_ReminderText'); return false;">FCK Editor On/Off</a>
-  </div>
-{/if}
--->
-        </ul>
-    
-        <li><label class="cluetip" title="{'UAM_lastvisitTitle'|translate}|{'UAM_lastvisitTitle_d'|translate}">{'UAM_LastVisit'|@translate}</label><br><br>
-          <input type="radio" value="false" {$UAM_ADDLASTVISIT_FALSE} name="UAM_Add_LastVisit_Column">{'UAM_LastVisit_false'|@translate}<br>
-          <input type="radio" value="true" {$UAM_ADDLASTVISIT_TRUE} name="UAM_Add_LastVisit_Column">{'UAM_LastVisit_true'|@translate}<br><br>
-        </li>
-
-        <li><label class="cluetip" title="{'UAM_commentTitle'|translate}|{'UAM_commentTitle_d'|translate}">{'UAM_No_Comment_Anonymous'|@translate}</label><br><br>
-          <input type="radio" value="false" {$UAM_NO_COMMENT_ANO_FALSE} name="UAM_No_Comment_Anonymous">{'UAM_No_Comment_Anonymous_false'|@translate}<br>
-          <input type="radio" value="true" {$UAM_NO_COMMENT_ANO_TRUE} name="UAM_No_Comment_Anonymous">{'UAM_No_Comment_Anonymous_true'|@translate}<br><br>
-        </li>
-      </ul>
-    </fieldset>
-  </div>
-</div>
-
-<p><input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'audit'|@translate}" name="audit"></p>
-
-<div id="instructionTips" class="instructionBlock" >
-    
-  <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>
-  
-  <div id="Tips" class="instructionBlockContent" style="display:none">
-    <fieldset>
-      <div id="Tips1_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('Tips1_header', 'Tips1')">
-        <span>{'UAM_Tips1'|@translate}</span>
-      </div>
-      <div id="Tips1" class="instructionBlockContent" style="display:none">
-        <fieldset>
-          {'UAM_Tips1_txt'|@translate}
-        </fieldset>
-      </div>
-    </fieldset>
-  </div>
-</div>
-</form>
-
-<script type="text/javascript">
-  var n1=document.getElementById("nb_para").value ;
-  var n2=document.getElementById("nb_para2").value;
-   uam_blockToggleDisplay(n1,n2 );
-</script>
Index: /extensions/NBC_UserAdvManager/trunk/admin/template/ghosttracker.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/template/ghosttracker.tpl	(revision 5593)
+++ /extensions/NBC_UserAdvManager/trunk/admin/template/ghosttracker.tpl	(revision 5593)
@@ -0,0 +1,79 @@
+﻿{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
+
+{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}
+
+<script type="text/javascript">
+jQuery().ready(function()
+{ldelim}
+  jQuery('.cluetip').cluetip(
+  {ldelim}
+    width: 600,
+    splitTitle: '|'
+  {rdelim});
+{rdelim});
+</script>
+
+<div class="titrePage">
+  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle4'|@translate}</h2>
+</div>
+
+<form method="post" action="" class="general">
+  <fieldset>
+  	<legend>{'GT_Init'|@translate}</legend>
+    <ul>
+		  <li>
+        <label>{'UAM_GhostTracker_Init'|@translate}</label><br><br>
+      </li>
+    </ul>
+    <p><input class="submit" type="submit" value="{'GT_Reset'|@translate}" name="GhostTracker_Init" ></p>
+  </fieldset>
+  
+  <fieldset>
+    <legend class="cluetip" title="{'UAM_gtTitle'|translate}|{'UAM_gtTitle_d'|translate}">{'GhostTracker_Title'|@translate}</legend>
+      {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+        <table class="table2" width="97%" summary="">
+          <thead>
+            <tr class="throw">
+              <td>&nbsp;</td>
+              <td>{'Username'|@translate}</td>
+              <td>{'Email address'|@translate}</td>
+              <td>{'LastVisit_Date'|@translate}</td>
+              <td>{'Reminder'|@translate}</td>
+            </tr>
+          </thead>
+
+          {foreach from=$users item=user name=users_loop}
+            <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
+              <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" ></td>
+              <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
+              <td>{$user.EMAIL}</td>
+{if $user.REMINDER == l10n('Reminder_Sent_NOK')}
+              <td style="color:orange;text-align:center;">{$user.LASTVISIT}</td>
+              <td style="color:orange;text-align:center;">{$user.REMINDER}</td>
+{else $user.REMINDER == l10n('Reminder_Sent_OK')}
+              <td style="color:red;text-align:center;">{$user.LASTVISIT}</td>
+              <td style="color:red;text-align:center;">{$user.REMINDER}</td>
+{/if}
+              {foreach from=$user.plugin_columns item=data}
+                <td>{$data}</td>
+              {/foreach}    			
+            </tr>
+          {/foreach}
+        </table>
+
+        {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+        <br>
+          
+<p>
+  {'target'|@translate}
+  <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
+  <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
+</p>
+
+<p>
+  <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected" >
+  <input class="submit" type="submit" value="{'Reminder'|@translate}" name="Reminder_Email" >
+</p>
+  </fieldset>
+</form>
Index: /extensions/NBC_UserAdvManager/trunk/admin/template/global.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/template/global.tpl	(revision 5593)
+++ /extensions/NBC_UserAdvManager/trunk/admin/template/global.tpl	(revision 5593)
@@ -0,0 +1,543 @@
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
+
+{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}
+
+<script type="text/javascript">
+jQuery().ready(function()
+{ldelim}
+  jQuery('.cluetip').cluetip(
+  {ldelim}
+    width: 550,
+    splitTitle: '|'
+  {rdelim});
+{rdelim});
+
+function blockToggleDisplay(headerId, contentId)
+{ldelim}
+  var revHeader = document.getElementById(headerId);
+  var revContent = document.getElementById(contentId);
+
+  if (revContent.style.display == 'none')
+  {ldelim}
+    revContent.style.display = 'block';
+    revHeader.className = 'instructionBlockHeaderExpanded';
+  {rdelim}
+  else
+  {ldelim}
+    revContent.style.display = 'none';
+    revHeader.className = 'instructionBlockHeaderCollapsed';
+  {rdelim}
+{rdelim}
+
+function uam_blockToggleDisplay( headerId, contentId )
+{ldelim}
+  if (typeof(headerId)=='string')
+  {ldelim}
+   if ( headerId.length>  1)
+       blockToggleDisplay(headerId, contentId) ;
+      document.getElementById("nb_para").value =headerId ;
+      document.getElementById("nb_para2").value =contentId;
+  {rdelim}
+{rdelim}
+</script>
+
+<div class="titrePage">
+  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle1'|@translate}</h2>
+</div>
+
+<form method="post" action="" class="general">
+
+  <p>
+    <input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}>
+      &nbsp;
+    <input class="submit" type="submit" value="{'audit'|@translate}" name="audit">
+  </p>
+
+  <input name="nb_para" id="nb_para" type="text" value="{$nb_para}" style="display:none"> 
+  <input name="nb_para2" id="nb_para2" type="text" value="{$nb_para2}" style="display:none"> 
+
+  <div id="instructionConfig1" class="instructionBlock" >
+
+    <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>
+
+    <div id="Config1" class="instructionBlockContent" style="display:none">
+      <fieldset>
+        <ul>
+          <li>
+            <label class="cluetip" title="{'UAM_casenTitle'|translate}|{'UAM_casenTitle_d'|translate}">
+              {'UAM_No_Casse'|@translate}
+            </label>
+          <br><br>
+            <input type="radio" value="false" {$UAM_NO_CASSE_FALSE} name="UAM_No_Casse">
+              {'UAM_No_Casse_false'|@translate}<br>
+            <input type="radio" value="true" {$UAM_NO_CASSE_TRUE} name="UAM_No_Casse">
+              {'UAM_No_Casse_true'|@translate}<br><br>
+          </li>
+      
+          <li>
+            <label class="cluetip" title="{'UAM_carexcTitle'|translate}|{'UAM_carexcTitle_d'|translate}">
+              {'UAM_Username_Char'|@translate}
+            </label>
+          <br><br>
+            <input type="radio" value="false" {$UAM_USERNAME_CHAR_FALSE} name="UAM_Username_Char">
+              {'UAM_Username_Char_false'|@translate}<br>
+            <input type="radio" value="true" {$UAM_USERNAME_CHAR_TRUE} name="UAM_Username_Char">
+              {'UAM_Username_Char_true'|@translate}
+            <div id="uam_leftmargin">
+              <input type="text" name="UAM_Username_List" value="{$UAM_USERNAME_CHAR_LIST}" size="20" style="text-align: center;">
+            </div>
+          <br><br>
+          </li>
+      
+          <li>
+            <label class="cluetip" title="{'UAM_passwTitle'|translate}|{'UAM_passwTitle_d'|translate}">
+              {'UAM_Password_Enforced'|@translate}
+            </label>
+          <br><br>
+            <input type="radio" value="false" {$UAM_PASSWORDENF_FALSE} name="UAM_Password_Enforced">
+              {'UAM_Password_Enforced_false'|@translate}<br>
+            <input type="radio" value="true" {$UAM_PASSWORDENF_TRUE} name="UAM_Password_Enforced">
+              {'UAM_Password_Enforced_true'|@translate}&nbsp;
+            <input type="text" name="UAM_Password_Score" value="{$UAM_PASSWORD_SCORE}" size="5" style="text-align: center;">
+          <br><br>
+            {'UAM_PasswordTest'|@translate}
+              <input class="cluetip" title="{'UAM_passwtestTitle'|translate}|{'UAM_passwtestTitle_d'|translate}" type="text" name="UAM_Password_Test" value="{$UAM_PASSWORD_TEST}" size="50" style="text-align: left;">
+              &nbsp;&nbsp;&nbsp;
+              <input class="submit" type="submit" value="{'PasswordTest'|@translate}" name="PasswordTest">
+              &nbsp;&nbsp;&nbsp;{'UAM_ScoreTest'|@translate}{$UAM_PASSWORD_TEST_SCORE}
+            <br><br>
+          </li>
+
+          <ul>
+            <li>
+              <label class="cluetip" title="{'UAM_passwadmTitle'|translate}|{'UAM_passwadmTitle_d'|translate}">
+                {'UAM_AdminPassword_Enforced'|@translate}
+              </label>
+            <br><br>
+              <input type="radio" value="false" {$UAM_ADMINPASSWENF_FALSE} name="UAM_AdminPassword_Enforced">
+                {'UAM_AdminPassword_Enforced_false'|@translate}<br>        
+              <input type="radio" value="true" {$UAM_ADMINPASSWENF_TRUE} name="UAM_AdminPassword_Enforced">
+                {'UAM_AdminPassword_Enforced_true'|@translate}
+              <br><br>
+            </li>
+          </ul>
+      
+          <li>
+            <label class="cluetip" title="{'UAM_mailexcTitle'|translate}|{'UAM_mailexcTitle_d'|translate}">
+              {'UAM_MailExclusion'|@translate}
+            </label>
+          <br><br>
+            <input type="radio" value="false" {$UAM_MAILEXCLUSION_FALSE} name="UAM_MailExclusion">
+              {'UAM_MailExclusion_false'|@translate}<br>
+            <input type="radio" value="true" {$UAM_MAILEXCLUSION_TRUE} name="UAM_MailExclusion">
+              {'UAM_MailExclusion_true'|@translate}
+            <br><br>
+          </li>
+
+          {if $UAM_MAILEXCLUSION_TRUE}
+            {if $UAM_ERROR_REPORTS4}     
+              <div id="uam_leftmargin">
+                <textarea name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" cols="80" style="color: red" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea>
+              </div>
+            <br><br>
+            {else}
+              <div id="uam_leftmargin">
+                <textarea name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea>
+              </div>
+            <br><br>
+            {/if}
+          {else}
+            <div id="uam_leftmargin">
+              <textarea name="UAM_MailExclusion_List" id="UAM_MailExclusion_List" rows="3" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_MAILEXCLUSION_LIST}</textarea>
+            </div>
+          <br><br>
+          {/if}
+        </ul>
+      </fieldset>
+    </div>
+  </div>
+
+
+
+
+  <div id="instructionConfig2" class="instructionBlock" >
+
+    <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>
+  
+    <div id="Config2" class="instructionBlockContent" style="display:none">
+      <fieldset>
+        <ul>
+          <li>
+            <label class="cluetip" title="{'UAM_infomailTitle'|translate}|{'UAM_infomailTitle_d'|translate}">
+              {'UAM_Mail_Info'|@translate}
+            </label>
+          <br><br>
+            <input type="radio" value="false" {$UAM_MAIL_INFO_FALSE} name="UAM_Mail_Info">
+              {'UAM_Mail_Info_false'|@translate}<br>
+            <input type="radio" value="true" {$UAM_MAIL_INFO_TRUE} name="UAM_Mail_Info">
+              {'UAM_Mail_Info_true'|@translate}
+            <br><br>
+          </li>
+
+          <ul>
+            {if $UAM_MAIL_INFO_TRUE}
+              <li>
+                <label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">
+                  {'UAM_MailInfo_Text'|@translate}
+                </label>
+              <br><br>
+                <textarea name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea>
+              <br><br>
+              </li>
+            {else}
+              <li>
+                <label class="cluetip" title="{'UAM_infotxtTitle'|translate}|{'UAM_infotxtTitle_d'|translate}">
+                  {'UAM_MailInfo_Text'|@translate}
+                </label>
+              <br><br>
+                <textarea name="UAM_MailInfo_Text" id="UAM_MailInfo_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_MAILINFO_TEXT}</textarea>
+              <br><br>
+              </li>
+            {/if}
+<!--
+            {* if 'FCK_PATH'|@defined *}
+              <div style="text-align:right;">
+                <a href="#" onClick="toogleEditor('UAM_MailInfo_Text'); return false;">FCK Editor On/Off</a>
+              </div>
+            {* /if *}
+-->
+          </ul>
+
+        	<li>
+            <label class="cluetip" title="{'UAM_confirmmailTitle'|translate}|{'UAM_confirmmailTitle_d'|translate}">
+              {'UAM_Confirm_Mail'|@translate}
+            </label>
+         <br><br>
+            <input type="radio" value="false" {$UAM_CONFIRM_MAIL_FALSE} name="UAM_Confirm_Mail">
+              {'UAM_Confirm_Mail_false'|@translate}<br>
+            <input type="radio" value="true" {$UAM_CONFIRM_MAIL_TRUE} name="UAM_Confirm_Mail">
+              {'UAM_Confirm_Mail_true'|@translate}
+            <br><br>
+        	</li>
+
+          <ul>
+         	  <li>
+              <label class="cluetip" title="{'UAM_adminconfmailTitle'|translate}|{'UAM_adminconfmailTitle_d'|translate}">
+                {'UAM_AdminConfMail'|@translate}
+              </label>
+            <br><br>
+              <input type="radio" value="false" {$UAM_ADMINCONFMAIL_FALSE} name="UAM_Admin_ConfMail">
+                {'UAM_Admin_ConfMail_false'|@translate}<br>
+              <input type="radio" value="true" {$UAM_ADMINCONFMAIL_TRUE} name="UAM_Admin_ConfMail">
+                {'UAM_Admin_ConfMail_true'|@translate}
+              <br><br>
+            </li>
+            
+            {if $UAM_CONFIRM_MAIL_TRUE}
+              <li>
+                <label class="cluetip" title="{'UAM_confirmtxtTitle'|translate}|{'UAM_confirmtxtTitle_d'|translate}">
+                  {'UAM_ConfirmMail_Text'|@translate}
+                </label>
+              <br><br>
+                <textarea name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea>
+              <br><br>
+              </li>
+            {else}
+              <li>
+                <label class="cluetip" title="{'UAM_confirmtxtTitle'|translate}|{'UAM_confirmtxtTitle_d'|translate}">
+                  {'UAM_ConfirmMail_Text'|@translate}
+                </label>
+              <br><br>
+                <textarea name="UAM_ConfirmMail_Text" id="UAM_ConfirmMail_Text" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_TEXT}</textarea>
+              <br><br>
+              </li>
+            {/if}
+<!--
+            {* if 'FCK_PATH'|@defined *}
+              <div style="text-align:right;">
+                <a href="#" onClick="toogleEditor('UAM_ConfirmMail_Text'); return false;">FCK Editor On/Off</a>
+              </div>
+            {* /if *}
+-->
+            {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><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><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>
+
+          <br><hr><br>
+        
+          <div id="uam_notice">{'UAM_Confirm_grpstat_notice'|@translate}</div>
+            <br>
+            <li>
+              <label class="cluetip" title="{'UAM_confirmgrpTitle'|translate}|{'UAM_confirmgrpTitle_d'|translate}">
+                {'UAM_Confirm_Group'|@translate}
+              </label>
+            <br><br>
+            </li>
+
+            <ul>
+              <li>
+                <label>
+                  {'UAM_No_Confirm_Group'|@translate}
+                </label><br>
+                <div id="uam_leftmargin">
+                  {html_options name="UAM_No_Confirm_Group" options=$No_Confirm_Group.group_options selected=$No_Confirm_Group.group_selected}
+                </div>
+                <br><br>
+              </li>
+      
+              <li>
+                <label>
+                  {'UAM_Validated_Group'|@translate}
+                </label><br>
+                <div id="uam_leftmargin">
+                  {html_options name="UAM_Validated_Group" options=$Validated_Group.group_options selected=$Validated_Group.group_selected}
+                </div>
+                <br><br>
+              </li>
+            </ul>
+
+            <li>
+              <label class="cluetip" title="{'UAM_confirmstatTitle'|translate}|{'UAM_confirmstatTitle_d'|translate}">
+                {'UAM_Confirm_Status'|@translate}
+              </label>
+            <br><br>
+            </li>
+
+            <ul>
+              <li>
+                <label>
+                  {'UAM_No_Confirm_Status'|@translate}
+                </label><br>
+                <div id="uam_leftmargin">
+                  {html_options name="UAM_No_Confirm_Status" options=$No_Confirm_Status.Status_options selected=$No_Confirm_Status.Status_selected}
+                </div>
+                <br><br>
+              </li>
+
+              <li>
+                <label>
+                  {'UAM_Validated_Status'|@translate}
+                </label><br>
+                <div id="uam_leftmargin">
+                  {html_options name="UAM_Validated_Status" options=$Confirm_Status.Status_options selected=$Confirm_Status.Status_selected}
+                </div>
+                <br><br>
+              </li>
+            </ul>
+
+            <br><hr><br>
+
+            <li>
+              <label class="cluetip" title="{'UAM_validationlimitTitle'|translate}|{'UAM_validationlimitTitle_d'|translate}">
+                {'UAM_ValidationLimit_Info'|@translate}
+              </label>
+            <br><br>
+              <input type="radio" value="false" {$UAM_CONFIRMMAIL_TIMEOUT_FALSE} name="UAM_ConfirmMail_TimeOut">
+                 {'UAM_ConfirmMail_TimeOut_false'|@translate}<br>
+              <input type="radio" value="true" {$UAM_CONFIRMMAIL_TIMEOUT_TRUE} name="UAM_ConfirmMail_TimeOut">
+                 {'UAM_ConfirmMail_TimeOut_true'|@translate}
+              <input type="text" name="UAM_ConfirmMail_Delay" value="{$UAM_CONFIRMMAIL_DELAY}" size="5" style="text-align: center;"><br><br>
+            </li>
+
+            <li>
+              <label class="cluetip" title="{'UAM_remailTitle'|translate}|{'UAM_remailTitle_d'|translate}">
+                {'UAM_ConfirmMail_Remail'|@translate}
+              </label>
+            <br><br>
+              <input type="radio" value="false" {$UAM_CONFIRMMAIL_REMAIL_FALSE} name="UAM_ConfirmMail_Remail">
+                 {'UAM_ConfirmMail_Remail_false'|@translate}<br>
+              <input type="radio" value="true" {$UAM_CONFIRMMAIL_REMAIL_TRUE} name="UAM_ConfirmMail_Remail">
+                 {'UAM_ConfirmMail_Remail_true'|@translate}<br><br>
+            </li>
+
+            <ul>
+              {if $UAM_CONFIRMMAIL_REMAIL_TRUE}
+                <li>
+                  <label class="cluetip" title="{'UAM_remailtxt1Title'|translate}|{'UAM_remailtxt1Title_d'|translate}">
+                    {'UAM_ConfirmMail_ReMail_Txt1'|@translate}
+                  </label>
+                <br><br>
+                  <textarea name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea>
+                <br><br>
+                </li>
+              {else}
+                <li>
+                  <label class="cluetip" title="{'UAM_remailtxt1Title'|translate}|{'UAM_remailtxt1Title_d'|translate}">
+                    {'UAM_ConfirmMail_ReMail_Txt1'|@translate}
+                  </label>
+                <br><br>
+                  <textarea  name="UAM_ConfirmMail_ReMail_Txt1" id="UAM_ConfirmMail_ReMail_Txt1" rows="10" cols="80" readonly{$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT1}</textarea>
+                <br><br>
+                </li>
+              {/if}
+<!--
+              {* if 'FCK_PATH'|@defined *}
+                <div style="text-align:right;">
+                  <a href="#" onClick="toogleEditor('UAM_ConfirmMail_ReMail_Txt1'); return false;">FCK Editor On/Off</a>
+                </div>
+              {* /if *}
+-->
+
+              {if $UAM_CONFIRMMAIL_REMAIL_TRUE}
+                <li>
+                  <label class="cluetip" title="{'UAM_remailtxt2Title'|translate}|{'UAM_remailtxt2Title_d'|translate}">
+                    {'UAM_ConfirmMail_ReMail_Txt2'|@translate}
+                  </label>
+                <br><br>
+                  <textarea name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea><br>
+                </li>
+              {else}
+                <li>
+                  <label class="cluetip" title="{'UAM_remailtxt2Title'|translate}|{'UAM_remailtxt2Title_d'|translate}">
+                    {'UAM_ConfirmMail_ReMail_Txt2'|@translate}
+                  </label>
+                <br><br>
+                  <textarea name="UAM_ConfirmMail_ReMail_Txt2" id="UAM_ConfirmMail_ReMail_Txt2" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_REMAIL_TXT2}</textarea>
+                <br><br>
+                </li>
+              {/if}
+<!--
+              {* if 'FCK_PATH'|@defined *}
+                <div style="text-align:right;">
+                  <a href="#" onClick="toogleEditor('UAM_ConfirmMail_ReMail_Txt2'); return false;">FCK Editor On/Off</a>
+                </div>
+              {* /if *}
+-->
+            </ul>
+        </ul>
+      </fieldset>
+    </div>
+  </div>
+
+
+  <div id="instructionConfig3" class="instructionBlock" >
+
+    <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>
+  
+    <div id="Config3" class="instructionBlockContent" style="display:none">
+      <fieldset>
+        <ul>
+          <li><label class="cluetip" title="{'UAM_ghosttrackerTitle'|translate}|{'UAM_ghosttrackerTitle_d'|translate}">{'UAM_GhostTracker'|@translate}</label><br><br>
+            <input type="radio" value="false" {$UAM_GHOSTRACKER_FALSE} name="UAM_GhostUser_Tracker">{'UAM_GhostTracker_false'|@translate}<br>
+            <input type="radio" value="true" {$UAM_GHOSTRACKER_TRUE} name="UAM_GhostUser_Tracker">{'UAM_GhostTracker_true'|@translate}<input type="text" name="UAM_GhostTracker_DayLimit" value="{$UAM_GHOSTRACKER_DAYLIMIT}" size="5" style="text-align: center;"><br><br>
+          </li>
+        
+          <ul>
+            {if $UAM_GHOSTRACKER_TRUE}
+              <li><label class="cluetip" title="{'UAM_gttextTitle'|translate}|{'UAM_gttextTitle_d'|translate}">{'UAM_GhostTracker_ReminderText'|@translate}</label><br><br>
+                <textarea name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
+              </li>
+            {else}
+              <li><label class="cluetip" title="{'UAM_gttextTitle'|translate}|{'UAM_gttextTitle_d'|translate}">{'UAM_GhostTracker_ReminderText'|@translate}</label><br><br>
+                <textarea name="UAM_GhostTracker_ReminderText" id="UAM_GhostTracker_ReminderText" rows="10" cols="80" readonly {$TAG_INPUT_ENABLED}>{$UAM_GHOSTRACKER_REMINDERTEXT}</textarea><br><br>
+              </li>
+            {/if}
+<!--
+            {* if 'FCK_PATH'|@defined *}
+              <div style="text-align:right;">
+                <a href="#" onClick="toogleEditor('UAM_GhostTracker_ReminderText'); return false;">FCK Editor On/Off</a>
+              </div>
+            {* /if *}
+-->
+          </ul>
+    
+          <li><label class="cluetip" title="{'UAM_lastvisitTitle'|translate}|{'UAM_lastvisitTitle_d'|translate}">{'UAM_LastVisit'|@translate}</label><br><br>
+            <input type="radio" value="false" {$UAM_ADDLASTVISIT_FALSE} name="UAM_Add_LastVisit_Column">{'UAM_LastVisit_false'|@translate}<br>
+            <input type="radio" value="true" {$UAM_ADDLASTVISIT_TRUE} name="UAM_Add_LastVisit_Column">{'UAM_LastVisit_true'|@translate}<br><br>
+          </li>
+
+          <li><label class="cluetip" title="{'UAM_commentTitle'|translate}|{'UAM_commentTitle_d'|translate}">{'UAM_No_Comment_Anonymous'|@translate}</label><br><br>
+            <input type="radio" value="false" {$UAM_NO_COMMENT_ANO_FALSE} name="UAM_No_Comment_Anonymous">{'UAM_No_Comment_Anonymous_false'|@translate}<br>
+            <input type="radio" value="true" {$UAM_NO_COMMENT_ANO_TRUE} name="UAM_No_Comment_Anonymous">{'UAM_No_Comment_Anonymous_true'|@translate}<br><br>
+          </li>
+        </ul>
+      </fieldset>
+    </div>
+  </div>
+
+  <p>
+    <input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED} >&nbsp;<input class="submit" type="submit" value="{'audit'|@translate}" name="audit">
+  </p>
+</form>
+
+<div id="instructionTips" class="instructionBlock" >
+  <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>
+  
+  <div id="Tips" class="instructionBlockContent" style="display:none">
+    <fieldset>
+      <div id="Tips1_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('Tips1_header', 'Tips1')">
+        <span>{'UAM_Tips1'|@translate}</span>
+      </div>
+      <div id="Tips1" class="instructionBlockContent" style="display:none">
+        <fieldset>
+          {'UAM_Tips1_txt'|@translate}
+        </fieldset>
+      </div>
+    </fieldset>
+  </div>
+</div>
+
+
+<script type="text/javascript">
+  var n1=document.getElementById("nb_para").value;
+  var n2=document.getElementById("nb_para2").value;
+   uam_blockToggleDisplay(n1,n2);
+</script>
Index: /extensions/NBC_UserAdvManager/trunk/admin/template/index.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/template/index.php	(revision 5593)
+++ /extensions/NBC_UserAdvManager/trunk/admin/template/index.php	(revision 5593)
@@ -0,0 +1,33 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | PhpWebGallery - a PHP based picture gallery                           |
+// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// +-----------------------------------------------------------------------+
+// | file          : $Id: index.php 1912 2007-03-16 06:30:07Z rub $
+// | last update   : $Date: 2007-03-16 07:30:07 +0100 (ven, 16 mar 2007) $
+// | last modifier : $Author: rub $
+// | revision      : $Revision: 1912 $
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
Index: /extensions/NBC_UserAdvManager/trunk/admin/template/navigation_bar.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/template/navigation_bar.tpl	(revision 5593)
+++ /extensions/NBC_UserAdvManager/trunk/admin/template/navigation_bar.tpl	(revision 5593)
@@ -0,0 +1,28 @@
+<div class="navigationBar">
+  {if isset($navbar.URL_FIRST)}
+  <a href="{$navbar.URL_FIRST}" rel="first">{'First'|@translate}</a> |
+  <a href="{$navbar.URL_PREV}" rel="prev">{'Previous'|@translate}</a> |
+  {else}
+  {'First'|@translate} |
+  {'Previous'|@translate} |
+  {/if}
+
+  {assign var='prev_page' value=0}
+  {foreach from=$navbar.pages key=page item=url}
+    {if $page > $prev_page+1}...{/if}
+    {if $page == $navbar.CURRENT_PAGE}
+    <span class="pageNumberSelected">{$page}</span>
+    {else}
+    <a href="{$url}">{$page}</a>
+    {/if}
+    {assign var='prev_page' value=$page}
+  {/foreach}
+
+  {if isset($navbar.URL_NEXT)}
+  | <a href="{$navbar.URL_NEXT}" rel="next">{'Next'|@translate}</a>
+  | <a href="{$navbar.URL_LAST}" rel="last">{'Last'|@translate}</a>
+  {else}
+  | {'Next'|@translate}
+  | {'Last'|@translate}
+  {/if}
+</div>
Index: /extensions/NBC_UserAdvManager/trunk/admin/template/uam.css
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/template/uam.css	(revision 5593)
+++ /extensions/NBC_UserAdvManager/trunk/admin/template/uam.css	(revision 5593)
@@ -0,0 +1,61 @@
+label.cluetip
+{
+  font-weight:bold;
+}
+
+legend.cluetip
+{
+  font-weight:bold;
+}
+
+#uam_leftmargin
+{
+  margin-left: 2em
+}
+
+#uam_notice
+{
+  text-align:center;
+  text-decoration: underline;
+  font-weight:bold;
+}
+
+.instructionBlock
+{
+  border: 1px solid #666;
+  margin: 5px;
+  overflow: hidden;
+}
+
+.instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded
+{
+  background-color:#111;
+  background-position:15px center;
+  background-repeat:no-repeat;
+  color:#ff3363;
+  cursor:pointer;
+  font-size:110%;
+  overflow:hidden;
+  padding:8px 41px;
+  text-align: left;
+}
+
+.instructionBlockHeaderCollapsed span, .instructionBlockHeaderExpanded span
+{
+  border-bottom: none;
+}
+ 
+.instructionBlockHeaderCollapsed
+{
+  background-image: url(./icon/expand.gif);
+}
+
+.instructionBlockHeaderExpanded
+{
+  background-image: url(./icon/collapse.gif);
+}
+
+.instructionBlockContent
+{
+  padding:0 15px 15px;
+}
Index: /extensions/NBC_UserAdvManager/trunk/admin/template/userlist.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/template/userlist.tpl	(revision 5593)
+++ /extensions/NBC_UserAdvManager/trunk/admin/template/userlist.tpl	(revision 5593)
@@ -0,0 +1,60 @@
+﻿{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
+
+{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}
+
+<script type="text/javascript">
+jQuery().ready(function()
+{ldelim}
+  jQuery('.cluetip').cluetip(
+  {ldelim}
+    width: 600,
+    splitTitle: '|'
+  {rdelim});
+{rdelim});
+</script>
+
+<div class="titrePage">
+  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle5'|@translate}</h2>
+</div>
+
+<form method="post" action="" class="general">
+  <fieldset>
+  	<legend class="cluetip" title="{'UAM_userlistTitle'|translate}|{'UAM_userlistTitle_d'|translate}">{'UserList_Title'|@translate}</legend>
+
+    {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+      <table class="table2" width="97%" summary="">
+  			<thead>
+    			<tr class="throw">
+      			<td>{'Username'|@translate}</td>
+      			<td>{'Email address'|@translate}</td>
+            <td>{'LastVisit_Date'|@translate}</td>
+            <td>{'Nb_Days'|@translate}</td>
+    			</tr>
+  			</thead>
+
+        {foreach from=$users item=user name=users_loop}
+          <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
+            <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
+            <td>{$user.EMAIL}</td>
+            <td style="text-align:center;">{$user.LASTVISIT}</td>
+{if $user.DISPLAY == 'green'}
+            <td style="color:lime;text-align:center;">{$user.DAYS}</td>
+{elseif $user.DISPLAY == 'orange'}
+            <td style="color:orange;text-align:center;">{$user.DAYS}</td>
+{elseif $user.DISPLAY == 'red'}
+            <td style="color:red;text-align:center;">{$user.DAYS}</td>
+{else}
+            <td style="text-align:center;">{$user.DAYS}</td>
+{/if}
+            {foreach from=$user.plugin_columns item=data}
+              <td>{$data}</td>
+            {/foreach}    			
+          </tr>
+        {/foreach}
+      </table>
+
+      {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+    	<br>
+  </fieldset>
+</form>
Index: /extensions/NBC_UserAdvManager/trunk/admin/template/usermanager.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/template/usermanager.tpl	(revision 5593)
+++ /extensions/NBC_UserAdvManager/trunk/admin/template/usermanager.tpl	(revision 5593)
@@ -0,0 +1,71 @@
+﻿{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
+
+{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}
+
+<script type="text/javascript">
+jQuery().ready(function()
+{ldelim}
+  jQuery('.cluetip').cluetip(
+  {ldelim}
+    width: 600,
+    splitTitle: '|'
+  {rdelim});
+{rdelim});
+</script>
+
+<div class="titrePage">
+  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle3'|@translate}</h2>
+</div>
+
+<form method="post" action="" class="general">
+  <fieldset>
+  	<legend class="cluetip" title="{'UAM_usermanTitle'|translate}|{'UAM_usermanTitle_d'|translate}">{'UserManager_Title'|@translate}</legend>
+
+    {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+      <table class="table2" width="97%" summary="">
+  		  <thead>
+    			<tr class="throw">
+      			<td>&nbsp;</td>
+      			<td>{'Username'|@translate}</td>
+      			<td>{'User status'|@translate}</td>
+      			<td>{'Email address'|@translate}</td>
+      			<td>{'Groups'|@translate}</td>
+      			<td>{'Registration_Date'|@translate}</td>
+            <td>{'Reminder'|@translate}</td>
+    			</tr>
+  			</thead>
+
+        {foreach from=$users item=user name=users_loop}
+          <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
+            <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" ></td>
+            <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
+            <td>{$user.STATUS}</td>
+            <td>{$user.EMAIL}</td>
+            <td>{$user.GROUPS}</td>
+            <td {if $user.EXPIRATION == True}style="color:red;text-align:center;"{else}style="color:lime;text-align:center;"{/if}>{$user.REGISTRATION}</td>
+            <td style="text-align:center;">{$user.REMINDER}</td>
+            {foreach from=$user.plugin_columns item=data}
+              <td>{$data}</td>
+            {/foreach}    			
+          </tr>
+        {/foreach}
+      </table>
+
+      {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
+    	<br>
+
+<p>
+  {'target'|@translate}
+  <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
+  <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
+</p>
+
+<p>
+  <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
+  <input class="submit" type="submit" value="{'Mail_without_key'|@translate}" name="Mail_Without_Key">
+  <input class="submit" type="submit" value="{'Mail_with_key'|@translate}" name="Mail_With_Key">
+  <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
+</p>
+  </fieldset>
+</form>
Index: tensions/NBC_UserAdvManager/trunk/admin/uam.css
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/uam.css	(revision 5592)
+++ 	(revision )
@@ -1,21 +1,0 @@
-label.cluetip
-{
-  font-weight:bold;
-}
-
-legend.cluetip
-{
-  font-weight:bold;
-}
-
-#uam_leftmargin
-{
-  margin-left: 2em
-}
-
-#uam_notice
-{
-  text-align:center;
-  text-decoration: underline;
-  font-weight:bold;
-}
Index: tensions/NBC_UserAdvManager/trunk/admin/userlist.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/userlist.tpl	(revision 5592)
+++ 	(revision )
@@ -1,58 +1,0 @@
-﻿{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{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="{$UAM_PATH}admin/uam.css">{/html_head}
-
-<script type="text/javascript">
-jQuery().ready(function(){ldelim}
-  jQuery('.cluetip').cluetip({ldelim}
-    width: 500,
-    splitTitle: '|'
-  });
-});
-</script>
-
-<div class="titrePage">
-  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle5'|@translate}</h2>
-</div>
-
-<form method="post" action="" class="general">
-  <fieldset>
-  	<legend class="cluetip" title="{'UAM_userlistTitle'|translate}|{'UAM_userlistTitle_d'|translate}">{'UserList_Title'|@translate}</legend>
-
-    <div class="navigationBar">{$NAVBAR}</div>
-      <table class="table2" width="97%" summary="">
-  			<thead>
-    			<tr class="throw">
-      			<td>{'Username'|@translate}</td>
-      			<td>{'Email address'|@translate}</td>
-            <td>{'LastVisit_Date'|@translate}</td>
-            <td>{'Nb_Days'|@translate}</td>
-    			</tr>
-  			</thead>
-
-        {foreach from=$users item=user name=users_loop}
-          <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
-            <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
-            <td>{$user.EMAIL}</td>
-            <td style="text-align:center;">{$user.LASTVISIT}</td>
-{if $user.DISPLAY == 'green'}
-            <td style="color:lime;text-align:center;">{$user.DAYS}</td>
-{elseif $user.DISPLAY == 'orange'}
-            <td style="color:orange;text-align:center;">{$user.DAYS}</td>
-{elseif $user.DISPLAY == 'red'}
-            <td style="color:red;text-align:center;">{$user.DAYS}</td>
-{else}
-            <td style="text-align:center;">{$user.DAYS}</td>
-{/if}
-            {foreach from=$user.plugin_columns item=data}
-              <td>{$data}</td>
-            {/foreach}    			
-          </tr>
-        {/foreach}
-      </table>
-
-      <div class="navigationBar">{$NAVBAR}</div>
-    	<br>
-  </fieldset>
-</form>
Index: tensions/NBC_UserAdvManager/trunk/admin/usermanager.tpl
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/admin/usermanager.tpl	(revision 5592)
+++ 	(revision )
@@ -1,69 +1,0 @@
-﻿{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{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="{$UAM_PATH}admin/uam.css">{/html_head}
-
-<script type="text/javascript">
-jQuery().ready(function(){ldelim}
-  jQuery('.cluetip').cluetip({ldelim}
-    width: 500,
-    splitTitle: '|'
-  });
-});
-</script>
-
-<div class="titrePage">
-  <h2>{'Title_Tab'|@translate} {$UAM_VERSION}<br>{'SubTitle3'|@translate}</h2>
-</div>
-
-<form method="post" action="" class="general">
-  <fieldset>
-  	<legend class="cluetip" title="{'UAM_usermanTitle'|translate}|{'UAM_usermanTitle_d'|translate}">{'UserManager_Title'|@translate}</legend>
-
-    <div class="navigationBar">{$NAVBAR}</div>
-      <table class="table2" width="97%" summary="">
-  		  <thead>
-    			<tr class="throw">
-      			<td>&nbsp;</td>
-      			<td>{'Username'|@translate}</td>
-      			<td>{'user_status'|@translate}</td>
-      			<td>{'Email address'|@translate}</td>
-      			<td>{'Groups'|@translate}</td>
-      			<td>{'Registration_Date'|@translate}</td>
-            <td>{'Reminder'|@translate}</td>
-    			</tr>
-  			</thead>
-
-        {foreach from=$users item=user name=users_loop}
-          <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
-            <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" ></td>
-            <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
-            <td>{$user.STATUS}</td>
-            <td>{$user.EMAIL}</td>
-            <td>{$user.GROUPS}</td>
-            <td {if $user.EXPIRATION == True}style="color:red;text-align:center;"{else}style="color:lime;text-align:center;"{/if}>{$user.REGISTRATION}</td>
-            <td style="text-align:center;">{$user.REMINDER}</td>
-            {foreach from=$user.plugin_columns item=data}
-              <td>{$data}</td>
-            {/foreach}    			
-          </tr>
-        {/foreach}
-      </table>
-
-      <div class="navigationBar">{$NAVBAR}</div>
-    	<br>
-
-<p>
-  {'target'|@translate}
-  <label><input type="radio" name="target" value="all" > {'all'|@translate}</label>
-  <label><input type="radio" name="target" value="selection" checked="checked" > {'selection'|@translate}</label>
-</p>
-
-<p>
-  <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
-  <input class="submit" type="submit" value="{'Mail_without_key'|@translate}" name="Mail_Without_Key">
-  <input class="submit" type="submit" value="{'Mail_with_key'|@translate}" name="Mail_With_Key">
-  <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
-</p>
-  </fieldset>
-</form>
Index: /extensions/NBC_UserAdvManager/trunk/changelog.txt.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/changelog.txt.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/changelog.txt.php	(revision 5593)
@@ -153,7 +153,14 @@
 -- 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 
+
+***************************************
+***** Plugin history (branch 2.15)*****
+***************************************
+
+-- 2.15.0 : Plugin compatibility for Piwigo 2.1
             Bug 1467 fixed - FCK Editor's functionnalities are available on registration's confirmation return page customization fields
+            Bug 1474 fixed - Messages on registration's confirmation return page (ConfirmMail.tpl) are customizable 
             Bug 1508 fixed - Plugin's name is now UserAdvManager (deletion of "nbc_" in code and PEM)
+            Bug 1551 fixed - Database upgrade improvement
 */
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/de_DE/help/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/de_DE/help/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/de_DE/help/plugin.lang.php	(revision 5593)
@@ -148,3 +148,17 @@
 <b>HINWEIS</b> : Die Liste wird nicht angezeigt, die nicht validiert ihrer Registrierung (falls die M&ouml;glichkeit der Validierung der Registrierung aktiviert ist). Diese Benutzer werden dann in besonderer Weise in der &quot;Tracking Validierungen verwaltet&quot; aus.';
 // --------- End: New or revised $lang ---- from version 2.14.1
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+/*TODO*/$lang['UAM_confirmmail_custom1'] = 'Text of the confirmation page - Confirmation accepted';
+/*TODO*/$lang['UAM_confirmmail_custom1_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>acceptance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
+After installing the plugin, a standard text is set as an example.<br>
+This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
+<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
+/*TODO*/$lang['UAM_confirmmail_custom2'] = 'Text of the confirmation page - Confirmation rejected';
+/*TODO*/$lang['UAM_confirmmail_custom2_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>rejectance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
+After installing the plugin, a standard text is set as an example.<br>
+This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
+<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/de_DE/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/de_DE/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/de_DE/plugin.lang.php	(revision 5593)
@@ -197,5 +197,4 @@
 $lang['Reminder_without_key_of_%s'] = '%s, Ihre Validierung Schlüssel abläuft';
 /* Errors and Warnings */
-$lang['Err_UserManager_Settings'] = 'Diese Seite ist nur verfügbar, wenn &quot;Deadline für die Registrierung begrenzte Validierung&quot; aktiv ist und ein Unvalidierte User-Gruppe ist im Abschnitt &quot;Einstellung Bestätigungen und Validierungen der Registrierung&quot; gesetzt.';
 $lang['Err_GhostTracker_Settings'] = 'Diese Seite ist nur verfügbar, wenn &quot;Geist Tracker&quot; aktiv &quot;Einstellen der Registrierung durchgeführt und andere Optionen&quot;.';
 $lang['Err_Userlist_Settings'] = 'Diese Seite ist nur verfügbar, wenn &quot;Monitoring registrierte Benutzer&quot; ist aktiv in der &quot;Einstellung der Registrierung durchgeführt und andere Optionen&quot;';
@@ -225,5 +224,5 @@
 - Optional können Sie das Plugin Extended Description Multi-Sprachen<br>
             </li><br><br>
-              <li>
+            <li>
 Etappen:<br><br>
 A. In plugin UAM:
@@ -235,5 +234,5 @@
                 <li>Speichern Sie das Plugin-Konfiguration</li>
               </ol>
-              </li><br>
+<br>
 B. In plugin PWG Stuffs :
               <ol>
@@ -244,5 +243,15 @@
                 <li>Überprüfen Sie die Konfiguration des Moduls</li>
               </ol>
+            </li>
           </ul>';
 // --------- End: New or revised $lang ---- from version 2.14.0
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+$lang['UAM_confirmmail_custom_Txt1'] = 'Text der Bestätigungs-Seite - Bestätigung akzeptiert';
+$lang['UAM_confirmmail_custom_Txt2'] = 'Text der Bestätigungs-Seite - Bestätigung abgelehnt';
+$lang['LastVisit_Date'] = 'Letzter Besuch';
+$lang['Nb_Days'] = 'Differenz in Tagen';
+$lang['Err_UserManager_Settings'] = 'Diese Seite ist nur verfügbar, wenn "Bestätigung der Anmeldung" aktiv ist und wenn eine Gruppe von nicht validierte Besuchern wird in "Einstellen Bestätigungen und Validierungen der Registrierung" konfiguriert.';
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/en_UK/help/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/en_UK/help/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/en_UK/help/plugin.lang.php	(revision 5593)
@@ -148,3 +148,17 @@
 <b>NOTE</b> : The list does not display who have not validated their registration (if the option of validating the registration is activated). These users are then managed in a special way in the &quot;Tracking validations&quot; tab.';
 // --------- End: New or revised $lang ---- from version 2.14.1
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+$lang['UAM_confirmmail_custom1'] = 'Text of the confirmation page - Confirmation accepted';
+$lang['UAM_confirmmail_custom1_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>acceptance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
+After installing the plugin, a standard text is set as an example.<br>
+This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
+<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
+$lang['UAM_confirmmail_custom2'] = 'Text of the confirmation page - Confirmation rejected';
+$lang['UAM_confirmmail_custom2_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>rejectance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
+After installing the plugin, a standard text is set as an example.<br>
+This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
+<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/en_UK/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/en_UK/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/en_UK/plugin.lang.php	(revision 5593)
@@ -66,5 +66,4 @@
 /* Ghost Tracker Tab */
 $lang['Tab_GhostTracker'] = 'Ghost Tracker';
-$lang['LastVisit_Date'] = 'Last visit';
 $lang['Reminder'] = 'Email reminder';
 $lang['Reminder_Sent_OK'] = 'YES';
@@ -105,5 +104,4 @@
 /* UserList Tab */
 $lang['UserList_Title'] = 'Monitoring registered users';
-$lang['Nb_Days'] = 'Number of days<br>since last visit';
 // --------- End: New or revised $lang ---- from version 2.13.0
 
@@ -197,5 +195,4 @@
 $lang['Reminder_without_key_of_%s'] = '%s, your validation key will expire';
 /* Errors and Warnings */
-$lang['Err_UserManager_Settings'] = 'This page is available only if "Deadline for registration validation limited" is active and an unvalidated users group is set in "Setting confirmations and validations of registration".';
 $lang['Err_GhostTracker_Settings'] = 'This page is available only if "Ghost Tracker" is active in "Setting the registrations followed and other options".';
 $lang['Err_Userlist_Settings'] = 'This page is available only if "Monitoring registered users" is active in the "Setting the registrations followed and other options".';
@@ -224,5 +221,5 @@
 - Optionally, the plugin Extended Description to support multi-languages<br>
             </li><br><br>
-              <li>
+            <li>
 Stages:<br><br>
 A. In plugin UAM:
@@ -234,5 +231,5 @@
                 <li>Save the plugin configuration</li>
               </ol>
-              </li><br>
+<br>
 B. In plugin PWG Stuffs :
               <ol>
@@ -243,11 +240,15 @@
                 <li>Validate the configuration of the module</li>
               </ol>
+            </li>
           </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
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+$lang['UAM_confirmmail_custom_Txt1'] = 'Text of the confirmation page - Confirmation accepted';
+$lang['UAM_confirmmail_custom_Txt2'] = 'Text of the confirmation page - Confirmation rejected';
+$lang['LastVisit_Date'] = 'Last visit';
+$lang['Nb_Days'] = 'Difference in days';
+$lang['Err_UserManager_Settings'] = 'This page is available only if "Confirmation of registration" is active and if a group of visitors not validated is configured in "Setting confirmations and validations of registration".';
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/es_ES/help/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/es_ES/help/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/es_ES/help/plugin.lang.php	(revision 5593)
@@ -148,3 +148,17 @@
 <b>NOTA</b> : La lista no muestra que no han validado su registro (si la opci&oacute;n de validar el registro est&aacute; activado). Estos usuarios son administrados despu&eacute;s de una manera especial en &quot;Seguimiento de las Validaciones&quot; ficha.';
 // --------- End: New or revised $lang ---- from version 2.14.1
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+/*TODO*/$lang['UAM_confirmmail_custom1'] = 'Text of the confirmation page - Confirmation accepted';
+/*TODO*/$lang['UAM_confirmmail_custom1_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>acceptance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
+After installing the plugin, a standard text is set as an example.<br>
+This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
+<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
+/*TODO*/$lang['UAM_confirmmail_custom2'] = 'Text of the confirmation page - Confirmation rejected';
+/*TODO*/$lang['UAM_confirmmail_custom2_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>rejectance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
+After installing the plugin, a standard text is set as an example.<br>
+This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
+<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/es_ES/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/es_ES/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/es_ES/plugin.lang.php	(revision 5593)
@@ -67,5 +67,4 @@
 /* Ghost Tracker Tab */
 $lang['Tab_GhostTracker'] = 'Ghost Tracker';
-$lang['LastVisit_Date'] = 'Última visita';
 $lang['Reminder'] = 'Recordatorio por email';
 $lang['Reminder_Sent_OK'] = 'SI';
@@ -106,5 +105,4 @@
 /* UserList Tab */
 $lang['UserList_Title'] = 'Seguimiento los usuarios registrados';
-$lang['Nb_Days'] = 'Número de días<br>desde la última visita';
 // --------- End: New or revised $lang ---- from version 2.13.0
 
@@ -199,5 +197,4 @@
 $lang['Reminder_without_key_of_%s'] = '%s, su clave de validación expirará';
 /* Errors and Warnings */
-$lang['Err_UserManager_Settings'] = 'Esta página está disponible sólo si "Plazo para la validación de registro limitado" está activa y un grupo de usuarios no validados se encuentra en "Configuración de la confirmación y validación de registro".';
 $lang['Err_GhostTracker_Settings'] = 'Esta página está disponible sólo si "Ghost Tracker" está activo en "Configuración de los registros seguido y otras opciones".';
 $lang['Err_Userlist_Settings'] = 'Esta página está disponible sólo si "Seguimiento de los usuarios registrados" está activo en la "Configuración de los registros seguido y otras opciones".';
@@ -226,5 +223,5 @@
 - Opcionalmente, la Extended Description plugin para soportar múltiples idiomas<br>
             </li><br><br>
-              <li>
+            <li>
 Etapas:<br><br>
 A. En plugin UAM:
@@ -236,5 +233,5 @@
                 <li>Guardar la configuración de plug-in</li>
               </ol>
-              </li><br>
+<br>
 B. En plugin PWG Stuffs :
               <ol>
@@ -245,5 +242,15 @@
                 <li>Validar la configuración del módulo</li>
               </ol>
+            </li>
           </ul>';
 // --------- End: New or revised $lang ---- from version 2.14.0
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+$lang['UAM_confirmmail_custom_Txt1'] = 'Texto de la página de confirmación - Confirmación aceptada';
+$lang['UAM_confirmmail_custom_Txt2'] = 'Texto de la página de confirmación - Confirmación rechazada';
+$lang['LastVisit_Date'] = 'Su última visita';
+$lang['Nb_Days'] = 'Diferencia en días';
+$lang['Err_UserManager_Settings'] = 'Esta página está disponible sólo si "Confirmación de registro" está activo y si un grupo de visitantes no ha sido validada está configurado en "Configuración de las confirmaciones y validaciones de registro".';
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/fr_FR/help/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/fr_FR/help/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/fr_FR/help/plugin.lang.php	(revision 5593)
@@ -147,15 +147,15 @@
 
 
-// --------- 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>
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+$lang['UAM_confirmmail_custom1'] = 'Texte de la page de confirmation - Confirmation acceptée';
+$lang['UAM_confirmmail_custom1_d'] = 'Lorsque 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>
+$lang['UAM_confirmmail_custom2'] = 'Texte de la page de confirmation - Confirmation rejetée';
+$lang['UAM_confirmmail_custom2_d'] = 'Lorsque 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
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/fr_FR/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/fr_FR/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/fr_FR/plugin.lang.php	(revision 5593)
@@ -66,5 +66,4 @@
 /* Ghost Tracker Tab */
 $lang['Tab_GhostTracker'] = 'Ghost Tracker';
-$lang['LastVisit_Date'] = 'Date de dernière visite';
 $lang['Reminder'] = 'Email de rappel';
 $lang['Reminder_Sent_OK'] = 'OUI';
@@ -106,5 +105,4 @@
 $lang['UserList_Title'] = 'Suivi des utilisateurs inscrits';
 $lang['Tab_UserList'] = 'Suivi des utilisateurs';
-$lang['Nb_Days'] = 'Nb de jours<br>depuis dernière visite';
 // --------- End: New or revised $lang ---- from version 2.13.0
 
@@ -196,5 +194,4 @@
 $lang['Reminder_without_key_of_%s'] = '%s, votre clef de validation va expirer';
 /* Errors and Warnings */
-$lang['Err_UserManager_Settings'] = 'Cette page n\'est accessible que si "Délai de validation d\'inscription" est actif et si un groupe de visiteurs non validés est configuré dans le "Paramétrage des confirmations et validations d\'inscriptions".';
 $lang['Err_GhostTracker_Settings'] = 'Cette page n\'est accessible que si "Gestion des visiteurs fantômes" est actif dans "Paramétrage des suivis des inscrits et autres options".';
 $lang['Err_Userlist_Settings'] = 'Cette page n\'est accessible que si le "Suivi des utilisateurs inscrits" est actif dans "Paramétrage des suivis des inscrits et autres options".';
@@ -211,44 +208,46 @@
             Objectifs:<br>
             - A son arrivée sur la galerie : Informer le visiteur qu\'il peut s\'inscrire pour accéder aux photos privées<br>
-            - A l\'inscription : Générer un email avec lien direct de validation, informer le nouvel utilisateur de sa non-validation et le rattacher au groupe &quot;Attente&quot;<br>
-            - A la validation : Le passer automatiquement du groupe &quot;Attente&quot; au groupe &quot;Validés&quot;, qui lui permet d\'accéder normalement aux catégories privées<br><br>
-            <span style="font-style:italic">Rappel: En fonctionnement standard, le &quot;Guest&quot; ne voit que les catégories publiques, sans message d\'information.</span>
+            - A l\'inscription : Générer un email avec lien direct de validation, informer le nouvel utilisateur de sa non-validation et le rattacher au groupe "Attente"<br>
+            - A la validation : Le passer automatiquement du groupe "Attente" au groupe "Validés", qui lui permet d\'accéder normalement aux catégories privées<br><br>
+            <span style="font-style:italic">Rappel: En fonctionnement standard, le "Guest" ne voit que les catégories publiques, sans message d\'information.</span>
             </li><br><br>
             <li>
 Pré-requis:<br>
 - 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>
+- Au moins les 2 groupes d\'utilisateurs Piwigo suivants : "Attente", sans aucune permission sur les catégories privées, et "Validés", avec toutes les permissions sur les catégories privées<br>
 - Le plugin UAM<br>
-- Le plugin PWG Stuffs, pour l\'ajout d\'un module de type &quot;Bloc personnel&quot;<br>
+- Le plugin PWG Stuffs, pour l\'ajout d\'un module de type "Bloc personnel"<br>
 - En option, le plugin Extended Description, pour le support multi-langues<br>
             </li><br><br>
-              <li>
+            <li>
 Réalisation:<br><br>
-A. Dans le plugin UAM:
+A. Dans le plugin UAM:<br>
               <ol>
                 <li>Activer la confirmation d\'inscription</li>
-                <li>Saisir un &quot;texte d\'accueil personnalisé&quot; qui sera joint au mail de confirmation d\'inscription. Si le plugin Extended Description est activé, les balises de langues peuvent être utilisées</li>
-                <li>Sélectionner le groupe &quot;Attente&quot; à la rubrique &quot;Pour les utilisateurs n\'ayant pas validé leur inscription&quot;</li>
-                <li>Sélectionner le groupe &quot;Validés&quot; à la rubrique &quot;Pour les utilisateurs ayant validé leur inscription&quot;</li>
+                <li>Saisir un "texte d\'accueil personnalisé" qui sera joint au mail de confirmation d\'inscription. Si le plugin Extended Description est activé, les balises de langues peuvent être utilisées</li>
+                <li>Sélectionner le groupe "Attente" à la rubrique "Pour les utilisateurs n\'ayant pas validé leur inscription"</li>
+                <li>Sélectionner le groupe "Validés" à la rubrique "Pour les utilisateurs ayant validé leur inscription"</li>
                 <li>Enregistrer la configuration du plugin</li>
               </ol>
-              </li><br>
-B. Dans le plugin PWG Stuffs:
+<br>
+B. Dans le plugin PWG Stuffs:<br>
               <ol>
-                <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>Ajouter un nouveau module de type "Bloc personnel : Affiche un bloc personnel (un édito par exemple)"</li>
+                <li>Configurer le module, en indiquant son titre (ex : "Inscription en attente de validation") et sa description, et cocher uniquement "Attente" 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 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>Cocher "Afficher le module sur la page d\'accueil du site"</li>
                 <li>Valider la configuration du module</li>
               </ol>
+            </li>
           </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
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+$lang['UAM_confirmmail_custom_Txt1'] = 'Texte de la page de confirmation - Confirmation acceptée';
+$lang['UAM_confirmmail_custom_Txt2'] = 'Texte de la page de confirmation - Confirmation rejetée';
+$lang['LastVisit_Date'] = 'Dernière visite le';
+$lang['Nb_Days'] = 'Ecart en jours';
+$lang['Err_UserManager_Settings'] = 'Cette page n\'est accessible que si "Confirmation d\'inscription" est actif et si un groupe de visiteurs non validés est configuré dans le "Paramétrage des confirmations et validations d\'inscriptions".';
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/it_IT/help/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/it_IT/help/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/it_IT/help/plugin.lang.php	(revision 5593)
@@ -27,11 +27,12 @@
 ';
 $lang['UAM_casenTitle'] = 'Pseudo: Sensibilità maiuscole/minuscole';
-$lang['UAM_casenTitle_d'] = 'Di default, Piwigo è sensibile alle minuscole/maiuscole e vengono considerate come diverse lettere nei pseudo scelti dagli utenti al momento dell\'iscrizzione. E dunque "Pippo", "pippo" e "PIPPO" possono essere 3 diversi utenti.<br><br>
-L\'attivazione di questa opzione permette di considerare "Pippo", "pippo", "PIPPO", ... come un\'solo utente. Se "pippo" esiste già, creare un nuovo pseudo "Pippo" risulterà impossibile.<br><br>
-<b style="color: red;">Attenzione: questa opzione non ha alcun effetto sui pseudo creati prima della sua attivazione.</b>';
+$lang['UAM_casenTitle_d'] = 'Di default, Piwigo è sensibile alle minuscole e maiuscole e vengono considerate come diverse lettere nei pseudo scelti dagli utenti al momento dell\'iscrizzione. E dunque &quot;Pippo&quot;, &quot;pippo&quot; e &quot;PIPPO&quot; possono essere 3 diversi utenti.<br><br>
+L\'attivazione di questa opzione permette di considerare &quot;Pippo&quot;, &quot;pippo&quot;, &quot;PIPPO&quot;, ... come un\'solo utente. Se &quot;pippo&quot; esiste già, creare un nuovo pseudo &quot;Pippo&quot; risulterà impossibile.<br><br>
+<b style=&quot;color: red&quot;>Attenzione: questa opzione non ha alcun effetto sui pseudo creati prima della sua attivazione.</b>';
 $lang['UAM_carexcTitle'] = 'Pseudo: Esclusione di caratteri';
-$lang['UAM_carexcTitle_d'] = 'Può essere interessante vietare certi caratteri per i pseudo (ad esempio: negare login contenente "@"). Questa opzione permette di escludere dei caratteri o sequenza di caratterile.<br>NB: L\'opzione può anche escludere parole intere.
+$lang['UAM_carexcTitle_d'] = 'Può essere interessante vietare certi caratteri per i pseudo (ad esempio: negare login contenente &quot;@&quot;). Questa opzione permette di escludere i caratteri o sequenza di caratteri, eventi.<br>
+NB: L\'opzione può anche escludere parole intere.
 <br><br>
-<b style="color: red">Attenzione: questa opzione non ha alcun effetto sui pseudo creati prima della sua attivazione.</b>';
+<b style=&quot;color: red;&quot;>Attenzione: questa opzione non ha alcun effetto sui pseudo creati prima della sua attivazione.</b>';
 $lang['UAM_passwTitle'] = 'Rafforzare il livello di sicurezza delle password';
 $lang['UAM_passwTitle_d'] = 'L\'attivazione di questa opzione rende obbligatorio l\'inserimento di una password al momento della registrazione, e richiede la password scelta dal visitatore di incontrare un livello minimo di complessità. Se la soglia non viene raggiunta, il punteggio conseguito e il punteggio minimo da raggiungere sono visualizzate, insieme con raccomandazioni per aumentare il valore di questa partitura.<br><br>
@@ -148,3 +149,17 @@
 <b>NOTE</b> : The list does not display who have not validated their registration (if the option of validating the registration is activated). These users are then managed in a special way in the &quot;Tracking validations&quot; tab.';
 // --------- End: New or revised $lang ---- from version 2.14.1
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+/*TODO*/$lang['UAM_confirmmail_custom1'] = 'Text of the confirmation page - Confirmation accepted';
+/*TODO*/$lang['UAM_confirmmail_custom1_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>acceptance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
+After installing the plugin, a standard text is set as an example.<br>
+This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
+<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
+/*TODO*/$lang['UAM_confirmmail_custom2'] = 'Text of the confirmation page - Confirmation rejected';
+/*TODO*/$lang['UAM_confirmmail_custom2_d'] = 'When the option &quot;Confirmation of registration&quot; is active, this field allows you to customize the <b><u>rejectance text</u></b> on the registration confirmation page displayed when user clicks the confirmation link that was received by email.<br>
+After installing the plugin, a standard text is set as an example.<br>
+This field is compatible with the FCK Editor and, for multi-languages, you can use the tags [lang] of the plugin Extended description if it\'s active.<br>
+<b style=&quot;color:red;&quot;>Changing the text is possible ONLY if &quot;Confirmation of registration&quot; is activated.</b>';
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/language/it_IT/plugin.lang.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/language/it_IT/plugin.lang.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/language/it_IT/plugin.lang.php	(revision 5593)
@@ -67,5 +67,4 @@
 /* Ghost Tracker Tab */
 $lang['Tab_GhostTracker'] = 'GhostTracker';
-$lang['LastVisit_Date'] = 'Data ultima visita';
 $lang['Reminder'] = 'Email di rilancio';
 $lang['Reminder_Sent_OK'] = 'SI';
@@ -106,5 +105,4 @@
 /* UserList Tab */
 $lang['UserList_Title'] = 'Monitoraggio degli utenti registrati';
-$lang['Nb_Days'] = 'Numero di giorni<br>dall\'ultima visita';
 // --------- End: New or revised $lang ---- from version 2.13.0
 
@@ -199,5 +197,4 @@
 $lang['Reminder_without_key_of_%s'] = '%s, la chiave di convalida sta per scadere';
 /* Errors and Warnings */
-$lang['Err_UserManager_Settings'] = 'Questa pagina è disponibile solo se "Termine per la validazione dell\'iscrizione limitato" è attivo e se un gruppo di utenti non convalidati è attivo in "Impostare le conferme e validazioni all\'iscrizione".';
 $lang['Err_GhostTracker_Settings'] = 'Questa pagina è disponibile solo se "GhostTracker" è attivo in "Impostare le registrazioni seguite e altre opzioni".';
 $lang['Err_Userlist_Settings'] = 'Questa pagina è disponibile solo se "Monitoraggio degli utenti registrati" è attivo nella sezione "Impostare le registrazioni seguite e altre opzioni".';
@@ -226,5 +223,5 @@
 - In opzione, il plugin Extended Description per il supporto multi-lingue<br>
             </li><br><br>
-              <li>
+            <li>
 Tappe:<br><br>
 A. Nel plugin NBC_UAM:
@@ -236,5 +233,5 @@
                 <li>Salvare le impostazzioni</li>
               </ol>
-              </li><br>
+<br>
 B. Nel plugin PWG Stuffs :
               <ol>
@@ -245,5 +242,15 @@
                 <li>Salvare le impostazzioni</li>
               </ol>
+            </li>
           </ul>';
 // --------- End: New or revised $lang ---- from version 2.14.0
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.15.0
+$lang['UAM_confirmmail_custom_Txt1'] = 'Testo della pagina di conferma - Conferma accettati';
+$lang['UAM_confirmmail_custom_Txt2'] = 'Testo della pagina di conferma - Conferma respinto';
+$lang['LastVisit_Date'] = 'ultima visita';
+$lang['Nb_Days'] = 'Differenza in giorni';
+$lang['Err_UserManager_Settings'] = 'Questa pagina è disponibile solo se "Conferma dell\'iscrizione" è attiva e se un gruppo di visitatori non convalidato è configurato in "Impostare le conferme e validazioni all\'iscrizione".';
+// --------- End: New or revised $lang ---- from version 2.15.0
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/main.inc.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/main.inc.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/main.inc.php	(revision 5593)
@@ -2,5 +2,5 @@
 /*
 Plugin Name: UserAdvManager
-Version: 2.14.2
+Version: 2.15.0
 Description: Renforcer la gestion des utilisateurs - Enforce users management
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
Index: /extensions/NBC_UserAdvManager/trunk/maintain.inc.php
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/maintain.inc.php	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/maintain.inc.php	(revision 5593)
@@ -2,6 +2,7 @@
 
 if(!defined("UAM_PATH")) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');
-if (!defined('UAM_ROOT')) {
-  define('UAM_ROOT',     dirname(__FILE__).'/');
+if (!defined('UAM_ROOT'))
+{
+  define('UAM_ROOT', dirname(__FILE__).'/');
 }
 
@@ -81,83 +82,106 @@
   clean_obsolete_files();
 
-
+/* Check if it's a blank installation */
+/* ********************************** */
+	$query = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "nbc_UserAdvManager_ConfirmMail"
+;';
+  $count1 = mysql_num_rows(pwg_query($query));
+  
+	$query1 = '
+SELECT param
+  FROM '.CONFIG_TABLE.'
+WHERE param = "nbc_UserAdvManager_ConfirmMail"
+;';
+  $count2 = mysql_num_rows(pwg_query($query1));
+
+/* If old params exist an upgrade is needed */
+/* **************************************** */
+  if ($count1 == 1 or $count2 == 1)
+  {
 /* Check for upgrade from 2.10 to 2.11 */
 /* *********************************** */
-	$query = '
+    $query = '
 SELECT *
   FROM '.CONFIG_TABLE.'
 WHERE param = "nbc_UserAdvManager_ConfirmMail"
 ;';
-  $count = mysql_num_rows(pwg_query($query)); 
-  
-	if ($count == 0)
-	{
-  /* upgrade from branch 2.10 to 2.11 */
-  /* ******************************** */
-		upgrade_210();
-	}
+    $count = mysql_num_rows(pwg_query($query)); 
+  
+    if ($count == 0)
+    {
+    /* upgrade from branch 2.10 to 2.11 */
+    /* ******************************** */
+      upgrade_210();
+    }
 
 
 /* Check for upgrade from 2.11 to 2.12 */
 /* *********************************** */
-  if (!table_exist(USER_LASTVISIT_TABLE))
-  {
-  /* upgrade from branch 2.11 to 2.12 */
-  /* ******************************** */
-		upgrade_211();
-  }
+    if (!table_exist(USER_LASTVISIT_TABLE))
+    {
+    /* upgrade from branch 2.11 to 2.12 */
+    /* ******************************** */
+  		upgrade_211();
+    }
 
 
 /* Check for upgrade from 2.12 to 2.13 */
 /* *********************************** */
-  $query = '
-SELECT *
-FROM '.USER_CONFIRM_MAIL_TABLE.'
-;';
-
-  $result = pwg_query($query);
+    $fields = mysql_list_fields($conf['db_base'],USER_CONFIRM_MAIL_TABLE);
+    $nb_fields = mysql_num_fields($fields); 
+
+//  $query = '
+//SELECT *
+//FROM '.USER_CONFIRM_MAIL_TABLE.'
+//;';
+
+//  $result = pwg_query($query);
 	
-	$numfields = mysql_num_fields($result);
-
-  if ($numfields < 6)
-  {
-  /* upgrade from branch 2.12 to 2.13 */
-  /* ******************************** */
-    upgrade_212();
-  }
+//	$numfields = mysql_num_fields($result);
+
+    if ($nb_fields < 6)
+    {
+    /* upgrade from branch 2.12 to 2.13 */
+    /* ******************************** */
+      upgrade_212();
+    }
 
 
 /* Serializing conf parameters - Available since 2.14.0 */
 /* **************************************************** */
-  if (unserialize($conf['nbc_UserAdvManager']) === false)
-  {
-  /* upgrade from branch 2.13 to 2.14 */
-  /* ******************************** */
-    upgrade_213();
-  }
-
+    if (unserialize($conf['nbc_UserAdvManager']) === false)
+    {
+    /* upgrade from branch 2.13 to 2.14 */
+    /* ******************************** */
+      upgrade_213();
+    }
+  
 
 /* Check for upgrade from 2.14.1 to 2.14.2 */
 /* *************************************** */
-	$query1 = '
+  	$query1 = '
 SELECT param
   FROM '.CONFIG_TABLE.'
+WHERE param = "nbc_UserAdvManager"
+;';
+    $count1 = mysql_num_rows(pwg_query($query1));
+  
+    $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();
-	}
+    $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();
+    }
+  }
 }
 
@@ -352,14 +376,28 @@
 
 /* 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);
+SELECT value
+  FROM '.CONFIG_TABLE.'
+WHERE param = "UserAdvManager_ConfirmMail"
+;';
+
+  $result = pwg_query($query);
+  $conf_UAM_ConfirmMail = pwg_db_fetch_assoc($result);
+    
+  $conf_ConfirmMail = unserialize($conf_UAM_ConfirmMail['value']);
+  
+  $conf_ConfirmMail[5] ='Thank you to have confirmed your email address and your registration on the gallery. Have fun !';
+  $conf_ConfirmMail[6] ='Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.';
+  
+  $update_conf = serialize($conf_ConfirmMail);
+    
+  $query = '
+      UPDATE '.CONFIG_TABLE.'
+			SET value="'.addslashes($update_conf).'"
+			WHERE param="UserAdvManager_ConfirmMail"
+			LIMIT 1
+		;';
+
+		pwg_query($query);
 }
 ?>
Index: /extensions/NBC_UserAdvManager/trunk/obsolete.list
===================================================================
--- /extensions/NBC_UserAdvManager/trunk/obsolete.list	(revision 5592)
+++ /extensions/NBC_UserAdvManager/trunk/obsolete.list	(revision 5593)
@@ -1,4 +1,5 @@
-admin/UserAdvManager_admin.php
-admin/confirmmail.tpl
-admin/UserAdvManager_admin.tpl
-include/functions_UserAdvManager.inc.php
+admin/ghosttracker.tpl
+admin/global.tpl
+admin/uam.css
+admin/userlist.tpl
+admin/usermanager.tpl
