extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-20 18:08:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for bug 1308

Browse Source
This commit is contained in:
ceb 2002-10-15 00:12:39 +00:00
parent 5490271c27
commit df62f9d644
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,7 @@
$this->account_id = $account_id; $this->account_id = $account_id;
$this->app_name = $app_name; $this->app_name = $app_name;
$this->db = $GLOBALS['phpgw']->db; $this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
$this->grants = $GLOBALS['phpgw']->acl->get_grants($app_name); $this->grants = $GLOBALS['phpgw']->acl->get_grants($app_name);
} }
@ -195,6 +196,9 @@
$sql = "SELECT * from phpgw_categories WHERE (cat_appname='" . $this->app_name . "' AND" . $grant_cats . $global_cats . ")" $sql = "SELECT * from phpgw_categories WHERE (cat_appname='" . $this->app_name . "' AND" . $grant_cats . $global_cats . ")"
. $parent_filter . $querymethod . $filter; . $parent_filter . $querymethod . $filter;
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
if ($limit) if ($limit)
{ {
$this->db->limit_query($sql . $ordermethod,$start,__LINE__,__FILE__); $this->db->limit_query($sql . $ordermethod,$start,__LINE__,__FILE__);
@ -204,8 +208,6 @@
$this->db->query($sql . $ordermethod,__LINE__,__FILE__); $this->db->query($sql . $ordermethod,__LINE__,__FILE__);
} }
$this->total_records = $this->db->num_rows();
return $this->db2cats(); return $this->db2cats();
} }
@ -269,6 +271,9 @@
$sql = "SELECT * from phpgw_categories WHERE (cat_appname='" . $this->app_name . "' AND" . $grant_cats . $global_cats . ")" $sql = "SELECT * from phpgw_categories WHERE (cat_appname='" . $this->app_name . "' AND" . $grant_cats . $global_cats . ")"
. $querymethod; . $querymethod;
$this->db2->query($sql . $parent_select,__LINE__,__FILE__);
$total_mains = $this->db2->num_rows();
if ($limit) if ($limit)
{ {
$this->db->limit_query($sql . $parent_select . $ordermethod,$start,__LINE__,__FILE__); $this->db->limit_query($sql . $parent_select . $ordermethod,$start,__LINE__,__FILE__);
@ -285,6 +290,9 @@
{ {
$sub_select = " AND cat_parent='" . $cats[$i]['cat_id'] . "' AND cat_level='" . ($cats[$i]['level']+1) . "'"; $sub_select = " AND cat_parent='" . $cats[$i]['cat_id'] . "' AND cat_level='" . ($cats[$i]['level']+1) . "'";
$this->db2->query($sql . $sub_select,__LINE__,__FILE__);
$total_subs += $this->db2->num_rows();
if ($limit) if ($limit)
{ {
$this->db->limit_query($sql . $sub_select . $ordermethod,$start,__LINE__,__FILE__); $this->db->limit_query($sql . $sub_select . $ordermethod,$start,__LINE__,__FILE__);
@ -316,7 +324,8 @@
$num_cats = count($cats); $num_cats = count($cats);
} }
} }
$this->total_records = count($cats); //$this->total_records = count($cats);
$this->total_records = $total_mains + $total_subs;
return $cats; return $cats;
} }