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

Added a fix for a missing, and a little cleanup for viewing events with a single category.

Browse Source
This commit is contained in:
skeeter 2001-10-01 02:34:45 +00:00
parent b28384e34b
commit 548548dfda
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
calendar/inc/class.uicalendar.inc.php
View File

@ -284,7 +284,7 @@
{ {
$printer = '<body bgcolor="'.$phpgw_info['theme']['bg_color'].'">'; $printer = '<body bgcolor="'.$phpgw_info['theme']['bg_color'].'">';
$print = ''; $print = '';
$phpgw_info['flags']['nofooter'] = True; $GLOBALS['phpgw_info']['flags']['nofooter'] = True;
} }
$var = Array( $var = Array(
@ -1835,7 +1835,6 @@
function planner_category($ids) function planner_category($ids)
{ {
static $cats; static $cats;
echo "Categories : ".$ids."<br>\n";
if(!is_array($ids)) if(!is_array($ids))
{ {
if (strpos($ids,',')) if (strpos($ids,','))
@ -1859,7 +1858,7 @@
} }
$ret_val[] = $cats[$id]; $ret_val[] = $cats[$id];
} }
return implode($ret_val,','); return $ret_val;
} }
function week_header($month,$year,$display_name = False) function week_header($month,$year,$display_name = False)
@ -2190,8 +2189,16 @@
if ($event['category']) if ($event['category'])
{ {
$category = Array();
$this->cat->categories($this->bo->owner,'calendar'); $this->cat->categories($this->bo->owner,'calendar');
if(strpos($event['category'],','))
{
$category = explode(',',$event['category']); $category = explode(',',$event['category']);
}
else
{
$category[] = $event['category'];
}
@reset($category); @reset($category);
while(list($key,$cat) = each($category)) while(list($key,$cat) = each($category))
{ {