mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
removed unnecessary instancations and using static methods of html and egw_link class
This commit is contained in:
parent
ae735c80af
commit
5aa6c90625
@ -1364,11 +1364,7 @@ class bocal
|
||||
{
|
||||
if (!is_numeric($id))
|
||||
{
|
||||
if (!is_object($GLOBALS['egw']->link))
|
||||
{
|
||||
$GLOBALS['egw']->link =& CreateObject('phpgwapi.bolink');
|
||||
}
|
||||
$id2lid[$id] = $GLOBALS['egw']->link->title($this->resources[$id{0}]['app'],substr($id,1));
|
||||
$id2lid[$id] = egw_link::title($this->resources[$id{0}]['app'],substr($id,1));
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1396,23 +1392,19 @@ class bocal
|
||||
|
||||
if (!$long_status)
|
||||
{
|
||||
if (!is_object($GLOBALS['egw']->html))
|
||||
{
|
||||
$GLOBALS['egw']->html =& CreateObject('phpgwapi.html');
|
||||
}
|
||||
switch($status)
|
||||
{
|
||||
case 'A': // accepted
|
||||
$status = $GLOBALS['egw']->html->image('calendar','agt_action_success',$this->verbose_status[$status]);
|
||||
$status = html::image('calendar','agt_action_success',$this->verbose_status[$status]);
|
||||
break;
|
||||
case 'R': // rejected
|
||||
$status = $GLOBALS['egw']->html->image('calendar','agt_action_fail',$this->verbose_status[$status]);
|
||||
$status = html::image('calendar','agt_action_fail',$this->verbose_status[$status]);
|
||||
break;
|
||||
case 'T': // tentative
|
||||
$status = $GLOBALS['egw']->html->image('calendar','tentative',$this->verbose_status[$status]);
|
||||
$status = html::image('calendar','tentative',$this->verbose_status[$status]);
|
||||
break;
|
||||
case 'U': // no response = unknown
|
||||
$status = $GLOBALS['egw']->html->image('calendar','cnr-pending',$this->verbose_status[$status]);
|
||||
$status = html::image('calendar','cnr-pending',$this->verbose_status[$status]);
|
||||
break;
|
||||
case 'G': // group invitation
|
||||
// Todo: Image, seems not to be used
|
||||
|
@ -219,10 +219,6 @@ class socal
|
||||
{
|
||||
if (!is_array($cat_ids) && !@$GLOBALS['egw_info']['user']['preferences']['common']['cats_no_subs'])
|
||||
{
|
||||
if (!is_object($GLOBALS['egw']->categories))
|
||||
{
|
||||
$GLOBALS['egw']->categories =& CreateObject('phpgwapi.categories');
|
||||
}
|
||||
$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
|
||||
}
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user