From 97898b36858d5f187e9659d723c71eb04b2f0593 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 28 Feb 2006 04:28:06 +0000 Subject: calendar improvements: week on weekly list starts on Monday, ability to show grayed months/weeks/days (without any picture in it), added icons for created/posted fields language uniformization calendar fixes: correct number of pictures in calendar view, code simplification (I hope so) git-svn-id: http://piwigo.org/svn/trunk@1059 68402e56-0260-453c-a942-63ccdbb3a9ee --- search.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'search.php') diff --git a/search.php b/search.php index e4a63ae7d..587c7f760 100644 --- a/search.php +++ b/search.php @@ -35,14 +35,14 @@ if (isset($_POST['submit'])) { if (isset($_POST['search_allwords']) and !preg_match('/^\s*$/', $_POST['search_allwords'])) - { + { $drop_char_match = array( '-','^','$',';','#','&','(',')','<','>','`','\'','"','|',',','@','_', '?','%','~','.','[',']','{','}',':','\\','/','=','\'','!','*'); $drop_char_replace = array( ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','','',' ',' ',' ',' ','',' ', ' ',' ',' ',' ',' ',' ',' ',' ','' ,' ',' ',' ',' ',' '); - + // Split words $search['fields']['allwords'] = array( 'words' => array_unique( @@ -58,7 +58,7 @@ if (isset($_POST['submit'])) 'mode' => $_POST['mode'], ); } - + if ($_POST['search_author']) { $search['fields']['author'] = array( @@ -69,7 +69,7 @@ if (isset($_POST['submit'])) 'mode' => 'OR', ); } - + if (isset($_POST['cat'])) { $search['fields']['cat'] = array( @@ -80,7 +80,7 @@ if (isset($_POST['submit'])) // dates $type_date = $_POST['date_type']; - + if (!empty($_POST['start_year'])) { $search['fields'][$type_date.'-after'] = array( @@ -110,7 +110,7 @@ if (isset($_POST['submit'])) 'inc' => true, ); } - + if (!empty($search)) { // default search mode : each clause must be respected @@ -178,12 +178,10 @@ $template->assign_vars(array( 'L_DAYS'=>$lang['days'], 'L_MONTH'=>$lang['w_month'], 'L_SEARCH_DATE_TYPE'=>$lang['search_date_type'], - 'L_SEARCH_CREATION'=>$lang['search_date_creation'], - 'L_SEARCH_AVAILABILITY'=>$lang['search_date_available'], 'L_RESULT_SORT'=>$lang['search_sort'], 'L_SORT_ASCENDING'=>$lang['search_ascending'], 'L_SORT_DESCENDING'=>$lang['search_descending'], - + 'TODAY_DAY' => date('d', time()), 'TODAY_MONTH' => date('m', time()), 'TODAY_YEAR' => date('Y', time()), -- cgit v1.2.3