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

fix wrong namespace and replaced a couple more CreateObject

Browse Source
This commit is contained in:
Ralf Becker 2016-07-26 09:03:02 +02:00
parent b3a3ba39e2
commit babaab8278
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_datasource.inc.php
View File

@ -92,10 +92,7 @@ class calendar_datasource extends datasource
if (!is_array($this->pm_config)) if (!is_array($this->pm_config))
{ {
$c =& CreateObject('phpgwapi.config','projectmanager'); $this->pm_config = Api\Config::read('projectmanager');
$c->read_repository();
$this->pm_config = $c->config_data;
unset($c);
if (!$this->pm_config['hours_per_workday']) $this->pm_config['hours_per_workday'] = 8; if (!$this->pm_config['hours_per_workday']) $this->pm_config['hours_per_workday'] = 8;
} }
$ds['pe_planned_time'] -= $nights * 60 * (24 - $this->pm_config['hours_per_workday']); $ds['pe_planned_time'] -= $nights * 60 * (24 - $this->pm_config['hours_per_workday']);

2
calendar/inc/class.calendar_merge.inc.php
View File

@ -577,7 +577,7 @@ class calendar_merge extends Api\Storage\Merge
$replacements = $this->contact_replacements(substr($participant,1),''); $replacements = $this->contact_replacements(substr($participant,1),'');
break; break;
case 'r': case 'r':
if (is_null(self::$resources)) self::$resources = CreateObject('resources.resources_bo'); if (is_null(self::$resources)) self::$resources = new resources_bo();
if (($resource = self::$resources->read(substr($participant,1)))) if (($resource = self::$resources->read(substr($participant,1))))
{ {
foreach($resource as $name => $value) foreach($resource as $name => $value)

4
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -766,7 +766,7 @@ class calendar_uiforms extends calendar_ui
calendar_so::split_status($status,$q,$r); calendar_so::split_status($status,$q,$r);
if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U') if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
{ {
$preferences = new Preferences($uid); $preferences = new Api\Preferences($uid);
$part_prefs = $preferences->read_repository(); $part_prefs = $preferences->read_repository();
switch ($part_prefs['calendar']['reset_stati']) switch ($part_prefs['calendar']['reset_stati'])
{ {
@ -2773,7 +2773,7 @@ class calendar_uiforms extends calendar_ui
calendar_so::split_status($status,$q,$r); calendar_so::split_status($status,$q,$r);
if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U') if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
{ {
$preferences = new Preferenes($uid); $preferences = new Api\Preferenes($uid);
$part_prefs = $preferences->read_repository(); $part_prefs = $preferences->read_repository();
switch ($part_prefs['calendar']['reset_stati']) switch ($part_prefs['calendar']['reset_stati'])
{ {