aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjwangen <jwangen>2002-10-28 21:06:38 +0000
committerjwangen <jwangen>2002-10-28 21:06:38 +0000
commita5d9c88f08bc23a454688f2601aec1d43bd637d2 (patch)
tree52abd94188c45df8fc2fed1004c19b07dfc42742
parent9fefac069b9077c78c99d7323d0ebbe966ecbd1b (diff)
downloadphpicalendar-a5d9c88f08bc23a454688f2601aec1d43bd637d2.tar.gz
phpicalendar-a5d9c88f08bc23a454688f2601aec1d43bd637d2.tar.bz2
phpicalendar-a5d9c88f08bc23a454688f2601aec1d43bd637d2.zip
Fixed error when just a space is given
-rw-r--r--languages/norwegian.inc.php26
-rw-r--r--search.php10
2 files changed, 22 insertions, 14 deletions
diff --git a/languages/norwegian.inc.php b/languages/norwegian.inc.php
index aa63f7b..893cd8c 100644
--- a/languages/norwegian.inc.php
+++ b/languages/norwegian.inc.php
@@ -24,7 +24,7 @@ $last_week_lang = 'Forrige uke';
$last_year_lang = 'Forrige &aring;r';
$subscribe_lang = 'Abonn&eacute;r';
$download_lang = 'Last ned';
-$powered_by_lang = 'Powered by';
+$powered_by_lang = 'Kj&oslash;res med';
$version_lang = '0.8';
$event_lang = 'Hendelse';
$event_start_lang = 'Start tid';
@@ -46,21 +46,21 @@ $gomonth_lang = 'G&aring; til denne m&aring;neden';
$goyear_lang = 'G&aring; til dette &aring;ret';
// new in 0.8 -------------
-$search_lang = 'Search'; // the verb
-$results_lang = 'Search Results';
-$query_lang = 'Query: '; // will be followed by the search query
-$no_results_lang = 'No events found';
+$search_lang = 'S&oslash;k'; // the verb
+$results_lang = 'S&oslash;keresultater';
+$query_lang = 'Sp&oslash;rsm&aring;l '; // will be followed by the search query
+$no_results_lang = 'Ingen hendelser funnet';
-$goprint_lang = 'Printer Friendly';
-$time_lang = 'Time';
-$summary_lang = 'Summary';
-$description_lang = 'Description';
+$goprint_lang = 'Utskriftsvennlig';
+$time_lang = 'Tid';
+$summary_lang = 'Oppsummering';
+$description_lang = 'Beskrivelse';
// RSS text for 0.8
-$this_site_is_lang = 'This site is';
-$no_events_day_lang = 'No events today.';
-$no_events_week_lang = 'No events this week.';
-$no_events_month_lang = 'No events this month.';
+$this_site_is_lang = 'Dette nettstedet er';
+$no_events_day_lang = 'Ingen hendleser i dag.';
+$no_events_week_lang = 'Ingen hendelser denne uken.';
+$no_events_month_lang = 'Ingen hendelser denne m&aring;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
diff --git a/search.php b/search.php
index 04ce634..3cbd121 100644
--- a/search.php
+++ b/search.php
@@ -43,7 +43,11 @@ $search_box .=
$search_started = getmicrotime();
if ($search_valid) {
$format_search_arr = format_search($query);
- $formatted_search = $format_search_arr[0];
+ if (!$format_search_arr[0]) {
+ $formatted_search = '<b>No query given</b>';
+ } else {
+ $formatted_search = $format_search_arr[0];
+ }
if (isset($master_array) && is_array($master_array)) {
foreach($master_array as $date_key_tmp => $date_tmp) {
if (is_array($date_tmp)) {
@@ -291,6 +295,8 @@ function format_search($search_str) {
$search_str = strtolower($search_str);
+ if ($search_str == ' ') return array(false,$and_arr,$or_arr,$not_arr);
+
// clean up search string
$search_str = trim($search_str);
$search_str = str_replace(' and ', ' ', $search_str);
@@ -367,6 +373,8 @@ function search_boolean($needle_arr, $haystack) {
$or_arr = $needle_arr[2];
$not_arr = $needle_arr[3];
+ if (!$needle_arr[0]) return false;
+
// compare lowercase versions of the strings
$haystack = strtolower($haystack);

© 2014-2024 Faster IT GmbH | imprint | privacy policy