Updated Norwegian, updated Swedish, fixed bugs in search

4 files changed, 10 insertions, 10 deletions

diff --git a/languages/norwegian.inc.php b/languages/norwegian.inc.php
index 893cd8c..43c9148 100644
--- a/languages/norwegian.inc.php
+++ b/languages/norwegian.inc.php
@@ -48,7 +48,7 @@ $goyear_lang		= 'Gå til dette året';
 // new in 0.8 -------------
 $search_lang		= 'Søk'; // the verb
 $results_lang		= 'Søkeresultater';
-$query_lang			= 'Spørsmål '; // will be followed by the search query
+$query_lang			= 'Spørring: '; // will be followed by the search query
 $no_results_lang	= 'Ingen hendelser funnet';
 
 $goprint_lang		= 'Utskriftsvennlig';
@@ -58,13 +58,12 @@ $description_lang	= 'Beskrivelse';
 
 // RSS text for 0.8
 $this_site_is_lang		= 'Dette nettstedet er';
-$no_events_day_lang		= 'Ingen hendleser i dag.';
+$no_events_day_lang		= 'Ingen hendelser i dag.';
 $no_events_week_lang	= 'Ingen hendelser denne uken.';
 $no_events_month_lang	= 'Ingen hendelser denne måneden.';
 $rss_day_date			= 'g:i A';  // Lists just the time
 $rss_week_date			= '%b %e';  // Lists just the day
 $rss_month_date			= '%b %e';  // Lists just the day
-$rss_language			= 'en-us';
 // -------------------------
 
 $daysofweek_lang			= array('Søndag','Mandag','Tirsdag','Onsdag','Torsdag','Fredag','Lørdag');
diff --git a/languages/swedish.inc.php b/languages/swedish.inc.php
index fd7097d..9215ecc 100644
--- a/languages/swedish.inc.php
+++ b/languages/swedish.inc.php
diff --git a/search.php b/search.php
index 3cbd121..b85e3ca 100644
--- a/search.php
+++ b/search.php
@@ -374,20 +374,23 @@ function search_boolean($needle_arr, $haystack) {
 	$not_arr = $needle_arr[3];
 	
 	if (!$needle_arr[0]) return false;
+	if ((sizeof($and_arr) == 0) &&
+		(sizeof($or_arr) == 0) &&
+		(sizeof($not_arr) == 0)) return false;
 	
 	// compare lowercase versions of the strings
 	$haystack = strtolower($haystack);
 
 	// check against the NOT
 	foreach($not_arr as $s) {
-		if (ereg($s, $haystack) == true) {
+		if (is_string(strstr($haystack,$s)) == true) {
 			return false;
 		}
 	}
 	
 	// check against the AND
 	foreach($and_arr as $s) {
-		if (ereg($s,$haystack) == false) {
+		if (is_string(strstr($haystack,$s)) == false) {
 			return false;
 		}
 	}
@@ -397,18 +400,17 @@ function search_boolean($needle_arr, $haystack) {
 		$is_false = true;
 		foreach($or as $s) {
 			if (substr($s,0,1) == '-') {
-				if (ereg(substr($s,1),$haystack) == false) {
+				if (is_string(strstr($haystack,substr($s,1))) == false) {
 					$is_false = false;
 					break;
 				}			
-			} elseif (ereg($s,$haystack) == true) {
+			} elseif (is_string(strstr($haystack,$s)) == true) {
 				$is_false = false;
 				break;
 			}
 		}
 		if ($is_false) return false;	
 	}
-	
 	// if we haven't returned false, then we return true
 	return true;
 }
diff --git a/sidebar.php b/sidebar.php
index fa9469a..0c4cf5b 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -6,8 +6,7 @@
 		$cal_displayname2 = $cal_displayname2 . "...";
 	}
 	
-	$search_box .= 
-	'<form action="search.php" method="GET"><input type="hidden" name="cal" value="'.$cal.'"><input type="hidden" name="getdate" value="'.$getdate.'"><input type="text" size="15" class="search_style" name="query" value="'.$search_lang.'"><INPUT type="image" src="styles/'.$style_sheet.'/search.gif" border=0 height="19" width="18" name="submit" value="Search"></form>';
+	$search_box .= '<form action="search.php" method="GET"><input type="hidden" name="cal" value="'.$cal.'"><input type="hidden" name="getdate" value="'.$getdate.'"><input type="text" size="15" class="search_style" name="query" value="'.$search_lang.'" onfocus="javascript:if(this.value==\'Search\') {this.value=\'\';}" onblur="javascript:if(this.value==\'\') {this.value=\'Search\'}"><INPUT type="image" src="styles/'.$style_sheet.'/search.gif" border=0 height="19" width="18" name="submit" value="Search"></form>';
 	
 	?>