Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1164) +++ branches/2.8.x/CHANGELOG (revision 1165) @@ -12,6 +12,14 @@ ------------------------------------- 2.8.1 ------------------------------------- 12-Oct-2009 Dietmar Woellbrink +! update function show_bread_crumb in framework/frontend.functions.php +! replace separator with entities char, add title for multilingual +! set breakcrumb in div container class="breadcrumb" +! set separator in span tag class="separator" +12-Oct-2009 Dietmar Woellbrink +! update jquery fancybox from 1.0 to 1.2.1 ++ fancybox imagefolder incl. fancybox.css +12-Oct-2009 Dietmar Woellbrink ! shows more details in wysiwyg editor 10-Oct-2009 Dietmar Woellbrink ! small update upgrade.php to reset newsfiles to created dates Index: branches/2.8.x/wb/framework/frontend.functions.php =================================================================== --- branches/2.8.x/wb/framework/frontend.functions.php (revision 1164) +++ branches/2.8.x/wb/framework/frontend.functions.php (revision 1165) @@ -1,491 +1,500 @@ - - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -/* - This file is purely for ensuring compatibility with 3rd party - contributions made for WB version 2.5.2 or below -*/ -if(!defined('WB_URL')) { - header('Location: ../index.php'); - exit(0); -} - -// references to objects and variables that changed their names - -$admin = &$wb; - -$default_link=&$wb->default_link; - -$page_trail=&$wb->page_trail; -$page_description=&$wb->page_description; -$page_keywords=&$wb->page_keywords; -$page_link=&$wb->link; - -// extra_sql is not used anymore - this is basically a register_globals exploit prevention... -$extra_sql=&$wb->extra_sql; -$extra_where_sql=&$wb->extra_where_sql; - -$include_head_link_css = ''; -$include_body_links = ''; -$include_head_links = ''; - -$query="SELECT directory FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'snippet'"; -$query_result=$database->query($query); -if ($query_result->numRows()>0) { - while ($row = $query_result->fetchRow()) { - $module_dir = $row['directory']; - if (file_exists(WB_PATH.'/modules/'.$module_dir.'/include.php')) { - include(WB_PATH.'/modules/'.$module_dir.'/include.php'); - /* check if frontend.css file needs to be included into the of index.php - */ - if( file_exists(WB_PATH .'/modules/'.$module_dir.'/frontend.css')) { - $include_head_link_css .= ' of index.php - if(file_exists(WB_PATH .'/modules/'.$module_dir.'/frontend.js')) { - $include_head_links .= ''."\n"; - $include_head_file = 'frontend.js'; - } - // check if frontend_body.js file needs to be included into the of index.php - if(file_exists(WB_PATH .'/modules/'.$module_dir.'/frontend_body.js')) { - $include_body_links .= ''."\n"; - $include_body_file = 'frontend_body.js'; - } - } - } -} - -// Frontend functions -if (!function_exists('page_link')) { - function page_link($link) { - global $wb; - return $wb->page_link($link); - } -} - -//function to highlight search results -if(!function_exists('search_highlight')) { -function search_highlight($foo='', $arr_string=array()) { - require_once(WB_PATH.'/framework/functions.php'); - static $string_ul_umlaut = FALSE; - static $string_ul_regex = FALSE; - if($string_ul_umlaut===FALSE || $string_ul_regex===FALSE) - require(WB_PATH.'/search/search_convert.php'); - $foo = entities_to_umlauts($foo, 'UTF-8'); - array_walk($arr_string, create_function('&$v,$k','$v = preg_quote($v, \'~\');')); - $search_string = implode("|", $arr_string); - $string = str_replace($string_ul_umlaut, $string_ul_regex, $search_string); - // the highlighting - // match $string, but not inside , , or HTML-Tags - // split $string into pieces - "cut away" styles, scripts, comments, HTML-tags and eMail-addresses - // we have to cut

 and  as well.
-	// for HTML-Tags use <(?:[^<]|<.*>)*> which will match strings like 
-	$matches = preg_split("~(|||||<(?:[^<]|<.*>)*>|\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,8}\b)~iUs",$foo,-1,(PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY));
-	if(is_array($matches) && $matches != array()) {
-		$foo = "";
-		foreach($matches as $match) {
-			if($match{0}!="<" && !preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,8}$/i', $match)) {
-				$match = str_replace(array('<', '>', '&', '"', ''', ' '), array('<', '>', '&', '"', '\'', "\xC2\xA0"), $match);
-				$match = preg_replace('~('.$string.')~ui', '_span class=_highlight__$1_/span_',$match);
-				$match = str_replace(array('&', '<', '>', '"', '\'', "\xC2\xA0"), array('&', '<', '>', '"', ''', ' '), $match);
-				$match = str_replace(array('_span class=_highlight__', '_/span_'), array('', ''), $match);
-			}
-			$foo .= $match;
-		}
-	}
-	
-	if(DEFAULT_CHARSET != 'utf-8') {
-		$foo = umlauts_to_entities($foo, 'UTF-8');
-	}
-	return $foo;
-}
-}
-
-// Old menu call invokes new menu function
-if (!function_exists('page_menu')) {
-	function page_menu($parent = 0, $menu_number = 1, $item_template = '[a] [menu_title] [/a]', $menu_header = '', $menu_footer = '', $default_class = ' class="menu_default"', $current_class = ' class="menu_current"', $recurse = LEVEL) {
-		global $wb;
-		$wb->menu_number=$menu_number;
-		$wb->menu_item_template=$item_template;
-		$wb->menu_item_footer='';
-		$wb->menu_parent = $parent;
-		$wb->menu_header = $menu_header; 
-		$wb->menu_footer = $menu_footer;
-		$wb->menu_default_class = $default_class;
-		$wb->menu_current_class = $current_class;
-		$wb->menu_recurse = $recurse+2; 	
-		$wb->menu();
-		unset($wb->menu_parent);
-		unset($wb->menu_number);
-		unset($wb->menu_item_template);
-		unset($wb->menu_item_footer);
-		unset($wb->menu_header);
-		unset($wb->menu_footer);
-		unset($wb->menu_default_class);
-		unset($wb->menu_current_class);
-		unset($wb->menu_start_level);
-		unset($wb->menu_collapse);
-		unset($wb->menu_recurse);
-	}
-}
-
-if (!function_exists('show_menu')) {
-	function show_menu($menu_number = NULL, $start_level=NULL, $recurse = NULL, $collapse = NULL, $item_template = NULL, $item_footer = NULL, $menu_header = NULL, $menu_footer = NULL, $default_class = NULL, $current_class = NULL, $parent = NULL) {
-		global $wb;
-		if (isset($menu_number))
-			$wb->menu_number=$menu_number;
-		if (isset($start_level))
-			$wb->menu_start_level=$start_level;
-		if (isset($recurse))
-			$wb->menu_recurse=$recurse;
-		if (isset($collapse))
-			$wb->menu_collapse=$collapse;
-		if (isset($item_template))
-			$wb->menu_item_template=$item_template;
-		if (isset($item_footer))
-			$wb->menu_item_footer=$item_footer;
-		if (isset($menu_header))
-			$wb->menu_header=$menu_header;
-		if (isset($menu_footer))
-			$wb->menu_footer=$menu_footer;
-		if (isset($default_class))
-			$wb->menu_default_class=$default_class;
-		if (isset($current_class))
-			$wb->menu_current_class=$current_class;
-		if (isset($parent))
-			$wb->menu_parent=$parent;
-		$wb->menu();
-		unset($wb->menu_recurse);
-		unset($wb->menu_parent);
-		unset($wb->menu_start_level);
-	}
-}
-
-if (!function_exists('page_content')) {
-	function page_content($block = 1) {
-		// Get outside objects
-		global $TEXT,$MENU,$HEADING,$MESSAGE;
-		global $globals;
-		global $database;
-		global $wb;
-		$admin = & $wb;
-		if ($wb->page_access_denied==true) {
-	        echo $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'];
-			exit();
-		}
-		if ($wb->page_no_active_sections==true) {
-	        echo $MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'];
-			exit();
-		}
-		if(isset($globals) AND is_array($globals)) { foreach($globals AS $global_name) { global $$global_name; } }
-		// Make sure block is numeric
-		if(!is_numeric($block)) { $block = 1; }
-		// Include page content
-		if(!defined('PAGE_CONTENT') OR $block!=1) {
-			$page_id=$wb->page_id;
-			// First get all sections for this page
-			$query_sections = $database->query("SELECT section_id,module,publ_start,publ_end FROM ".TABLE_PREFIX."sections WHERE page_id = '".$page_id."' AND block = '$block' ORDER BY position");
-			// If none were found, check if default content is supposed to be shown
-			if($query_sections->numRows() == 0) {
-				if ($wb->default_block_content=='none') {
-					return;
-				}
-				if (is_numeric($wb->default_block_content)) {
-					$page_id=$wb->default_block_content;
-				} else {
-					$page_id=$wb->default_page_id;
-				}				
-				$query_sections = $database->query("SELECT section_id,module,publ_start,publ_end FROM ".TABLE_PREFIX."sections WHERE page_id = '".$page_id."' AND block = '$block' ORDER BY position");
-				// Still no cotent found? Give it up, there's just nothing to show!
-				if($query_sections->numRows() == 0) {
-					return;
-				}
-			}
-			// Loop through them and include their module file
-			while($section = $query_sections->fetchRow()) {
-				// skip this section if it is out of publication-date
-				$now = time();
-				if( !(($now<=$section['publ_end'] || $section['publ_end']==0) && ($now>=$section['publ_start'] || $section['publ_start']==0)) ) {
-					continue;
-				}
-				$section_id = $section['section_id'];
-				$module = $section['module'];
-				// make a anchor for every section.
-				if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') {
-					echo '';
-				}
-
-				// fetch content -- this is where to place possible output-filters (before highlighting)
-				ob_start(); // fetch original content
-				require(WB_PATH.'/modules/'.$module.'/view.php');
-				$content = ob_get_contents();
-				ob_end_clean();
-
-				// highlights searchresults
-				if(isset($_GET['searchresult']) && is_numeric($_GET['searchresult']) && !isset($_GET['nohighlight']) && isset($_GET['sstring']) && !empty($_GET['sstring'])) {
-					$arr_string = explode(" ", $_GET['sstring']);
-					if($_GET['searchresult']==2) { // exact match
-						$arr_string[0] = str_replace("_", " ", $arr_string[0]);
-					}
-					echo search_highlight($content, $arr_string);
-				} else {
-					echo $content;
-				}
-			}
-		} else {
-			require(PAGE_CONTENT);
-		}
-	}
-}
-
-if (!function_exists('show_content')) {
-	function show_content($block=1) {
-		page_content($block);
-	}
-}
-
-if (!function_exists('show_breadcrumbs')) {
-	function show_breadcrumbs($sep=' > ',$tier=1,$links=true,$depth=-1) {
-		global $wb;
-		$page_id=$wb->page_id;
-		if ($page_id!=0)
-		{
-	 		global $database;
-			$bca=$wb->page_trail;
-			$counter=0;
-			foreach ($bca as $temp)
-			{
-		        if ($counter>=($tier-1) AND ($depth<0 OR $tier+$depth>$counter))
-		        {
-					if ($counter>=$tier) echo $sep;
-					$query_menu=$database->query("SELECT menu_title,link FROM ".TABLE_PREFIX."pages WHERE page_id=$temp");
-					$page=$query_menu->fetchRow();
-					if ($links==true AND $temp!=$page_id)
-						echo ''.$page['menu_title'].'';
-					else
-					    echo $page['menu_title'];
-		        }
-	            $counter++;
-			}
-		}
-	}
-}
-
-// Function for page title
-if (!function_exists('page_title')) {
-	function page_title($spacer = ' - ', $template = '[WEBSITE_TITLE][SPACER][PAGE_TITLE]') {
-		$vars = array('[WEBSITE_TITLE]', '[PAGE_TITLE]', '[MENU_TITLE]', '[SPACER]');
-		$values = array(WEBSITE_TITLE, PAGE_TITLE, MENU_TITLE, $spacer);
-		echo str_replace($vars, $values, $template);
-	}
-}
-
-// Function for page description
-if (!function_exists('page_description')) {
-	function page_description() {
-		global $wb;
-		if ($wb->page_description!='') {
-			echo $wb->page_description;
-		} else {
-			echo WEBSITE_DESCRIPTION;
-		}
-	}
-}
-
-// Function for page keywords
-if (!function_exists('page_keywords')) {
-	function page_keywords() {
-		global $wb;
-		if ($wb->page_keywords!='') {
-			echo $wb->page_keywords;
-		} else {
-			echo WEBSITE_KEYWORDS;
-		}
-	}
-}
-
-// Function for page header
-if (!function_exists('page_header')) {
-	function page_header($date_format = 'Y') {
-		echo WEBSITE_HEADER;
-	}
-}
-
-// Function for page footer
-if (!function_exists('page_footer')) {
-	function page_footer($date_format = 'Y') {
-		global $starttime;
-		$vars = array('[YEAR]', '[PROCESS_TIME]');
-		$processtime=array_sum(explode(" ",microtime()))-$starttime;
-		$values = array(gmdate($date_format),$processtime);
-		echo str_replace($vars, $values, WEBSITE_FOOTER);
-	}
-}
-
-// Function to add optional module Javascript into the  section of the frontend
-if(!function_exists('register_frontend_modfiles_body')) {
-	function register_frontend_modfiles_body($file_id="js") {
-		// sanity check of parameter passed to the function
-		$file_id = strtolower($file_id);
-		if($file_id !== "css" && $file_id !== "javascript" && $file_id !== "js") {
-			return;
-		}
-
-		global $wb, $database, $include_body_links;
-		// define default baselink and filename for optional module javascript files
-		$body_links = "";
-		$base_link = '';
-		$base_file = "frontend_body.js";
-
-		if(!empty($include_body_links)) {
-			if(strpos($body_links, $include_body_links) === false) {
-				$body_links .= $include_body_links;
-			}
-			$include_body_links = '';
-		}
-
-		// gather information for all models embedded on actual page
-		$page_id = $wb->page_id;
-		$query_modules = $database->query("SELECT module FROM " .TABLE_PREFIX ."sections
-				WHERE page_id=$page_id AND module<>'wysiwyg'");
-
-		while($row = $query_modules->fetchRow()) {
-			// check if page module directory contains a frontend_body.js file
-			if(file_exists(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) {
-					// create link with frontend_body.js source for the current module
-				$tmp_link = str_replace("{MODULE_DIRECTORY}", $row['module'], $base_link);
-
-				// define constant indicating that the register_frontent_files was invoked
-					if(!defined('MOD_FRONTEND_BODY_JAVASCRIPT_REGISTERED')) define('MOD_FRONTEND_BODY_JAVASCRIPT_REGISTERED', true);
-
-				// ensure that frontend_body.js is only added once per module type
-				if(strpos($body_links, $tmp_link) === false) {
-					$body_links .= $tmp_link ."\n";
-				}
-			};
-		}
-
-		/* include the Javascript email protection function
-		if( $file_id != 'css' && file_exists(WB_PATH .'/modules/droplets/js/mdcr.js')) {
-			$body_links .= ''."\n";
-		} elseif( $file_id != 'css' && file_exists(WB_PATH .'/modules/output_filter/js/mdcr.js')) {
-			$body_links .= ''."\n";
-		} */
-		echo $body_links;
-	}
-}
-
-
-// Function to add optional module Javascript or CSS stylesheets into the  section of the frontend
-if(!function_exists('register_frontend_modfiles')) {
-	function register_frontend_modfiles($file_id="css") {
-		// sanity check of parameter passed to the function
-		$file_id = strtolower($file_id);
-		if($file_id !== "css" && $file_id !== "javascript" && $file_id !== "js") {
-			return;
-		}
-
-		global $wb, $database, $include_head_link_css, $include_head_links;
-		// define default baselink and filename for optional module javascript and stylesheet files
-		$head_links = "";
-
-		if($file_id == "css") {
-			$base_link = '';
-			$base_file = "frontend.js";
-		}
-
-		if(!empty($include_head_link_css)) {
-			if(strpos($head_links, $include_head_link_css) === false) {
-				$head_links .= $include_head_link_css;
-			}
-			$include_head_link_css = '';
-		} else {
-			if(!empty($include_head_links)) {
-				if(strpos($head_links, $include_head_links) === false) {
-					$head_links .= $include_head_links;
-				}
-				$include_head_links = '';
-			}
-		}
-
-		// gather information for all models embedded on actual page
-		$page_id = $wb->page_id;
-		$query_modules = $database->query("SELECT module FROM " .TABLE_PREFIX ."sections 
-				WHERE page_id=$page_id AND module<>'wysiwyg'");
-
-		while($row = $query_modules->fetchRow()) {
-			// check if page module directory contains a frontend.js or frontend.css file
-			if(file_exists(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) {
-					// create link with frontend.js or frontend.css source for the current module
-				$tmp_link = str_replace("{MODULE_DIRECTORY}", $row['module'], $base_link);
-
-				// define constant indicating that the register_frontent_files was invoked
-				if($file_id == 'css') {
-					if(!defined('MOD_FRONTEND_CSS_REGISTERED')) define('MOD_FRONTEND_CSS_REGISTERED', true);
-				} else {
-					if(!defined('MOD_FRONTEND_JAVASCRIPT_REGISTERED')) define('MOD_FRONTEND_JAVASCRIPT_REGISTERED', true);
-				}
-				// ensure that frontend.js or frontend.css is only added once per module type
-				if(strpos($head_links, $tmp_link) === false) {
-					$head_links .= $tmp_link ."\n";
-				}
-			};
-		}
-
-		// include the Javascript email protection function
-		if( $file_id != 'css' && file_exists(WB_PATH .'/modules/droplets/js/mdcr.js')) {
-			$head_links .= ''."\n";
-		} elseif( $file_id != 'css' && file_exists(WB_PATH .'/modules/output_filter/js/mdcr.js')) {
-			$head_links .= ''."\n";
-		}
-		echo $head_links;
-	}
-}
-
-// Begin WB < 2.4.x template compatibility code
-	// Make extra_sql accessable through private_sql
-	$private_sql = $extra_sql;
-	$private_where_sql = $extra_where_sql;
-	// Query pages for menu
-	$menu1 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '0' AND $extra_where_sql ORDER BY position ASC");
-	// Check if current pages is a parent page and if we need its submenu
-	if(PARENT == 0) {
-		// Get the pages submenu
-		$menu2 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '".PAGE_ID."' AND $extra_where_sql ORDER BY position ASC");
-	} else {
-		// Get the pages submenu
-		$menu2 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '".PARENT."' AND $extra_where_sql ORDER BY position ASC");
-	}
-// End WB < 2.4.x template compatibility code
-// Include template file
-
-
-?>
+
+ Copyright (C) 2004-2009, Ryan Djurovich
+
+ Website Baker is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ Website Baker is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Website Baker; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+/*
+	This file is purely for ensuring compatibility with 3rd party
+	contributions made for WB version 2.5.2 or below
+*/
+if(!defined('WB_URL')) {
+	header('Location: ../index.php');
+	exit(0);
+}
+
+// references to objects and variables that changed their names
+
+$admin = &$wb;
+
+$default_link=&$wb->default_link;
+
+$page_trail=&$wb->page_trail;
+$page_description=&$wb->page_description;
+$page_keywords=&$wb->page_keywords;
+$page_link=&$wb->link;
+
+// extra_sql is not used anymore - this is basically a register_globals exploit prevention...
+$extra_sql=&$wb->extra_sql;
+$extra_where_sql=&$wb->extra_where_sql;
+
+$include_head_link_css = '';
+$include_body_links = '';
+$include_head_links = '';
+
+$query="SELECT directory FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND function = 'snippet'";
+$query_result=$database->query($query);
+if ($query_result->numRows()>0) {
+	while ($row = $query_result->fetchRow()) {
+		$module_dir = $row['directory'];
+		if (file_exists(WB_PATH.'/modules/'.$module_dir.'/include.php')) {
+			include(WB_PATH.'/modules/'.$module_dir.'/include.php');
+			/* check if frontend.css file needs to be included into the  of index.php
+			*/
+			if( file_exists(WB_PATH .'/modules/'.$module_dir.'/frontend.css')) {
+				$include_head_link_css .= ' of index.php
+			if(file_exists(WB_PATH .'/modules/'.$module_dir.'/frontend.js')) {
+				$include_head_links .= ''."\n";
+				$include_head_file = 'frontend.js';
+			}
+			// check if frontend_body.js file needs to be included into the  of index.php
+			if(file_exists(WB_PATH .'/modules/'.$module_dir.'/frontend_body.js')) {
+				$include_body_links .= ''."\n";
+				$include_body_file = 'frontend_body.js';
+			}
+		}
+	}
+}
+
+// Frontend functions
+if (!function_exists('page_link')) {
+	function page_link($link) {
+		global $wb;
+		return $wb->page_link($link);
+	}
+}
+
+//function to highlight search results
+if(!function_exists('search_highlight')) {
+function search_highlight($foo='', $arr_string=array()) {
+	require_once(WB_PATH.'/framework/functions.php');
+	static $string_ul_umlaut = FALSE;
+	static $string_ul_regex = FALSE;
+	if($string_ul_umlaut===FALSE || $string_ul_regex===FALSE)
+		require(WB_PATH.'/search/search_convert.php');
+	$foo = entities_to_umlauts($foo, 'UTF-8');
+	array_walk($arr_string, create_function('&$v,$k','$v = preg_quote($v, \'~\');'));
+	$search_string = implode("|", $arr_string);
+	$string = str_replace($string_ul_umlaut, $string_ul_regex, $search_string);
+	// the highlighting
+	// match $string, but not inside , ,  or HTML-Tags
+	// split $string into pieces - "cut away" styles, scripts, comments, HTML-tags and eMail-addresses
+	// we have to cut  and  as well.
+	// for HTML-Tags use <(?:[^<]|<.*>)*> which will match strings like 
+	$matches = preg_split("~(|||||<(?:[^<]|<.*>)*>|\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,8}\b)~iUs",$foo,-1,(PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY));
+	if(is_array($matches) && $matches != array()) {
+		$foo = "";
+		foreach($matches as $match) {
+			if($match{0}!="<" && !preg_match('/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,8}$/i', $match)) {
+				$match = str_replace(array('<', '>', '&', '"', ''', ' '), array('<', '>', '&', '"', '\'', "\xC2\xA0"), $match);
+				$match = preg_replace('~('.$string.')~ui', '_span class=_highlight__$1_/span_',$match);
+				$match = str_replace(array('&', '<', '>', '"', '\'', "\xC2\xA0"), array('&', '<', '>', '"', ''', ' '), $match);
+				$match = str_replace(array('_span class=_highlight__', '_/span_'), array('', ''), $match);
+			}
+			$foo .= $match;
+		}
+	}
+	
+	if(DEFAULT_CHARSET != 'utf-8') {
+		$foo = umlauts_to_entities($foo, 'UTF-8');
+	}
+	return $foo;
+}
+}
+
+// Old menu call invokes new menu function
+if (!function_exists('page_menu')) {
+	function page_menu($parent = 0, $menu_number = 1, $item_template = '[a] [menu_title] [/a]', $menu_header = '', $menu_footer = '', $default_class = ' class="menu_default"', $current_class = ' class="menu_current"', $recurse = LEVEL) {
+		global $wb;
+		$wb->menu_number=$menu_number;
+		$wb->menu_item_template=$item_template;
+		$wb->menu_item_footer='';
+		$wb->menu_parent = $parent;
+		$wb->menu_header = $menu_header; 
+		$wb->menu_footer = $menu_footer;
+		$wb->menu_default_class = $default_class;
+		$wb->menu_current_class = $current_class;
+		$wb->menu_recurse = $recurse+2; 	
+		$wb->menu();
+		unset($wb->menu_parent);
+		unset($wb->menu_number);
+		unset($wb->menu_item_template);
+		unset($wb->menu_item_footer);
+		unset($wb->menu_header);
+		unset($wb->menu_footer);
+		unset($wb->menu_default_class);
+		unset($wb->menu_current_class);
+		unset($wb->menu_start_level);
+		unset($wb->menu_collapse);
+		unset($wb->menu_recurse);
+	}
+}
+
+if (!function_exists('show_menu')) {
+	function show_menu($menu_number = NULL, $start_level=NULL, $recurse = NULL, $collapse = NULL, $item_template = NULL, $item_footer = NULL, $menu_header = NULL, $menu_footer = NULL, $default_class = NULL, $current_class = NULL, $parent = NULL) {
+		global $wb;
+		if (isset($menu_number))
+			$wb->menu_number=$menu_number;
+		if (isset($start_level))
+			$wb->menu_start_level=$start_level;
+		if (isset($recurse))
+			$wb->menu_recurse=$recurse;
+		if (isset($collapse))
+			$wb->menu_collapse=$collapse;
+		if (isset($item_template))
+			$wb->menu_item_template=$item_template;
+		if (isset($item_footer))
+			$wb->menu_item_footer=$item_footer;
+		if (isset($menu_header))
+			$wb->menu_header=$menu_header;
+		if (isset($menu_footer))
+			$wb->menu_footer=$menu_footer;
+		if (isset($default_class))
+			$wb->menu_default_class=$default_class;
+		if (isset($current_class))
+			$wb->menu_current_class=$current_class;
+		if (isset($parent))
+			$wb->menu_parent=$parent;
+		$wb->menu();
+		unset($wb->menu_recurse);
+		unset($wb->menu_parent);
+		unset($wb->menu_start_level);
+	}
+}
+
+if (!function_exists('page_content')) {
+	function page_content($block = 1) {
+		// Get outside objects
+		global $TEXT,$MENU,$HEADING,$MESSAGE;
+		global $globals;
+		global $database;
+		global $wb;
+		$admin = & $wb;
+		if ($wb->page_access_denied==true) {
+	        echo $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'];
+			exit();
+		}
+		if ($wb->page_no_active_sections==true) {
+	        echo $MESSAGE['FRONTEND']['SORRY_NO_ACTIVE_SECTIONS'];
+			exit();
+		}
+		if(isset($globals) AND is_array($globals)) { foreach($globals AS $global_name) { global $$global_name; } }
+		// Make sure block is numeric
+		if(!is_numeric($block)) { $block = 1; }
+		// Include page content
+		if(!defined('PAGE_CONTENT') OR $block!=1) {
+			$page_id=$wb->page_id;
+			// First get all sections for this page
+			$query_sections = $database->query("SELECT section_id,module,publ_start,publ_end FROM ".TABLE_PREFIX."sections WHERE page_id = '".$page_id."' AND block = '$block' ORDER BY position");
+			// If none were found, check if default content is supposed to be shown
+			if($query_sections->numRows() == 0) {
+				if ($wb->default_block_content=='none') {
+					return;
+				}
+				if (is_numeric($wb->default_block_content)) {
+					$page_id=$wb->default_block_content;
+				} else {
+					$page_id=$wb->default_page_id;
+				}				
+				$query_sections = $database->query("SELECT section_id,module,publ_start,publ_end FROM ".TABLE_PREFIX."sections WHERE page_id = '".$page_id."' AND block = '$block' ORDER BY position");
+				// Still no cotent found? Give it up, there's just nothing to show!
+				if($query_sections->numRows() == 0) {
+					return;
+				}
+			}
+			// Loop through them and include their module file
+			while($section = $query_sections->fetchRow()) {
+				// skip this section if it is out of publication-date
+				$now = time();
+				if( !(($now<=$section['publ_end'] || $section['publ_end']==0) && ($now>=$section['publ_start'] || $section['publ_start']==0)) ) {
+					continue;
+				}
+				$section_id = $section['section_id'];
+				$module = $section['module'];
+				// make a anchor for every section.
+				if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') {
+					echo '';
+				}
+
+				// fetch content -- this is where to place possible output-filters (before highlighting)
+				ob_start(); // fetch original content
+				require(WB_PATH.'/modules/'.$module.'/view.php');
+				$content = ob_get_contents();
+				ob_end_clean();
+
+				// highlights searchresults
+				if(isset($_GET['searchresult']) && is_numeric($_GET['searchresult']) && !isset($_GET['nohighlight']) && isset($_GET['sstring']) && !empty($_GET['sstring'])) {
+					$arr_string = explode(" ", $_GET['sstring']);
+					if($_GET['searchresult']==2) { // exact match
+						$arr_string[0] = str_replace("_", " ", $arr_string[0]);
+					}
+					echo search_highlight($content, $arr_string);
+				} else {
+					echo $content;
+				}
+			}
+		} else {
+			require(PAGE_CONTENT);
+		}
+	}
+}
+
+if (!function_exists('show_content')) {
+	function show_content($block=1) {
+		page_content($block);
+	}
+}
+
+if (!function_exists('show_breadcrumbs'))
+{
+	function show_breadcrumbs($sep=' » ',$tier=1,$links=true,$depth=-1, $title='You are here: ')
+    {
+		global $wb;
+		$page_id=$wb->page_id;
+		if ($page_id!=0)
+		{
+	 		global $database;
+			$bca=$wb->page_trail;
+			$counter=0;
+            print ''.$title;
+
+			foreach ($bca as $temp)
+			{
+		        if ($counter>=($tier-1) AND ($depth<0 OR $tier+$depth>$counter))
+		        {
+					if ($counter>=$tier) print ''.$sep.'';
+					$query_menu=$database->query("SELECT menu_title,link FROM ".TABLE_PREFIX."pages WHERE page_id=$temp");
+					$page=$query_menu->fetchRow();
+					if ($links==true AND $temp!=$page_id)
+                    {
+						print ''.$page['menu_title'].'';
+                    }
+					else
+                    {
+					    print ''.$page['menu_title'].'';
+                    }
+		        }
+	            $counter++;
+			}
+            print "\n";
+		}
+	}
+}
+
+// Function for page title
+if (!function_exists('page_title')) {
+	function page_title($spacer = ' - ', $template = '[WEBSITE_TITLE][SPACER][PAGE_TITLE]') {
+		$vars = array('[WEBSITE_TITLE]', '[PAGE_TITLE]', '[MENU_TITLE]', '[SPACER]');
+		$values = array(WEBSITE_TITLE, PAGE_TITLE, MENU_TITLE, $spacer);
+		echo str_replace($vars, $values, $template);
+	}
+}
+
+// Function for page description
+if (!function_exists('page_description')) {
+	function page_description() {
+		global $wb;
+		if ($wb->page_description!='') {
+			echo $wb->page_description;
+		} else {
+			echo WEBSITE_DESCRIPTION;
+		}
+	}
+}
+
+// Function for page keywords
+if (!function_exists('page_keywords')) {
+	function page_keywords() {
+		global $wb;
+		if ($wb->page_keywords!='') {
+			echo $wb->page_keywords;
+		} else {
+			echo WEBSITE_KEYWORDS;
+		}
+	}
+}
+
+// Function for page header
+if (!function_exists('page_header')) {
+	function page_header($date_format = 'Y') {
+		echo WEBSITE_HEADER;
+	}
+}
+
+// Function for page footer
+if (!function_exists('page_footer')) {
+	function page_footer($date_format = 'Y') {
+		global $starttime;
+		$vars = array('[YEAR]', '[PROCESS_TIME]');
+		$processtime=array_sum(explode(" ",microtime()))-$starttime;
+		$values = array(gmdate($date_format),$processtime);
+		echo str_replace($vars, $values, WEBSITE_FOOTER);
+	}
+}
+
+// Function to add optional module Javascript into the  section of the frontend
+if(!function_exists('register_frontend_modfiles_body')) {
+	function register_frontend_modfiles_body($file_id="js") {
+		// sanity check of parameter passed to the function
+		$file_id = strtolower($file_id);
+		if($file_id !== "css" && $file_id !== "javascript" && $file_id !== "js") {
+			return;
+		}
+
+		global $wb, $database, $include_body_links;
+		// define default baselink and filename for optional module javascript files
+		$body_links = "";
+		$base_link = '';
+		$base_file = "frontend_body.js";
+
+		if(!empty($include_body_links)) {
+			if(strpos($body_links, $include_body_links) === false) {
+				$body_links .= $include_body_links;
+			}
+			$include_body_links = '';
+		}
+
+		// gather information for all models embedded on actual page
+		$page_id = $wb->page_id;
+		$query_modules = $database->query("SELECT module FROM " .TABLE_PREFIX ."sections
+				WHERE page_id=$page_id AND module<>'wysiwyg'");
+
+		while($row = $query_modules->fetchRow()) {
+			// check if page module directory contains a frontend_body.js file
+			if(file_exists(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) {
+					// create link with frontend_body.js source for the current module
+				$tmp_link = str_replace("{MODULE_DIRECTORY}", $row['module'], $base_link);
+
+				// define constant indicating that the register_frontent_files was invoked
+					if(!defined('MOD_FRONTEND_BODY_JAVASCRIPT_REGISTERED')) define('MOD_FRONTEND_BODY_JAVASCRIPT_REGISTERED', true);
+
+				// ensure that frontend_body.js is only added once per module type
+				if(strpos($body_links, $tmp_link) === false) {
+					$body_links .= $tmp_link ."\n";
+				}
+			};
+		}
+
+		/* include the Javascript email protection function
+		if( $file_id != 'css' && file_exists(WB_PATH .'/modules/droplets/js/mdcr.js')) {
+			$body_links .= ''."\n";
+		} elseif( $file_id != 'css' && file_exists(WB_PATH .'/modules/output_filter/js/mdcr.js')) {
+			$body_links .= ''."\n";
+		} */
+		echo $body_links;
+	}
+}
+
+
+// Function to add optional module Javascript or CSS stylesheets into the  section of the frontend
+if(!function_exists('register_frontend_modfiles')) {
+	function register_frontend_modfiles($file_id="css") {
+		// sanity check of parameter passed to the function
+		$file_id = strtolower($file_id);
+		if($file_id !== "css" && $file_id !== "javascript" && $file_id !== "js") {
+			return;
+		}
+
+		global $wb, $database, $include_head_link_css, $include_head_links;
+		// define default baselink and filename for optional module javascript and stylesheet files
+		$head_links = "";
+
+		if($file_id == "css") {
+			$base_link = '';
+			$base_file = "frontend.js";
+		}
+
+		if(!empty($include_head_link_css)) {
+			if(strpos($head_links, $include_head_link_css) === false) {
+				$head_links .= $include_head_link_css;
+			}
+			$include_head_link_css = '';
+		} else {
+			if(!empty($include_head_links)) {
+				if(strpos($head_links, $include_head_links) === false) {
+					$head_links .= $include_head_links;
+				}
+				$include_head_links = '';
+			}
+		}
+
+		// gather information for all models embedded on actual page
+		$page_id = $wb->page_id;
+		$query_modules = $database->query("SELECT module FROM " .TABLE_PREFIX ."sections 
+				WHERE page_id=$page_id AND module<>'wysiwyg'");
+
+		while($row = $query_modules->fetchRow()) {
+			// check if page module directory contains a frontend.js or frontend.css file
+			if(file_exists(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) {
+					// create link with frontend.js or frontend.css source for the current module
+				$tmp_link = str_replace("{MODULE_DIRECTORY}", $row['module'], $base_link);
+
+				// define constant indicating that the register_frontent_files was invoked
+				if($file_id == 'css') {
+					if(!defined('MOD_FRONTEND_CSS_REGISTERED')) define('MOD_FRONTEND_CSS_REGISTERED', true);
+				} else {
+					if(!defined('MOD_FRONTEND_JAVASCRIPT_REGISTERED')) define('MOD_FRONTEND_JAVASCRIPT_REGISTERED', true);
+				}
+				// ensure that frontend.js or frontend.css is only added once per module type
+				if(strpos($head_links, $tmp_link) === false) {
+					$head_links .= $tmp_link ."\n";
+				}
+			};
+		}
+
+		// include the Javascript email protection function
+		if( $file_id != 'css' && file_exists(WB_PATH .'/modules/droplets/js/mdcr.js')) {
+			$head_links .= ''."\n";
+		} elseif( $file_id != 'css' && file_exists(WB_PATH .'/modules/output_filter/js/mdcr.js')) {
+			$head_links .= ''."\n";
+		}
+		echo $head_links;
+	}
+}
+
+// Begin WB < 2.4.x template compatibility code
+	// Make extra_sql accessable through private_sql
+	$private_sql = $extra_sql;
+	$private_where_sql = $extra_where_sql;
+	// Query pages for menu
+	$menu1 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '0' AND $extra_where_sql ORDER BY position ASC");
+	// Check if current pages is a parent page and if we need its submenu
+	if(PARENT == 0) {
+		// Get the pages submenu
+		$menu2 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '".PAGE_ID."' AND $extra_where_sql ORDER BY position ASC");
+	} else {
+		// Get the pages submenu
+		$menu2 = $database->query("SELECT page_id,menu_title,page_title,link,target,visibility$extra_sql FROM ".TABLE_PREFIX."pages WHERE parent = '".PARENT."' AND $extra_where_sql ORDER BY position ASC");
+	}
+// End WB < 2.4.x template compatibility code
+// Include template file
+
+
+?>