Project

General

Profile

« Previous | Next » 

Revision 1736

Added by Luisehahne over 12 years ago

! replace more invalid char in secureform.mtab to work with settings_page

View differences:

branches/2.8.x/CHANGELOG
13 13 

  		




  14
  14
  
    

  		




  15
  15
  
    

  		




  
  16
  
    
31 Aug-2012 Build 1736 Dietmar Woellbrink (Luisehahne)


  		




  
  17
  
    
! replace more invalid char in secureform.mtab to work with settings_page


  		




  16
  18
  
    
31 Aug-2012 Build 1735 Dietmar Woellbrink (Luisehahne)


  		




  17
  19
  
    
# fixed missing $admin-print_header() by security warning


  		




  18
  20
  
    
# fixed secureform.mtab because settings_page failed


  		












  

    
      branches/2.8.x/wb/admin/pages/settings.php
    
  





  187
  187
  
    
	$sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']);


  		




  188
  188
  
    
	$sIconDir = str_replace('\\', '/', ((defined('PAGE_ICON_DIR') && PAGE_ICON_DIR != '') ? PAGE_ICON_DIR : MEDIA_DIRECTORY));


  		




  189
  189
  
    
	$sIconDir = str_replace('/*', '/'.$sTemplate, $sIconDir);


  		




  190
  
  
    
	$bIconDirHide = (defined('PAGE_EXTENDED') && PAGE_EXTENDED == 'true') ? '' : 'hide';


  		




  
  190
  
    
	$bIconDirHide = (defined('PAGE_EXTENDED') && PAGE_EXTENDED) ? '' : 'hide';


  		




  191
  191
  
    
//	$oTpl->set_var('ICON_DIR', WB_REL.$sIconDir);


  		




  192
  192
  
    
	$sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) );


  		




  193
  193
  
    

  		












  

    
      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.3');


  		




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


  		




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


  		




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


  		












  

    
      branches/2.8.x/wb/framework/SecureForm.mtab.php
    
  





  301
  301
  
    
		$key = md5($this->_salt.rand().uniqid('', true));


  		




  302
  302
  
    

  		




  303
  303
  
    
		//shorten hash a bit


  		




  304
  
  
    
		$key = str_replace(array("=","$","+","/"),array("","","",""),base64_encode(pack('H*',$key)));


  		




  
  304
  
    
		//$key = str_replace(array("=","$","+","/"),array("","","",""),base64_encode(pack('H*',$key)));


  		




  
  305
  
    
        $regex = "/[$+= \/-]/"; // 20120831 dw


  		




  
  306
  
    
        $replace = "";


  		




  
  307
  
    
        $key = preg_replace ($regex, $replace, base64_encode(pack('H*',$key)), -1 );


  		




  305
  308
  
    

  		




  306
  309
  
    
		// the key is unique, so store it in list


  		




  307
  310
  
    
		if( !array_key_exists($key,  $_SESSION[$this->_idkey_name])) {


  		












Also available in:  Unified diff