Changeset 5181
- Timestamp:
- Mar 18, 2010, 11:08:28 PM (14 years ago)
- Location:
- extensions/NBC_UserAdvManager/trunk
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/NBC_UserAdvManager/trunk/ConfirmMail.php
r5056 r5181 3 3 define('PHPWG_ROOT_PATH','./../../'); 4 4 include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); 5 include_once ( NBC_UAM_PATH.'include/constants.php');6 include_once ( NBC_UAM_PATH.'include/functions.inc.php');5 include_once (UAM_PATH.'include/constants.php'); 6 include_once (UAM_PATH.'include/functions.inc.php'); 7 7 8 8 // +-----------------------------------------------------------------------+ … … 10 10 // +-----------------------------------------------------------------------+ 11 11 //check_status(ACCESS_NONE); 12 load_language('plugin.lang', NBC_UAM_PATH);12 load_language('plugin.lang', UAM_PATH); 13 13 14 14 if (isset($_GET['key'])) 15 15 { 16 16 17 global $conf; 18 19 $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']); 20 17 21 if (VerifyConfirmMail($_GET['key'])) 22 { 18 23 $template->assign( 19 24 array( 20 'CONFIRM_MAIL_MESSAGE' => l10n('confirm_mail_ok'),25 'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[5], 21 26 ) 22 27 ); 23 else 28 } 29 else 30 { 24 31 $template->assign( 25 32 array( 26 'CONFIRM_MAIL_MESSAGE' => l10n('confirm_mail_bad'),33 'CONFIRM_MAIL_MESSAGE' => $conf_UAM_ConfirmMail[6], 27 34 ) 28 ); 29 // redirect(make_index_url()); 35 ); 36 } 37 38 //$refresh_txt = l10n('ConfirmMail_redirection'); 39 //$refresh_time = '10'; 40 //redirect(make_index_url(),'',$refresh_time); 30 41 } 31 42 … … 50 61 $template->set_filenames( 51 62 array( 52 'confirm_mail'=> NBC_UAM_PATH.'ConfirmMail.tpl',63 'confirm_mail'=>UAM_PATH.'ConfirmMail.tpl', 53 64 ) 54 65 ); -
extensions/NBC_UserAdvManager/trunk/ConfirmMail.tpl
r4159 r5181 4 4 <ul class="categoryActions"> 5 5 <li> 6 {if isset($GALLERY_URL) 6 {if isset($GALLERY_URL)} 7 7 <a href="{$GALLERY_URL}" title="{'return to homepage'|@translate}"> 8 8 <img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"> -
extensions/NBC_UserAdvManager/trunk/admin/UAM_admin.php
r5105 r5181 9 9 check_status(ACCESS_ADMINISTRATOR); 10 10 11 if (!defined(' NBC_UAM_PATH')) define('NBC_UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');11 if (!defined('UAM_PATH')) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/'); 12 12 13 13 //ini_set('error_reporting', E_ALL); … … 18 18 $my_base_url = get_admin_plugin_menu_link(__FILE__); 19 19 20 load_language('plugin.lang', NBC_UAM_PATH);21 load_language('help/plugin.lang', NBC_UAM_PATH);20 load_language('plugin.lang', UAM_PATH); 21 load_language('help/plugin.lang', UAM_PATH); 22 22 23 23 $page['global'] = array(); … … 58 58 // | Getting plugin version | 59 59 // +-----------------------------------------------------------------------+ 60 $plugin = Plugin Ver(NBC_UAM_PATH);60 $plugin = PluginInfos(UAM_PATH); 61 61 $version = $plugin['version'] ; 62 62 … … 66 66 // +----------------------------------------------------------+ 67 67 68 /* Pending because this may cause problems with special characters in emails*/69 /*$toolbar = 'Basic';68 /* Available only for ConfirmMail return page customization */ 69 $toolbar = 'Basic'; 70 70 $width = '750px'; 71 71 $height = '300px'; 72 72 $areas = array(); 73 array_push( $areas,'UAM_ MailInfo_Text','UAM_ConfirmMail_Text','UAM_GhostTracker_ReminderText','UAM_ConfirmMail_ReMail_Txt1','UAM_ConfirmMail_ReMail_Txt2');73 array_push( $areas,'UAM_ConfirmMail_Custom_Txt1','UAM_ConfirmMail_Custom_Txt2'); 74 74 75 75 if (function_exists('set_fckeditor_instance')) … … 86 86 87 87 set_fckeditor_instance($areas, $toolbar, $width, $height); 88 } */88 } 89 89 90 90 … … 144 144 $_POST['UAM_Admin_ConfMail']); 145 145 146 $conf[' nbc_UserAdvManager'] = serialize($newconf_UAM);146 $conf['UserAdvManager'] = serialize($newconf_UAM); 147 147 148 148 $query = ' 149 149 UPDATE '.CONFIG_TABLE.' 150 SET value="'.addslashes($conf[' nbc_UserAdvManager']).'"151 WHERE param=" nbc_UserAdvManager"150 SET value="'.addslashes($conf['UserAdvManager']).'" 151 WHERE param="UserAdvManager" 152 152 LIMIT 1 153 153 ;'; … … 160 160 161 161 $_POST['UAM_ConfirmMail_ReMail_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt2'])); 162 163 $_POST['UAM_ConfirmMail_Custom_Txt1'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt1'])); 164 165 $_POST['UAM_ConfirmMail_Custom_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt2'])); 162 166 163 167 … … 167 171 $_POST['UAM_ConfirmMail_ReMail_Txt1'], 168 172 $_POST['UAM_ConfirmMail_Remail'], 169 $_POST['UAM_ConfirmMail_ReMail_Txt2']); 170 171 $conf['nbc_UserAdvManager_ConfirmMail'] = serialize($newconf_UAM_ConfirmMail); 173 $_POST['UAM_ConfirmMail_ReMail_Txt2'], 174 $_POST['UAM_ConfirmMail_Custom_Txt1'], 175 $_POST['UAM_ConfirmMail_Custom_Txt2']); 176 177 $conf['UserAdvManager_ConfirmMail'] = serialize($newconf_UAM_ConfirmMail); 172 178 173 179 $query = ' 174 180 UPDATE '.CONFIG_TABLE.' 175 SET value="'.addslashes($conf[' nbc_UserAdvManager_ConfirmMail']).'"176 WHERE param=" nbc_UserAdvManager_ConfirmMail"181 SET value="'.addslashes($conf['UserAdvManager_ConfirmMail']).'" 182 WHERE param="UserAdvManager_ConfirmMail" 177 183 LIMIT 1 178 184 ;'; … … 194 200 } 195 201 196 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);202 $conf_UAM = unserialize($conf['UserAdvManager']); 197 203 198 204 /* Group setting for unvalidated and validated users */ … … 289 295 $nb_para2=(isset($_POST["nb_para2"])) ? $_POST["nb_para2"]:""; 290 296 291 $conf_UAM_ConfirmMail = unserialize($conf[' nbc_UserAdvManager_ConfirmMail']);297 $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']); 292 298 293 299 $template->assign( … … 296 302 'nb_para2' => $nb_para2, 297 303 'UAM_VERSION' => $version, 298 ' NBC_UAM_PATH' => NBC_UAM_PATH,304 'UAM_PATH' => UAM_PATH, 299 305 'UAM_MAIL_INFO_TRUE' => $conf_UAM[0]=='true' ? 'checked="checked"' : '' , 300 306 'UAM_MAIL_INFO_FALSE' => $conf_UAM[0]=='false' ? 'checked="checked"' : '' , … … 339 345 'UAM_CONFIRMMAIL_REMAIL_TXT1' => $conf_UAM_ConfirmMail[2], 340 346 'UAM_CONFIRMMAIL_REMAIL_TXT2' => $conf_UAM_ConfirmMail[4], 347 'UAM_CONFIRMMAIL_CUSTOM_TXT1' => $conf_UAM_ConfirmMail[5], 348 'UAM_CONFIRMMAIL_CUSTOM_TXT2' => $conf_UAM_ConfirmMail[6], 341 349 ) 342 350 ); … … 401 409 while($row = mysql_fetch_assoc($result)) 402 410 { 403 $conf_ nbc_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]);404 for ($i = 0 ; $i < count($conf_ nbc_MailExclusion) ; $i++)411 $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]); 412 for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++) 405 413 { 406 $pattern = '/'.$conf_ nbc_MailExclusion[$i].'/';414 $pattern = '/'.$conf_MailExclusion[$i].'/'; 407 415 if (preg_match($pattern, $row['mail_address'])) 408 416 { … … 457 465 case 'userlist': 458 466 459 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);467 $conf_UAM = unserialize($conf['UserAdvManager']); 460 468 461 469 if (isset($conf_UAM[20]) and $conf_UAM[20]=='true') … … 570 578 array( 571 579 'UAM_VERSION' => $version, 572 ' NBC_UAM_PATH'=> NBC_UAM_PATH,580 'UAM_PATH' => UAM_PATH, 573 581 ) 574 582 ); … … 618 626 case 'usermanager': 619 627 620 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);621 622 $conf_UAM_ConfirmMail = unserialize($conf[' nbc_UserAdvManager_ConfirmMail']);628 $conf_UAM = unserialize($conf['UserAdvManager']); 629 630 $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']); 623 631 624 632 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( 1136 1144 array( 1137 'UAM_VERSION' 1138 ' NBC_UAM_PATH' => NBC_UAM_PATH,1145 'UAM_VERSION' => $version, 1146 'UAM_PATH' => UAM_PATH, 1139 1147 ) 1140 1148 ); … … 1172 1180 case 'ghosttracker': 1173 1181 1174 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);1182 $conf_UAM = unserialize($conf['UserAdvManager']); 1175 1183 1176 1184 if (isset($conf_UAM[17]) and $conf_UAM[17]=='true') … … 1491 1499 $template->assign( 1492 1500 array( 1493 'UAM_VERSION' 1494 ' NBC_UAM_PATH' => NBC_UAM_PATH,1501 'UAM_VERSION' => $version, 1502 'UAM_PATH' => UAM_PATH, 1495 1503 ) 1496 1504 ); -
extensions/NBC_UserAdvManager/trunk/admin/ghosttracker.tpl
r5056 r5181 2 2 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"} 3 3 4 {html_head}<link rel="stylesheet" type="text/css" href="{$ NBC_UAM_PATH}admin/uam.css">{/html_head}4 {html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/uam.css">{/html_head} 5 5 6 6 <script type="text/javascript"> -
extensions/NBC_UserAdvManager/trunk/admin/global.tpl
r5085 r5181 2 2 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"} 3 3 4 {html_head}<link rel="stylesheet" type="text/css" href="{$ NBC_UAM_PATH}admin/uam.css">{/html_head}4 {html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/uam.css">{/html_head} 5 5 6 6 <script type="text/javascript"> … … 14 14 15 15 <script type="text/javascript"> 16 function nbc_blockToggleDisplay( headerId, contentId )16 function uam_blockToggleDisplay( headerId, contentId ) 17 17 {ldelim} 18 18 if (typeof(headerId)=='string') … … 38 38 <div id="instructionConfig1" class="instructionBlock" > 39 39 40 <div id="config1_header" class="instructionBlockHeaderCollapsed" onclick=" nbc_blockToggleDisplay('config1_header', 'Config1')">40 <div id="config1_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('config1_header', 'Config1')"> 41 41 <span class="cluetip" title="{'UAM_restricTitle'|translate}|{'UAM_restricTitle_d'|translate}">{'UAM_Title1'|@translate}</span> 42 42 </div> … … 96 96 <div id="instructionConfig2" class="instructionBlock" > 97 97 98 <div id="config2_header" class="instructionBlockHeaderCollapsed" onclick=" nbc_blockToggleDisplay('config2_header', 'Config2')">98 <div id="config2_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('config2_header', 'Config2')"> 99 99 <span class="cluetip" title="{'UAM_confirmTitle'|translate}|{'UAM_confirmTitle_d'|translate}">{'UAM_Title2'|@translate}</span> 100 100 </div> … … 235 235 --> 236 236 </ul> 237 <br><hr><br> 238 239 {if $UAM_CONFIRM_MAIL_TRUE} 240 <li><label class="cluetip" title="{'UAM_confirmmail_custom1'|translate}|{'UAM_confirmmail_custom1_d'|translate}">{'UAM_confirmmail_custom_Txt1'|@translate}</label><br><br> 241 <textarea name="UAM_ConfirmMail_Custom_Txt1" id="UAM_ConfirmMail_Custom_Txt1" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT1}</textarea><br> 242 </li> 243 {if 'FCK_PATH'|@defined} 244 <div style="text-align:right;"> 245 <a href="#" onClick="toogleEditor('UAM_ConfirmMail_Custom_Txt1'); return false;">FCK Editor On/Off</a> 246 </div> 247 {/if} 248 249 <li><label class="cluetip" title="{'UAM_confirmmail_custom2'|translate}|{'UAM_confirmmail_custom2_d'|translate}">{'UAM_confirmmail_custom_Txt2'|@translate}</label><br><br> 250 <textarea name="UAM_ConfirmMail_Custom_Txt2" id="UAM_ConfirmMail_Custom_Txt2" rows="10" cols="80" {$TAG_INPUT_ENABLED}>{$UAM_CONFIRMMAIL_CUSTOM_TXT2}</textarea><br> 251 </li> 252 {if 'FCK_PATH'|@defined} 253 <div style="text-align:right;"> 254 <a href="#" onClick="toogleEditor('UAM_ConfirmMail_Custom_Txt2'); return false;">FCK Editor On/Off</a> 255 </div> 256 {/if} 257 {else} 258 <li><label class="cluetip" title="{'UAM_confirmmail_custom1'|translate}|{'UAM_confirmmail_custom1_d'|translate}">{'UAM_confirmmail_custom_Txt1'|@translate}</label><br><br> 259 <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> 260 </li> 261 262 <li><label class="cluetip" title="{'UAM_confirmmail_custom2'|translate}|{'UAM_confirmmail_custom2_d'|translate}">{'UAM_confirmmail_custom_Txt2'|@translate}</label><br><br> 263 <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> 264 </li> 265 {/if} 237 266 </ul> 238 267 </fieldset> … … 243 272 <div id="instructionConfig3" class="instructionBlock" > 244 273 245 <div id="config3_header" class="instructionBlockHeaderCollapsed" onclick=" nbc_blockToggleDisplay('config3_header', 'Config3')">274 <div id="config3_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('config3_header', 'Config3')"> 246 275 <span class="cluetip" title="{'UAM_miscTitle'|translate}|{'UAM_miscTitle_d'|translate}">{'UAM_Title3'|@translate}</span> 247 276 </div> … … 292 321 <div id="instructionTips" class="instructionBlock" > 293 322 294 <div id="Tips_header" class="instructionBlockHeaderCollapsed" onclick=" nbc_blockToggleDisplay('Tips_header', 'Tips')">323 <div id="Tips_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('Tips_header', 'Tips')"> 295 324 <span class="cluetip" title="{'UAM_tipsTitle'|translate}|{'UAM_tipsTitle_d'|translate}">{'UAM_Title4'|@translate}</span> 296 325 </div> … … 298 327 <div id="Tips" class="instructionBlockContent" style="display:none"> 299 328 <fieldset> 300 <div id="Tips1_header" class="instructionBlockHeaderCollapsed" onclick=" nbc_blockToggleDisplay('Tips1_header', 'Tips1')">329 <div id="Tips1_header" class="instructionBlockHeaderCollapsed" onclick="uam_blockToggleDisplay('Tips1_header', 'Tips1')"> 301 330 <span>{'UAM_Tips1'|@translate}</span> 302 331 </div> … … 314 343 var n1=document.getElementById("nb_para").value ; 315 344 var n2=document.getElementById("nb_para2").value; 316 nbc_blockToggleDisplay(n1,n2 );345 uam_blockToggleDisplay(n1,n2 ); 317 346 </script> -
extensions/NBC_UserAdvManager/trunk/admin/userlist.tpl
r5056 r5181 2 2 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"} 3 3 4 {html_head}<link rel="stylesheet" type="text/css" href="{$ NBC_UAM_PATH}admin/uam.css">{/html_head}4 {html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/uam.css">{/html_head} 5 5 6 6 <script type="text/javascript"> -
extensions/NBC_UserAdvManager/trunk/admin/usermanager.tpl
r5056 r5181 2 2 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.cluetip.packed.js"} 3 3 4 {html_head}<link rel="stylesheet" type="text/css" href="{$ NBC_UAM_PATH}admin/uam.css">{/html_head}4 {html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/uam.css">{/html_head} 5 5 6 6 <script type="text/javascript"> -
extensions/NBC_UserAdvManager/trunk/changelog.txt.php
r5105 r5181 1 1 <?php 2 2 /* 3 Plugin Name: NBC_UserAdvManager3 Plugin Name: UserAdvManager 4 4 ** Change log ** 5 5 *************************************** … … 152 152 153 153 -- 2.14.1 : Bug 1497 fixed - Using users tracker without Ghost Tracker is now OK 154 155 -- 2.14.2 : Bug 1474 fixed - Messages on registration's confirmation return page (ConfirmMail.tpl) are customizable 156 Bug 1467 fixed - FCK Editor's functionnalities are available on registration's confirmation return page customization fields 157 Bug 1508 fixed - Plugin's name is now UserAdvManager (deletion of "nbc_" in code and PEM) 154 158 */ 155 159 ?> -
extensions/NBC_UserAdvManager/trunk/include/functions.inc.php
r5084 r5181 1 1 <?php 2 include_once ( NBC_UAM_PATH.'include/constants.php');3 load_language('plugin.lang', NBC_UAM_PATH);2 include_once (UAM_PATH.'include/constants.php'); 3 load_language('plugin.lang', UAM_PATH); 4 4 5 5 /* Function called from main.inc.php to send validation email */ … … 9 9 global $conf; 10 10 11 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);11 $conf_UAM = unserialize($conf['UserAdvManager']); 12 12 13 13 include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php'); … … 36 36 $language = $data['language']; /* Usefull for debugging */ 37 37 switch_lang_to($data['language']); 38 load_language('plugin.lang', NBC_UAM_PATH);38 load_language('plugin.lang', UAM_PATH); 39 39 } 40 40 … … 151 151 global $conf; 152 152 153 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);154 155 $conf_UAM_ConfirmMail = unserialize($conf[' nbc_UserAdvManager_ConfirmMail']);153 $conf_UAM = unserialize($conf['UserAdvManager']); 154 155 $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']); 156 156 157 157 include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php'); … … 172 172 switch_lang_to($data['language']); 173 173 174 load_language('plugin.lang', NBC_UAM_PATH);174 load_language('plugin.lang', UAM_PATH); 175 175 176 176 switch($typemail) … … 253 253 global $conf; 254 254 255 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);255 $conf_UAM = unserialize($conf['UserAdvManager']); 256 256 257 257 include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php'); … … 271 271 switch_lang_to($data['language']); 272 272 273 load_language('plugin.lang', NBC_UAM_PATH);273 load_language('plugin.lang', UAM_PATH); 274 274 275 275 $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Ghost_reminder_of_%s', $username)); … … 333 333 global $conf; 334 334 335 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);335 $conf_UAM = unserialize($conf['UserAdvManager']); 336 336 $Confirm_Mail_ID = FindAvailableConfirmMailID(); 337 337 … … 387 387 } 388 388 389 return get_absolute_root_url(). NBC_UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;389 return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID; 390 390 } 391 391 } … … 417 417 pwg_query($query); 418 418 419 return get_absolute_root_url(). NBC_UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;419 return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID; 420 420 } 421 421 } … … 465 465 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 466 466 467 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);468 469 $conf_UAM_ConfirmMail = unserialize($conf[' nbc_UserAdvManager_ConfirmMail']);467 $conf_UAM = unserialize($conf['UserAdvManager']); 468 469 $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']); 470 470 471 471 $query = " … … 633 633 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 634 634 635 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);635 $conf_UAM = unserialize($conf['UserAdvManager']); 636 636 637 637 $query = " … … 736 736 global $conf; 737 737 738 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);738 $conf_UAM = unserialize($conf['UserAdvManager']); 739 739 740 740 if (isset($login) and isset($conf_UAM[8]) and $conf_UAM[8] <> '') 741 741 { 742 $conf_ nbc_CharExclusion = preg_split("/,/",$conf_UAM[8]);743 for ($i = 0 ; $i < count($conf_ nbc_CharExclusion) ; $i++)744 { 745 $pattern = '/'.$conf_ nbc_CharExclusion[$i].'/i';742 $conf_CharExclusion = preg_split("/,/",$conf_UAM[8]); 743 for ($i = 0 ; $i < count($conf_CharExclusion) ; $i++) 744 { 745 $pattern = '/'.$conf_CharExclusion[$i].'/i'; 746 746 if (preg_match($pattern, $login)) 747 747 { … … 763 763 global $conf; 764 764 765 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);765 $conf_UAM = unserialize($conf['UserAdvManager']); 766 766 767 767 if (isset($email) and isset($conf_UAM[13]) and $conf_UAM[13] <> '') 768 768 { 769 769 //$ncsemail = strtolower($email); 770 $conf_ nbc_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]);771 for ($i = 0 ; $i < count($conf_ nbc_MailExclusion) ; $i++)770 $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]); 771 for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++) 772 772 { 773 $pattern = '/'.$conf_ nbc_MailExclusion[$i].'/i';773 $pattern = '/'.$conf_MailExclusion[$i].'/i'; 774 774 if (preg_match($pattern, $email)) 775 775 { … … 791 791 792 792 /* Get ConfirmMail configuration */ 793 $conf_UAM_ConfirmMail = unserialize($conf[' nbc_UserAdvManager_ConfirmMail']);793 $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']); 794 794 /* Get UAM configuration */ 795 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);795 $conf_UAM = unserialize($conf['UserAdvManager']); 796 796 797 797 $users = array(); … … 882 882 global $conf, $page; 883 883 884 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);884 $conf_UAM = unserialize($conf['UserAdvManager']); 885 885 886 886 $users = array(); … … 967 967 968 968 /* Get ConfirmMail configuration */ 969 $conf_UAM_ConfirmMail = unserialize($conf[' nbc_UserAdvManager_ConfirmMail']);969 $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']); 970 970 971 971 /* Get UAM configuration */ 972 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);972 $conf_UAM = unserialize($conf['UserAdvManager']); 973 973 974 974 $query = " … … 1092 1092 1093 1093 /* Email sending debugger function */ 1094 function MailLog 1095 { 1096 $fo=fopen ( NBC_UAM_PATH.'admin/maillog.txt','a') ;1094 function MailLog($to, $subject, $content, $language) 1095 { 1096 $fo=fopen (UAM_PATH.'admin/maillog.txt','a') ; 1097 1097 fwrite($fo,"======================\n") ; 1098 1098 fwrite($fo,'le ' . date('D, d M Y H:i:s') . "\r\n"); … … 1105 1105 1106 1106 1107 /* Function called from UAM_admin.php to get the plugin version*/1108 function Plugin Ver($dir)1107 /* Function called from UAM_admin.php and main.inc.php to get the plugin version and name */ 1108 function PluginInfos($dir) 1109 1109 { 1110 1110 $path = $dir; … … 1153 1153 function clean_obsolete_files() 1154 1154 { 1155 if (file_exists( NBC_UAM_PATH.'obsolete.list')1156 and $old_files = file( NBC_UAM_PATH.'obsolete.list', FILE_IGNORE_NEW_LINES)1155 if (file_exists(UAM_PATH.'obsolete.list') 1156 and $old_files = file(UAM_PATH.'obsolete.list', FILE_IGNORE_NEW_LINES) 1157 1157 and !empty($old_files)) 1158 1158 { … … 1160 1160 foreach($old_files as $old_file) 1161 1161 { 1162 $path = NBC_UAM_PATH.$old_file;1162 $path = UAM_PATH.$old_file; 1163 1163 if (is_file($path)) 1164 1164 { -
extensions/NBC_UserAdvManager/trunk/language/de_DE/plugin.lang.php
r5085 r5181 3 3 global $lang,$conf; 4 4 5 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);5 $conf_UAM = unserialize($conf['UserAdvManager']); 6 6 7 7 … … 221 221 - Eine Galerie mit allen oder einigen privaten Kategorien, sichtbar nur durch registrierte Benutzer<br> 222 222 - Mindestens 2 der folgenden Piwigo Nutzergruppen: "Warten", ohne die Erlaubnis der privaten Gruppen und "Validiert" mit allen Berechtigungen für den privaten Kategorien<br> 223 - NBC_UAM plugin<br>223 - UAM plugin<br> 224 224 - PWG Stuffs plugin, für das Hinzufügen eines Moduls Art "Personal Block"<br> 225 225 - Optional können Sie das Plugin Extended Description Multi-Sprachen<br> … … 227 227 <li> 228 228 Etappen:<br><br> 229 A. In plugin NBC_UAM:229 A. In plugin UAM: 230 230 <ol> 231 231 <li>Aktivieren Sie Anmeldebestätigung</li> … … 240 240 <li>Fügen Sie ein neues Modul Typ "Personal-Block: Zeigt einen Block Personal (z. B. eine redaktionelle)"</li> 241 241 <li>Konfigurieren Sie das Modul unter Angabe der Titel (zB "Anmeldung bis Validierung") und seine Beschreibung, und aktivieren Sie nur "Warten" in der Liste der Gruppen erlaubt</li> 242 <li>Kompletten Inhalt des Moduls mit der Meldung Informationen, die den Benutzern angezeigt werden nicht validiert. Als NBC_UAM kann Markup-Sprachen verwendet werden, wenn das Plugin Extended Description aktiviert ist</li>242 <li>Kompletten Inhalt des Moduls mit der Meldung Informationen, die den Benutzern angezeigt werden nicht validiert. Als UAM kann Markup-Sprachen verwendet werden, wenn das Plugin Extended Description aktiviert ist</li> 243 243 <li>Check "Display das Modul auf der Homepage der Website"</li> 244 244 <li>Überprüfen Sie die Konfiguration des Moduls</li> -
extensions/NBC_UserAdvManager/trunk/language/en_UK/plugin.lang.php
r5085 r5181 3 3 global $lang,$conf; 4 4 5 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);5 $conf_UAM = unserialize($conf['UserAdvManager']); 6 6 7 7 … … 20 20 $lang['title_confirm_mail'] = 'Validate your registration'; 21 21 $lang['confirm_mail_page_title'] = 'Validate your registration'; 22 $lang['confirm_mail_ok'] = '<br><br><br>Thank you to have confirmed your email address and your registration on the gallery. Have fun !<br><br><br><br>';23 22 24 23 … … 192 191 $lang['Add of %s'] = 'Profile created for %s'; 193 192 $lang['Update of %s'] = 'Profile %s updated'; 194 /* Email confirmation page */ 195 $lang['confirm_mail_bad'] = '<br><br><br>Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.<br><br><br><br>'; 193 196 194 /* Mailing */ 197 195 $lang['Ghost_reminder_of_%s'] = '%s, this is a reminder email'; … … 222 220 - A gallery with all or some private categories, visible only by registered users<br> 223 221 - At least 2 following Piwigo\'s users groups: "Waiting," without permission on private categories, and "Validated" with all the permissions on the private categories<br> 224 - NBC_UAM plugin<br>222 - UAM plugin<br> 225 223 - PWG Stuffs plugin, for adding a module type "Personal Block"<br> 226 224 - Optionally, the plugin Extended Description to support multi-languages<br> … … 228 226 <li> 229 227 Stages:<br><br> 230 A. In plugin NBC_UAM:228 A. In plugin UAM: 231 229 <ol> 232 230 <li>Enable registration confirmation</li> … … 241 239 <li>Add a new module type "Personal block: Shows a block staff (eg an editorial)"</li> 242 240 <li>Configure the module, indicating the title (eg "Registration pending validation") and its description, and only check "Waiting" in the list of groups allowed</li> 243 <li>Complete content of the module with the message information to be displayed to users not validated. As NBC_UAM, languages markup may be used if the plugin is enabled Extended Description</li>241 <li>Complete content of the module with the message information to be displayed to users not validated. As UAM, languages markup may be used if the plugin is enabled Extended Description</li> 244 242 <li>Check "Display the module on the homepage of the site"</li> 245 243 <li>Validate the configuration of the module</li> … … 247 245 </ul>'; 248 246 // --------- End: New or revised $lang ---- from version 2.14.0 247 248 249 // --------- Starting below: New or revised $lang ---- from version 2.14.2 250 $lang['UAM_confirmmail_custom_Txt'] = 'Validation page customization'; 251 /* Email confirmation page */ 252 // --------- End: New or revised $lang ---- from version 2.14.2 249 253 ?> -
extensions/NBC_UserAdvManager/trunk/language/es_ES/plugin.lang.php
r5085 r5181 3 3 global $lang,$conf; 4 4 5 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);5 $conf_UAM = unserialize($conf['UserAdvManager']); 6 6 7 7 … … 222 222 - Una galería con todas o algunas categorías privado, visible sólo por los usuarios registrados<br> 223 223 - Al menos 2 siguientes Piwigo grupos de usuarios: "Espera," sin permiso en las categorías de privados, y "Validado" con todos los permisos en las categorías de privados<br> 224 - NBC_UAM plugin<br>224 - UAM plugin<br> 225 225 - PWG Stuffs plugin, para agregar un tipo de módulo "Personal Block"<br> 226 226 - Opcionalmente, la Extended Description plugin para soportar múltiples idiomas<br> … … 228 228 <li> 229 229 Etapas:<br><br> 230 A. En plugin NBC_UAM:230 A. En plugin UAM: 231 231 <ol> 232 232 <li>Activar la confirmación de registro</li> … … 241 241 <li>Añadir un tipo de módulo nuevo "bloque de Personal: Muestra una plantilla de bloque (por ejemplo, un editorial)"</li> 242 242 <li>Configurar el módulo, lo que indica el título (por ejemplo, "en espera de la validación de Registro") y su descripción, y solamente "Espera" en la lista de grupos permitido</li> 243 <li>El contenido completo del módulo con la información del mensaje que se mostrará a los usuarios no validados. Como NBC_UAM, lenguajes de marcas pueden ser utilizados si el plugin Extended Description está activado</li>243 <li>El contenido completo del módulo con la información del mensaje que se mostrará a los usuarios no validados. Como UAM, lenguajes de marcas pueden ser utilizados si el plugin Extended Description está activado</li> 244 244 <li>Active la casilla "Mostrar el módulo en la página principal del sitio"</li> 245 245 <li>Validar la configuración del módulo</li> -
extensions/NBC_UserAdvManager/trunk/language/fr_FR/help/plugin.lang.php
r5105 r5181 145 145 <b>A NOTER</b> : La liste n\'affiche pas les inscrits qui n\'auraient pas validé leur inscription (si l\'option de validation de l\'inscription est activée). Ces utilisateurs sont alors gérés de manière particulière dans l\'onglet "Suivi des validations".'; 146 146 // --------- End: New or revised $lang ---- from version 2.14.1 147 148 149 // --------- Starting below: New or revised $lang ---- from version 2.14.2 150 $lang['UAM_confirmmail_custom1'] = 'Personnalisation du retour de confirmation - Confirmation acceptée'; 151 $lang['UAM_confirmmail_custom1_d'] = 'Lorque l\'option "Confirmation d\'inscription" 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> 152 A l\'installation du plugin, un texte standard est donnée en exemple.<br><br> 153 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> 154 <b style="color: red;">La modification du texte n\'est possible QUE si l\'option "Confirmation d\'inscription" est activée.</b>'; 155 $lang['UAM_confirmmail_custom2'] = 'Personnalisation du retour de confirmation - Confirmation rejetée'; 156 $lang['UAM_confirmmail_custom2_d'] = 'Lorque l\'option "Confirmation d\'inscription" 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> 157 A l\'installation du plugin, un texte standard est donnée en exemple.<br><br> 158 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> 159 <b style="color: red;">La modification du texte n\'est possible QUE si l\'option "Confirmation d\'inscription" est activée.</b>'; 160 // --------- End: New or revised $lang ---- from version 2.14.2 147 161 ?> -
extensions/NBC_UserAdvManager/trunk/language/fr_FR/plugin.lang.php
r5130 r5181 3 3 global $lang,$conf; 4 4 5 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);5 $conf_UAM = unserialize($conf['UserAdvManager']); 6 6 7 7 … … 20 20 $lang['title_confirm_mail'] = 'Confirmation de votre inscription'; 21 21 $lang['confirm_mail_page_title'] = 'Confirmation d\'inscription'; 22 $lang['confirm_mail_ok'] = '<br><br><br>Merci d\'avoir confirmé votre mail et aussi et surtout votre inscription sur le site, profitez bien des photos ...<br><br><br><br>';23 22 24 23 … … 192 191 $lang['Add of %s'] = 'Profil créé pour %s'; 193 192 $lang['Update of %s'] = 'Mise à jour du profil de %s'; 194 /* Email confirmation page */195 $lang['confirm_mail_bad'] = '<br><br><br>Votre clef d\'activation unique est erronée ou expirée ou vous avez déjà validé votre compte, veuillez contacter le webmaster pour régler ce problème.<br><br><br><br>';196 193 /* Mailing */ 197 194 $lang['Ghost_reminder_of_%s'] = '%s, ceci est un email de rappel.'; … … 222 219 - Une galerie avec tout ou partie des catégories privées, visibles par les seuls utilisateurs inscrits<br> 223 220 - 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> 224 - Le plugin NBC_UAM<br>221 - Le plugin UAM<br> 225 222 - Le plugin PWG Stuffs, pour l\'ajout d\'un module de type "Bloc personnel"<br> 226 223 - En option, le plugin Extended Description, pour le support multi-langues<br> … … 228 225 <li> 229 226 Réalisation:<br><br> 230 A. Dans le plugin NBC_UAM:227 A. Dans le plugin UAM: 231 228 <ol> 232 229 <li>Activer la confirmation d\'inscription</li> … … 241 238 <li>Ajouter un nouveau module de type "Bloc personnel : Affiche un bloc personnel (un édito par exemple)"</li> 242 239 <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> 243 <li>Compléter le contenu du module avec le texte du message d\'information qui sera affiché aux utilisateurs non validés. Comme dans NBC_UAM, les balises de langues peuvent être utilisées si le plugin Extended Description est activé</li>240 <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> 244 241 <li>Cocher "Afficher le module sur la page d\'accueil du site"</li> 245 242 <li>Valider la configuration du module</li> … … 247 244 </ul>'; 248 245 // --------- End: New or revised $lang ---- from version 2.14.0 246 247 248 // --------- Starting below: New or revised $lang ---- from version 2.14.0 249 $lang['UAM_confirmmail_custom_Txt1'] = 'Personnalisation du retour de confirmation - Confirmation acceptée'; 250 $lang['UAM_confirmmail_custom_Txt2'] = 'Personnalisation du retour de confirmation - Confirmation rejetée'; 251 /* Email confirmation page */ 252 //$lang['ConfirmMail_redirection'] = 'Redirection automatique vers l\'accueil.'; 253 // --------- End: New or revised $lang ---- from version 2.14.2 249 254 ?> -
extensions/NBC_UserAdvManager/trunk/language/it_IT/plugin.lang.php
r5180 r5181 3 3 global $lang,$conf; 4 4 5 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);5 $conf_UAM = unserialize($conf['UserAdvManager']); 6 6 7 7 … … 106 106 /* UserList Tab */ 107 107 $lang['UserList_Title'] = 'Monitoraggio degli utenti registrati'; 108 $lang['Tab_UserList'] = 'Monitoraggio degli utenti';109 108 $lang['Nb_Days'] = 'Numero di giorni<br>dall\'ultima visita'; 110 109 // --------- End: New or revised $lang ---- from version 2.13.0 … … 148 147 $lang['UAM_Confirm_Mail_false'] = ' Disattivare (di default)'; 149 148 $lang['UAM_ConfirmMail_Text'] = ' Personalizzare il testo dell\'Email di conferma:'; 149 $lang['UAM_Confirm_grpstat_notice'] = 'ATTENZIONE: Si consiglia di utilizzare o il gruppo o lo statuto di convalida ma non entrambi simultaneamente.'; 150 150 $lang['UAM_Confirm_Group'] = 'Gruppi di convalida<br>(------- per non assegnare nessun gruppo)'; 151 151 $lang['UAM_Confirm_Status'] = 'Convalida Statuti<br>(Invia ------- per mantenere il valore di default di Piwigo)'; 152 $lang['UAM_Confirm_grpstat_notice'] = 'ATTENZIONE: Si consiglia di utilizzare o il gruppo o lo statuto di convalida ma non entrambi simultaneamente.';153 152 $lang['UAM_No_Confirm_Group'] = 'Gruppo per gli utenti che non hanno convalidato la loro iscrizione<br>'; 154 153 $lang['UAM_Validated_Group'] = 'Gruppo per gli utenti che hanno convalidato la loro iscrizione<br>'; … … 171 170 $lang['UAM_LastVisit_true'] = ' Attivare'; 172 171 $lang['UAM_LastVisit_false'] = ' Disattivare (di default)'; 173 $lang['UAM_No_Comment_Anonymous'] = 'Commenti : P esudo obbligatorio per gli ospiti';172 $lang['UAM_No_Comment_Anonymous'] = 'Commenti : Pseudo obbligatorio per gli ospiti'; 174 173 $lang['UAM_No_Comment_Anonymous_true'] = ' Attivare'; 175 174 $lang['UAM_No_Comment_Anonymous_false'] = ' Disattivare (di default)'; … … 189 188 /* UserList Tab */ 190 189 $lang['SubTitle5'] = 'Infos sugli utenti'; 190 $lang['Tab_UserList'] = 'Monitoraggio degli utenti'; 191 191 /* Mailing */ 192 192 $lang['Add of %s'] = 'Profilo creato per %s'; -
extensions/NBC_UserAdvManager/trunk/main.inc.php
r5105 r5181 1 1 <?php 2 2 /* 3 Plugin Name: NBCUserAdvManager4 Version: 2.14. 13 Plugin Name: UserAdvManager 4 Version: 2.14.2 5 5 Description: Renforcer la gestion des utilisateurs - Enforce users management 6 6 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216 … … 9 9 */ 10 10 11 /* History: NBC_UAM_PATH.'Changelog.txt.php' */11 /* History: UAM_PATH.'Changelog.txt.php' */ 12 12 13 13 /* … … 38 38 39 39 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 40 if (!defined(' NBC_UAM_DIR')) define('NBC_UAM_DIR' , basename(dirname(__FILE__)));41 if (!defined(' NBC_UAM_PATH')) define('NBC_UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');42 43 include_once ( NBC_UAM_PATH.'include/constants.php');44 include_once ( NBC_UAM_PATH.'include/functions.inc.php');45 46 load_language('plugin.lang', NBC_UAM_PATH);40 if (!defined('UAM_DIR')) define('UAM_DIR' , basename(dirname(__FILE__))); 41 if (!defined('UAM_PATH')) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/'); 42 43 include_once (UAM_PATH.'include/constants.php'); 44 include_once (UAM_PATH.'include/functions.inc.php'); 45 46 load_language('plugin.lang', UAM_PATH); 47 47 48 48 … … 52 52 function UAM_admin_menu($menu) 53 53 { 54 // +-----------------------------------------------------------------------+ 55 // | Getting plugin name | 56 // +-----------------------------------------------------------------------+ 57 $plugin = PluginInfos(UAM_PATH); 58 $name = $plugin['name']; 59 54 60 array_push($menu, 55 61 array( 56 'NAME' => 'UserAdvManager',57 'URL' => get_admin_plugin_menu_link( NBC_UAM_PATH.'/admin/UAM_admin.php')62 'NAME' => $name, 63 'URL' => get_admin_plugin_menu_link(UAM_PATH.'/admin/UAM_admin.php') 58 64 ) 59 65 ); … … 69 75 global $conf, $user; 70 76 71 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);77 $conf_UAM = unserialize($conf['UserAdvManager']); 72 78 73 79 /* Admins and Guests are not tracked for Ghost Tracker or Users Tracker */ … … 120 126 global $conf; 121 127 122 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);128 $conf_UAM = unserialize($conf['UserAdvManager']); 123 129 124 130 /* Sending registration confirmation by email */ … … 244 250 $PasswordCheck = 0; 245 251 246 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);252 $conf_UAM = unserialize($conf['UserAdvManager']); 247 253 248 254 /* Password enforcement control */ … … 301 307 global $conf, $user, $template; 302 308 303 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);309 $conf_UAM = unserialize($conf['UserAdvManager']); 304 310 305 311 if (isset($_POST['validate']) and !is_admin()) … … 378 384 function UAM_InitPage() 379 385 { 380 load_language('plugin.lang', NBC_UAM_PATH);386 load_language('plugin.lang', UAM_PATH); 381 387 global $conf, $template, $page, $lang, $errors; 382 388 383 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);389 $conf_UAM = unserialize($conf['UserAdvManager']); 384 390 385 391 /* Admin user management */ … … 403 409 function UAM_CheckEmptyCommentAuthor($comment_action, $comm) 404 410 { 405 load_language('plugin.lang', NBC_UAM_PATH);411 load_language('plugin.lang', UAM_PATH); 406 412 global $infos, $conf, $template; 407 413 408 $conf_UAM = unserialize($conf[' nbc_UserAdvManager']);414 $conf_UAM = unserialize($conf['UserAdvManager']); 409 415 410 416 /* User creation OR update */ -
extensions/NBC_UserAdvManager/trunk/maintain.inc.php
r5086 r5181 1 1 <?php 2 2 3 if(!defined(" NBC_UAM_PATH")) define('NBC_UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/');4 if (!defined(' NBC_UAM_ROOT')) {5 define(' NBC_UAM_ROOT', dirname(__FILE__).'/');6 } 7 8 include_once ( NBC_UAM_PATH.'include/constants.php');9 include_once ( NBC_UAM_PATH.'include/functions.inc.php');3 if(!defined("UAM_PATH")) define('UAM_PATH' , PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/'); 4 if (!defined('UAM_ROOT')) { 5 define('UAM_ROOT', dirname(__FILE__).'/'); 6 } 7 8 include_once (UAM_PATH.'include/constants.php'); 9 include_once (UAM_PATH.'include/functions.inc.php'); 10 10 11 11 … … 26 26 $q = ' 27 27 INSERT INTO '.CONFIG_TABLE.' (param, value, comment) 28 VALUES (" nbc_UserAdvManager","'.addslashes(serialize($default1)).'","NBC_UAM parameters")28 VALUES ("UserAdvManager","'.addslashes(serialize($default1)).'","UAM parameters") 29 29 ;'; 30 30 pwg_query($q); … … 39 39 This is a reminder message because you registered on our gallery but you do not validate your registration and your validation key will expire. To allow you access to our gallery, you have 2 days to confirm your registration by clicking on the link in the message you should have received when you registered. 40 40 41 Note: After this period, your account will be permanently deleted.' );41 Note: After this period, your account will be permanently deleted.','Thank you to have confirmed your email address and your registration on the gallery. Have fun !','Your activation key is incorrect or expired or you have already validated your account, please contact the webmaster to fix this problem.'); 42 42 43 43 $q = ' 44 44 INSERT INTO '.CONFIG_TABLE.' (param, value, comment) 45 VALUES (" nbc_UserAdvManager_ConfirmMail","'.addslashes(serialize($default2)).'","NBC_UAM ConfirmMail parameters")45 VALUES ("UserAdvManager_ConfirmMail","'.addslashes(serialize($default2)).'","UAM ConfirmMail parameters") 46 46 ;'; 47 47 pwg_query($q); … … 136 136 upgrade_213(); 137 137 } 138 139 140 /* Check for upgrade from 2.14.1 to 2.14.2 */ 141 /* *************************************** */ 142 $query1 = ' 143 SELECT param 144 FROM '.CONFIG_TABLE.' 145 WHERE param = "nbc_UserAdvManager_ConfirmMail" 146 ;'; 147 $count1 = mysql_num_rows(pwg_query($query1)); 148 149 $query1 = ' 150 SELECT param 151 FROM '.CONFIG_TABLE.' 152 WHERE param = "nbc_UserAdvManager_ConfirmMail" 153 ;'; 154 $count2 = mysql_num_rows(pwg_query($query1)); 155 156 if ($count1 == 1 or $count2 == 1) 157 { 158 /* upgrade from branch 2.14.1 to 2.14.2 */ 159 /* ************************************ */ 160 upgrade_214_1(); 161 } 138 162 } 139 163 … … 143 167 global $conf; 144 168 145 if (isset($conf[' nbc_UserAdvManager']))169 if (isset($conf['UserAdvManager'])) 146 170 { 147 171 $q = ' 148 172 DELETE FROM '.CONFIG_TABLE.' 149 WHERE param=" nbc_UserAdvManager"173 WHERE param="UserAdvManager" 150 174 ;'; 151 175 … … 153 177 } 154 178 155 if (isset($conf[' nbc_UserAdvManager_ConfirmMail']))179 if (isset($conf['UserAdvManager_ConfirmMail'])) 156 180 { 157 181 $q = ' 158 182 DELETE FROM '.CONFIG_TABLE.' 159 WHERE param=" nbc_UserAdvManager_ConfirmMail"183 WHERE param="UserAdvManager_ConfirmMail" 160 184 ;'; 161 185 … … 303 327 ;'; 304 328 pwg_query($query); 305 } 329 330 upgrade_214_1(); 331 } 332 } 333 334 function upgrade_214_1() 335 { 336 global $conf; 337 338 /* Changing parameter name */ 339 $q = ' 340 UPDATE '.CONFIG_TABLE.' 341 SET param = "UserAdvManager" 342 WHERE param = "nbc_UserAdvManager" 343 ;'; 344 pwg_query($q); 345 346 $q = ' 347 UPDATE '.CONFIG_TABLE.' 348 SET param = "UserAdvManager_ConfirmMail" 349 WHERE param = "nbc_UserAdvManager_ConfirmMail" 350 ;'; 351 pwg_query($q); 352 353 /* Upgrading ConfirmMail options */ 354 $conf_UAM2 = explode(';', $conf['UserAdvManager_ConfirmMail']); 355 356 $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.'); 357 358 $query = ' 359 UPDATE '.CONFIG_TABLE.' 360 SET value = "'.addslashes(serialize($upgrade_UAM2)).'" 361 WHERE param = "UserAdvManager_ConfirmMail" 362 ;'; 363 pwg_query($query); 306 364 } 307 365 ?>
Note: See TracChangeset
for help on using the changeset viewer.