[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.73,1.74

[Bettina gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv32547

Modified Files:
        class.categories.inc.php 
Log Message:
added limit_query call to the return_sorted_array function; but still doesnt 
work correctly

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** class.categories.inc.php    12 Jan 2002 04:08:35 -0000      1.73
--- class.categories.inc.php    13 Jan 2002 00:39:26 -0000      1.74
***************
*** 3,8 ****
        * phpGroupWare API - Categories                                         
   *
        * This file written by Joseph Engo <address@hidden>                *
        * Category manager                                                      
   *
!       * Copyright (C) 2000, 2001 Joseph Engo                                  
   *
        * 
-------------------------------------------------------------------------*
        * This library is part of the phpGroupWare API                          
   *
--- 3,9 ----
        * phpGroupWare API - Categories                                         
   *
        * This file written by Joseph Engo <address@hidden>                *
+       *                  and Bettina Gille address@hidden                *
        * Category manager                                                      
   *
!       * Copyright (C) 2000,2001,2002 Joseph Engo                              
   *
        * 
-------------------------------------------------------------------------*
        * This library is part of the phpGroupWare API                          
   *
***************
*** 240,244 ****
                        $mainselect = ' AND cat_level=0';
  
!                       $this->db->query($sql . $mainselect . 
$ordermethod,__LINE__,__FILE__);
  
                        $i = 0;
--- 241,252 ----
                        $mainselect = ' AND cat_level=0';
  
!                       if ($limit)
!                       {
!                               $this->db->limit_query($sql . $mainselect . 
$ordermethod,$start,__LINE__,__FILE__);
!                       }
!                       else
!                       {
!                               $this->db->query($sql . $mainselect . 
$ordermethod,__LINE__,__FILE__);
!                       }
  
                        $i = 0;
***************
*** 263,267 ****
                                $subselect = " AND cat_parent='" . 
$cats[$i]['id'] . "' AND cat_level='" . ($cats[$i]['level']+1) . "'";
  
!                               $this->db->query($sql . $subselect . 
$ordermethod,__LINE__,__FILE__);
  
                                $subcats = array();
--- 271,282 ----
                                $subselect = " AND cat_parent='" . 
$cats[$i]['id'] . "' AND cat_level='" . ($cats[$i]['level']+1) . "'";
  
!                               if ($limit)
!                               {
!                                       $this->db->limit_query($sql . 
$subselect . $ordermethod,$start,__LINE__,__FILE__);
!                               }
!                               else
!                               {
!                                       $this->db->query($sql . $subselect . 
$ordermethod,__LINE__,__FILE__);
!                               }
  
                                $subcats = array();
***************
*** 452,456 ****
                        $cat_values['descr'] = 
$this->db->db_addslashes($cat_values['descr']);
                        $cat_values['name'] = 
$this->db->db_addslashes($cat_values['name']);
-                       $cat_values['data'] = 
$this->db->db_addslashes($cat_values['data']);
  
                        $this->db->query("INSERT INTO phpgw_categories 
(cat_parent,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data,"
--- 467,470 ----
***************
*** 508,512 ****
                        $cat_values['descr'] = 
$this->db->db_addslashes($cat_values['descr']);
                        $cat_values['name'] = 
$this->db->db_addslashes($cat_values['name']);
-                       $cat_values['data'] = 
$this->db->db_addslashes($cat_values['data']);
  
                        $sql = "UPDATE phpgw_categories SET cat_name='" . 
$cat_values['name'] . "', cat_description='" . $cat_values['descr']
--- 522,525 ----