mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-03 20:09:27 +01:00
update xslt
This commit is contained in:
parent
ae2ab768d3
commit
fe749bb211
@ -272,7 +272,8 @@
|
|||||||
. $querymethod;
|
. $querymethod;
|
||||||
|
|
||||||
$this->db2->query($sql . $parent_select,__LINE__,__FILE__);
|
$this->db2->query($sql . $parent_select,__LINE__,__FILE__);
|
||||||
$total_mains = $this->db2->num_rows();
|
//$total_mains = $this->db2->num_rows();
|
||||||
|
$this->total_records = $this->db2->num_rows();
|
||||||
|
|
||||||
if ($limit)
|
if ($limit)
|
||||||
{
|
{
|
||||||
@ -290,10 +291,10 @@
|
|||||||
{
|
{
|
||||||
$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__);
|
/*$this->db2->query($sql . $sub_select,__LINE__,__FILE__);
|
||||||
$total_subs += $this->db2->num_rows();
|
$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__);
|
||||||
}
|
}
|
||||||
@ -325,7 +326,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//$this->total_records = count($cats);
|
//$this->total_records = count($cats);
|
||||||
$this->total_records = $total_mains + $total_subs;
|
//$this->total_records = $total_mains + $total_subs;
|
||||||
return $cats;
|
return $cats;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -452,11 +453,10 @@
|
|||||||
{
|
{
|
||||||
if(is_array($data))
|
if(is_array($data))
|
||||||
{
|
{
|
||||||
$format = (isset($data['format'])?$data['format']:'select');
|
$format = (isset($data['format'])?$data['format']:'filter');
|
||||||
$type = (isset($data['type'])?$data['type']:'all');
|
$type = (isset($data['type'])?$data['type']:'all');
|
||||||
$selected = (isset($data['selected'])?$data['selected']:'');
|
$selected = (isset($data['selected'])?$data['selected']:'');
|
||||||
$globals = (isset($data['globals'])?$data['globals']:False);
|
$globals = (isset($data['globals'])?$data['globals']:False);
|
||||||
$site_link = (isset($data['site_link'])?$data['site_link']:'site');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_array($selected))
|
if (!is_array($selected))
|
||||||
@ -473,8 +473,16 @@
|
|||||||
$cats = $this->return_sorted_array($start,False,$query,$sort,$order,$globals);
|
$cats = $this->return_sorted_array($start,False,$query,$sort,$order,$globals);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($format == 'select')
|
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))
|
while (is_array($cats) && list(,$cat) = each($cats))
|
||||||
{
|
{
|
||||||
$sel_cat = '';
|
$sel_cat = '';
|
||||||
@ -516,7 +524,6 @@
|
|||||||
}
|
}
|
||||||
return $cat_list;
|
return $cat_list;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@function add
|
@function add
|
||||||
|
Loading…
Reference in New Issue
Block a user