EGroupware / egroupware

api/src/Storage/Tracking.php

Spacing +175 added lines, -175 removed lines

@@ -207,22 +207,22 @@ 
 	 * @param string $cf_app = null if set, custom field names get added to $field2history
 	 * @return bo_tracking
 	 */
-	function __construct($cf_app = null, $notification_class=false)
+	function __construct($cf_app = null, $notification_class = false)
 	{
 		if ($cf_app)
 		{
-			$linkable_cf_types = array('link-entry')+array_keys(Api\Link::app_list());
-			foreach(Customfields::get($cf_app, true) as $cf_name => $cf_data)
+			$linkable_cf_types = array('link-entry') + array_keys(Api\Link::app_list());
+			foreach (Customfields::get($cf_app, true) as $cf_name => $cf_data)
 			{
 				$this->field2history['#'.$cf_name] = '#'.$cf_name;
 
-				if (in_array($cf_data['type'],$linkable_cf_types))
+				if (in_array($cf_data['type'], $linkable_cf_types))
 				{
 					$this->cf_link_fields['#'.$cf_name] = $cf_data['type'] == 'link-entry' ? '' : $cf_data['type'];
 				}
 			}
 		}
-		if($notification_class)
+		if ($notification_class)
 		{
 			$this->notification_class = $notification_class;
 		}
@@ -237,9 +237,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		unset($data, $receiver);	// not uses as just a stub
+		unset($data, $receiver); // not uses as just a stub
 
 		return array();
 	}
@@ -254,10 +254,10 @@ 
 	 *
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_customfields($data, $only_type2=null, $user = false)
+	function get_customfields($data, $only_type2 = null, $user = false)
 	{
 		$details = array();
-		if(!is_numeric($user))
+		if (!is_numeric($user))
 		{
 			$user = false;
 		}
@@ -265,7 +265,7 @@ 
 		if (($cfs = Customfields::get($this->app, $user, $only_type2)))
 		{
 			$header_done = false;
-			foreach($cfs as $name => $field)
+			foreach ($cfs as $name => $field)
 			{
 				if (in_array($field['type'], Customfields::$non_printable_fields)) continue;
 
@@ -311,9 +311,9 @@ 
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	protected function get_config($name,$data,$old=null)
+	protected function get_config($name, $data, $old = null)
 	{
-		unset($name, $data, $old);	// not used as just a stub
+		unset($name, $data, $old); // not used as just a stub
 
 		return null;
 	}
@@ -329,7 +329,7 @@ 
 	 * @param boolean $skip_notification = false do NOT send any notification
 	 * @return int|boolean false on error, integer number of changes logged or true for new entries ($old == null)
 	 */
-	public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null,$skip_notification=false)
+	public function track(array $data, array $old = null, $user = null, $deleted = null, array $changed_fields = null, $skip_notification = false)
 	{
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
 
@@ -338,7 +338,7 @@ 
 		if ($old && $this->field2history)
 		{
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.print_r($changed_fields,true));
-			$changes = $this->save_history($data,$old,$deleted,$changed_fields);
+			$changes = $this->save_history($data, $old, $deleted, $changed_fields);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.print_r($changed_fields,true));
 			//error_log(__METHOD__.__LINE__.' Changes:'.print_r($changes,true));
 		}
@@ -346,10 +346,10 @@ 
 		//error_log(__METHOD__.__LINE__.' LinkFields:'.array2string($this->cf_link_fields));
 		if ($changes && $this->cf_link_fields)
 		{
-			$this->update_links($data,(array)$old);
+			$this->update_links($data, (array)$old);
 		}
 		// do not run do_notifications if we have no changes
-		if ($changes && !$skip_notification && !$this->do_notifications($data,$old,$deleted))
+		if ($changes && !$skip_notification && !$this->do_notifications($data, $old, $deleted))
 		{
 			$changes = false;
 		}
@@ -366,45 +366,45 @@ 
 	{
 		//error_log(__METHOD__.__LINE__.array2string($data).function_backtrace());
 		//error_log(__METHOD__.__LINE__.array2string($this->cf_link_fields));
-		foreach(array_keys((array)$this->cf_link_fields) as $name)
+		foreach (array_keys((array)$this->cf_link_fields) as $name)
 		{
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (old):'.array2string($old[$name]));
-			if (is_array($data[$name]) && array_key_exists('id',$data[$name])) $data[$name] = $data[$name]['id'];
-			if (is_array($old[$name]) && array_key_exists('id',$old[$name])) $old[$name] = $old[$name]['id'];
+			if (is_array($data[$name]) && array_key_exists('id', $data[$name])) $data[$name] = $data[$name]['id'];
+			if (is_array($old[$name]) && array_key_exists('id', $old[$name])) $old[$name] = $old[$name]['id'];
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (old):'.array2string($old[$name]));
 		}
-		$current_ids = array_unique(array_diff(array_intersect_key($data,$this->cf_link_fields),array('',0,NULL)));
-		$old_ids = $old ? array_unique(array_diff(array_intersect_key($old,$this->cf_link_fields),array('',0,NULL))) : array();
+		$current_ids = array_unique(array_diff(array_intersect_key($data, $this->cf_link_fields), array('', 0, NULL)));
+		$old_ids = $old ? array_unique(array_diff(array_intersect_key($old, $this->cf_link_fields), array('', 0, NULL))) : array();
 		//error_log(__METHOD__.__LINE__.array2string($current_ids));
 		//error_log(__METHOD__.__LINE__.array2string($old_ids));
 		// create links for added application entry
-		foreach(array_diff($current_ids,$old_ids) as $name => $id)
+		foreach (array_diff($current_ids, $old_ids) as $name => $id)
 		{
 			if (!($app = $this->cf_link_fields[$name]))
 			{
-				list($app,$id) = explode(':',$id);
-				if (!$id) continue;	// can be eg. 'addressbook:', if no contact selected
+				list($app, $id) = explode(':', $id);
+				if (!$id) continue; // can be eg. 'addressbook:', if no contact selected
 			}
 			$source_id = $data[$this->id_field];
 			//error_log(__METHOD__.__LINE__.array2string($source_id));
-			if ($source_id) Api\Link::link($this->app,$source_id,$app,$id);
+			if ($source_id) Api\Link::link($this->app, $source_id, $app, $id);
 			//error_log(__METHOD__.__LINE__."Api\Link::link('$this->app',".array2string($source_id).",'$app',$id);");
 			//echo "<p>Api\Link::link('$this->app',{$data[$this->id_field]},'$app',$id);</p>\n";
 		}
 
 		// unlink removed application entries
-		foreach(array_diff($old_ids,$current_ids) as $name => $id)
+		foreach (array_diff($old_ids, $current_ids) as $name => $id)
 		{
-			if (!isset($data[$name])) continue;	// ignore not set link cf's, eg. from sync clients
+			if (!isset($data[$name])) continue; // ignore not set link cf's, eg. from sync clients
 			if (!($app = $this->cf_link_fields[$name]))
 			{
-				list($app,$id) = explode(':',$id);
+				list($app, $id) = explode(':', $id);
 				if (!$id) continue;
 			}
 			$source_id = $data[$this->id_field];
-			if ($source_id) Api\Link::unlink(null,$this->app,$source_id,0,$app,$id);
+			if ($source_id) Api\Link::unlink(null, $this->app, $source_id, 0, $app, $id);
 			//echo "<p>Api\Link::unlink(NULL,'$this->app',{$data[$this->id_field]},0,'$app',$id);</p>\n";
 		}
 	}
@@ -419,14 +419,14 @@ 
 	 * @param array $changed_fields = null changed fields from ealier call to $this->changed_fields($data,$old), to not compute it again
 	 * @return int number of log-entries made
 	 */
-	protected function save_history(array $data,array $old=null,$deleted=null,array $changed_fields=null)
+	protected function save_history(array $data, array $old = null, $deleted = null, array $changed_fields = null)
 	{
-		unset($deleted);	// not used, but required by function signature
+		unset($deleted); // not used, but required by function signature
 
 		//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		if (is_null($changed_fields))
 		{
-			$changed_fields = self::changed_fields($data,$old);
+			$changed_fields = self::changed_fields($data, $old);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		}
 		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action'])) return 0;
@@ -441,26 +441,26 @@ 
 			$this->historylog->add('user_agent_action', $data[$this->id_field],
 				$_SERVER['HTTP_USER_AGENT'], $_SESSION[Api\Session::EGW_SESSION_VAR]['session_action']);
 		}
-		foreach($changed_fields as $name)
+		foreach ($changed_fields as $name)
 		{
 			$status = isset($this->field2history[$name]) ? $this->field2history[$name] : $name;
 			//error_log(__METHOD__.__LINE__." Name $name,".' Status:'.array2string($status));
 			if (is_array($status))	// 1:N relation --> remove common rows
 			{
 				//error_log(__METHOD__.__LINE__.' is Array');
-				self::compact_1_N_relation($data[$name],$status);
-				self::compact_1_N_relation($old[$name],$status);
-				$added = array_values(array_diff($data[$name],$old[$name]));
-				$removed = array_values(array_diff($old[$name],$data[$name]));
-				$n = max(array(count($added),count($removed)));
-				for($i = 0; $i < $n; ++$i)
+				self::compact_1_N_relation($data[$name], $status);
+				self::compact_1_N_relation($old[$name], $status);
+				$added = array_values(array_diff($data[$name], $old[$name]));
+				$removed = array_values(array_diff($old[$name], $data[$name]));
+				$n = max(array(count($added), count($removed)));
+				for ($i = 0; $i < $n; ++$i)
 				{
 					//error_log(__METHOD__."() $i: historylog->add('$name',data['$this->id_field']={$data[$this->id_field]},".array2string($added[$i]).','.array2string($removed[$i]));
-					$this->historylog->add($name,$data[$this->id_field],$added[$i],$removed[$i]);
+					$this->historylog->add($name, $data[$this->id_field], $added[$i], $removed[$i]);
 				}
 			}
 			else if (is_string($data[$name]) && is_string($old[$name]) && (
-					$this->historylog->needs_diff ($name, $data[$name]) || $this->historylog->needs_diff ($name, $old[$name])))
+					$this->historylog->needs_diff($name, $data[$name]) || $this->historylog->needs_diff($name, $old[$name])))
 			{
 				// Multiline string, just store diff
 				// Strip HTML first though
@@ -468,13 +468,13 @@ 
 				$new_text = Api\Mail\Html::convertHTMLToText($data[$name]);
 
 				// If only change was something in HTML, show the HTML
-				if(trim($old_text) === trim($new_text))
+				if (trim($old_text) === trim($new_text))
 				{
 					$old_text = $old[$name];
 					$new_text = $data[$name];
 				}
 
-				$diff = new \Horde_Text_Diff('auto', array(explode("\n",$old_text), explode("\n",$new_text)));
+				$diff = new \Horde_Text_Diff('auto', array(explode("\n", $old_text), explode("\n", $new_text)));
 				$renderer = new \Horde_Text_Diff_Renderer_Unified();
 				$this->historylog->add(
 					$status,
@@ -486,9 +486,9 @@ 
 			else
 			{
 				//error_log(__METHOD__.__LINE__.' IDField:'.array2string($this->id_field).' ->'.$data[$this->id_field].' New:'.$data[$name].' Old:'.$old[$name]);
-				$this->historylog->add($status,$data[$this->id_field],
-					is_array($data[$name]) ? implode(',',$data[$name]) : $data[$name],
-					is_array($old[$name]) ? implode(',',$old[$name]) : $old[$name]);
+				$this->historylog->add($status, $data[$this->id_field],
+					is_array($data[$name]) ? implode(',', $data[$name]) : $data[$name],
+					is_array($old[$name]) ? implode(',', $old[$name]) : $old[$name]);
 			}
 		}
 		//error_log(__METHOD__.__LINE__.' return:'.count($changed_fields));
@@ -504,28 +504,28 @@ 
 	 * @param array $old = null
 	 * @return array of keys with different values in $data and $old
 	 */
-	public function changed_fields(array $data,array $old=null)
+	public function changed_fields(array $data, array $old = null)
 	{
 		if (is_null($old)) return array_keys($data);
 		$changed_fields = array();
-		foreach($this->field2history as $name => $status)
+		foreach ($this->field2history as $name => $status)
 		{
-			if (!$old[$name] && !$data[$name]) continue;	// treat all sorts of empty equally
+			if (!$old[$name] && !$data[$name]) continue; // treat all sorts of empty equally
 
-			if ($name[0] == '#' && !isset($data[$name])) continue;	// no set customfields are not stored, therefore not changed
+			if ($name[0] == '#' && !isset($data[$name])) continue; // no set customfields are not stored, therefore not changed
 
 			if (is_array($status))	// 1:N relation
 			{
-				self::compact_1_N_relation($data[$name],$status);
-				self::compact_1_N_relation($old[$name],$status);
+				self::compact_1_N_relation($data[$name], $status);
+				self::compact_1_N_relation($old[$name], $status);
 			}
 			if ($old[$name] != $data[$name])
 			{
 				// normalize arrays, we do NOT care for the order of multiselections
 				if (is_array($data[$name]) || is_array($old[$name]))
 				{
-					if (!is_array($data[$name])) $data[$name] = explode(',',$data[$name]);
-					if (!is_array($old[$name])) $old[$name] = explode(',',$old[$name]);
+					if (!is_array($data[$name])) $data[$name] = explode(',', $data[$name]);
+					if (!is_array($old[$name])) $old[$name] = explode(',', $old[$name]);
 					if (count($data[$name]) == count($old[$name]))
 					{
 						sort($data[$name]);
@@ -535,13 +535,13 @@ 
 				}
 				elseif (str_replace("\r", '', $old[$name]) == str_replace("\r", '', $data[$name]))
 				{
-					continue;	// change only in CR (eg. different OS) --> ignore
+					continue; // change only in CR (eg. different OS) --> ignore
 				}
 				$changed_fields[] = $name;
 				//echo "<p>$name: ".array2string($data[$name]).' != '.array2string($old[$name])."</p>\n";
 			}
 		}
-		foreach($data as $name => $value)
+		foreach ($data as $name => $value)
 		{
 			if ($name[0] == '#' && $name[1] == '#' && $value !== $old[$name])
 			{
@@ -558,18 +558,18 @@ 
 	 * @param array &$rows rows of the 1:N relation
 	 * @param array $cols field names as values
 	 */
-	private static function compact_1_N_relation(&$rows,array $cols)
+	private static function compact_1_N_relation(&$rows, array $cols)
 	{
 		if (is_array($rows))
 		{
-			foreach($rows as &$row)
+			foreach ($rows as &$row)
 			{
 				$values = array();
-				foreach($cols as $col)
+				foreach ($cols as $col)
 				{
 					$values[] = $row[$col];
 				}
-				$row = implode(self::ONE2N_SEPERATOR,$values);
+				$row = implode(self::ONE2N_SEPERATOR, $values);
 			}
 		}
 		else
@@ -588,7 +588,7 @@ 
 	 * @param array $email_notified=null if present will return the emails notified, if given emails in that list will not be notified
 	 * @return boolean true on success, false on error (error messages are in $this->errors)
 	 */
-	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
+	public function do_notifications($data, $old, $deleted = null, &$email_notified = null)
 	{
 		$this->errors = $email_sent = array();
 		if (!empty($email_notified) && is_array($email_notified)) $email_sent = $email_notified;
@@ -596,19 +596,19 @@ 
 		if (!$this->notify_current_user && $this->user)		// do we have a current user and should we notify the current user about his own changes
 		{
 			//error_log("do_notificaton() adding user=$this->user to email_sent, to not notify him");
-			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user,'account_email');
+			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user, 'account_email');
 		}
-		$skip_notify = $this->get_config('skip_notify',$data,$old);
-		if($skip_notify && is_array($skip_notify))
+		$skip_notify = $this->get_config('skip_notify', $data, $old);
+		if ($skip_notify && is_array($skip_notify))
 		{
 			$email_sent = array_merge($email_sent, $skip_notify);
 		}
 
 		// entry creator
-		if ($this->creator_field && ($email = $GLOBALS['egw']->accounts->id2name($data[$this->creator_field],'account_email')) &&
+		if ($this->creator_field && ($email = $GLOBALS['egw']->accounts->id2name($data[$this->creator_field], 'account_email')) &&
 			!in_array($email, $email_sent))
 		{
-			if ($this->send_notification($data,$old,$email,$data[$this->creator_field],'notify_creator'))
+			if ($this->send_notification($data, $old, $email, $data[$this->creator_field], 'notify_creator'))
 			{
 				$email_sent[] = $email;
 			}
@@ -617,12 +617,12 @@ 
 		// members of group when entry owned by group
 		if ($this->creator_field && $GLOBALS['egw']->accounts->get_type($data[$this->creator_field]) == 'g')
 		{
-			foreach($GLOBALS['egw']->accounts->members($data[$this->creator_field],true) as $u)
+			foreach ($GLOBALS['egw']->accounts->members($data[$this->creator_field], true) as $u)
 			{
-				if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) &&
+				if (($email = $GLOBALS['egw']->accounts->id2name($u, 'account_email')) &&
 					!in_array($email, $email_sent))
 				{
-					if ($this->send_notification($data,$old,$email,$u,'notify_owner_group_member'))
+					if ($this->send_notification($data, $old, $email, $u, 'notify_owner_group_member'))
 					{
 						$email_sent[] = $email;
 					}
@@ -639,14 +639,14 @@ 
 			if ($data[$this->assigned_field])	// current assignments
 			{
 				$assignees = is_array($data[$this->assigned_field]) ?
-					$data[$this->assigned_field] : explode(',',$data[$this->assigned_field]);
+					$data[$this->assigned_field] : explode(',', $data[$this->assigned_field]);
 			}
 			if ($old && $old[$this->assigned_field])
 			{
 				$old_assignees = is_array($old[$this->assigned_field]) ?
-					$old[$this->assigned_field] : explode(',',$old[$this->assigned_field]);
+					$old[$this->assigned_field] : explode(',', $old[$this->assigned_field]);
 			}
-			foreach(array_unique(array_merge($assignees,$old_assignees)) as $assignee)
+			foreach (array_unique(array_merge($assignees, $old_assignees)) as $assignee)
 			{
 				//error_log(__METHOD__."() assignee=$assignee, type=".$GLOBALS['egw']->accounts->get_type($assignee).", email=".$GLOBALS['egw']->accounts->id2name($assignee,'account_email'));
 				if (!$assignee) continue;
@@ -654,10 +654,10 @@ 
 				// item assignee is a user
 				if ($GLOBALS['egw']->accounts->get_type($assignee) == 'u')
 				{
-					if (($email = $GLOBALS['egw']->accounts->id2name($assignee,'account_email')) && !in_array($email, $email_sent))
+					if (($email = $GLOBALS['egw']->accounts->id2name($assignee, 'account_email')) && !in_array($email, $email_sent))
 					{
-						if ($this->send_notification($data,$old,$email,$assignee,'notify_assigned',
-							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))	// assignment changed
+						if ($this->send_notification($data, $old, $email, $assignee, 'notify_assigned',
+							in_array($assignee, $assignees) !== in_array($assignee, $old_assignees) || $deleted))	// assignment changed
 						{
 							$email_sent[] = $email;
 						}
@@ -665,12 +665,12 @@ 
 				}
 				else	// item assignee is a group
 				{
-					foreach($GLOBALS['egw']->accounts->members($assignee,true) as $u)
+					foreach ($GLOBALS['egw']->accounts->members($assignee, true) as $u)
 					{
-						if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) && !in_array($email, $email_sent))
+						if (($email = $GLOBALS['egw']->accounts->id2name($u, 'account_email')) && !in_array($email, $email_sent))
 						{
-							if ($this->send_notification($data,$old,$email,$u,'notify_assigned',
-								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))	// assignment changed
+							if ($this->send_notification($data, $old, $email, $u, 'notify_assigned',
+								in_array($u, $assignees) !== in_array($u, $old_assignees) || $deleted))	// assignment changed
 							{
 								$email_sent[] = $email;
 							}
@@ -681,14 +681,14 @@ 
 		}
 
 		// notification copies
-		if (($copies = $this->get_config('copy',$data,$old)))
+		if (($copies = $this->get_config('copy', $data, $old)))
 		{
-			$lang = $this->get_config('lang',$data,$old);
-			foreach($copies as $email)
+			$lang = $this->get_config('lang', $data, $old);
+			foreach ($copies as $email)
 			{
-				if (strchr($email,'@') !== false && !in_array($email, $email_sent))
+				if (strchr($email, '@') !== false && !in_array($email, $email_sent))
 				{
-					if ($this->send_notification($data,$old,$email,$lang,'notify_copy'))
+					if ($this->send_notification($data, $old, $email, $lang, 'notify_copy'))
 					{
 						$email_sent[] = $email;
 					}
@@ -733,7 +733,7 @@ 
 	 * @param boolean $deleted = null can be set to true to let the tracking know the item got deleted or undelted
 	 * @return boolean true on success or false if notification not requested or error (error-message is in $this->errors)
 	 */
-	public function send_notification($data,$old,$email,$user_or_lang,$check=null,$assignment_changed=true,$deleted=null)
+	public function send_notification($data, $old, $email, $user_or_lang, $check = null, $assignment_changed = true, $deleted = null)
 	{
 		//error_log(__METHOD__."(,,'$email',$user_or_lang,$check,$assignment_changed,$deleted)");
 		if (!$email) return false;
@@ -746,16 +746,16 @@ 
 		{
 			$GLOBALS['egw_info']['user']['account_id'] = $user_or_lang;
 			$GLOBALS['egw']->preferences->__construct($user_or_lang);
-			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
+			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false); // no session prefs!
 
 			if ($check && $this->check2pref) $check = $this->check2pref[$check];
 
-			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] ||	// no notification requested
+			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] || // no notification requested
 				// only notification about changed assignment requested
 				$check && $GLOBALS['egw_info']['user']['preferences'][$this->app][$check] === 'assignment' && !$assignment_changed ||
 				$this->user == $user_or_lang && !$this->notify_current_user)  // no popup for own actions
 			{
-				$do_notify = false;	// no notification requested / necessary
+				$do_notify = false; // no notification requested / necessary
 			}
 			$can_cache = (Customfields::get($this->app, true) == Customfields::get($this->app, $user_or_lang));
 		}
@@ -779,37 +779,37 @@ 
 
 			// Cache message body to not have to re-generate it every time
 			$lang = Api\Translation::$userlang;
-			$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'] .
+			$date_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].
 				$GLOBALS['egw_info']['user']['preferences']['common']['timeformat'];
 
 			// Cache text body, if there's no private custom fields we might reveal
-			if($can_cache)
+			if ($can_cache)
 			{
-				$body_cache =& $this->body_cache[$data[$this->id_field]][$lang][$date_format];
+				$body_cache = & $this->body_cache[$data[$this->id_field]][$lang][$date_format];
 			}
-			if(empty($data[$this->id_field]) || !isset($body_cache['text']))
+			if (empty($data[$this->id_field]) || !isset($body_cache['text']))
 			{
-				$body_cache['text'] = $this->get_body(false,$data,$old,false,$receiver);
+				$body_cache['text'] = $this->get_body(false, $data, $old, false, $receiver);
 			}
 			// Cache HTML body
-			if(empty($data[$this->id_field]) || !isset($body_cache['html']))
+			if (empty($data[$this->id_field]) || !isset($body_cache['html']))
 			{
-				$body_cache['html'] = $this->get_body(true,$data,$old,false,$receiver);
+				$body_cache['html'] = $this->get_body(true, $data, $old, false, $receiver);
 			}
 
 			// get rest of notification message
-			$sender = $this->get_sender($data,$old,true,$receiver);
-			$reply_to = $this->get_reply_to($data,$old);
-			$subject = $this->get_subject($data,$old,$deleted,$receiver);
-			$link = $this->get_notification_link($data,$old,$receiver);
-			$attachments = $this->get_attachments($data,$old,$receiver);
+			$sender = $this->get_sender($data, $old, true, $receiver);
+			$reply_to = $this->get_reply_to($data, $old);
+			$subject = $this->get_subject($data, $old, $deleted, $receiver);
+			$link = $this->get_notification_link($data, $old, $receiver);
+			$attachments = $this->get_attachments($data, $old, $receiver);
 		}
 
 		// restore user enviroment BEFORE calling notification class or returning
 		$GLOBALS['egw_info']['user'] = $save_user;
 		// need to call preferences constructor and read_repository, to set user timezone again
 		$GLOBALS['egw']->preferences->__construct($GLOBALS['egw_info']['user']['account_id']);
-		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
+		$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false); // no session prefs!
 
 		// Re-load date/time preferences
 		Api\DateTime::init();
@@ -873,11 +873,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function datetime($timestamp,$do_time=true)
+	public function datetime($timestamp, $do_time = true)
 	{
-		if (!is_a($timestamp,'DateTime'))
+		if (!is_a($timestamp, 'DateTime'))
 		{
-			$timestamp = new Api\DateTime($timestamp,Api\DateTime::$server_timezone);
+			$timestamp = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
 		}
 		$timestamp->setTimezone(Api\DateTime::$user_timezone);
 		if (is_null($do_time))
@@ -903,25 +903,25 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string or userid
 	 */
-	protected function get_sender($data,$old,$prefer_id=false,$receiver=null)
+	protected function get_sender($data, $old, $prefer_id = false, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		$sender = $this->get_config('sender',$data,$old);
+		$sender = $this->get_config('sender', $data, $old);
 		//echo "<p>".__METHOD__."() get_config('sender',...)='".htmlspecialchars($sender)."'</p>\n";
 
 		if (($this->prefer_user_as_sender || !$sender) && $this->user &&
-			($email = $GLOBALS['egw']->accounts->id2name($this->user,'account_email')))
+			($email = $GLOBALS['egw']->accounts->id2name($this->user, 'account_email')))
 		{
-			$name = $GLOBALS['egw']->accounts->id2name($this->user,'account_fullname');
+			$name = $GLOBALS['egw']->accounts->id2name($this->user, 'account_fullname');
 
-			if($prefer_id) {
+			if ($prefer_id) {
 				$sender = $this->user;
 			} else {
 				$sender = $name ? $name.' <'.$email.'>' : $email;
 			}
 		}
-		elseif(!$sender)
+		elseif (!$sender)
 		{
 			$sender = 'EGroupware '.lang($this->app).' <noreply@'.$GLOBALS['egw_info']['server']['mail_suffix'].'>';
 		}
@@ -939,9 +939,9 @@ 
 	 * @param array $old
 	 * @return string or null
 	 */
-	protected function get_reply_to($data,$old)
+	protected function get_reply_to($data, $old)
 	{
-		$reply_to = $this->get_config('reply_to',$data,$old);
+		$reply_to = $this->get_config('reply_to', $data, $old);
 
 		return $reply_to;
 	}
@@ -953,11 +953,11 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	protected function get_title($data,$old)
+	protected function get_title($data, $old)
 	{
-		unset($old);	// not used, but required by function signature
+		unset($old); // not used, but required by function signature
 
-		return Api\Link::title($this->app,$data[$this->id_field]);
+		return Api\Link::title($this->app, $data[$this->id_field]);
 	}
 
 	/**
@@ -971,11 +971,11 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_subject($data,$old,$deleted=null,$receiver=null)
+	protected function get_subject($data, $old, $deleted = null, $receiver = null)
 	{
-		unset($old, $deleted, $receiver);	// not used, but required by function signature
+		unset($old, $deleted, $receiver); // not used, but required by function signature
 
-		return Api\Link::title($this->app,$data[$this->id_field]);
+		return Api\Link::title($this->app, $data[$this->id_field]);
 	}
 
 	/**
@@ -988,9 +988,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	protected function get_message($data,$old,$receiver=null)
+	protected function get_message($data, $old, $receiver = null)
 	{
-		unset($data, $old, $receiver);	// not used, but required by function signature
+		unset($data, $old, $receiver); // not used, but required by function signature
 
 		return '';
 	}
@@ -1006,24 +1006,24 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string|array string with link (!$allow_popup) or array(link,popup-size), popup size is something like '640x480'
 	 */
-	protected function get_link($data,$old,$allow_popup=false,$receiver=null)
+	protected function get_link($data, $old, $allow_popup = false, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		if (($link = $this->get_config('link',$data,$old)))
+		if (($link = $this->get_config('link', $data, $old)))
 		{
-			if (!$this->get_config('link_no_id', $data) && strpos($link,$this->id_field.'=') === false && isset($data[$this->id_field]))
+			if (!$this->get_config('link_no_id', $data) && strpos($link, $this->id_field.'=') === false && isset($data[$this->id_field]))
 			{
-				$link .= strpos($link,'?') === false ? '?' : '&';
+				$link .= strpos($link, '?') === false ? '?' : '&';
 				$link .= $this->id_field.'='.$data[$this->id_field];
 			}
 		}
 		else
 		{
-			if (($view = Api\Link::view($this->app,$data[$this->id_field])))
+			if (($view = Api\Link::view($this->app, $data[$this->id_field])))
 			{
-				$link = Api\Framework::link('/index.php',$view);
-				$popup = Api\Link::is_popup($this->app,'view');
+				$link = Api\Framework::link('/index.php', $view);
+				$popup = Api\Link::is_popup($this->app, 'view');
 			}
 		}
 		if ($link[0] == '/') Api\Framework::getUrl($link);
@@ -1031,12 +1031,12 @@ 
 		if (!$allow_popup)
 		{
 			// remove the session-id in the notification mail!
-			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$link);
+			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '', $link);
 
 			if ($popup) $link .= '&nopopup=1';
 		}
 		//error_log(__METHOD__."(..., $allow_popup, $receiver) returning ".array2string($allow_popup ? array($link,$popup) : $link));
-		return $allow_popup ? array($link,$popup) : $link;
+		return $allow_popup ? array($link, $popup) : $link;
 	}
 
 	/**
@@ -1047,18 +1047,18 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array with link
 	 */
-	protected function get_notification_link($data,$old,$receiver=null)
+	protected function get_notification_link($data, $old, $receiver = null)
 	{
-		unset($receiver);	// not used, but required by function signature
+		unset($receiver); // not used, but required by function signature
 
-		if (($view = Api\Link::view($this->app,$data[$this->id_field])))
+		if (($view = Api\Link::view($this->app, $data[$this->id_field])))
 		{
 			return array(
-				'text' 	=> $this->get_title($data,$old),
+				'text' 	=> $this->get_title($data, $old),
 				'app'	=> $this->app,
 				'id'	=> $data[$this->id_field],
 				'view' 	=> $view,
-				'popup'	=> Api\Link::is_popup($this->app,'view'),
+				'popup'	=> Api\Link::is_popup($this->app, 'view'),
 			);
 		}
 		return false;
@@ -1074,15 +1074,15 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return string
 	 */
-	public function get_body($html_email,$data,$old,$integrate_link = true,$receiver=null)
+	public function get_body($html_email, $data, $old, $integrate_link = true, $receiver = null)
 	{
 		$body = '';
-		if($this->get_config(self::CUSTOM_NOTIFICATION, $data, $old))
+		if ($this->get_config(self::CUSTOM_NOTIFICATION, $data, $old))
 		{
-			$body = $this->get_custom_message($data,$old,null,$receiver);
-			if(($sig = $this->get_signature($data,$old,$receiver)))
+			$body = $this->get_custom_message($data, $old, null, $receiver);
+			if (($sig = $this->get_signature($data, $old, $receiver)))
 			{
-				$body .= ($html_email ? '<br />':'') . "\n$sig";
+				$body .= ($html_email ? '<br />' : '')."\n$sig";
 			}
 			return $body;
 		}
@@ -1091,35 +1091,35 @@ 
 			$body = '<table cellspacing="2" cellpadding="0" border="0" width="100%">'."\n";
 		}
 		// new or modified message
-		if (($message = $this->get_message($data,$old,$receiver)))
+		if (($message = $this->get_message($data, $old, $receiver)))
 		{
 			foreach ((array)$message as $_message)
 			{
-				$body .= $this->format_line($html_email,'message',false,($_message=='---'?($html_email?'<hr/>':$_message):$_message));
+				$body .= $this->format_line($html_email, 'message', false, ($_message == '---' ? ($html_email ? '<hr/>' : $_message) : $_message));
 			}
 		}
-		if ($integrate_link && ($link = $this->get_link($data,$old,false,$receiver)))
+		if ($integrate_link && ($link = $this->get_link($data, $old, false, $receiver)))
 		{
-			$body .= $this->format_line($html_email,'link',false,$integrate_link === true ? lang('You can respond by visiting:') : $integrate_link,$link);
+			$body .= $this->format_line($html_email, 'link', false, $integrate_link === true ? lang('You can respond by visiting:') : $integrate_link, $link);
 		}
-		foreach($this->get_details($data,$receiver) as $name => $detail)
+		foreach ($this->get_details($data, $receiver) as $name => $detail)
 		{
 			// if there's no old entry, the entry is not modified by definition
 			// if both values are '', 0 or null, we count them as equal too
 			$modified = $old && $data[$name] != $old[$name] && !(!$data[$name] && !$old[$name]);
 			//if ($modified) error_log("data[$name]=".print_r($data[$name],true).", old[$name]=".print_r($old[$name],true)." --> modified=".(int)$modified);
-			if (empty($detail['value']) && !$modified) continue;	// skip unchanged, empty values
+			if (empty($detail['value']) && !$modified) continue; // skip unchanged, empty values
 
-			$body .= $this->format_line($html_email,$detail['type'],$modified,
+			$body .= $this->format_line($html_email, $detail['type'], $modified,
 				$detail['label'] ? $detail['label'] : '', $detail['value']);
 		}
 		if ($html_email)
 		{
 			$body .= "</table>\n";
 		}
-		if(($sig = $this->get_signature($data,$old,$receiver)))
+		if (($sig = $this->get_signature($data, $old, $receiver)))
 		{
-			$body .= ($html_email ? '<br />':'') . "\n$sig";
+			$body .= ($html_email ? '<br />' : '')."\n$sig";
 		}
 		if (!$html_email && $data['tr_edit_mode'] == 'html')
 		{
@@ -1139,20 +1139,20 @@ 
 	 * @param string $data = null data or null to display just $line over 2 columns
 	 * @return string
 	 */
-	protected function format_line($html_mail,$type,$modified,$line,$data=null)
+	protected function format_line($html_mail, $type, $modified, $line, $data = null)
 	{
 		//error_log(__METHOD__.'('.array2string($html_mail).",'$type',".array2string($modified).",'$line',".array2string($data).')');
 		$content = '';
 
 		if ($html_mail)
 		{
-			if (!$this->html_content_allow) $line = Api\Html::htmlspecialchars($line);	// XSS
+			if (!$this->html_content_allow) $line = Api\Html::htmlspecialchars($line); // XSS
 
 			$color = $modified ? 'red' : false;
 			$size  = '110%';
 			$bold = false;
 			$background = '#FFFFF1';
-			switch($type)
+			switch ($type)
 			{
 				case 'message':
 					$background = '#D3DCE3;';
@@ -1170,7 +1170,7 @@ 
 					if (strpos($data, '<br') === false)
 					{
 						$data = nl2br($this->html_content_allow ? $data : Api\Html::htmlspecialchars($data));
-						$this->html_content_allow = true;	// to NOT do htmlspecialchars again
+						$this->html_content_allow = true; // to NOT do htmlspecialchars again
 					}
 					break;
 				case 'reply':
@@ -1179,13 +1179,13 @@ 
 				default:
 					$size = false;
 			}
-			$style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color?'color:'.$color:'');
+			$style = ($bold ? 'font-weight:bold;' : '').($size ? 'font-size:'.$size.';' : '').($color ? 'color:'.$color : '');
 
-			$content = '<tr style="background-color: '.$background.';"><td style="'.$style.($line && $data?'" width="20%':'" colspan="2').'">';
+			$content = '<tr style="background-color: '.$background.';"><td style="'.$style.($line && $data ? '" width="20%' : '" colspan="2').'">';
 		}
 		else	// text-mail
 		{
-			if ($type == 'reply') $content = str_repeat('-',64)."\n";
+			if ($type == 'reply') $content = str_repeat('-', 64)."\n";
 
 			if ($modified) $content .= '> ';
 		}
@@ -1197,7 +1197,7 @@ 
 			if ($type == 'link')
 			{
 				// the link is often too long for html boxes chunk-split allows to break lines if needed
-				$content .= Api\Html::a_href(chunk_split(rawurldecode($data),40,'&#8203;'),$data,'','target="_blank"');
+				$content .= Api\Html::a_href(chunk_split(rawurldecode($data), 40, '&#8203;'), $data, '', 'target="_blank"');
 			}
 			elseif ($this->html_content_allow)
 			{
@@ -1210,7 +1210,7 @@ 
 		}
 		else
 		{
-			$content .= ($content&&$data?': ':'').$data;
+			$content .= ($content && $data ? ': ' : '').$data;
 		}
 		if ($html_mail) $content .= '</td></tr>';
 
@@ -1227,9 +1227,9 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array or array with values for either 'string' or 'path' and optionally (mime-)'type', 'filename' and 'encoding'
 	 */
-	protected function get_attachments($data,$old,$receiver=null)
+	protected function get_attachments($data, $old, $receiver = null)
 	{
-		unset($data, $old, $receiver);	// not used, but required by function signature
+		unset($data, $old, $receiver); // not used, but required by function signature
 
 	 	return array();
 	}
@@ -1242,20 +1242,20 @@ 
 	 */
 	protected function get_signature($data, $old, $receiver)
 	{
-		unset($old, $receiver);	// not used, but required by function signature
+		unset($old, $receiver); // not used, but required by function signature
 
 		$config = Api\Config::read('notifications');
-		if(!isset($data[$this->id_field]))
+		if (!isset($data[$this->id_field]))
 		{
-			error_log($this->app . ' did not properly implement bo_tracking->id_field.  Merge skipped.');
+			error_log($this->app.' did not properly implement bo_tracking->id_field.  Merge skipped.');
 		}
-		elseif(class_exists($this->app. '_merge'))
+		elseif (class_exists($this->app.'_merge'))
 		{
 			$merge_class = $this->app.'_merge';
 			$merge = new $merge_class();
 			$error = null;
 			$sig = $merge->merge_string($config['signature'], array($data[$this->id_field]), $error, 'text/html');
-			if($error)
+			if ($error)
 			{
 				error_log($error);
 				return $config['signature'];
@@ -1272,7 +1272,7 @@ 
 	protected function get_custom_message($data, $old, $merge_class = null, $receiver = false)
 	{
 		$message = $this->get_config(self::CUSTOM_NOTIFICATION, $data, $old);
-		if(!$message)
+		if (!$message)
 		{
 			return '';
 		}
@@ -1281,21 +1281,21 @@ 
 		$message = $this->sanitize_custom_message($message, $receiver);
 
 		// Automatically set merge class from naming conventions
-		if($merge_class == null)
+		if ($merge_class == null)
 		{
 			$merge_class = $this->app.'_merge';
 		}
-		if(!isset($data[$this->id_field]))
+		if (!isset($data[$this->id_field]))
 		{
-			error_log($this->app . ' did not properly implement bo_tracking->id_field.  Merge skipped.');
+			error_log($this->app.' did not properly implement bo_tracking->id_field.  Merge skipped.');
 			return $message;
 		}
-		elseif(class_exists($merge_class))
+		elseif (class_exists($merge_class))
 		{
 			$merge = new $merge_class();
 			$error = null;
 			$merged_message = $merge->merge_string($message, array($data[$this->id_field]), $error, 'text/html');
-			if($error)
+			if ($error)
 			{
 				error_log($error);
 				return $message;
@@ -1317,7 +1317,7 @@ 
 	 */
 	protected function sanitize_custom_message($message, $receiver)
 	{
-		if(!is_numeric($receiver))
+		if (!is_numeric($receiver))
 		{
 			$receiver = false;
 		}
@@ -1327,14 +1327,14 @@ 
 
 		// If we have a specific user and they're the same then there are
 		// no private fields so nothing needs to be done
-		if($receiver && $all_cfs == $cfs)
+		if ($receiver && $all_cfs == $cfs)
 		{
 			return $message;
 		}
 
 		// Replace any placeholders that use the private field, or any sub-keys
 		// of the field
-		foreach($all_cfs as $name => $field)
+		foreach ($all_cfs as $name => $field)
 		{
 			if ($receiver === false && $field['private'] || !$cfs[$name])
 			{