Index: branches/main/admin/interface/version.php =================================================================== --- branches/main/admin/interface/version.php (revision 4) +++ branches/main/admin/interface/version.php (revision 5) @@ -48,6 +48,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) { define('VERSION', '2.10.1-dev'); } -if(!defined('REVISION')) { define('REVISION', '4'); } +if(!defined('REVISION')) { define('REVISION', '5'); } if(!defined('SP')) { define('SP', ''); } Index: branches/main/modules/output_filter/filters/filterEmail.php =================================================================== --- branches/main/modules/output_filter/filters/filterEmail.php (revision 4) +++ branches/main/modules/output_filter/filters/filterEmail.php (revision 5) @@ -15,19 +15,12 @@ ) { return $content; } - // test if js-decryption is installed - if( preg_match('/.*<\/head/siU', $content) ) { + $bNeedMdcr = false; + // test if js-decryption is available + $script = str_replace('\\', '/',str_replace(WB_PATH,'', dirname(__DIR__)).'/js/mdcr.js'); + if(is_readable(WB_PATH.$script)) { + $scriptLink = "\t".''."\n"; $aFilterSettings['OutputFilterMode'] |= pow(2, 2); // n | 2^2 - }else { - // try to insert js-decrypt into if available - $script = str_replace('\\', '/',str_replace(WB_PATH,'', dirname(__DIR__)).'/js/mdcr.js'); - if(is_readable(WB_PATH.$script)) { - $scriptLink = "\t".''."\n"; - $regex = '/(.*)(<\s*?\/\s*?head\s*>.*)/isU'; - $replace = '$1'.$scriptLink.'$2'; - $content = preg_replace ($regex, $replace, $content); - $aFilterSettings['OutputFilterMode'] |= pow(2, 2); // n | 2^2 - } } /* *** obfuscate mailto addresses by js:mdcr *** */ // work out the defined output filter mode: possible output filter modes: [0], 1, 2, 3, 6, 7 @@ -54,7 +47,7 @@ $content = preg_replace_callback( $pattern, /* ************************************************************************** */ - function ($match) use ($aFilterSettings) { + function ($match) use ($aFilterSettings, $bNeedMdcr) { // check if required arguments are defined $search = array('@', '.'); $replace = array($aFilterSettings['at_replacement'] ,$aFilterSettings['dot_replacement']); @@ -111,6 +104,7 @@ $encrypted_email .= chr($shift + 97); // build the encrypted Javascript mailto link $mailto_link = "" .$match[5] .""; + $bNeedMdcr = true; return $mailto_link; } else { /** DO NOT USE JAVASCRIPT ENCRYPTION FOR MAILTO LINKS **/ @@ -132,5 +126,18 @@ $content ); } + if ($bNeedMdcr) { + // test if js-decryption is installed + if (!preg_match('/.*<\/head/siU', $content) ) { + // try to insert js-decrypt into if available + $script = str_replace('\\', '/',str_replace(WB_PATH,'', dirname(__DIR__)).'/js/mdcr.js'); + if(is_readable(WB_PATH.$script)) { + $scriptLink = "\t".''."\n"; + $regex = '/(.*)(<\s*?\/\s*?head\s*>.*)/isU'; + $replace = '$1'.$scriptLink.'$2'; + $content = preg_replace ($regex, $replace, $content); + } + } + } return $content; }