extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

* InfoLog: query custom-fields for notifications

Browse Source 
and remove static $ignore_acl parameter, as it is only used in no longer necessary read
This commit is contained in:
Ralf Becker 2014-01-28 09:36:36 +00:00
parent 40a13d193b
commit 9960468583
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
infolog/inc/class.infolog_bo.inc.php
View File

@ -113,13 +113,6 @@ class infolog_bo
* @var infolog_tracking * @var infolog_tracking
*/ */
var $tracking; var $tracking;
/**
* Variable used to tell read function to ignore the acl
* used in async_notification;
*
* @var ignore_acl
*/
static $ignore_acl;
/** /**
* Maximum number of line characters (-_+=~) allowed in a mail, to not stall the layout. * Maximum number of line characters (-_+=~) allowed in a mail, to not stall the layout.
* Longer lines / biger number of these chars are truncated to that max. number or chars. * Longer lines / biger number of these chars are truncated to that max. number or chars.
@ -598,7 +591,7 @@ class infolog_bo
} }
$info_id = $data['info_id']; // in case the uid was specified $info_id = $data['info_id']; // in case the uid was specified
if (!(self::$ignore_acl || $ignore_acl) && !$this->check_access($data,EGW_ACL_READ)) // check behind read, to prevent a double read if (!$ignore_acl && !$this->check_access($data,EGW_ACL_READ)) // check behind read, to prevent a double read
{ {
return False; return False;
} }
@ -1557,7 +1550,7 @@ class infolog_bo
$filter .= date('Y-m-d',time()+24*60*60*(int)$pref_value); $filter .= date('Y-m-d',time()+24*60*60*(int)$pref_value);
//error_log(__METHOD__."() checking with filter '$filter' ($pref_value) for user $user ($email)"); //error_log(__METHOD__."() checking with filter '$filter' ($pref_value) for user $user ($email)");
$params = array('filter' => $filter); $params = array('filter' => $filter, 'custom_fields' => true);
foreach($this->so->search($params) as $info) foreach($this->so->search($params) as $info)
{ {
// check if we already send a notification for that infolog entry, eg. starting and due on same day // check if we already send a notification for that infolog entry, eg. starting and due on same day
@ -1591,13 +1584,7 @@ class infolog_bo
break; break;
} }
//error_log("notifiying $user($email) about $info[info_subject]: $info[message]"); //error_log("notifiying $user($email) about $info[info_subject]: $info[message]");
// ignore acl for further processing, needed to instruct bo->read to ignore the
// acl, when called for tracking -> get_signature -> merge to resolve possible
// infolog specific placeholders in infolog_egw_record
self::$ignore_acl = true;
$info = $this->read($info['info_id'], false, 'server',true);
$this->tracking->send_notification($info,null,$email,$user,$pref); $this->tracking->send_notification($info,null,$email,$user,$pref);
self::$ignore_acl = false;
$notified_info_ids[] = $info['info_id']; $notified_info_ids[] = $info['info_id'];
} }

1
infolog/inc/class.infolog_so.inc.php
View File

@ -674,6 +674,7 @@ class infolog_so
* @param int $query[num_rows] number of rows to return if $query[start] is set, default is to use the value from the general prefs * @param int $query[num_rows] number of rows to return if $query[start] is set, default is to use the value from the general prefs
* @param string|array $query[cols]=null what to query, if set the recordset / iterator get's returned * @param string|array $query[cols]=null what to query, if set the recordset / iterator get's returned
* @param string $query[append]=null get's appended to sql query, eg. for GROUP BY * @param string $query[append]=null get's appended to sql query, eg. for GROUP BY
* @param boolean $query['custom_fields']=false query custom-fields too, default not
* @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set * @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set
*/ */
function search(&$query) function search(&$query)