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

fix ide warnings

Browse Source
This commit is contained in:
Ralf Becker 2014-01-28 10:02:11 +00:00
parent 95bc6ced24
commit 0c2f0fdcfa
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
infolog/inc/class.infolog_tracking.inc.php
View File

@ -198,6 +198,7 @@ class infolog_tracking extends bo_tracking
*/ */
function get_details($data,$receiver=null) function get_details($data,$receiver=null)
{ {
unset($receiver); // not used, but required function signature
//error_log(__METHOD__.__LINE__.' Data:'.array2string($data)); //error_log(__METHOD__.__LINE__.' Data:'.array2string($data));
$responsible = array(); $responsible = array();
if ($data['info_responsible']) if ($data['info_responsible'])
@ -312,14 +313,18 @@ class infolog_tracking extends bo_tracking
*/ */
function get_config($name,$data,$old=null) function get_config($name,$data,$old=null)
{ {
$config = array(); unset($old); // not used, but required function signature
switch($name) switch($name)
{ {
case 'copy': // include the info_cc addresses case 'copy': // include the info_cc addresses
if ($data['info_access'] == 'private') return array(); // no copies for private entries if ($data['info_access'] == 'private') return array(); // no copies for private entries
if ($data['info_cc']) if ($data['info_cc'])
{ {
$config = array_merge($config,preg_split('/, ?/',$data['info_cc'])); $config = preg_split('/, ?/',$data['info_cc']);
}
else
{
$config = array();
} }
break; break;
case self::CUSTOM_NOTIFICATION: case self::CUSTOM_NOTIFICATION:
@ -329,14 +334,14 @@ class infolog_tracking extends bo_tracking
return ''; return '';
} }
// Per-type notification // Per-type notification
$config = $info_config[self::CUSTOM_NOTIFICATION][$data['info_type']]; $type_config = $info_config[self::CUSTOM_NOTIFICATION][$data['info_type']];
$global = $info_config[self::CUSTOM_NOTIFICATION]['~global~']; $global = $info_config[self::CUSTOM_NOTIFICATION]['~global~'];
// Disabled // Disabled
if(!$config['use_custom'] && !$global['use_custom']) return ''; if(!$type_config['use_custom'] && !$global['use_custom']) return '';
// Type or globabl // Type or globabl
$config = trim(strip_tags($config['message'])) != '' && $config['use_custom'] ? $config['message'] : $global['message']; $config = trim(strip_tags($type_config['message'])) != '' && $type_config['use_custom'] ? $type_config['message'] : $global['message'];
break; break;
} }
return $config; return $config;