Revision 1552
Added by Dietmar almost 13 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
11 | 11 |
! = Update/Change |
12 | 12 |
|
13 | 13 |
=========================== add small Features 2.8.2 ========================== |
14 |
31 Dez-2011 Build 1552 Dietmar Woellbrink (Luisehahne) |
|
15 |
# fix mdcr.js $scriptLink to absolute url |
|
16 |
! change separator breadcrumb admintools |
|
14 | 17 |
27 Dez-2011 Build 1551 Dietmar Woellbrink (Luisehahne) |
15 | 18 |
+ add languages vars in languages files |
16 | 19 |
+ add upload error mesages moduleinstall |
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', '1551');
|
|
55 |
if(!defined('REVISION')) define('REVISION', '1552');
|
|
56 | 56 |
if(!defined('SP')) define('SP', 'SP2'); |
branches/2.8.x/wb/admin/admintools/tool.php | ||
---|---|---|
35 | 35 |
print '<h4><a href="'.ADMIN_URL.'/admintools/index.php" '. |
36 | 36 |
'title="'.$HEADING['ADMINISTRATION_TOOLS'].'">'. |
37 | 37 |
$HEADING['ADMINISTRATION_TOOLS'].'</a>'. |
38 |
'»'.$toolName.'</h4>'."\n";
|
|
38 |
' » '.$toolName.'</h4>'."\n";
|
|
39 | 39 |
} |
40 | 40 |
// include modules tool.php |
41 | 41 |
require(WB_PATH.'/modules/'.$toolDir.'/tool.php'); |
branches/2.8.x/wb/modules/output_filter/filter-routines.php | ||
---|---|---|
34 | 34 |
$output_filter_mode |= ($filter_settings['mailto_filter'] * pow(2, 1)); // n | 2^1 |
35 | 35 |
define('OUTPUT_FILTER_AT_REPLACEMENT', $filter_settings['at_replacement']); |
36 | 36 |
define('OUTPUT_FILTER_DOT_REPLACEMENT', $filter_settings['dot_replacement']); |
37 |
/* ### filter type: protect email addresses ################################# */ |
|
38 |
if( ($output_filter_mode & pow(2, 0)) || ($output_filter_mode & pow(2, 1)) ) { |
|
39 |
$content = _doFilterEmail($content, $output_filter_mode); |
|
40 |
} |
|
37 | 41 |
/* ### filter type: full qualified URLs ##################################### */ |
38 | 42 |
if($filter_settings['sys_rel'] == 1){ |
39 | 43 |
$content = _doFilterRelUrl($content); |
40 | 44 |
} |
41 |
/* ### filter type: protect email addresses ################################# */ |
|
42 |
if( ($output_filter_mode & pow(2, 0)) || ($output_filter_mode & pow(2, 1)) ) { |
|
43 |
$content = _doFilterEmail($content, $output_filter_mode); |
|
44 |
} |
|
45 | 45 |
/* ### end of filters ####################################################### */ |
46 | 46 |
return $content; |
47 | 47 |
} |
... | ... | |
113 | 113 |
$output_filter_mode |= pow(2, 2); // n | 2^2 |
114 | 114 |
}else { |
115 | 115 |
// try to insert js-decrypt into <head> if available |
116 |
$script = str_replace('\\', '/', dirname(__FILE__)).'/js/mdcr.js';
|
|
117 |
if(is_readable($script)) { |
|
118 |
$scriptLink = '<script src="'.$script.'" type="text/javascript"></script>'; |
|
116 |
$script = str_replace('\\', '/',str_replace(WB_PATH,'', dirname(__FILE__)).'/js/mdcr.js');
|
|
117 |
if(is_readable(WB_PATH.$script)) {
|
|
118 |
$scriptLink = '<script src="'.WB_URL.$script.'" type="text/javascript"></script>';
|
|
119 | 119 |
$regex = '/(.*)(<\s*?\/\s*?head\s*>.*)/isU'; |
120 | 120 |
$replace = '$1'.$scriptLink.'$2'; |
121 | 121 |
$content = preg_replace ($regex, $replace, $content); |
Also available in: Unified diff
! change separator breadcrumb admintools