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

Small fixes, GNU Patch #264, and now puts printer friendly format with more details.

Browse Source
This commit is contained in:
skeeter 2002-04-19 14:02:31 +00:00
parent 86ab1d83f2
commit e7ac2f14ed
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.bocalendar.inc.php
View File

@ -130,7 +130,6 @@
function bocalendar($session=0) function bocalendar($session=0)
{ {
$this->grants = $GLOBALS['phpgw']->acl->get_grants('calendar'); $this->grants = $GLOBALS['phpgw']->acl->get_grants('calendar');
@reset($this->grants); @reset($this->grants);
if($this->debug) if($this->debug)
{ {
@ -205,7 +204,6 @@
) )
); );
$this->datetime = $this->so->datetime; $this->datetime = $this->so->datetime;
$localtime = $this->datetime->gmtnow + $this->datetime->tz_offset; $localtime = $this->datetime->gmtnow + $this->datetime->tz_offset;
$date = get_var('date',Array('HTTP_GET_VARS','HTTP_POST_VARS')); $date = get_var('date',Array('HTTP_GET_VARS','HTTP_POST_VARS'));
@ -374,7 +372,7 @@
{ {
echo '<!-- '."\n".'Read:'."\n"._debug_array($data,False)."\n".' -->'."\n"; echo '<!-- '."\n".'Read:'."\n"._debug_array($data,False)."\n".' -->'."\n";
} }
$this->filter = $data['filter']; $this->filter = $data['filter'];
$this->cat_id = $data['cat_id']; $this->cat_id = $data['cat_id'];
$this->owner = intval($data['owner']); $this->owner = intval($data['owner']);
@ -1235,11 +1233,11 @@
function get_short_field($event,$is_private=True,$field='') function get_short_field($event,$is_private=True,$field='')
{ {
if ($is_private) if($is_private)
{ {
return 'private'; return 'private';
} }
elseif (strlen($event[$field]) > 19) elseif(strlen($event[$field]) > 19 && !$this->printer_friendly)
{ {
return substr($event[$field], 0 , 19) . '...'; return substr($event[$field], 0 , 19) . '...';
} }

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

@ -1947,7 +1947,7 @@
. ' .event-on { background: '.$this->theme['row_on'].'; color: '.$this->theme['bg_text'].'; font: 100 80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n" . ' .event-on { background: '.$this->theme['row_on'].'; color: '.$this->theme['bg_text'].'; font: 100 80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
. ' .event-off { background: '.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100 80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n" . ' .event-off { background: '.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100 80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
. ' .event-holiday { background: '.$this->theme['bg04'].'; color: '.$this->theme['bg_text'].'; font: 100 80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n" . ' .event-holiday { background: '.$this->theme['bg04'].'; color: '.$this->theme['bg_text'].'; font: 100 80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
. ' .time { background: '.$this->theme['navbar_bg'].'; color: '.$this->theme['bg_text'].'; font: 65%/100% '.$this->theme['font'].'; width: '.$time_width.'%; border: 1px '.$this->theme['navbar_text'].'; vertical-align: middle; }'."\n" . ' .time { background: '.$this->theme['navbar_bg'].'; color: '.$this->theme['bg_text'].'; font: 65%/100% '.$this->theme['font'].'; width: '.$time_width.'%; border: 1px '.$this->theme['navbar_text'].'; vertical-align: middle }'."\n"
. ' .tablecell { width: 80px; height: 80px }'; . ' .tablecell { width: 80px; height: 80px }';
} }
@ -2021,13 +2021,13 @@
{ {
$time = ''; $time = '';
} }
$text = '';; $text = '';
if(!$is_private) if(!$is_private)
{ {
$text .= $this->bo->display_status($event['users_status']); $text .= $this->bo->display_status($event['users_status']);
} }
$text = '<font size="-2" face="'.$this->theme['font'].'"><nobr>'.$time.'</nobr>&nbsp;'.$this->bo->get_short_field($event,$is_private,'title').$text.'</font>'.$GLOBALS['phpgw']->browser->br; $text = '<font size="-2" face="'.$this->theme['font'].'"><nobr>'.$time.'</nobr>&nbsp;'.$this->bo->get_short_field($event,$is_private,'title').$text.'</font>'.$GLOBALS['phpgw']->browser->br;
if ($editable) if ($editable)
{ {
$date = sprintf('%04d%02d%02d',$year,$month,$day); $date = sprintf('%04d%02d%02d',$year,$month,$day);
@ -2099,6 +2099,10 @@
$this->output_template_array($p,'picture','pict',$var); $this->output_template_array($p,'picture','pict',$var);
} }
} }
else
{
$text .= '<font size="-2" face="'.$this->theme['font'].'">'.nl2br($this->bo->get_short_field($event,$is_private,'description')).'</font>'.$GLOBALS['phpgw']->browser->br;
}
if ($text) if ($text)
{ {
$var = Array( $var = Array(
@ -2563,7 +2567,7 @@
function view_event($event,$alarms=False) function view_event($event,$alarms=False)
{ {
if(!$event['participants'][$this->bo->owner] && !$this->bo->member_of_group()) if((!$event['participants'][$this->bo->owner] && !$this->bo->member_of_group()) || (!$event['public'] && !$this->bo->check_perms(PHPGW_ACL_PRIVATE)))
{ {
return '<center>'.lang('You do not have permission to read this record!').'</center>'; return '<center>'.lang('You do not have permission to read this record!').'</center>';
} }