[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.107,1.108

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.categories.inc.php 
Log Message:
update tpl

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -r1.107 -r1.108
*** class.categories.inc.php    1 May 2003 23:23:22 -0000       1.107
--- class.categories.inc.php    3 May 2003 14:17:15 -0000       1.108
***************
*** 5,9 ****
        *                  and Bettina Gille address@hidden                *
        * Category manager                                                      
   *
!       * Copyright (C) 2000 - 2002 Joseph Engo                                 
   *
        * 
------------------------------------------------------------------------ *
        * This library is part of the phpGroupWare API                          
   *
--- 5,9 ----
        *                  and Bettina Gille address@hidden                *
        * Category manager                                                      
   *
!       * Copyright (C) 2000 - 2003 Joseph Engo                                 
   *
        * 
------------------------------------------------------------------------ *
        * This library is part of the phpGroupWare API                          
   *
***************
*** 54,58 ****
  
                        $this->account_id       = $account_id;
!                       $this->app_name         = 
$GLOBALS['phpgw']->db->db_addslashes($app_name);
                        $this->db                       = $GLOBALS['phpgw']->db;
                        $this->db2                      = $this->db;
--- 54,58 ----
  
                        $this->account_id       = $account_id;
!                       $this->app_name         = $app_name;
                        $this->db                       = $GLOBALS['phpgw']->db;
                        $this->db2                      = $this->db;
***************
*** 143,148 ****
                        $start = intval($start);
                        $query = $this->db->db_addslashes($query);
-                       $sort  = $this->db->db_addslashes($sort);
-                       $order = $this->db->db_addslashes($order);
  
                        if ($globals)
--- 143,146 ----
***************
*** 189,195 ****
                        }
  
!                       if (strlen($parent_id) != 0)
                        {
!                               $parent_id              = (int) $parent_id;
                                $parent_filter  = ' AND cat_parent=' . 
$parent_id;
                        }
--- 187,193 ----
                        }
  
!                       if (intval($parent_id) > 0)
                        {
!                               $parent_id              = intval($parent_id);
                                $parent_filter  = ' AND cat_parent=' . 
$parent_id;
                        }
***************
*** 226,233 ****
                {
                        $start          = intval($start);
-                       $query          = $this->db->db_addslashes($query);
-                       $sort           = $this->db->db_addslashes($sort);
-                       $order          = $this->db->db_addslashes($order);
                        $parent_id      = intval($parent_id);
  
                        if ($globals)
--- 224,229 ----
                {
                        $start          = intval($start);
                        $parent_id      = intval($parent_id);
+                       $query          = $this->db->db_addslashes($query);
  
                        if ($globals)