extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ceb 2002-10-13 22:04:55 +00:00
parent 02ed6da227
commit 23edad505e
5 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/inc/class.bocategories.inc.php
View File

@ -138,14 +138,7 @@
function formatted_list($data) function formatted_list($data)
{ {
if ($data['globals']) return $this->cats->formatted_list($data);
{
return $this->cats->formated_list($data['select'],$data['all'],$data['parent'],True);
}
else
{
return $this->cats->formated_list($data['select'],$data['all'],$data['parent']);
}
} }
function delete($data) function delete($data)

10
admin/inc/class.uicategories.inc.php
View File

@ -289,7 +289,7 @@
$parent = $values['parent']; $parent = $values['parent'];
} }
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formated_list(array('format' => 'select', $GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formatted_list(array('format' => 'select',
'type' => 'all', 'type' => 'all',
'selected' => $parent, 'selected' => $parent,
'globals' => $global_cats))); 'globals' => $global_cats)));
@ -372,10 +372,10 @@
$GLOBALS['phpgw']->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats['name'])); $GLOBALS['phpgw']->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats['name']));
$GLOBALS['phpgw']->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats['descr'])); $GLOBALS['phpgw']->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats['descr']));
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array('select' => 'select', $GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formatted_list(array('format' => 'select',
'all' => 'all', 'type' => 'all',
'parent' => $cats['parent'], 'selected' => $cats['parent'],
'global_cats' => $global_cats))); 'globals' => $global_cats)));
$GLOBALS['phpgw']->template->parse('buttons','edit'); $GLOBALS['phpgw']->template->parse('buttons','edit');
$GLOBALS['phpgw']->template->fp('phpgw_body','form'); $GLOBALS['phpgw']->template->fp('phpgw_body','form');
} }

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

@ -326,9 +326,9 @@
@param $id integer id of category @param $id integer id of category
@result $cats array populated with @result $cats array populated with
*/ */
function return_single($id = '') function return_single($cat_id = '')
{ {
$this->db->query('SELECT * FROM phpgw_categories WHERE cat_id=' . intval($id),__LINE__,__FILE__); $this->db->query('SELECT * FROM phpgw_categories WHERE cat_id=' . intval($cat_id),__LINE__,__FILE__);
list($cat) = $this->db2cats(); list($cat) = $this->db2cats();
@ -336,7 +336,7 @@
} }
/*! /*!
@function formated_list @function formatted_list
@abstract return into a select box, list or other formats @abstract return into a select box, list or other formats
@param $format currently only supports select (select box) @param $format currently only supports select (select box)
@param $type string - subs or mains @param $type string - subs or mains
@ -344,12 +344,8 @@
@param $globals True or False, includes the global phpgroupware categories or not @param $globals True or False, includes the global phpgroupware categories or not
@result $s array - populated with categories @result $s array - populated with categories
*/ */
function formatted_list($format,$type = 'all',$selected = '',$globals = False,$site_link = 'site')
{
return $this->formated_list($format,$type,$selected,$globals,$site_link);
}
function formated_list($format,$type = 'all',$selected = '',$globals = False,$site_link = 'site') function formatted_list($format,$type = 'all',$selected = '',$globals = False,$site_link = 'site')
{ {
if(is_array($format)) if(is_array($format))
{ {

4
preferences/inc/class.bocategories.inc.php
View File

@ -119,9 +119,9 @@
return $this->cats->exists($data); return $this->cats->exists($data);
} }
function formatted_list($format,$type,$cat_parent,$global_cats) function formatted_list($data)
{ {
return $this->cats->formated_list($format,$type,$cat_parent,$global_cats); return $this->cats->formatted_list($data);
} }
function delete($data) function delete($data)

11
preferences/inc/class.uicategories.inc.php
View File

@ -341,9 +341,9 @@
} }
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formatted_list(array('format' => 'select', $GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formatted_list(array('format' => 'select',
'type' => $type, 'type' => $type,
'selected' => $parent, 'selected' => $parent,
'globals' => $global_cats))); 'globals' => $global_cats)));
$GLOBALS['phpgw']->template->set_var('cat_name',$values['name']); $GLOBALS['phpgw']->template->set_var('cat_name',$values['name']);
$GLOBALS['phpgw']->template->set_var('cat_description',$values['descr']); $GLOBALS['phpgw']->template->set_var('cat_description',$values['descr']);
@ -455,7 +455,10 @@
$type = 'mains'; $type = 'mains';
} }
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formated_list('select',$type,$cats['parent'],$global_cats)); $GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formatted_list(array('format' => 'select',
'type' => $type,
'selected' => $cats['parent'],
'globals' => $global_cats)));
$GLOBALS['phpgw']->template->set_var('access',$cats['access'] == 'private'?' checked':''); $GLOBALS['phpgw']->template->set_var('access',$cats['access'] == 'private'?' checked':'');