Project

General

Profile

« Previous | Next » 

Revision 1522

Added by darkviper almost 13 years ago

little fixes
  1. /modules/output_filter/filter-routines.php little fix to inserting mdcr.js
  2. /modules/form/view.php little fix depending from recoded output filter

View differences:

branches/2.8.x/CHANGELOG
10 10 
# = Bugfix
11 11 
! = Update/Change
12 12 

  		




  
  13
  
    
----------------------------------- Fixes 2.8.2 --------------------------------


  		




  
  14
  
    
12 Nov-2011 Build 1522 Werner v.d.Decken(DarkViper)


  		




  
  15
  
    
# /modules/output_filter/filter-routines.php little fix to inserting mdcr.js


  		




  
  16
  
    
# /modules/form/view.php little fix depending from recoded output filter


  		




  13
  17
  
    
=========================== add small Features 2.8.2 ==========================


  		




  14
  18
  
    
09 Nov-2011 Build 1521 Dietmar Woellbrink (Luisehahne)


  		




  15
  19
  
    
! update jquery to version 1.6.4


  		












  

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





  52
  52
  
    

  		




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


  		




  54
  54
  
    
if(!defined('VERSION')) define('VERSION', '2.8.2');


  		




  55
  
  
    
if(!defined('REVISION')) define('REVISION', '1521');


  		




  
  55
  
    
if(!defined('REVISION')) define('REVISION', '1522');


  		












  

    
      branches/2.8.x/wb/modules/form/view.php
    
  





  32
  32
  
    
// obtain the settings of the output filter module


  		




  33
  33
  
    
if(file_exists(WB_PATH.'/modules/output_filter/filter-routines.php')) {


  		




  34
  34
  
    
	include_once(WB_PATH.'/modules/output_filter/filter-routines.php');


  		




  35
  
  
    
	$filter_settings = get_output_filter_settings();


  		




  
  35
  
    
	$filter_settings = getOutputFilterSettings();


  		




  36
  36
  
    
} else {


  		




  37
  37
  
    
	// no output filter used, define default settings


  		




  38
  38
  
    
	$filter_settings['email_filter'] = 0;


  		




  ......




  231
  231
  
    

  		




  232
  232
  
    
// Print footer


  		




  233
  233
  
    
echo $footer;


  		




  234
  
  
    

  		




  235
  
  
    
/**


  		




  236
  
  
    
	NOTE: comment out the line ob_end_flush() if you indicate problems (e.g. when using ob_start in the index.php of your template)


  		




  237
  
  
    
	With ob_end_flush(): output filter will be disabled for this page (and all sections embedded on this page)


  		




  238
  
  
    
	Without ob_end_flush(): emails are rewritten (e.g. name@domain.com --> name(at)domain(dot)com) if output filter is enabled


  		




  239
  
  
    
	All replacements made by the Output-Filter module will be reverted before the email is send out


  		




  240
  
  
    
*/


  		




  241
  
  
    
if($filter_settings['email_filter'] && !($filter_settings['at_replacement']=='@' && $filter_settings['dot_replacement']=='.')) {


  		




  242
  
  
    
  /* 	ob_end_flush(); */


  		




  243
  
  
    
}


  		




  244
  
  
    

  		




  245
  234
  
    
// Add form end code


  		




  246
  235
  
    
?>


  		




  247
  236
  
    
</form>


  		












  

    
      branches/2.8.x/wb/modules/output_filter/filter-routines.php
    
  





  117
  117
  
    
			if(is_readable($script)) {


  		




  118
  118
  
    
				$scriptLink = '<script src="'.$script.'" type="text/javascript"></script>';


  		




  119
  119
  
    
				$regex = '/(.*)(<\s*?\/\s*?head\s*>.*)/isU';


  		




  120
  
  
    
				$replace = '$1<script src="'.$scriptLink.'" type="text/javascript"></script>$2';


  		




  
  120
  
    
				$replace = '$1'.$scriptLink.'$2';


  		




  121
  121
  
    
				$content = preg_replace ($regex, $replace, $content);


  		




  122
  122
  
    
				$output_filter_mode |= pow(2, 2); // n | 2^2


  		




  123
  123
  
    
			}


  		












Also available in:  Unified diff