/ - Diff - WB 2.08.x - Tracking

     # = Bugfix
     ! = Update/Change
     ------------------------------------- 2.7.0 -------------------------------------
     ------------------------------------- 2.7.0 -------------------------------------
 -Mar-2008 Thomas Hornik
     +	search: added search_time_limit in settings (mainly for sites with PHP < 4.3.3 and slow search)
 -Mar-2008 Matthias Gallas
     #	Fixed missing <body> tag in Admin Interface (ticket #572)
 -Mar-2008 Matthias Gallas

+    	}
+    }
     echo "<br /><u>Adding module_order and max_excerpt to search-table</u><br />";
     echo "<br /><u>Adding module_order, max_excerpt and time_limit to search-table</u><br />";
     // module_order - in which order to show the search-results
     // max_excerpt - how many lines of excerpt to print per matching page
     // time_limit - time-limit for searching per module
     $cfg = array(
     	'module_order' => 'faqbaker,manual,wysiwyg',
     	'max_excerpt' => '15'
     	'max_excerpt' => '15',
     	'time_limit' => '0'
     );
     foreach($cfg as $key=>$value) {
     	db_add_search_key_value($key, $value);

     		case 'max_excerpt':
     			$template->set_var('SEARCH_MAX_EXCERPT', $setting_value);
     		break;
     		// time-limit
     		case 'time_limit':
     			$template->set_var('SEARCH_TIME_LIMIT', $setting_value);
     		break;
     		// Search template
     		case 'template':
     			$search_template = $setting_value;
-...
     								'MODE_SWITCH_WARNING' => $MESSAGE['SETTINGS']['MODE_SWITCH_WARNING'],
     								'WORLD_WRITEABLE_WARNING' => $MESSAGE['SETTINGS']['WORLD_WRITEABLE_WARNING'],
     								'TEXT_MODULE_ORDER' => $TEXT['MODULE_ORDER'],
     								'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT']
     								'TEXT_MAX_EXCERPT' => $TEXT['MAX_EXCERPT'],
     								'TEXT_TIME_LIMIT' => $TEXT['TIME_LIMIT']
+    								)
     						);

     		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
     	</td>
     </tr>
     <tr class="advanced">
     	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
     	<td class="setting_value" colspan="2">
     		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
     	</td>
     </tr>
     <tr>
     	<td>&nbsp;</td>
     	<td>

     } else { $fetch_cfg_enable_flush['value'] = 'false'; }
     if($fetch_cfg_enable_flush['value'] == 'false') { $cfg_enable_flush = false;
     } else { $cfg_enable_flush = true; }
     $query = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'time_limit' LIMIT 1"); // time-limit per module
     if($query->numRows() > 0) { $fetch_search_time_limit = $query->fetchRow();
     } else { $fetch_search_time_limit['value'] = 'false'; }
     $search_time_limit = (int)($fetch_search_time_limit['value']);
     if($search_time_limit < 1) $search_time_limit = 0;
     // Replace vars in search settings with values
     $vars = array('[SEARCH_STRING]', '[WB_URL]', '[PAGE_EXTENSION]', '[TEXT_RESULTS_FOR]');
     $values = array($search_display_string, WB_URL, PAGE_EXTENSION, $TEXT['RESULTS_FOR']);
-...
     	$seen_pages = array(); // seen pages per module.
     	$pages_listed = array(); // seen pages.
     	foreach($sorted_modules AS $module_name) {
     		$start_time = time();	// get start-time to check time-limit; not very accurate, but ok
     		$seen_pages[$module_name] = array();
     		if(!isset($search_funcs[$module_name])) {
     			continue; // there is no search_func for this module
-...
     		");
     		if($sections_query->numRows() > 0) {
     			while($res = $sections_query->fetchRow()) {
     				// check if time-limit is exceeded for this module
     				if($search_time_limit > 0 && (time()-$start_time > $search_time_limit)) {
     					break;
+    				}
     				// Only show this section if it is not "out of publication-date"
     				$now = time();
     				if( !( $now<$res['publ_end'] && ($now>$res['publ_start'] || $res['publ_start']==0) ||

     	// stop-sign: .!?; + DOUBLE EXCLAMATION MARK - INTERROBANG - EXCLAMATION QUESTION MARK - QUESTION EXCLAMATION MARK - DOUBLE QUESTION MARK - HALFWIDTH IDEOGRAPHIC FULL STOP - IDEOGRAPHIC FULL STOP - IDEOGRAPHIC COMMA
     	$str2=".!?;"."\xE2\x80\xBC"."\xE2\x80\xBD"."\xE2\x81\x89"."\xE2\x81\x88"."\xE2\x81\x87"."\xEF\xBD\xA1"."\xE3\x80\x82"."\xE3\x80\x81";
     	$regex='/(?:^|\b|['.$str1.'])([^'.$str1.']{0,200}?'.$word.'[^'.$str2.']{0,200}(?:['.$str2.']|\b|$))/Sisu';
     	if(version_compare(PHP_VERSION, '4.3.3', '>=') == 1) {
     	if(version_compare(PHP_VERSION, '4.3.3', '>=')) {
     		// jump from match to match, get excerpt, stop if $max_excerpt_num is reached
     		$last_end = 0; $offset = 0;
     		while(preg_match('/'.$word.'/Sisu', $text, $match_array, PREG_OFFSET_CAPTURE, $last_end)) {
-...
     		{ return false; }
     	if($mod_no_highlight) // no highlighting
     		{ $mod_page_link_target = "&amp;nohighlight=1".$mod_page_link_target; }
     	// clean the text:
     	$mod_text = str_replace(array("\x0D","\x0A"), ' ', $mod_text);
     	$mod_text = preg_replace('#<(!--.*--|style.*</style|script.*</script)>#SiU', ' ', $mod_text);

     	$search_max_excerpt = addslashes('15');
     	$insert_search_max_excerpt = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'max_excerpt', '$search_max_excerpt', '')";
     	$database->query($insert_search_max_excerpt);
     	// max time to search per module
     	$search_time_limit = addslashes('0');
     	$insert_search_time_limit = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'time_limit', '$search_time_limit', '')";
     	$database->query($insert_search_time_limit);
     	// some config-elements
     	$database->query("INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'cfg_enable_old_search', 'true', '')");
     	$database->query("INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'cfg_search_keywords', 'true', '')");

trunk/wb/languages/FI.php
402	402	$TEXT['CHARSET'] = 'Merkistö';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/EN.php
402	402	$TEXT['CHARSET'] = 'Charset';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching';
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt';
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module';
405	406	$TEXT['PUBL_START_DATE'] = 'Start date';
406	407	$TEXT['PUBL_END_DATE'] = 'End date';
407	408	$TEXT['CALENDAR'] = 'Calender';

trunk/wb/languages/CS.php
402	402	$TEXT['CHARSET'] = 'Kódová stránka';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/SE.php
402	402	$TEXT['CHARSET'] = 'Typsnitt';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/ES.php
402	402	$TEXT['CHARSET'] = 'Conjunto de Caraceteres';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/FR.php
402	402	$TEXT['CHARSET'] = 'Encodage';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/ET.php
402	402	$TEXT['CHARSET'] = 'Charset'; //needs to be translated
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/HR.php
402	402	$TEXT['CHARSET'] = 'Postavka znakova';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/NL.php
402	402	$TEXT['CHARSET'] = 'Tekenset';
403	403	$TEXT['MODULE_ORDER'] = 'Module volgorde om te zoeken';
404	404	$TEXT['MAX_EXCERPT'] = 'Max lijnen per zoeksessie';
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start datum';
406	407	$TEXT['PUBL_END_DATE'] = 'Eind datum';
407	408	$TEXT['CALENDAR'] = 'Kalender';

trunk/wb/languages/PL.php
402	402	$TEXT['CHARSET'] = 'Kodowanie znaków';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/HU.php
402	402	$TEXT['CHARSET'] = 'Charset'; //needs to be translated
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/IT.php
402	402	$TEXT['CHARSET'] = 'Caratteri';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/LV.php
402	402	$TEXT['CHARSET'] = 'Simbolu kopa';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/PT.php
402	402	$TEXT['CHARSET'] = 'Charset'; //needs to be translated
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/CA.php
402	402	$TEXT['CHARSET'] = 'Charset'; //needs to be translated
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

     $TEXT['VERIFICATION'] = 'Indtast verifikationstal';
     $TEXT['DEFAULT_CHARSET'] = 'Standard tegns&aelig;t';
     $TEXT['CHARSET'] = 'Tegns&aelig;t';
     $TEXT['MODULE_ORDER'] = 'Modul-r&aelig;kkef&oslash;lge ved s&oslash;gning';
     $TEXT['MAX_EXCERPT'] = 'Max linier i uddrag';
     $TEXT['MODULE_ORDER'] = 'Modul-r&aelig;kkef&oslash;lge ved s&oslash;gning';
     $TEXT['MAX_EXCERPT'] = 'Max linier i uddrag';
     $TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
     $TEXT['PUBL_START_DATE'] = 'Startdato';
     $TEXT['PUBL_END_DATE'] = 'Slutdato';
     $TEXT['CALENDAR'] = 'Kalender';

trunk/wb/languages/TR.php
402	402	$TEXT['CHARSET'] = 'Charset'; //needs to be translated
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/RU.php
402	402	$TEXT['CHARSET'] = 'Charset';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

trunk/wb/languages/DE.php
402	402	$TEXT['CHARSET'] = 'Zeichensatz';
403	403	$TEXT['MODULE_ORDER'] = 'Modulreihenfolge für die Suche';
404	404	$TEXT['MAX_EXCERPT'] = 'Max Anzahl Zitate pro Seite';
	405	$TEXT['TIME_LIMIT'] = 'Zeitlimit zur Erstellung der Zitate pro Modul';
405	406	$TEXT['PUBL_START_DATE'] = 'Start Datum';
406	407	$TEXT['PUBL_END_DATE'] = 'End Datum';
407	408	$TEXT['CALENDAR'] = 'Kalender';

trunk/wb/languages/BG.php
402	402	$TEXT['CHARSET'] = 'Кодова таблица';
403	403	$TEXT['MODULE_ORDER'] = 'Module-order for searching'; //needs to be translated
404	404	$TEXT['MAX_EXCERPT'] = 'Max lines of excerpt'; //needs to be translated
	405	$TEXT['TIME_LIMIT'] = 'Max time to gather excerpts per module'; //needs to be translated
405	406	$TEXT['PUBL_START_DATE'] = 'Start date'; //needs to be translated
406	407	$TEXT['PUBL_END_DATE'] = 'End date'; //needs to be translated
407	408	$TEXT['CALENDAR'] = 'Calender'; //needs to be translated

Project

General

Profile

WB 2.08.x

Revision 769

Added by thorn about 16 years ago