[Phpgroupware-cvs] CVS: calendar/inc class.socalendar.inc.php, 1.22.2.5.2.3, 1.22.2.5.2.4 class.uicalendar.inc.php, 1.66.2.55.2.19, 1.66.2.55.2.20

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.socalendar.inc.php class.uicalendar.inc.php 
Log Message:
fixed sorting in cal-search, to show result choronlogical: newest to oldest

Index: class.socalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar.inc.php,v
retrieving revision 1.22.2.5.2.3
retrieving revision 1.22.2.5.2.4
diff -C2 -r1.22.2.5.2.3 -r1.22.2.5.2.4
*** class.socalendar.inc.php    11 Aug 2003 12:56:29 -0000      1.22.2.5.2.3
--- class.socalendar.inc.php    20 Aug 2003 18:08:23 -0000      1.22.2.5.2.4
***************
*** 156,161 ****
  
                        $sql .= (strpos($this->filter,'private')?'AND 
phpgw_cal.is_public=0 ':'');
!                       $sql .= ($this->cat_id?"AND phpgw_cal.category like 
'%".$this->cat_id."%' ":'');
!                       $sql .= 'ORDER BY phpgw_cal.datetime ASC, 
phpgw_cal.edatetime ASC, phpgw_cal.priority ASC';
  
                        return $this->get_event_ids(False,$sql,True);
--- 156,161 ----
  
                        $sql .= (strpos($this->filter,'private')?'AND 
phpgw_cal.is_public=0 ':'');
!                       $sql .= ($this->cat_id? "AND 
(phpgw_cal.category='$this->cat_id' OR phpgw_cal.category like 
'%,".$this->cat_id.",%') ":'');
!                       $sql .= 'ORDER BY phpgw_cal.datetime DESC, 
phpgw_cal.edatetime DESC, phpgw_cal.priority ASC';
  
                        return $this->get_event_ids(False,$sql,True);

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.55.2.19
retrieving revision 1.66.2.55.2.20
diff -C2 -r1.66.2.55.2.19 -r1.66.2.55.2.20
*** class.uicalendar.inc.php    19 Aug 2003 10:49:44 -0000      1.66.2.55.2.19
--- class.uicalendar.inc.php    20 Aug 2003 18:08:23 -0000      1.66.2.55.2.20
***************
*** 2184,2188 ****
  
                        $event_ids = 
$this->bo->search_keywords($_POST['keywords']);
-                       $ids = Array();
                        foreach($event_ids as $key => $id)
                        {
--- 2184,2187 ----
***************
*** 2196,2200 ****
                                $datetime = 
$this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
  
-                               $ids[strval($event['id'])]++;
                                $info[strval($event['id'])] = array(
                                        'tr_color'      => 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color(),
--- 2195,2198 ----
***************
*** 2206,2214 ****
                        $matches = count($event_ids);
  
-                       if ($matches > 0)
-                       {
-                               $matches = count($ids);
-                       }
- 
                        if ($matches == 1)
                        {
--- 2204,2207 ----
***************
*** 2247,2258 ****
                                $p->parse('rows','search_list_header',True);
                        }
!                       // now sort by number of hits
!                       arsort($ids);
!                       foreach($ids as $key => $nul)
                        {
!                               $p->set_var($info[$key]);
                                $p->parse('rows','search_list',True);
                        }
!       
                        if($matches > 0)
                        {
--- 2240,2249 ----
                                $p->parse('rows','search_list_header',True);
                        }
!                       foreach($info as $id => $data)
                        {
!                               $p->set_var($data);
                                $p->parse('rows','search_list',True);
                        }
! 
                        if($matches > 0)
                        {