Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

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

    r5084 r5181  
    11<?php
    2 include_once (NBC_UAM_PATH.'include/constants.php');
    3 load_language('plugin.lang', NBC_UAM_PATH);
     2include_once (UAM_PATH.'include/constants.php');
     3load_language('plugin.lang', UAM_PATH);
    44
    55/* Function called from main.inc.php to send validation email */
    … …  
    99  global $conf;
    1010
    11   $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
     11  $conf_UAM = unserialize($conf['UserAdvManager']);
    1212 
    1313        include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
    … …  
    3636    $language = $data['language']; /* Usefull for debugging */
    3737    switch_lang_to($data['language']);
    38     load_language('plugin.lang', NBC_UAM_PATH);
     38    load_language('plugin.lang', UAM_PATH);
    3939  }
    4040
    … …  
    151151  global $conf;
    152152
    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']);
    156156 
    157157        include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
    … …  
    172172  switch_lang_to($data['language']);
    173173   
    174   load_language('plugin.lang', NBC_UAM_PATH);
     174  load_language('plugin.lang', UAM_PATH);
    175175
    176176  switch($typemail)
    … …  
    253253  global $conf;
    254254
    255   $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
     255  $conf_UAM = unserialize($conf['UserAdvManager']);
    256256 
    257257        include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
    … …  
    271271  switch_lang_to($data['language']);
    272272   
    273   load_language('plugin.lang', NBC_UAM_PATH);
     273  load_language('plugin.lang', UAM_PATH);
    274274 
    275275  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Ghost_reminder_of_%s', $username));     
    … …  
    333333  global $conf;
    334334
    335   $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
     335  $conf_UAM = unserialize($conf['UserAdvManager']);
    336336  $Confirm_Mail_ID = FindAvailableConfirmMailID();
    337337
    … …  
    387387    }
    388388   
    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;
    390390  }
    391391}
    … …  
    417417                pwg_query($query);
    418418   
    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;
    420420  }
    421421}
    … …  
    465465  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
    466466 
    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']);
    470470
    471471  $query = "
    … …  
    633633  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
    634634
    635   $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
     635  $conf_UAM = unserialize($conf['UserAdvManager']);
    636636       
    637637  $query = "
    … …  
    736736  global $conf;
    737737
    738   $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
     738  $conf_UAM = unserialize($conf['UserAdvManager']);
    739739
    740740  if (isset($login) and isset($conf_UAM[8]) and $conf_UAM[8] <> '')
    741741  {
    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';
    746746      if (preg_match($pattern, $login))
    747747      {
    … …  
    763763  global $conf;
    764764
    765   $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
     765  $conf_UAM = unserialize($conf['UserAdvManager']);
    766766 
    767767        if (isset($email) and isset($conf_UAM[13]) and $conf_UAM[13] <> '')
    768768        {
    769769                //$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++)
    772772                {
    773                         $pattern = '/'.$conf_nbc_MailExclusion[$i].'/i';
     773                        $pattern = '/'.$conf_MailExclusion[$i].'/i';
    774774                        if (preg_match($pattern, $email))
    775775      {
    … …  
    791791         
    792792        /* Get ConfirmMail configuration */
    793   $conf_UAM_ConfirmMail = unserialize($conf['nbc_UserAdvManager_ConfirmMail']);
     793  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
    794794  /* Get UAM configuration */
    795   $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
     795  $conf_UAM = unserialize($conf['UserAdvManager']);
    796796 
    797797  $users = array();
    … …  
    882882        global $conf, $page;
    883883
    884   $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
     884  $conf_UAM = unserialize($conf['UserAdvManager']);
    885885 
    886886  $users = array();
    … …  
    967967         
    968968        /* Get ConfirmMail configuration */
    969   $conf_UAM_ConfirmMail = unserialize($conf['nbc_UserAdvManager_ConfirmMail']);
     969  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
    970970         
    971971        /* Get UAM configuration */
    972   $conf_UAM = unserialize($conf['nbc_UserAdvManager']);
     972  $conf_UAM = unserialize($conf['UserAdvManager']);
    973973       
    974974        $query = "
    … …  
    10921092
    10931093/* Email sending debugger function */
    1094 function MailLog  ($to, $subject, $content, $language)
    1095 {
    1096    $fo=fopen (NBC_UAM_PATH.'admin/maillog.txt','a') ;
     1094function MailLog($to, $subject, $content, $language)
     1095{
     1096   $fo=fopen (UAM_PATH.'admin/maillog.txt','a') ;
    10971097   fwrite($fo,"======================\n") ;
    10981098   fwrite($fo,'le ' . date('D, d M Y H:i:s') . "\r\n");
    … …  
    11051105
    11061106
    1107 /* Function called from UAM_admin.php to get the plugin version */
    1108 function PluginVer($dir)
     1107/* Function called from UAM_admin.php and main.inc.php to get the plugin version and name */
     1108function PluginInfos($dir)
    11091109{
    11101110  $path = $dir;
    … …  
    11531153function clean_obsolete_files()
    11541154{
    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)
    11571157    and !empty($old_files))
    11581158  {
    … …  
    11601160    foreach($old_files as $old_file)
    11611161    {
    1162       $path = NBC_UAM_PATH.$old_file;
     1162      $path = UAM_PATH.$old_file;
    11631163      if (is_file($path))
    11641164      {
Note: See TracChangeset for help on using the changeset viewer.