Project

General

Profile

« Previous | Next » 

Revision 2064

Added by darkviper almost 11 years ago

! register PHPMailerAutoload now in initialize instead of class.WbMailer.php
  1. a unsecure require() fixed in class PHPMailer::__construct() (notice to Syncro given)

View differences:

branches/2.8.x/CHANGELOG
12 12 
===============================================================================
13 13 

  		




  14
  14
  
    

  		




  
  15
  
    
01 Jan-2014 Build 2064 Manuela v.d.Decken(DarkViper)


  		




  
  16
  
    
! register PHPMailerAutoload now in initialize instead of class.WbMailer.php


  		




  
  17
  
    
# a unsecure require() fixed in class PHPMailer::__construct() (notice to Syncro given)


  		




  15
  18
  
    
01 Jan-2014 Build 2063 Dietmar Woellbrink (Luisehahne)


  		




  16
  19
  
    
# problems with confirmation mail solved


  		




  17
  20
  
    
01 Jan-2014 Build 2062 Manuela v.d.Decken(DarkViper)


  		












  

    
      branches/2.8.x/wb/include/phpmailer/class.phpmailer.php
    
  





  572
  572
  
    
        $this->exceptions = ($exceptions == true);


  		




  573
  573
  
    
        //Make sure our autoloader is loaded


  		




  574
  574
  
    
        if (!in_array('PHPMailerAutoload', spl_autoload_functions())) {


  		




  575
  
  
    
            require 'PHPMailerAutoload.php';


  		




  
  575
  
    
            $sAutoLoaderFile = __DIR__.DIRECTORY_SEPARATOR.'PHPMailerAutoload.php';


  		




  
  576
  
    
            if (!is_readable($sAutoLoaderFile)) {


  		




  
  577
  
    
                throw new phpmailerException('Unable to find autoloader: [' . $sAutoLoaderFile . ']');


  		




  
  578
  
    
            }


  		




  
  579
  
    
            require($sAutoLoaderFile);


  		




  576
  580
  
    
        }


  		




  577
  581
  
    
    }


  		




  578
  582
  
    

  		












  

    
      branches/2.8.x/wb/admin/interface/version.php
    
  





  51
  51
  
    

  		




  52
  52
  
    
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)


  		




  53
  53
  
    
if(!defined('VERSION')) define('VERSION', '2.8.4');


  		




  54
  
  
    
if(!defined('REVISION')) define('REVISION', '2063');


  		




  
  54
  
    
if(!defined('REVISION')) define('REVISION', '2064');


  		




  55
  55
  
    
if(!defined('SP')) define('SP', '');


  		












  

    
      branches/2.8.x/wb/framework/initialize.php
    
  





  234
  234
  
    
	}


  		




  235
  235
  
    
	WbAutoloader::doRegister(array(ADMIN_DIRECTORY=>'a', 'modules'=>'m', 'templates'=>'t', 'include'=>'i'));


  		




  236
  236
  
    
// instantiate and initialize adaptor for temporary registry replacement ---


  		




  237
  
  
    
	WbAdaptor::getInstance()->getWbConstants();


  		




  
  237
  
    
    $oReg = WbAdaptor::getInstance();


  		




  
  238
  
    
	$oReg->getWbConstants();


  		




  238
  239
  
    
// register TWIG autoloader ---


  		




  239
  240
  
    
	$sTmp = dirname(dirname(__FILE__)).'/include/Sensio/Twig/lib/Twig/Autoloader.php';


  		




  240
  241
  
    
	if(!class_exists('Twig_Autoloader')) { 


  		




  241
  242
  
    
		include($sTmp); 


  		




  242
  243
  
    
	}


  		




  243
  244
  
    
	Twig_Autoloader::register();


  		




  
  245
  
    
// register PHPMailer autoloader ---


  		




  
  246
  
    
    if (!function_exists('PHPMailerAutoload')) {


  		




  
  247
  
    
        require($oReg->AppPath.'include/phpmailer/PHPMailerAutoload.php');


  		




  
  248
  
    
    }


  		




  244
  249
  
    
// aktivate exceptionhandler ---


  		




  245
  250
  
    
	if(!function_exists('globalExceptionHandler')) {


  		




  246
  251
  
    
		include(dirname(__FILE__).'/globalExceptionHandler.php');


  		




  ......




  382
  387
  
    
	}


  		




  383
  388
  
    
/** end of deprecated part **/


  		




  384
  389
  
    
// instantiate and initialize adaptor for temporary registry replacement ---


  		




  385
  
  
    
	WbAdaptor::getInstance()->getWbConstants();


  		




  
  390
  
    
	$oReg->getWbConstants();


  		




  386
  391
  
    
// load and activate new global translation table


  		




  387
  392
  
    
	Translate::getInstance()->initialize('en',


  		




  388
  393
  
    
										 (defined('DEFAULT_LANGUAGE') ? DEFAULT_LANGUAGE : ''), 


  		












  

    
      branches/2.8.x/wb/framework/class.WbMailer.php
    
  





  22
  22
  
    
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


  		




  23
  23
  
    

  		




  24
  24
  
    
*/


  		




  25
  
  
    
/* -------------------------------------------------------- */


  		




  26
  
  
    
// Must include code to stop this file being accessed directly


  		




  27
  
  
    
if(!defined('WB_PATH')) {


  		




  28
  
  
    
	require_once(dirname(__FILE__).'/globalExceptionHandler.php');


  		




  29
  
  
    
	throw new IllegalFileException();


  		




  30
  
  
    
}


  		




  31
  
  
    
/* -------------------------------------------------------- */


  		




  32
  
  
    
// Include PHPMailer class if needed


  		




  33
  
  
    
if (!function_exists('PHPMailerAutoload')) {


  		




  34
  
  
    
    require(WbAdaptor::getInstance()->AppPath.'include/phpmailer/PHPMailerAutoload.php');


  		




  35
  
  
    
}


  		




  36
  25
  
    

  		




  37
  26
  
    
class WbMailer extends PHPMailer


  		




  38
  27
  
    
{


  		












Also available in:  Unified diff