holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added limit_query call to the return_sorted_array function; but still doesnt work correctly

Browse Source
This commit is contained in:
ceb 2002-01-13 00:39:26 +00:00
parent 27e9b9af70
commit 9783df1431
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpgwapi/inc/class.categories.inc.php
View File

@ -2,8 +2,9 @@
/**************************************************************************\ /**************************************************************************\
* phpGroupWare API - Categories * * phpGroupWare API - Categories *
* This file written by Joseph Engo <jengo@phpgroupware.org> * * This file written by Joseph Engo <jengo@phpgroupware.org> *
* and Bettina Gille [ceb@phpgroupware.org] *
* Category manager * * Category manager *
* Copyright (C) 2000, 2001 Joseph Engo * * Copyright (C) 2000,2001,2002 Joseph Engo *
* -------------------------------------------------------------------------* * -------------------------------------------------------------------------*
* This library is part of the phpGroupWare API * * This library is part of the phpGroupWare API *
* http://www.phpgroupware.org/api * * http://www.phpgroupware.org/api *
@ -239,7 +240,14 @@
$mainselect = ' AND cat_level=0'; $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__); $this->db->query($sql . $mainselect . $ordermethod,__LINE__,__FILE__);
}
$i = 0; $i = 0;
while ($this->db->next_record()) while ($this->db->next_record())
@ -262,7 +270,14 @@
{ {
$subselect = " AND cat_parent='" . $cats[$i]['id'] . "' AND cat_level='" . ($cats[$i]['level']+1) . "'"; $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__); $this->db->query($sql . $subselect . $ordermethod,__LINE__,__FILE__);
}
$subcats = array(); $subcats = array();
$j = 0; $j = 0;
@ -451,7 +466,6 @@
$cat_values['descr'] = $this->db->db_addslashes($cat_values['descr']); $cat_values['descr'] = $this->db->db_addslashes($cat_values['descr']);
$cat_values['name'] = $this->db->db_addslashes($cat_values['name']); $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," $this->db->query("INSERT INTO phpgw_categories (cat_parent,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data,"
. "cat_main,cat_level) VALUES ('" . $cat_values['parent'] . "','" . $this->account_id . "','" . $cat_values['access'] . "cat_main,cat_level) VALUES ('" . $cat_values['parent'] . "','" . $this->account_id . "','" . $cat_values['access']
@ -507,7 +521,6 @@
$cat_values['descr'] = $this->db->db_addslashes($cat_values['descr']); $cat_values['descr'] = $this->db->db_addslashes($cat_values['descr']);
$cat_values['name'] = $this->db->db_addslashes($cat_values['name']); $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'] $sql = "UPDATE phpgw_categories SET cat_name='" . $cat_values['name'] . "', cat_description='" . $cat_values['descr']
. "', cat_data='" . $cat_values['data'] . "', cat_parent='" . $cat_values['parent'] . "', cat_access='" . "', cat_data='" . $cat_values['data'] . "', cat_parent='" . $cat_values['parent'] . "', cat_access='"