Changeset 5181 for extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

Timestamp:

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

Author:

Eric

Message:

[NBC_UserAdvManager]

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

File:

• extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php (modified) (19 diffs)

extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php

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