Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1625) +++ branches/2.8.x/CHANGELOG (revision 1626) @@ -11,6 +11,8 @@ ! = Update/Change =============================================================================== +29 Feb-2012 Build 1626 Werner v.d.Decken(DarkViper) +! started rebuild and reorganize the OutputFilter-System 29 Feb-2012 Build 1625 Dietmar Woellbrink (Luisehahne) ! update correct_theme_source and fixed the call in all files 29 Feb-2012 Build 1624 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1625) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1626) @@ -51,5 +51,5 @@ // 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.8.3'); -if(!defined('REVISION')) define('REVISION', '1625'); +if(!defined('REVISION')) define('REVISION', '1626'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/index.php =================================================================== --- branches/2.8.x/wb/index.php (revision 1625) +++ branches/2.8.x/wb/index.php (revision 1626) @@ -122,36 +122,13 @@ require(WB_PATH.'/templates/'.TEMPLATE.'/index.php'); $output = ob_get_contents(); if(ob_get_length() > 0) { ob_end_clean(); } - -// wb->preprocess() -- replace all [wblink123] with real, internal links -if( method_exists($wb, 'preprocess') ) -{ - $wb->preprocess($output); -} - -// Load Droplet engine and process - if(file_exists(WB_PATH .'/modules/droplets/droplets.php')) { - include_once(WB_PATH .'/modules/droplets/droplets.php'); - if(function_exists('evalDroplets')) { - $output = evalDroplets($output); - } - } - -// Load backwards compatible frontend filter support and process - if(file_exists(WB_PATH .'/modules/output_filter/filter-routines.php')) { - include_once(WB_PATH .'/modules/output_filter/filter-routines.php'); +// execute frontend output filters + if(file_exists(WB_PATH .'/modules/output_filter/index.php')) { + include_once(WB_PATH .'/modules/output_filter/index.php'); if(function_exists('executeFrontendOutputFilter')) { $output = executeFrontendOutputFilter($output); - }elseif(function_exists('filter_frontend_output')) { - $output = filter_frontend_output($output); } - } - -// move css definitions into head section - if(function_exists('moveCssToHead')) { - $output = moveCssToHead($output); - } // now send complete page to the browser echo $output; // end of wb-script Index: branches/2.8.x/wb/modules/output_filter/filter-routines.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/filter-routines.php (revision 1625) +++ branches/2.8.x/wb/modules/output_filter/filter-routines.php (revision 1626) @@ -14,221 +14,8 @@ * @lastmodified $Date$ * */ -/* -------------------------------------------------------- */ -// Must include code to stop this file being accessed directly -require_once( dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); -if(!defined('WB_PATH')) { throw new IllegalFileException(); } -/* -------------------------------------------------------- */ - -/* ************************************************************************** */ -/** - * execute the frontend output filter to modify email addresses - * @param string actual content - * @return string modified content - */ - function executeFrontendOutputFilter($content) { - // get output filter settings from database - $filter_settings = getOutputFilterSettings(); - $output_filter_mode = 0; - $output_filter_mode |= ($filter_settings['email_filter'] * pow(2, 0)); // n | 2^0 - $output_filter_mode |= ($filter_settings['mailto_filter'] * pow(2, 1)); // n | 2^1 - define('OUTPUT_FILTER_AT_REPLACEMENT', $filter_settings['at_replacement']); - define('OUTPUT_FILTER_DOT_REPLACEMENT', $filter_settings['dot_replacement']); -/* ### filter type: protect email addresses ################################# */ - if( ($output_filter_mode & pow(2, 0)) || ($output_filter_mode & pow(2, 1)) ) { - $content = _doFilterEmail($content, $output_filter_mode); - } -/* ### filter type: full qualified URLs ##################################### */ - if($filter_settings['sys_rel'] == 1){ - $content = _doFilterRelUrl($content); - } -/* ### end of filters ####################################################### */ - return $content; +/* --- this is a wrapper for backward compatibility only --- */ + $sModuleDir = str_replace('\\', '/', dirname(__FILE__)).'/'; + if (file_exists($sModuleDir.'index.php')) { + require($sModuleDir.'index.php'); } -/* ************************************************************************** */ -/** - * function to read the current filter settings - * @global object $database - * @global object $admin - * @param void - * @return array contains all settings - */ - function getOutputFilterSettings() { - global $database, $admin; - // set default values - $settings = array( - 'sys_rel' => 0, - 'email_filter' => 0, - 'mailto_filter' => 0, - 'at_replacement' => '(at)', - 'dot_replacement' => '(dot)' - ); - // be sure field 'sys_rel' is in table - $database->field_add( TABLE_PREFIX.'mod_output_filter', 'sys_rel', 'INT NOT NULL DEFAULT \'0\' FIRST'); - // request settings from database - $sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_output_filter'; - if(($res = $database->query($sql))) { - if(($rec = $res->fetchRow())) { - $settings = $rec; - $settings['at_replacement'] = $admin->strip_slashes($settings['at_replacement']); - $settings['dot_replacement'] = $admin->strip_slashes($settings['dot_replacement']); - } - } - // return array with filter settings - return $settings; - } -/* ************************************************************************** */ -/** - * Convert full qualified, local URLs into relative URLs - * @param string $content - * @return string - */ - function _doFilterRelUrl($content) { - $content = preg_replace_callback( - '/((?:href|src)\s*=\s*")([^\"]*?)(")/iU', - create_function('$matches', - '$retval = $matches[0]; '. - '$h = parse_url($matches[2], PHP_URL_HOST); '. - 'if(isset($h) && $h != \'\') { '. - 'if(stripos(WB_URL, $h) !== false) { '. - '$a = parse_url($matches[2]); '. - '$p = (isset($a[\'path\']) ? $a[\'path\'] : \'\'); '. - '$q = (isset($a[\'query\']) ? \'?\'.$a[\'query\'] : \'\'); '. - '$f = (isset($a[\'fragment\']) ? \'#\'.$a[\'fragment\'] : \'\'); '. - '$p .= ($q.$f); '. - '$retval = $matches[1]."/".(isset($p) ? ltrim(str_replace("//", "/", $p), "/") : "").$matches[3]; '. - '}} return $retval;'), - $content); - return $content; - } -/* ************************************************************************** */ -/** - * protect email addresses (replace '@' and '.' and obfuscate address - * @param string $content - * @return string - */ - function _doFilterEmail($content, $output_filter_mode) { - // test if js-decryption is installed - if( preg_match('/.*<\/head/siU', $content) ) { - $output_filter_mode |= pow(2, 2); // n | 2^2 - }else { - // try to insert js-decrypt into if available - $script = str_replace('\\', '/',str_replace(WB_PATH,'', dirname(__FILE__)).'/js/mdcr.js'); - if(is_readable(WB_PATH.$script)) { - $scriptLink = ''; - $regex = '/(.*)(<\s*?\/\s*?head\s*>.*)/isU'; - $replace = '$1'.$scriptLink.'$2'; - $content = preg_replace ($regex, $replace, $content); - $output_filter_mode |= pow(2, 2); // n | 2^2 - } - } - // define some constants so we do not call the database in the callback functions again - define('OUTPUT_FILTER_MODE', (int)$output_filter_mode); -/* *** obfuscate mailto addresses by js:mdcr *** */ - // work out the defined output filter mode: possible output filter modes: [0], 1, 2, 3, 6, 7 - // 2^0 * (0.. disable, 1.. enable) filtering of mail addresses in text - // 2^1 * (0.. disable, 1.. enable) filtering of mail addresses in mailto links - // 2^2 * (0.. disable, 1.. enable) Javascript mailto encryption (only if mailto filtering enabled) - - // first search part to find all mailto email addresses - $pattern = '#(]*>)(.*?)'; - // second part to find all non mailto email addresses - $pattern .= '|(value\s*=\s*"|\')??\b([A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4})\b#i'; -/* - Sub 1:\b( " the email address in the mailto: part of the mail link - Sub 3:([^"]*?)" --> possible ?Subject&cc... stuff attached to the mail address - Sub 4:([^>]*>) --> all class or id statements after the mailto but before closing ..> - Sub 5:(.*?)\b --> the mailto text; all characters between >xxxxx - Sub 6:|\b([A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4})\b --> email addresses which may appear in the text (require word boundaries) -*/ - // find all email addresses embedded in the content and filter them using a callback function - $content = preg_replace_callback($pattern, '_cbDoExecuteFilter', $content); - return $content; - } -/* ************************************************************************** */ -/** - * callback-function for function _doFilterEmail() to proceed search results - * @param array results from preg_replace - * @return string proceeded replacement string - */ - function _cbDoExecuteFilter($match) { - // check if required arguments are defined - if(!( defined('OUTPUT_FILTER_MODE') - && defined('OUTPUT_FILTER_AT_REPLACEMENT') - && defined('OUTPUT_FILTER_MODE') - ) ) { - return $match[0]; - } - $search = array('@', '.'); - $replace = array(OUTPUT_FILTER_AT_REPLACEMENT ,OUTPUT_FILTER_DOT_REPLACEMENT); - // check if the match contains the expected number of subpatterns (6|8) - switch (count($match)) { - case 8: - /** OUTPUT FILTER FOR EMAIL ADDRESSES EMBEDDED IN TEXT **/ - // 1.. text mails only, 3.. text mails + mailto (no JS), 7 text mails + mailto (JS) - if(!in_array(OUTPUT_FILTER_MODE, array(1,3,7))) return $match[0]; - // do not filter mail addresses included in input tags ( -1; $i--) { - if(preg_match('#[FZXK0-9]#', $email_address[$i], $characters)) { - $encrypted_email .= $email_address[$i]; - } else { - $encrypted_email .= chr((ord($email_address[$i]) -97 + $shift) % 26 + 97); - } - } - $encrypted_email .= chr($shift + 97); - // build the encrypted Javascript mailto link - $mailto_link = "" .$match[5] .""; - return $mailto_link; - } else { - /** DO NOT USE JAVASCRIPT ENCRYPTION FOR MAILTO LINKS **/ - // as minimum protection, replace @ in the mailto part by (at) - // dots are not transformed as this would transform my.name@domain.com into: my(dot)name(at)domain(dot)com - // rebuild the mailto link from the subpatterns (at the missing characters " and ") - return $match[1] .str_replace('@', OUTPUT_FILTER_AT_REPLACEMENT, $match[2]) .$match[3] .'"' .$match[4] .$match[5] .''; - // if you want to protect both, @ and dots, comment out the line above and remove the comment from the line below - // return $match[1] .str_replace($search, $replace, $match[2]) .$match[3] .'"' .$match[4] .$match[5] .''; - } - break; - default: - // number of subpatterns do not match the requirements ... do nothing - return $match[0]; - break; - } - } -/* ************************************************************************** */ Index: branches/2.8.x/wb/modules/output_filter/info.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/info.php (revision 1625) +++ branches/2.8.x/wb/modules/output_filter/info.php (revision 1626) @@ -18,8 +18,8 @@ $module_directory = 'output_filter'; $module_name = 'Frontend Output Filter'; $module_function = 'tool'; -$module_version = '0.3'; -$module_platform = '2.8.2'; +$module_version = '0.4'; +$module_platform = '2.8.3'; $module_author = 'Christian Sommer(doc), WB-Project, Werner v.d. Decken(DarkViper)'; $module_license = 'GNU General Public License'; $module_description = 'This module allows to filter the output before displaying it on the frontend. Support for filtering mailto links and mail addresses in strings.'; Index: branches/2.8.x/wb/modules/output_filter/filters/filterRelUrl.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/filters/filterRelUrl.php (nonexistent) +++ branches/2.8.x/wb/modules/output_filter/filters/filterRelUrl.php (revision 1626) @@ -0,0 +1,26 @@ + Property changes on: branches/2.8.x/wb/modules/output_filter/filters/filterRelUrl.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/filters/filterWbLink.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/filters/filterWbLink.php (nonexistent) +++ branches/2.8.x/wb/modules/output_filter/filters/filterWbLink.php (revision 1626) @@ -0,0 +1,29 @@ + $page_id) { + $replace_list[$page_id] = $ids[0][$key]; + } + foreach($replace_list as $page_id => $tag) + { + $sql = 'SELECT `link` FROM `'.TABLE_PREFIX.'pages` WHERE `page_id` = '.(int)$page_id; + $link = $database->get_one($sql); + if(!is_null($link)) { + $link = $wb->page_link($link); + $content = str_replace($tag, $link, $content); + } + } + } + return $content; + } Property changes on: branches/2.8.x/wb/modules/output_filter/filters/filterWbLink.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/filters/filterEmail.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/filters/filterEmail.php (nonexistent) +++ branches/2.8.x/wb/modules/output_filter/filters/filterEmail.php (revision 1626) @@ -0,0 +1,130 @@ +.*<\/head/siU', $content) ) { + $output_filter_mode |= pow(2, 2); // n | 2^2 + }else { + // try to insert js-decrypt into if available + $script = str_replace('\\', '/',str_replace(WB_PATH,'', dirname(__FILE__)).'/js/mdcr.js'); + if(is_readable(WB_PATH.$script)) { + $scriptLink = ''; + $regex = '/(.*)(<\s*?\/\s*?head\s*>.*)/isU'; + $replace = '$1'.$scriptLink.'$2'; + $content = preg_replace ($regex, $replace, $content); + $output_filter_mode |= pow(2, 2); // n | 2^2 + } + } + // define some constants so we do not call the database in the callback functions again + define('OUTPUT_FILTER_MODE', (int)$output_filter_mode); +/* *** obfuscate mailto addresses by js:mdcr *** */ + // work out the defined output filter mode: possible output filter modes: [0], 1, 2, 3, 6, 7 + // 2^0 * (0.. disable, 1.. enable) filtering of mail addresses in text + // 2^1 * (0.. disable, 1.. enable) filtering of mail addresses in mailto links + // 2^2 * (0.. disable, 1.. enable) Javascript mailto encryption (only if mailto filtering enabled) + + // first search part to find all mailto email addresses + $pattern = '#(]*>)(.*?)'; + // second part to find all non mailto email addresses + $pattern .= '|(value\s*=\s*"|\')??\b([A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4})\b#i'; +/* + Sub 1:\b( " the email address in the mailto: part of the mail link + Sub 3:([^"]*?)" --> possible ?Subject&cc... stuff attached to the mail address + Sub 4:([^>]*>) --> all class or id statements after the mailto but before closing ..> + Sub 5:(.*?)\b --> the mailto text; all characters between >xxxxx + Sub 6:|\b([A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4})\b --> email addresses which may appear in the text (require word boundaries) +*/ + // find all email addresses embedded in the content and filter them using a callback function + $content = preg_replace_callback($pattern, '_cbDoExecuteFilter', $content); + return $content; + } +/* ************************************************************************** */ +/** + * callback-function for function _doFilterEmail() to proceed search results + * @param array results from preg_replace + * @return string proceeded replacement string + */ + function _cbDoExecuteFilter($match) { + // check if required arguments are defined + if(!( defined('OUTPUT_FILTER_MODE') + && defined('OUTPUT_FILTER_AT_REPLACEMENT') + && defined('OUTPUT_FILTER_MODE') + ) ) { + return $match[0]; + } + $search = array('@', '.'); + $replace = array(OUTPUT_FILTER_AT_REPLACEMENT ,OUTPUT_FILTER_DOT_REPLACEMENT); + // check if the match contains the expected number of subpatterns (6|8) + switch (count($match)) { + case 8: + /** OUTPUT FILTER FOR EMAIL ADDRESSES EMBEDDED IN TEXT **/ + // 1.. text mails only, 3.. text mails + mailto (no JS), 7 text mails + mailto (JS) + if(!in_array(OUTPUT_FILTER_MODE, array(1,3,7))) return $match[0]; + // do not filter mail addresses included in input tags ( -1; $i--) { + if(preg_match('#[FZXK0-9]#', $email_address[$i], $characters)) { + $encrypted_email .= $email_address[$i]; + } else { + $encrypted_email .= chr((ord($email_address[$i]) -97 + $shift) % 26 + 97); + } + } + $encrypted_email .= chr($shift + 97); + // build the encrypted Javascript mailto link + $mailto_link = "" .$match[5] .""; + return $mailto_link; + } else { + /** DO NOT USE JAVASCRIPT ENCRYPTION FOR MAILTO LINKS **/ + // as minimum protection, replace @ in the mailto part by (at) + // dots are not transformed as this would transform my.name@domain.com into: my(dot)name(at)domain(dot)com + // rebuild the mailto link from the subpatterns (at the missing characters " and ") + return $match[1] .str_replace('@', OUTPUT_FILTER_AT_REPLACEMENT, $match[2]) .$match[3] .'"' .$match[4] .$match[5] .''; + // if you want to protect both, @ and dots, comment out the line above and remove the comment from the line below + // return $match[1] .str_replace($search, $replace, $match[2]) .$match[3] .'"' .$match[4] .$match[5] .''; + } + break; + default: + // number of subpatterns do not match the requirements ... do nothing + return $match[0]; + break; + } + } Property changes on: branches/2.8.x/wb/modules/output_filter/filters/filterEmail.php ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/modules/output_filter/filters/filterDroplets.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/filters/filterDroplets.php (nonexistent) +++ branches/2.8.x/wb/modules/output_filter/filters/filterDroplets.php (revision 1626) @@ -0,0 +1,16 @@ + into section + * @param string $content + * @return string + */ + function doFilterCssToHead($content) { + // move css definitions into head section + $pattern1 = '/(?:]*?\"text\/css\".*?\/>)/si'; + $pattern2 = '/(?:]*?\"text\/css\"[^>]*?>.*?<\/style>)/si'; + while(preg_match($pattern1, $content, $matches)==1) { + // loop through all linked CSS + $insert = $matches[1]; + $content = str_replace($insert, '', $content); + $insert = "\n".$insert."\n\n.*?\n.*? into ########### */ + if (file_exists($sFilterDirectory.'filterCssToHead.php')) { + require($sFilterDirectory.'filterCssToHead.php'); + $content = doFilterCssToHead($content); + } + +/* ### end of filters ####################################################### */ + return $content; + } +/* ************************************************************************** */ +/** + * function to read the current filter settings + * @global object $database + * @global object $admin + * @param void + * @return array contains all settings + */ + function getOutputFilterSettings() { + global $database, $admin; + // set default values + $settings = array( + 'sys_rel' => 0, + 'email_filter' => 0, + 'mailto_filter' => 0, + 'at_replacement' => '(at)', + 'dot_replacement' => '(dot)' + ); + // be sure field 'sys_rel' is in table + $database->field_add( TABLE_PREFIX.'mod_output_filter', 'sys_rel', 'INT NOT NULL DEFAULT \'0\' FIRST'); + // request settings from database + $sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_output_filter'; + if(($res = $database->query($sql))) { + if(($rec = $res->fetchRow())) { + $settings = $rec; + $settings['at_replacement'] = $admin->strip_slashes($settings['at_replacement']); + $settings['dot_replacement'] = $admin->strip_slashes($settings['dot_replacement']); + } + } + // return array with filter settings + return $settings; + } +/* ************************************************************************** */