[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.101,1.10
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.101,1.102 |
|
Date: |
Sun, 20 Oct 2002 18:01:48 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv29659
Modified Files:
class.categories.inc.php
Log Message:
update xslt
Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -r1.101 -r1.102
*** class.categories.inc.php 15 Oct 2002 21:40:58 -0000 1.101
--- class.categories.inc.php 20 Oct 2002 22:01:46 -0000 1.102
***************
*** 273,277 ****
$this->db2->query($sql .
$parent_select,__LINE__,__FILE__);
! $total_mains = $this->db2->num_rows();
if ($limit)
--- 273,278 ----
$this->db2->query($sql .
$parent_select,__LINE__,__FILE__);
! //$total_mains = $this->db2->num_rows();
! $this->total_records = $this->db2->num_rows();
if ($limit)
***************
*** 291,298 ****
$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)
{
$this->db->limit_query($sql .
$sub_select . $ordermethod,$start,__LINE__,__FILE__);
--- 292,299 ----
$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)
{
$this->db->limit_query($sql .
$sub_select . $ordermethod,$start,__LINE__,__FILE__);
***************
*** 326,330 ****
}
//$this->total_records = count($cats);
! $this->total_records = $total_mains + $total_subs;
return $cats;
}
--- 327,331 ----
}
//$this->total_records = count($cats);
! //$this->total_records = $total_mains + $total_subs;
return $cats;
}
***************
*** 453,461 ****
if(is_array($data))
{
! $format =
(isset($data['format'])?$data['format']:'select');
! $type =
(isset($data['type'])?$data['type']:'all');
! $selected =
(isset($data['selected'])?$data['selected']:'');
! $globals =
(isset($data['globals'])?$data['globals']:False);
! $site_link =
(isset($data['site_link'])?$data['site_link']:'site');
}
--- 454,461 ----
if(is_array($data))
{
! $format =
(isset($data['format'])?$data['format']:'filter');
! $type =
(isset($data['type'])?$data['type']:'all');
! $selected =
(isset($data['selected'])?$data['selected']:'');
! $globals =
(isset($data['globals'])?$data['globals']:False);
}
***************
*** 474,520 ****
}
! if ($format == 'select')
{
! while (is_array($cats) && list(,$cat) =
each($cats))
! {
! $sel_cat = '';
! if (in_array($cat['cat_id'],$selected))
! {
! $sel_cat = 'selected';
! }
! $name = '';
! for ($i=0;$i<$cat['level'];$i++)
! {
! $name .= ' . ';
! }
! $name .=
$GLOBALS['phpgw']->strip_html($cat['name']);
! if ($cat['app_name'] == 'phpgw')
! {
! $name .= ' <' . lang('Global')
. '>';
! }
! if ($cat['owner'] == '-1')
! {
! $name .= ' <' . lang('Global')
. ' ' . lang($this->app_name) . '>';
! }
! $cat_list[] = array
! (
! 'cat_id' =>
$cat['cat_id'],
! 'name' => $name,
! 'selected' => $sel_cat
! );
}
! for ($i=0;$i<count($cat_list);$i++)
{
! if ($cat_list[$i]['selected'] !=
'selected')
! {
!
unset($cat_list[$i]['selected']);
! }
}
- return $cat_list;
}
}
--- 474,527 ----
}
! switch($format)
{
! case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'cat_select');
! break;
! case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'cat_filter');
! break;
! }
! while (is_array($cats) && list(,$cat) = each($cats))
! {
! $sel_cat = '';
! if (in_array($cat['cat_id'],$selected))
! {
! $sel_cat = 'selected';
! }
! $name = '';
! for ($i=0;$i<$cat['level'];$i++)
! {
! $name .= ' . ';
! }
! $name .=
$GLOBALS['phpgw']->strip_html($cat['name']);
! if ($cat['app_name'] == 'phpgw')
! {
! $name .= ' <' . lang('Global') . '>';
! }
! if ($cat['owner'] == '-1')
! {
! $name .= ' <' . lang('Global') . ' ' .
lang($this->app_name) . '>';
}
! $cat_list[] = array
! (
! 'cat_id' => $cat['cat_id'],
! 'name' => $name,
! 'selected' => $sel_cat
! );
! }
!
! for ($i=0;$i<count($cat_list);$i++)
! {
! if ($cat_list[$i]['selected'] != 'selected')
{
! unset($cat_list[$i]['selected']);
}
}
+ return $cat_list;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.101,1.102,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default cat_filter.xsl,1.7,1.8 cat_select.xsl,1.7,1.8
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default/images bg_filler.gif,NONE,1.1.2.1 bg_filler.png,NONE,1.1.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default cat_filter.xsl,1.7,1.8 cat_select.xsl,1.7,1.8
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default/images bg_filler.gif,NONE,1.1.2.1 bg_filler.png,NONE,1.1.2.1
- Index(es):