forked from extern/egroupware
reverted the stupid tab to 8 space conversation
and fixed bug [ 1011704 ] Division by zero error
This commit is contained in:
parent
59fa8a653f
commit
f6aae94ec2
@ -139,6 +139,13 @@
|
|||||||
$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html');
|
$GLOBALS['phpgw']->html = CreateObject('phpgwapi.html');
|
||||||
}
|
}
|
||||||
$this->html = &$GLOBALS['phpgw']->html;
|
$this->html = &$GLOBALS['phpgw']->html;
|
||||||
|
|
||||||
|
if(!isset($this->bo->prefs['calendar']['interval']))
|
||||||
|
{
|
||||||
|
$this->bo->prefs['calendar']['interval'] = 30;
|
||||||
|
$GLOBALS['phpgw']->preferences->add('calendar','interval',30);
|
||||||
|
$GLOBALS['phpgw']->preferences->save_repository();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Public functions */
|
/* Public functions */
|
||||||
@ -744,7 +751,6 @@
|
|||||||
echo '<center>'.lang('Sorry, this event does not exist').'.'.'</center>'."\n";
|
echo '<center>'.lang('Sorry, this event does not exist').'.'.'</center>'."\n";
|
||||||
$GLOBALS['phpgw']->common->phpgw_exit(True);
|
$GLOBALS['phpgw']->common->phpgw_exit(True);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($event['description']))
|
if(isset($event['description']))
|
||||||
{
|
{
|
||||||
$event['description'] = str_replace(array("\n","\r"),array('<br/>',''),$event['description']);
|
$event['description'] = str_replace(array("\n","\r"),array('<br/>',''),$event['description']);
|
||||||
@ -3722,12 +3728,6 @@
|
|||||||
}
|
}
|
||||||
uasort($participants,'strnatcasecmp'); // sort them after their fullname
|
uasort($participants,'strnatcasecmp'); // sort them after their fullname
|
||||||
|
|
||||||
if(!isset($this->bo->prefs['calendar']['interval']))
|
|
||||||
{
|
|
||||||
$this->bo->prefs['calendar']['interval'] = 15;
|
|
||||||
$GLOBALS['phpgw']->preferences->add('calendar','interval',15);
|
|
||||||
$GLOBALS['phpgw']->preferences->save_repository();
|
|
||||||
}
|
|
||||||
$increment = $this->bo->prefs['calendar']['interval'];
|
$increment = $this->bo->prefs['calendar']['interval'];
|
||||||
$interval = (int)(60 / $increment);
|
$interval = (int)(60 / $increment);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user