[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.40,1.66.2.41

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv29988

Modified Files:
      Tag: Version-0_9_14-branch
        class.uicalendar.inc.php 
Log Message:
corrected handling of an empty search


Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.40
retrieving revision 1.66.2.41
diff -C2 -r1.66.2.40 -r1.66.2.41
*** class.uicalendar.inc.php    13 Nov 2002 03:27:19 -0000      1.66.2.40
--- class.uicalendar.inc.php    16 Nov 2002 17:15:19 -0000      1.66.2.41
***************
*** 2131,2139 ****
                function search()
                {
!                       if (!$GLOBALS['HTTP_POST_VARS']['keywords'])
                        {
                                // If we reach this, it is because they didn't 
search for anything,
                                // attempt to send them back to where they 
where.
!                               Header('Location: ' . 
$GLOBALS['phpgw']->link($from));
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
--- 2131,2142 ----
                function search()
                {
!                       if (empty($GLOBALS['HTTP_POST_VARS']['keywords']))
                        {
                                // If we reach this, it is because they didn't 
search for anything,
                                // attempt to send them back to where they 
where.
!                               Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',array(
!                                       'menuaction' => 
$GLOBALS['HTTP_POST_VARS']['from'],
!                                       'date' => 
$GLOBALS['HTTP_POST_VARS']['year'].$GLOBALS['HTTP_POST_VARS']['month'].$GLOBALS['HTTP_POST_VARS']['day']
!                               )));
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }
***************
*** 2144,2154 ****
  
                        $error = '';
- 
-                       if (strlen($GLOBALS['HTTP_POST_VARS']['keywords']) == 0)
-                       {
-                               echo '<b>'.lang('Error').':</b>';
-                               echo lang('You must enter one or more search 
keywords.');
-                               return;
-                       }
  
                        $matches = 0;
--- 2147,2150 ----