EGroupware / egroupware

infolog/inc/class.infolog_ui.inc.php

Indentation +1 added lines, -1 removed lines

@@ -225,7 +225,7 @@
 
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
 					$link['link_id'] != $info['info_link_id'] &&
-				    ($link['app'] != $action || $link['id'] != $action_id) &&
+					($link['app'] != $action || $link['id'] != $action_id) &&
 					($show_links == 'all' || ($show_links == 'links') === ($link['app'] != Link::VFS_APPNAME)))
 				{
 					$info['filelinks'][] = $link;

Doc Comments +8 added lines, -8 removed lines

@@ -294,6 +294,8 @@ 
 	 * @param array &$query
 	 * @param array &$rows
 	 * @param array &$readonlys
+	 * @param type|null $rows
+	 * @param type|null $readonlys
 	 * @return int
 	 */
 	function get_rows(&$query,&$rows,&$readonlys)
@@ -569,7 +571,6 @@ 
 	 * Hook for timesheet to set some extra data and links
 	 *
 	 * @param array $data
-	 * @param int $data[id] info_id
 	 * @return array with key => value pairs to set in new timesheet and link_app/link_id arrays
 	 */
 	function timesheet_set($data)
@@ -595,7 +596,6 @@ 
 	 * Hook for calendar to set some extra data and links
 	 *
 	 * @param array $data event-array preset by calendar plus
-	 * @param int $data[entry_id] info_id
 	 * @return array with key => value pairs to set in new event and link_app/link_id arrays
 	 */
 	function calendar_set($data)
@@ -683,11 +683,11 @@ 
 	/**
 	 * Shows the infolog list
 	 *
-	 * @param array/string $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view
+	 * @param integer $values etemplate content or 'reset_action_view' if called by index.php to reset an action-view
 	 * @param string $action if set only entries liked to that $action:$action_id are shown
 	 * @param string $action_id if set only entries liked to that $action:$action_id are shown
-	 * @param mixed $called_as is how we got called, for a hook eg. the call-params of that page containing the hook
-	 * @param boolean $e$extra_app_header * @param boolean $return_html=false
+	 * @param integer $called_as is how we got called, for a hook eg. the call-params of that page containing the hook
+	 * @param boolean $extra_app_header * @param boolean $return_html
 	 * @param string $own_referer='' this is our own referer
 	 * @param string $action_title='' app_header for the action, if '' we try the link-title
 	 */
@@ -1515,9 +1515,9 @@ 
 	/**
 	 * Closes an infolog
 	 *
-	 * @param int|array $values=0 info_id (default _GET[info_id])
+	 * @param int|array $values info_id (default _GET[info_id])
 	 * @param string $_referer=''
-	 * @param boolean $closesingle=false
+	 * @param boolean $closesingle
 	 */
 	function close($values=0,$_referer='',$closesingle=false,$skip_notification = false)
 	{
@@ -1565,7 +1565,7 @@ 
 	/**
 	 * Deletes an InfoLog entry
 	 *
-	 * @param array|int $values info_id (default _GET[info_id])
+	 * @param integer $values info_id (default _GET[info_id])
 	 * @param string $_referer
 	 * @param string $called_by
 	 * @param boolean $skip_notification Do not send notification of deletion

Braces +293 added lines, -73 removed lines

@@ -90,7 +90,10 @@ 
 	 */
 	function __construct()
 	{
-		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog') translation::add_app('infolog');
+		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog')
+		{
+			translation::add_app('infolog');
+		}
 
 		// Make sure Global category is infolog - on first load, it may not be
 		if($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
@@ -164,13 +167,19 @@ 
 		$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed' || $info['info_status'] == 'cancelled'; //cancelled is regarded as a completed status as well in bo
 		// regard an infolog as done/billed/cancelled if its percentage is 100% when there is to status like the above for that type
 		if (!$done && !isset($this->bo->status[$info['info_type']]['done']) && !isset($this->bo->status[$info['info_type']]['billed']) &&
-			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100) $done = true ;
+			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100)
+		{
+			$done = true ;
+		}
 		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : '');
 		if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
 		{
 			$info['end_class'] = 'infolog_overdue';
 		}
-		if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id);
+		if (!isset($info['info_anz_subs']))
+		{
+			$info['info_anz_subs'] = $this->bo->anzSubs($id);
+		}
 		$this->bo->link_id2from($info,$action,$action_id);	// unset from for $action:$action_id
 		$info['info_percent'] = (int) $info['info_percent'].'%';
 		$editrights = $this->bo->check_access($info,EGW_ACL_EDIT);
@@ -203,12 +212,21 @@ 
 		{
 			$info['class'] .= 'rowNoSubs ';
 		}
-		if ($info['info_id_parent']) $info['class'] .= 'infolog_rowHasParent ';
-		if ($info['info_anz_subs'] > 0) $info['class'] .= 'infolog_rowHasSubs ';
+		if ($info['info_id_parent'])
+		{
+			$info['class'] .= 'infolog_rowHasParent ';
+		}
+		if ($info['info_anz_subs'] > 0)
+		{
+			$info['class'] .= 'infolog_rowHasSubs ';
+		}
 
 		$info['row_mod'] = $info['info_datemodified'];
 
-		if (!$show_links) $show_links = $this->prefs['show_links'];
+		if (!$show_links)
+		{
+			$show_links = $this->prefs['show_links'];
+		}
 		if (($show_links != 'none' && $show_links != 'no_describtion' ||
 			 $this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
 			(isset($info['links']) || ($info['links'] = egw_link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true,true))))
@@ -218,9 +236,16 @@ 
 			{
 				// incl. link modification time into row_mod (link's lastmod is always in server-time!)
 				$link_mod = egw_time::server2user($link['lastmod']);
-				if ($info['row_mod'] < $link_mod) $info['row_mod'] = $link_mod;
+				if ($info['row_mod'] < $link_mod)
+				{
+					$info['row_mod'] = $link_mod;
+				}
 
-				if ($link['deleted']) continue;	// skip deleted links, but incl. them in row_mod!
+				if ($link['deleted'])
+				{
+					continue;
+				}
+				// skip deleted links, but incl. them in row_mod!
 
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
 					$link['link_id'] != $info['info_link_id'] &&
@@ -233,14 +258,20 @@ 
 				{
 					$info['pm_id'] = $link['id'];
 				}
-				if ($link['app'] == 'timesheet') $timesheets[] = $link['id'];
+				if ($link['app'] == 'timesheet')
+				{
+					$timesheets[] = $link['id'];
+				}
 			}
 			if ($this->prefs['show_times'] && isset($GLOBALS['egw_info']['user']['apps']['timesheet']) && $timesheets)
 			{
 				$sum = ExecMethod('timesheet.timesheet_bo.sum',$timesheets);
 				$info['info_sum_timesheets'] = $sum['duration'];
 				// incl. max timesheet modification in row_mod
-				if ($info['row_mod'] < $sum['max_modified']) $info['row_mod'] = $sum['max_modified'];
+				if ($info['row_mod'] < $sum['max_modified'])
+				{
+					$info['row_mod'] = $sum['max_modified'];
+				}
 			}
 		}
 		$info['info_type_label'] = $this->bo->enums['type'][$info['info_type']];
@@ -255,10 +286,13 @@ 
 			}
 			$readonlys["edit_percent[$id]"] = true;
 		}
-		elseif($readonlys["edit_percent[$id]"])	// show percent, but button is switched off
+		elseif($readonlys["edit_percent[$id]"])
+		{
+			// show percent, but button is switched off
 		{
 			$info['info_percent2'] = $info['info_percent'];
 		}
+		}
 		if ($this->prefs['show_id'] == 1 || $this->prefs['show_id'] == 2 && $details)
 		{
 			$info['info_number'] = $info['info_id'];
@@ -331,10 +365,16 @@ 
 			$query['col_filter'] = array('info_id_parent' => $query['col_filter']['info_id_parent']);
 		}
 		$orginal_colfilter = $query['col_filter'];
-		if (isset($parent_id)) $query['col_filter']['info_id_parent'] = (string)$parent_id;
+		if (isset($parent_id))
+		{
+			$query['col_filter']['info_id_parent'] = (string)$parent_id;
+		}
 
 		//echo "<p>infolog_ui.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]',col_filter=".print_r($query['col_filter'],True).",sort=$query[sort],order=$query[order])</p>\n";
-		if (!isset($query['start'])) $query['start'] = 0;
+		if (!isset($query['start']))
+		{
+			$query['start'] = 0;
+		}
 
 		// handle action and linked filter (show only entries linked to a certain other entry)
 		$link_filters = array();
@@ -363,7 +403,10 @@ 
 				$app = $link['app'];
 				$id = $link['id'];
 			}
-			if(!is_array($id)) $id = explode(',',$id);
+			if(!is_array($id))
+			{
+				$id = explode(',',$id);
+			}
 			if (!($linked = egw_link::get_links_multiple($app,$id,true,'infolog','',$query['col_filter']['info_status'] == 'deleted')))
 			{
 				$rows = array();	// no infologs linked to selected link --> no rows to return
@@ -412,7 +455,10 @@ 
 			}
 		}
 		// Template change forces the UI to do a full update first, no point in getting rows right now
-		if($old_template && $old_template != $query['template']) return 0;
+		if($old_template && $old_template != $query['template'])
+		{
+			return 0;
+		}
 
 		// do we need to read the custom fields, depends on the column is enabled and customfields exist, prefs are filter specific
 		// so we have to check that as well
@@ -473,12 +519,18 @@ 
 		$parent_first = count($parents) == 1;
 		$parent_index = 0;
 		// et2 nextmatch listens to total, and only displays that many rows, so add parent in or we'll lose the last row
-		if($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
+		if($parent_first || $query['action'] == 'sp' && is_array($query['action_id']))
+		{
+			$query['total']++;
+		}
 
 		// Check to see if we need to remove description
 		foreach($infos as $id => $info)
 		{
-			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']);
+			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false)
+			{
+				$info['info_addr'] = str_replace(',',', ',$info['info_addr']);
+			}
 			if (!$query['csv_export'] || !is_array($query['csv_export']))
 			{
 				$info['links'] =& $links[$id];
@@ -502,7 +554,10 @@ 
 						{
 							foreach(array_keys($main) as $n)
 							{
-								if ($n[0] == '#' && !in_array($n, $columselection)) unset($main[$n]);
+								if ($n[0] == '#' && !in_array($n, $columselection))
+								{
+									unset($main[$n]);
+								}
 							}
 							break;
 						}
@@ -519,8 +574,14 @@ 
 		}
 		unset($links);
 
-		if ($query['cat_id']) $rows['no_cat_id'] = true;
-		if ($query['no_actions']) $rows['no_actions'] = true;
+		if ($query['cat_id'])
+		{
+			$rows['no_cat_id'] = true;
+		}
+		if ($query['no_actions'])
+		{
+			$rows['no_actions'] = true;
+		}
 		$rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
 		if($clear_status_filter)
 		{
@@ -528,7 +589,10 @@ 
 		}
 
 		// switch cf column off, if we have no cf's
-		if (!$query['custom_fields']) $rows['no_customfields'] = true;
+		if (!$query['custom_fields'])
+		{
+			$rows['no_customfields'] = true;
+		}
 
 		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'none' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']))
@@ -560,7 +624,11 @@ 
 			}
 		}
 
-		if (isset($linked)) $query['col_filter']['linked'] = $linked;  // add linked back to the colfilter
+		if (isset($linked))
+		{
+			$query['col_filter']['linked'] = $linked;
+		}
+		// add linked back to the colfilter
 
 		return $query['total'];
 	}
@@ -577,7 +645,10 @@ 
 		$set = array();
 		if ((int)$data['id'] && ($info = $this->bo->read($data['id'])))
 		{
-			if ($info['info_cat']) $set['cat_id'] = $info['info_cat'];
+			if ($info['info_cat'])
+			{
+				$set['cat_id'] = $info['info_cat'];
+			}
 
 			foreach(egw_link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true) as $link)
 			{
@@ -615,7 +686,10 @@ 
 			'end'		=> $infolog['info_enddate'] ? $infolog['info_enddate'] : $infolog['info_datecompleted']
 		));
 		unset($event['entry_id']);
-		if (!$event['end']) $event['end'] = $event['start'] + (int) $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength']*60;
+		if (!$event['end'])
+		{
+			$event['end'] = $event['start'] + (int) $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength']*60;
+		}
 
 		// Match categories by name
 		$event['category'] = $GLOBALS['egw']->categories->name2id(categories::id2name($infolog['info_cat']));
@@ -674,7 +748,10 @@ 
 		// Copy same custom fields
 		foreach(array_keys(config::get_customfields('calendar')) as $name)
 		{
-			if ($this->bo->customfields[$name]) $event['#'.$name] = $infolog['#'.$name];
+			if ($this->bo->customfields[$name])
+			{
+				$event['#'.$name] = $infolog['#'.$name];
+			}
 		}
 		//error_log(__METHOD__.'('.array2string($data).') infolog='.array2string($infolog).' returning '.array2string($event));
 		return $event;
@@ -824,13 +901,19 @@ 
 				$values['nm']['sort'] = 'DESC';
 			}
 
-			if (!$values['nm']['session_for'] && $this->called_by) $values['nm']['session_for'] = $this->called_by;
+			if (!$values['nm']['session_for'] && $this->called_by)
+			{
+				$values['nm']['session_for'] = $this->called_by;
+			}
 
 			$action_id = $values['action_id'] = $action ? $action_id : $nm['action_id'];
 			$action_title = $values['action_title'] = $action ? $action_title : $nm['action_title'];
 			$action = $values['action'] = $action ? $action : $nm['action'];
 		}
-		if($_GET['search']) $values['nm']['search'] = $_GET['search'];
+		if($_GET['search'])
+		{
+			$values['nm']['search'] = $_GET['search'];
+		}
 
 		if ($values['nm']['add'])
 		{
@@ -880,7 +963,10 @@ 
 		switch ($action)
 		{
 			case 'sp':
-				if (!is_array($action_id) && strpos($action_id, 'infolog:') === 0) $action_id = (int)substr($action_id, 8);
+				if (!is_array($action_id) && strpos($action_id, 'infolog:') === 0)
+				{
+					$action_id = (int)substr($action_id, 8);
+				}
 				if ((is_array($action_id) && !$this->bo->read(current($action_id))) || !$this->bo->read($action_id))
 				{
 					$action = '';
@@ -927,7 +1013,10 @@ 
 		// Allow add actions even when there's no rows
 		$values['nm']['placeholder_actions'] = array('new');
 
-		if(!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
+		if(!isset($values['nm']['filter2']))
+		{
+			$values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
+		}
 
 		// disable columns for main entry as set in the pref for details or no details
 		$values['nm']['columnselection_pref'] = 'nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows')
@@ -953,7 +1042,10 @@ 
 		{
 			foreach (array_keys($values['nm']['col_filter']) as $colfk)
 			{
-				if (is_int($colfk)) unset($values['nm']['col_filter']);
+				if (is_int($colfk))
+				{
+					unset($values['nm']['col_filter']);
+				}
 			}
 		}
 		$values['action'] = $persist['action'] = $values['nm']['action'] = $action;
@@ -996,7 +1088,10 @@ 
 		// does not take implicit rights as delegated into account, so they will not be available as filters
 		foreach($this->bo->group_owners as $type => $group)
 		{
-			if (!isset($this->bo->grants[$group])) unset($sel_options['info_type'][$type]);
+			if (!isset($this->bo->grants[$group]))
+			{
+				unset($sel_options['info_type'][$type]);
+			}
 		}
 
 
@@ -1045,7 +1140,11 @@ 
 		unset($types['delete']);
 		foreach($types as $type => &$data)
 		{
-			if ($type=='email') continue;//requirement by sales that it should not be shown in right - click - action dialog
+			if ($type=='email')
+			{
+				continue;
+			}
+			//requirement by sales that it should not be shown in right - click - action dialog
 			$data = array(
 				'caption' => $data,
 				'icon' => $type,
@@ -1345,7 +1444,10 @@ 
 				return $failed == 0;
 
 			case 'document':
-				if (!$settings) $settings = $this->prefs['default_document'];
+				if (!$settings)
+				{
+					$settings = $this->prefs['default_document'];
+				}
 				$document_merge = new infolog_merge();
 				$msg = $document_merge->download($settings, $checked, '', $this->prefs['document_dir']);
 				$failed = count($checked);
@@ -1531,11 +1633,16 @@ 
 			#_debug_array($info);
 			$status = $info['info_status'];
 			// closed stati assumed array('done','billed','cancelled')
-			if (isset($this->bo->status[$info['info_type']]['done'])) {
+			if (isset($this->bo->status[$info['info_type']]['done']))
+			{
 				$status ='done';
-			} elseif (isset($this->bo->status[$info['info_type']]['billed'])) {
+			}
+			elseif (isset($this->bo->status[$info['info_type']]['billed']))
+			{
 				$status ='billed';
-			} elseif (isset($this->bo->status[$info['info_type']]['cancelled'])) {
+			}
+			elseif (isset($this->bo->status[$info['info_type']]['cancelled']))
+			{
 				$status ='cancelled';
 			}
 			#_debug_array($status);
@@ -1549,17 +1656,25 @@ 
 			$this->bo->write($values, true,true,true,$skip_notification);
 
 			$query = array('action'=>'sp','action_id'=>$info_id);
-			if (!$closesingle) {
+			if (!$closesingle)
+			{
 				foreach((array)$this->bo->search($query) as $info)
 				{
-					if ($info['info_id_parent'] == $info_id)	// search also returns linked entries!
+					if ($info['info_id_parent'] == $info_id)
+					{
+						// search also returns linked entries!
 					{
-						$this->close($info['info_id'],$referer,$closesingle,$skip_notification);	// we call ourselfs recursive to process subs from subs too
+						$this->close($info['info_id'],$referer,$closesingle,$skip_notification);
+					}
+					// we call ourselfs recursive to process subs from subs too
 					}
 				}
 			}
 		}
-		if ($referer) $this->tmpl->location($referer);
+		if ($referer)
+		{
+			$this->tmpl->location($referer);
+		}
 	}
 
 	/**
@@ -1575,10 +1690,13 @@ 
 		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $_referer;
 
-		if (!is_array($values) && $info_id > 0 && !$this->bo->anzSubs($info_id))	// entries without subs get confirmed by javascript
+		if (!is_array($values) && $info_id > 0 && !$this->bo->anzSubs($info_id))
+		{
+			// entries without subs get confirmed by javascript
 		{
 			$values = array('delete' => true);
 		}
+		}
 		//echo "<p>infolog_ui::delete(".print_r($values,true).",'$referer','$called_by') info_id=$info_id</p>\n";
 
 		if (is_array($values) || $info_id <= 0)
@@ -1587,11 +1705,16 @@ 
 			{
 				$deleted = $this->bo->delete($info_id,$values['delete_subs'],$values['info_id_parent'], $skip_notification);
 			}
-			if ($called_by)		// direct call from the same request
+			if ($called_by)
+			{
+				// direct call from the same request
 			{
 				return $deleted ? lang('InfoLog entry deleted') : '';
 			}
-			if ($values['called_by'] == 'edit')	// we run in the edit popup => give control back to edit
+			}
+			if ($values['called_by'] == 'edit')
+			{
+				// we run in the edit popup => give control back to edit
 			{
 				$this->edit(array(
 					'info_id' => $info_id,
@@ -1600,6 +1723,7 @@ 
 					'msg'     => $deleted ? lang('Infolog entry deleted') : '',
 				));
 			}
+			}
 			return $referer ? $this->tmpl->location($referer) : $this->index();
 		}
 		$readonlys = $values = array();
@@ -1648,10 +1772,17 @@ 
 			$no_popup  = $content['no_popup'];  unset($content['no_popup']);
 
 			list($button) = @each($content['button']);
-			if (!$button && $action) $button = $action;	// action selectbox
+			if (!$button && $action)
+			{
+				$button = $action;
+			}
+			// action selectbox
 			//info_cc expects an comma separated string
 			//error_log(__METHOD__.__LINE__.array2string($content));
-			if (empty($content['info_cc'])) $content['info_cc'] = "";
+			if (empty($content['info_cc']))
+			{
+				$content['info_cc'] = "";
+			}
 			if (is_array($content['info_cc']))
 			{
 				foreach($content['info_cc'] as $i => $value)
@@ -1661,7 +1792,10 @@ 
 					//error_log(__METHOD__.__LINE__.$value.'->'.array2string($addresses[0]));
 					$content['info_cc'][$i]=$addresses[0]->host ? $addresses[0]->mailbox.'@'.$addresses[0]->host : $addresses[0]->mailbox;
 				}
-				if (!empty($content['info_cc'])) $content['info_cc'] = implode(',',$content['info_cc']);
+				if (!empty($content['info_cc']))
+				{
+					$content['info_cc'] = implode(',',$content['info_cc']);
+				}
 			}
 			unset($content['button']);
 			if ($button)
@@ -1800,9 +1934,12 @@ 
 						egw_link::link('infolog',$info_id,$content['link_to']['to_id']);
 						$content['link_to']['to_id'] = $info_id;
 					}
-					if ($info_link_id && strpos($info_link_id,':') !== false)	// updating info_link_id if necessary
+					if ($info_link_id && strpos($info_link_id,':') !== false)
+					{
+						// updating info_link_id if necessary
 					{
 						list($app,$id) = explode(':',$info_link_id);
+					}
 						$link = egw_link::get_link('infolog',$info_id,$app,$id);
 						if ((int) $content['info_link_id'] != (int) $link['link_id'])
 						{
@@ -1824,12 +1961,19 @@ 
 				}
 				elseif ($button == 'delete' && $info_id > 0)
 				{
-					if (!$referer && $action) $referer = array(
+					if (!$referer && $action)
+					{
+						$referer = array(
 						'menuaction' => 'infolog.infolog_ui.index',
 						'action' => $action,
 						'action_id' => $action_id
 					);
-					if (!($content['msg'] = $this->delete($info_id,$referer,'edit'))) return;	// checks ACL first
+					}
+					if (!($content['msg'] = $this->delete($info_id,$referer,'edit')))
+					{
+						return;
+					}
+					// checks ACL first
 
 					egw_framework::refresh_opener($content['msg'],'infolog',$info_id,'delete');
 				}
@@ -1879,13 +2023,20 @@ 
 			$type      = $type      ? $type      : get_var('type',     array('POST','GET'));
 			$referer   = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] :
 				common::get_referer('/index.php?menuaction=infolog.infolog_ui.index'));
-			if (strpos($referer, 'msg=') !== false) $referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer);	// remove previou/old msg from referer
+			if (strpos($referer, 'msg=') !== false)
+			{
+				$referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer);
+			}
+			// remove previou/old msg from referer
 			$no_popup  = $_GET['no_popup'];
 			$print = (int) $_REQUEST['print'];
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
 
 			$content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id );
-			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false) $content['info_addr'] = str_replace(',',', ',$content['info_addr']);
+			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false)
+			{
+				$content['info_addr'] = str_replace(',',', ',$content['info_addr']);
+			}
 			foreach(array('info_subject', 'info_des') as $key)
 			{
 				if(!isset($content[$key]) || strlen($content[$key]) < 75)
@@ -1909,10 +2060,16 @@ 
 						if (strlen($word)>75)
 						{
 							$buff = html::activate_links($word);
-							if (strlen($buff) == strlen($word)) // no links -> try to break overlong words
+							if (strlen($buff) == strlen($word))
+							{
+								// no links -> try to break overlong words
 							{
 								if (!(strpos($word,',')===false) && strpos($word,', ')===false) $word = str_replace(',',', ',$word);
-								if (!(strpos($word,'.')===false) && strpos($word,'. ')===false) $word = str_replace('.','. ',$word);
+							}
+								if (!(strpos($word,'.')===false) && strpos($word,'. ')===false)
+								{
+									$word = str_replace('.','. ',$word);
+								}
 								$word = wordwrap($word, 75, ' ', true);
 							}
 						}
@@ -1933,7 +2090,11 @@ 
 			{
 				$content['info_cat'] = $this->prefs['cat_add_default'];
 			}
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg'])
+			{
+				$content['msg'] = strip_tags($_GET['msg']);
+			}
+			// dont allow HTML!
 
 			switch($this->prefs['set_start'])
 			{
@@ -1944,13 +2105,19 @@ 
 			if ((int)$content['info_link_id'] > 0 && !egw_link::get_link($content['info_link_id']))
 			{
 				$content['info_link_id'] = 0;	// link has been deleted
-				if (!$content['info_custom_link']) $content['info_from'] = '';
+				if (!$content['info_custom_link'])
+				{
+					$content['info_from'] = '';
+				}
 			}
-			if (!$info_id && $action_id && $action == 'sp')    // new SubProject
+			if (!$info_id && $action_id && $action == 'sp')
+			{
+				// new SubProject
 			{
 				if (!$this->bo->check_access($action_id,EGW_ACL_ADD))
 				{
 					return $referer ? $this->tmpl->location($referer) : $this->index(0,$action,$action_id);
+			}
 				}
 			}
 			else
@@ -1984,10 +2151,16 @@ 
 				case 'copy':
 					$info_id = 0;
 					$this->create_copy($content, $action == 'sp');
-					if ($action == 'sp')	// for sub-entries use type or category, like for new entries
+					if ($action == 'sp')
+					{
+						// for sub-entries use type or category, like for new entries
 					{
 						if ($type) $content['info_type'] = $type;
-						if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int) $_REQUEST['cat_id'];
+					}
+						if (is_numeric($_REQUEST['cat_id']))
+						{
+							$content['info_cat'] = (int) $_REQUEST['cat_id'];
+						}
 					}
 					unset($action);	// it get stored in $content and will cause an other copy after [apply]
 					break;
@@ -2016,7 +2189,10 @@ 
 						{
 							foreach((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) egw_link::link('infolog',$content['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id=$set['link_id'][$i]))
+								{
+									egw_link::link('infolog',$content['link_to']['to_id'],$l_app,$l_id);
+								}
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
@@ -2035,8 +2211,15 @@ 
 						break;	// normal edit
 					}
 				case 'new':		// new entry, set some defaults, if not set by infolog_set hook
-					if (empty($content['info_startdate'])) $content['info_startdate'] = (int) $_GET['startdate'] ? (int) $_GET['startdate'] : $set_startdate;
-					if (empty($content['info_priority'])) $content['info_priority'] = 1; // normal
+					if (empty($content['info_startdate']))
+					{
+						$content['info_startdate'] = (int) $_GET['startdate'] ? (int) $_GET['startdate'] : $set_startdate;
+					}
+					if (empty($content['info_priority']))
+					{
+						$content['info_priority'] = 1;
+					}
+					// normal
 					$content['info_owner'] = $this->user;
 					if ($type != '' && empty($content['info_type']))
 					{
@@ -2046,8 +2229,14 @@ 
 					{
 						$content['info_type'] = $GLOBALS['egw_info']['user']['preferences']['infolog']['preferred_type'];
 					}
-					if (empty($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
-					if (empty($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+					if (empty($content['info_status']))
+					{
+						$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
+					}
+					if (empty($content['info_percent']))
+					{
+						$content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+					}
 					break;
 			}
 			if (!isset($this->bo->enums['type'][$content['info_type']]))
@@ -2150,12 +2339,18 @@ 
 
 		$content['duration_format'] = $this->duration_format;
 		$content['hours_per_workday'] = $this->hours_per_workday;
-		if ($this->prefs['show_id']) $content['info_number'] = $info_id;
+		if ($this->prefs['show_id'])
+		{
+			$content['info_number'] = $info_id;
+		}
 
 		$content['info_anz_subs'] = (int)$content['info_anz_subs'];	// gives javascript error if empty!
 
 		$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $content['old_pm_id'];
-		if (!isset($content['pm_id']) && $old_pm_id) $content['pm_id'] = $old_pm_id;
+		if (!isset($content['pm_id']) && $old_pm_id)
+		{
+			$content['pm_id'] = $old_pm_id;
+		}
 
 		if ($info_id && $this->bo->history)
 		{
@@ -2225,7 +2420,10 @@ 
 		//$content['info_des'] = substr($content['info_des'],0,1793);
 		//echo "<p>infolog_ui.edit(info_id='$info_id',action='$action',action_id='$action_id') readonlys="; print_r($readonlys); echo ", content = "; _debug_array($content);
 		//$content['info_cc'] is expected (by the widget) to be an array of emailaddresses, but is stored as comma separated string
-		if (!empty($content['info_cc'])&&!is_array($content['info_cc']))$content['info_cc'] = explode(',',$content['info_cc']);
+		if (!empty($content['info_cc'])&&!is_array($content['info_cc']))
+		{
+			$content['info_cc'] = explode(',',$content['info_cc']);
+		}
 		$this->tmpl->exec('infolog.infolog_ui.edit',$content,$sel_options,$readonlys,$preserv+array(	// preserved values
 			'info_id'       => $info_id,
 			'action'        => $action,
@@ -2253,7 +2451,11 @@ 
 		foreach ($exclude_fields as $field)
 		{
 			unset($content[$field]);
-			if ($field == 'info_from') unset($content['info_link_id']);	// both together is called contact in UI
+			if ($field == 'info_from')
+			{
+				unset($content['info_link_id']);
+			}
+			// both together is called contact in UI
 		}
 		if ($create_sub)
 		{
@@ -2281,13 +2483,25 @@ 
 			$content['info_type'] = $types[0];
 		}
 		// get a consistent status, percent and date-completed
-		if (!isset($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
-		if (!isset($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+		if (!isset($content['info_status']))
+		{
+			$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
+		}
+		if (!isset($content['info_percent']))
+		{
+			$content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
+		}
 		$content['info_datecompleted'] =$content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
 
-		if (!isset($content['info_cat'])) $content['info_cat'] = $this->prefs['cat_add_default'];
+		if (!isset($content['info_cat']))
+		{
+			$content['info_cat'] = $this->prefs['cat_add_default'];
+		}
 
-		if(!is_array($content['link_to'])) $content['link_to'] = array();
+		if(!is_array($content['link_to']))
+		{
+			$content['link_to'] = array();
+		}
 		$content['link_to']['to_app'] = 'infolog';
 		$content['link_to']['to_id'] = 0;
 		// Get links to be copied, if not excluded
@@ -2318,7 +2532,10 @@ 
 			{
 				$linkinfos = egw_link::get_link($info_link_id);
 				$content['info_contact'] = $linkinfos['link_app1']=='infolog'? $linkinfos['link_app2'].':'.$linkinfos['link_id2']:$linkinfos['link_app1'].':'.$linkinfos['link_id1'];
-				if (stripos($content['info_contact'],'projectmanager')!==false) $content['pm_id'] = $linkinfos['link_app1']=='projectmanager'? $linkinfos['link_id1']:$linkinfos['link_id2'];
+				if (stripos($content['info_contact'],'projectmanager')!==false)
+				{
+					$content['pm_id'] = $linkinfos['link_app1']=='projectmanager'? $linkinfos['link_id1']:$linkinfos['link_id2'];
+				}
 			}
 			unset($content['info_link_id']);
 		}
@@ -2646,7 +2863,10 @@ 
 		}
 		foreach($this->bo->customfields as $name => $data)
 		{
-			if ($data['type2'] && $type && !in_array($type,explode(',',$data['type2']))) continue;
+			if ($data['type2'] && $type && !in_array($type,explode(',',$data['type2'])))
+			{
+				continue;
+			}
 
 			$fields['#'.$name] = array(
 				'label' => $data['label'],

Spacing +360 added lines, -364 removed lines

@@ -48,32 +48,32 @@ 
 	 *
 	 * @var string
 	 */
-	var $duration_format = ',';	// comma is necessary!
+	var $duration_format = ','; // comma is necessary!
 
 	var $icons = array(
 		'type' => array(
-			'task'      => 'task.gif',      'task_alt'      => 'Task',
-			'phone'     => 'phone.gif',     'phone_alt'     => 'Phonecall',
-			'note'      => 'note.gif',      'note_alt'      => 'Note',
-			'confirm'   => 'confirm.gif',   'confirm_alt'   => 'Confirmation',
-			'reject'    => 'reject.gif',    'reject_alt'    => 'Reject',
-			'email'     => 'email.gif',     'email_alt'     => 'Email' ),
+			'task'      => 'task.gif', 'task_alt'      => 'Task',
+			'phone'     => 'phone.gif', 'phone_alt'     => 'Phonecall',
+			'note'      => 'note.gif', 'note_alt'      => 'Note',
+			'confirm'   => 'confirm.gif', 'confirm_alt'   => 'Confirmation',
+			'reject'    => 'reject.gif', 'reject_alt'    => 'Reject',
+			'email'     => 'email.gif', 'email_alt'     => 'Email' ),
 		'action' => array(
-			'new'       => 'new.gif',       'new_alt'       => 'Add Sub',
-			'view'      => 'view.gif',      'view_alt'      => 'View Subs',
-			'parent'    => 'parent.gif',    'parent_alt'    => 'View other Subs',
-			'edit'      => 'edit.gif',      'edit_alt'      => 'Edit',
-			'addfile'   => 'addfile.gif',   'addfile_alt'   => 'Add a file',
-			'delete'    => 'delete.gif',    'delete_alt'    => 'Delete',
-			'close'     => 'done.gif',      'close_alt'     => 'Close' ,
-			'close_all' => 'done_all.gif',  'close_all_alt' => 'Close' ),
+			'new'       => 'new.gif', 'new_alt'       => 'Add Sub',
+			'view'      => 'view.gif', 'view_alt'      => 'View Subs',
+			'parent'    => 'parent.gif', 'parent_alt'    => 'View other Subs',
+			'edit'      => 'edit.gif', 'edit_alt'      => 'Edit',
+			'addfile'   => 'addfile.gif', 'addfile_alt'   => 'Add a file',
+			'delete'    => 'delete.gif', 'delete_alt'    => 'Delete',
+			'close'     => 'done.gif', 'close_alt'     => 'Close',
+			'close_all' => 'done_all.gif', 'close_all_alt' => 'Close' ),
 		'status' => array(
-			'billed'    => 'billed.gif',    'billed_alt'    => 'billed',
-			'done'      => 'done.gif',      'done_alt'      => 'done',
+			'billed'    => 'billed.gif', 'billed_alt'    => 'billed',
+			'done'      => 'done.gif', 'done_alt'      => 'done',
 			'will-call' => 'will-call.gif', 'will-call_alt' => 'will-call',
-			'call'      => 'call.gif',      'call_alt'      => 'call',
-			'ongoing'   => 'ongoing.gif',   'ongoing_alt'   => 'ongoing',
-			'offer'     => 'offer.gif',     'offer_alt'     => 'offer' )
+			'call'      => 'call.gif', 'call_alt'      => 'call',
+			'ongoing'   => 'ongoing.gif', 'ongoing_alt'   => 'ongoing',
+			'offer'     => 'offer.gif', 'offer_alt'     => 'offer' )
 	);
 	var $filters;
 	var $messages = array(
@@ -93,7 +93,7 @@ 
 		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog') translation::add_app('infolog');
 
 		// Make sure Global category is infolog - on first load, it may not be
-		if($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
+		if ($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
 		{
 			$GLOBALS['egw']->categories = new categories();
 		}
@@ -104,18 +104,18 @@ 
 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
-		$this->prefs =& $GLOBALS['egw_info']['user']['preferences']['infolog'];
+		$this->prefs = & $GLOBALS['egw_info']['user']['preferences']['infolog'];
 
 		// read the duration format from project-manager
 		if ($GLOBALS['egw_info']['apps']['projectmanager'])
 		{
 			$pm_config = config::read('projectmanager');
-			$this->duration_format = str_replace(',','',implode('', (array)$pm_config['duration_units']));
+			$this->duration_format = str_replace(',', '', implode('', (array)$pm_config['duration_units']));
 			//error_log(__METHOD__."() ".__LINE__." duration_format=$this->duration_format, duration_unit=".array2string($pm_config['duration_units']));
 			$this->hours_per_workday = $pm_config['hours_per_workday'];
 			unset($pm_config);
 		}
-		$this->filters =& $this->bo->filters;
+		$this->filters = & $this->bo->filters;
 		/* these are just for testing of the notifications
 		for($i = -1; $i <= 3; ++$i)
 		{
@@ -134,12 +134,12 @@ 
 			$this->filters['responsible-open-date'.date('Y-m-d',time()+$i*24*60*60)] = "responsible starting in $i day(s)";
 		}
 		*/
-		$GLOBALS['infolog_ui'] =& $this;	// make ourself availible for ExecMethod of get_rows function
+		$GLOBALS['infolog_ui'] = & $this; // make ourself availible for ExecMethod of get_rows function
 
 		// can be removed for next release / infolog update
-		if (!$GLOBALS['egw']->hooks->hook_exists('calendar_set','infolog'))
+		if (!$GLOBALS['egw']->hooks->hook_exists('calendar_set', 'infolog'))
 		{
-			$GLOBALS['egw']->hooks->register_single_app_hook('infolog','calendar_set');
+			$GLOBALS['egw']->hooks->register_single_app_hook('infolog', 'calendar_set');
 		}
 	}
 
@@ -154,7 +154,7 @@ 
 	 * @param int $details
 	 * @return array
 	 */
-	function get_info($info,&$readonlys,$action='',$action_id='',$show_links=false,$details = 1)
+	function get_info($info, &$readonlys, $action = '', $action_id = '', $show_links = false, $details = 1)
 	{
 		if (!is_array($info))
 		{
@@ -164,19 +164,19 @@ 
 		$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed' || $info['info_status'] == 'cancelled'; //cancelled is regarded as a completed status as well in bo
 		// regard an infolog as done/billed/cancelled if its percentage is 100% when there is to status like the above for that type
 		if (!$done && !isset($this->bo->status[$info['info_type']]['done']) && !isset($this->bo->status[$info['info_type']]['billed']) &&
-			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent']==100) $done = true ;
-		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : '');
+			!isset($this->bo->status[$info['info_type']]['cancelled']) && (int)$info['info_percent'] == 100) $done = true;
+		$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']].($done ? '_done' : '');
 		if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
 		{
 			$info['end_class'] = 'infolog_overdue';
 		}
 		if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id);
-		$this->bo->link_id2from($info,$action,$action_id);	// unset from for $action:$action_id
-		$info['info_percent'] = (int) $info['info_percent'].'%';
-		$editrights = $this->bo->check_access($info,EGW_ACL_EDIT);
+		$this->bo->link_id2from($info, $action, $action_id); // unset from for $action:$action_id
+		$info['info_percent'] = (int)$info['info_percent'].'%';
+		$editrights = $this->bo->check_access($info, EGW_ACL_EDIT);
 		$isresposible = $this->bo->is_responsible($info);
 		if ((!($editrights || // edit rights or more then standard responsible rights
-			$isresposible && array_diff($this->bo->responsible_edit,array('info_status','info_percent','info_datecompleted')))))
+			$isresposible && array_diff($this->bo->responsible_edit, array('info_status', 'info_percent', 'info_datecompleted')))))
 		{
 			$info['class'] .= 'rowNoEdit ';
 		}
@@ -195,11 +195,11 @@ 
 		{
 			$info['class'] .= 'rowNoCloseAll ';
 		}
-		if (!$this->bo->check_access($info,EGW_ACL_DELETE))
+		if (!$this->bo->check_access($info, EGW_ACL_DELETE))
 		{
 			$info['class'] .= 'rowNoDelete ';
 		}
-		if (!$this->bo->check_access($info,EGW_ACL_ADD))
+		if (!$this->bo->check_access($info, EGW_ACL_ADD))
 		{
 			$info['class'] .= 'rowNoSubs ';
 		}
@@ -211,7 +211,7 @@ 
 		if (!$show_links) $show_links = $this->prefs['show_links'];
 		if (($show_links != 'none' && $show_links != 'no_describtion' ||
 			 $this->prefs['show_times'] || isset($GLOBALS['egw_info']['user']['apps']['timesheet'])) &&
-			(isset($info['links']) || ($info['links'] = egw_link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true,true))))
+			(isset($info['links']) || ($info['links'] = egw_link::get_links('infolog', $info['info_id'], '', 'link_lastmod DESC', true, true))))
 		{
 			$timesheets = array();
 			foreach ($info['links'] as $link)
@@ -220,7 +220,7 @@ 
 				$link_mod = egw_time::server2user($link['lastmod']);
 				if ($info['row_mod'] < $link_mod) $info['row_mod'] = $link_mod;
 
-				if ($link['deleted']) continue;	// skip deleted links, but incl. them in row_mod!
+				if ($link['deleted']) continue; // skip deleted links, but incl. them in row_mod!
 
 				if ($show_links != 'none' && $show_links != 'no_describtion' &&
 					$link['link_id'] != $info['info_link_id'] &&
@@ -237,7 +237,7 @@ 
 			}
 			if ($this->prefs['show_times'] && isset($GLOBALS['egw_info']['user']['apps']['timesheet']) && $timesheets)
 			{
-				$sum = ExecMethod('timesheet.timesheet_bo.sum',$timesheets);
+				$sum = ExecMethod('timesheet.timesheet_bo.sum', $timesheets);
 				$info['info_sum_timesheets'] = $sum['duration'];
 				// incl. max timesheet modification in row_mod
 				if ($info['row_mod'] < $sum['max_modified']) $info['row_mod'] = $sum['max_modified'];
@@ -255,7 +255,7 @@ 
 			}
 			$readonlys["edit_percent[$id]"] = true;
 		}
-		elseif($readonlys["edit_percent[$id]"])	// show percent, but button is switched off
+		elseif ($readonlys["edit_percent[$id]"])	// show percent, but button is switched off
 		{
 			$info['info_percent2'] = $info['info_percent'];
 		}
@@ -276,7 +276,7 @@ 
 	protected static function filter(array $query)
 	{
 		$filter = $query['filter'] ? 'filter' : ($query['cat_id'] ? 'cat_id' : null);
-		foreach((array)$query['col_filter'] as $name => $value)
+		foreach ((array)$query['col_filter'] as $name => $value)
 		{
 			if ((string)$value !== '')
 			{
@@ -296,7 +296,7 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	function get_rows(&$query,&$rows,&$readonlys)
+	function get_rows(&$query, &$rows, &$readonlys)
 	{
 		//error_log(__METHOD__."() query[csv_export]=".array2string($query['csv_export']).", query[filter]=".array2string($query['filter']).", query[col_filter]=".array2string(array_diff($query['col_filter'],array('',0))).' '.function_backtrace());
 		if (!$query['csv_export'])
@@ -313,7 +313,7 @@ 
 			}
 			//error_log(__METHOD__."() prefs[listNoSubs]=".array2string($this->prefs['listNoSubs'])." --> parent_id=$parent_id");
 			unset($query['col_filter']['parent_id']);
-			if(!$query['action'])
+			if (!$query['action'])
 			{
 				egw_cache::setSession('infolog', $query['session_for'].'session_data', $query);
 			}
@@ -322,10 +322,10 @@ 
 			$query['row_modified'] = 'row_mod';
 			$query['parent_id'] = 'info_id_parent';
 			$query['is_parent'] = 'info_anz_subs';
-			$query['action_var'] = 'multi_action';	// as 'action' is already used in infolog
+			$query['action_var'] = 'multi_action'; // as 'action' is already used in infolog
 		}
 		// nextmatch opened an infolog containing children --> do not filter them, always show all children
-		elseif($query['csv_export'] === 'children')
+		elseif ($query['csv_export'] === 'children')
 		{
 			$query['filter'] = $query['search'] = $query['cat_id'] = '';
 			$query['col_filter'] = array('info_id_parent' => $query['col_filter']['info_id_parent']);
@@ -345,17 +345,17 @@ 
 			$links['linked'] = array();
 			unset($query['col_filter']['linked']);
 		}
-		if($query['action'] && in_array($query['action'], array_keys($GLOBALS['egw_info']['apps'])) && $query['action_id'])
+		if ($query['action'] && in_array($query['action'], array_keys($GLOBALS['egw_info']['apps'])) && $query['action_id'])
 		{
 			$link_filters['action'] = array('app'=>$query['action'], 'id' => $query['action_id']);
 			$links['action'] = array();
 		}
-		foreach($link_filters as $key => $link)
+		foreach ($link_filters as $key => $link)
 		{
-			if(!is_array($link))
+			if (!is_array($link))
 			{
 				// Legacy string style
-				list($app,$id) = explode(':',$link);
+				list($app, $id) = explode(':', $link);
 			}
 			else
 			{
@@ -363,25 +363,25 @@ 
 				$app = $link['app'];
 				$id = $link['id'];
 			}
-			if(!is_array($id)) $id = explode(',',$id);
-			if (!($linked = egw_link::get_links_multiple($app,$id,true,'infolog','',$query['col_filter']['info_status'] == 'deleted')))
+			if (!is_array($id)) $id = explode(',', $id);
+			if (!($linked = egw_link::get_links_multiple($app, $id, true, 'infolog', '', $query['col_filter']['info_status'] == 'deleted')))
 			{
-				$rows = array();	// no infologs linked to selected link --> no rows to return
+				$rows = array(); // no infologs linked to selected link --> no rows to return
 				return 0;
 			}
 
 
-			foreach($linked as $infos)
+			foreach ($linked as $infos)
 			{
-				$links[$key] = array_merge($links[$key],$infos);
+				$links[$key] = array_merge($links[$key], $infos);
 			}
 			$links[$key] = array_unique($links[$key]);
-			if($key == 'linked')
+			if ($key == 'linked')
 			{
 				$linked = array('app' => $app, 'id' => $id, 'title' => (count($id) == 1 ? egw_link::title($app, $id) : lang('multiple')));
 			}
 		}
-		if(count($links))
+		if (count($links))
 		{
 			$query['col_filter']['info_id'] = count($links) > 1 ? call_user_func_array('array_intersect', $links) : $links[$key];
 		}
@@ -390,7 +390,7 @@ 
 		$old_template = $query['template'];
 
 		// Reset custom, type-specific template if type was cleared (without changing it for home)
-		if(!$query['template'] || stripos($query['template'], 'infolog.index.rows') === 0)
+		if (!$query['template'] || stripos($query['template'], 'infolog.index.rows') === 0)
 		{
 			$query['template'] = 'infolog.index.rows';
 		}
@@ -401,10 +401,10 @@ 
 			if ($tpl->read('infolog.index.rows.'.$query['col_filter']['info_type']))
 			{
 				$query['template'] = $tpl->name;
-				$query['custom_fields'] = true;	// read the custom fields too
+				$query['custom_fields'] = true; // read the custom fields too
 			}
 			// If status is not valid for selected type, clear status filter
-			if($query['col_filter']['info_status'] && $query['col_filter']['info_status'] != 'deleted' &&
+			if ($query['col_filter']['info_status'] && $query['col_filter']['info_status'] != 'deleted' &&
 				!in_array($query['col_filter']['info_status'], array_keys($this->bo->status[$query['col_filter']['info_type']])))
 			{
 				$query['col_filter']['info_status'] = '';
@@ -412,7 +412,7 @@ 
 			}
 		}
 		// Template change forces the UI to do a full update first, no point in getting rows right now
-		if($old_template && $old_template != $query['template']) return 0;
+		if ($old_template && $old_template != $query['template']) return 0;
 
 		// do we need to read the custom fields, depends on the column is enabled and customfields exist, prefs are filter specific
 		// so we have to check that as well
@@ -425,14 +425,14 @@ 
 
 		if (!$query['selectcols'] && $columselection)
 		{
-			$columselection = is_array($columselection) ? $columselection : explode(',',$columselection);
+			$columselection = is_array($columselection) ? $columselection : explode(',', $columselection);
 		}
 		else
 		{
-			$columselection = $query['selectcols'] ? (is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols'])) : array();
+			$columselection = $query['selectcols'] ? (is_array($query['selectcols']) ? $query['selectcols'] : explode(',', $query['selectcols'])) : array();
 		}
 		// do we need to query the cf's
-		$query['custom_fields'] = $this->bo->customfields && (!$columselection || in_array('customfields',$columselection));
+		$query['custom_fields'] = $this->bo->customfields && (!$columselection || in_array('customfields', $columselection));
 
 		$infos = $this->bo->search($query);
 		$query['col_filter'] = $orginal_colfilter;
@@ -450,12 +450,12 @@ 
 			$query['default_cols'] = '!cat_id,info_datemodified,info_used_time_info_planned_time,info_used_time_info_planned_time_info_replanned_time,info_id';
 		}
 		// set old show_times pref, that get_info calculates the cumulated time of the timesheets (we only check used&planned to work for both time cols)
-		$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection_pref']],'info_used_time_info_planned_time') !== false;
+		$this->prefs['show_times'] = strpos($this->prefs[$query['columnselection_pref']], 'info_used_time_info_planned_time') !== false;
 
 		// query all links and sub counts in one go
 		if ($infos && (!$query['csv_export'] || !is_array($query['csv_export'])))
 		{
-			$links = egw_link::get_links_multiple('infolog',array_keys($infos),true,'','link_lastmod DESC',true);	// true=incl. deleted
+			$links = egw_link::get_links_multiple('infolog', array_keys($infos), true, '', 'link_lastmod DESC', true); // true=incl. deleted
 			$anzSubs = $this->bo->anzSubs(array_keys($infos));
 		}
 		$rows = array();
@@ -466,27 +466,27 @@ 
 			$parents = $query['action'] == 'sp' && $query['action_id'] ? (array)$query['action_id'] : array();
 			if (count($parents) == 1 && is_array($query['action_id']))
 			{
-				$query['action_id'] = array_shift($query['action_id']);	// display single parent as app_header
+				$query['action_id'] = array_shift($query['action_id']); // display single parent as app_header
 			}
 		}
 
 		$parent_first = count($parents) == 1;
 		$parent_index = 0;
 		// et2 nextmatch listens to total, and only displays that many rows, so add parent in or we'll lose the last row
-		if($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
+		if ($parent_first || $query['action'] == 'sp' && is_array($query['action_id'])) $query['total']++;
 
 		// Check to see if we need to remove description
-		foreach($infos as $id => $info)
+		foreach ($infos as $id => $info)
 		{
-			if (!(strpos($info['info_addr'],',')===false) && strpos($info['info_addr'],', ')===false) $info['info_addr'] = str_replace(',',', ',$info['info_addr']);
+			if (!(strpos($info['info_addr'], ',') === false) && strpos($info['info_addr'], ', ') === false) $info['info_addr'] = str_replace(',', ', ', $info['info_addr']);
 			if (!$query['csv_export'] || !is_array($query['csv_export']))
 			{
-				$info['links'] =& $links[$id];
+				$info['links'] = & $links[$id];
 				$info['info_anz_subs'] = (int)$anzSubs[$id];
-				$info = $this->get_info($info,$readonlys,null,null,false,$details);
+				$info = $this->get_info($info, $readonlys, null, null, false, $details);
 			}
 			// for subs view ('sp') add parent(s) in front of subs once(!)
-			if ( $parent_first && ($main = $this->bo->read($query['action_id'])) ||
+			if ($parent_first && ($main = $this->bo->read($query['action_id'])) ||
 				$parents && ($parent_index = array_search($info['info_id_parent'], $parents)) !== false &&
 				($main = $this->bo->read($info['info_id_parent'])))
 			{
@@ -496,11 +496,11 @@ 
 				// as read() always read them all, while search() only reads the selected ones
 				if ($query['custom_fields'])
 				{
-					foreach($columselection as $col)
+					foreach ($columselection as $col)
 					{
 						if ($col[0] == '#')
 						{
-							foreach(array_keys($main) as $n)
+							foreach (array_keys($main) as $n)
 							{
 								if ($n[0] == '#' && !in_array($n, $columselection)) unset($main[$n]);
 							}
@@ -509,7 +509,7 @@ 
 					}
 				}
 				$parent_first = false;
-				if($query['start'] == 0)
+				if ($query['start'] == 0)
 				{
 					array_splice($rows, $id, 0, array($main));
 					unset($parents[$parent_index]);
@@ -522,7 +522,7 @@ 
 		if ($query['cat_id']) $rows['no_cat_id'] = true;
 		if ($query['no_actions']) $rows['no_actions'] = true;
 		$rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
-		if($clear_status_filter)
+		if ($clear_status_filter)
 		{
 			$rows['info_status'] = '';
 		}
@@ -554,13 +554,13 @@ 
 				$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang($this->filters[$query['filter']]);
 			}
 			if ($query['action'] && ($title = $query['action_title'] || is_array($query['action_id']) ?
-				$query['action_title'] : egw_link::title($query['action']=='sp'?'infolog':$query['action'],$query['action_id'])))
+				$query['action_title'] : egw_link::title($query['action'] == 'sp' ? 'infolog' : $query['action'], $query['action_id'])))
 			{
 				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$title;
 			}
 		}
 
-		if (isset($linked)) $query['col_filter']['linked'] = $linked;  // add linked back to the colfilter
+		if (isset($linked)) $query['col_filter']['linked'] = $linked; // add linked back to the colfilter
 
 		return $query['total'];
 	}
@@ -579,7 +579,7 @@ 
 		{
 			if ($info['info_cat']) $set['cat_id'] = $info['info_cat'];
 
-			foreach(egw_link::get_links('infolog',$info['info_id'],'','link_lastmod DESC',true) as $link)
+			foreach (egw_link::get_links('infolog', $info['info_id'], '', 'link_lastmod DESC', true) as $link)
 			{
 				if ($link['app'] != 'timesheet' && $link['app'] != egw_link::VFS_APPNAME)
 				{
@@ -604,7 +604,7 @@ 
 		{
 			return $data;
 		}
-		$event = array_merge($data,array(
+		$event = array_merge($data, array(
 			'category'	=> $GLOBALS['egw']->categories->check_list(EGW_ACL_READ, $infolog['info_cat']),
 			'priority'	=> $infolog['info_priority'] + 1,
 			'public'	=> $infolog['info_access'] != 'private',
@@ -615,7 +615,7 @@ 
 			'end'		=> $infolog['info_enddate'] ? $infolog['info_enddate'] : $infolog['info_datecompleted']
 		));
 		unset($event['entry_id']);
-		if (!$event['end']) $event['end'] = $event['start'] + (int) $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength']*60;
+		if (!$event['end']) $event['end'] = $event['start'] + (int)$GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength'] * 60;
 
 		// Match categories by name
 		$event['category'] = $GLOBALS['egw']->categories->name2id(categories::id2name($infolog['info_cat']));
@@ -624,38 +624,38 @@ 
 		$event['owner'] = $user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// add/modify participants according to prefs
-		$prefs = explode(',',$this->prefs['calendar_set'] ? $this->prefs['calendar_set'] : 'responsible,contact,user');
+		$prefs = explode(',', $this->prefs['calendar_set'] ? $this->prefs['calendar_set'] : 'responsible,contact,user');
 
 		// if no default participants (selected calendars) --> remove all
-		if (!in_array('selected',$prefs))
+		if (!in_array('selected', $prefs))
 		{
 			$event['participants'] = $event['participant_types'] = array();
 		}
 		// Add responsible as participant
-		if (in_array('responsible',$prefs))
+		if (in_array('responsible', $prefs))
 		{
-			foreach($infolog['info_responsible'] as $responsible)
+			foreach ($infolog['info_responsible'] as $responsible)
 			{
 				$event['participants'][$responsible] = $event['participant_types']['u'][$responsible] =
-					calendar_so::combine_status($user==$responsible?'A':'U');
+					calendar_so::combine_status($user == $responsible ? 'A' : 'U');
 			}
 		}
 		// Add linked contact as participant
-		if (in_array('contact',$prefs) && $infolog['info_link']['app'] == 'addressbook')
+		if (in_array('contact', $prefs) && $infolog['info_link']['app'] == 'addressbook')
 		{
-			$event['participants'][calendar_so::combine_user('c',$infolog['info_link']['id'])] =
+			$event['participants'][calendar_so::combine_user('c', $infolog['info_link']['id'])] =
 				$event['participant_types']['c'][$infolog['info_link']['id']] = calendar_so::combine_status('U');
 		}
-		if (in_array('owner',$prefs))
+		if (in_array('owner', $prefs))
 		{
 			$event['participants'][$infolog['info_owner']] = $event['participant_types']['u'][$infolog['info_owner']] =
-				calendar_so::combine_status('A',1,'CHAIR');
+				calendar_so::combine_status('A', 1, 'CHAIR');
 		}
 		// Add current user, if set or no other participants, which is not allowed
-		if (in_array('user',$prefs))
+		if (in_array('user', $prefs))
 		{
 			$event['participants'][$user] = $event['participant_types']['u'][$user] =
-				calendar_so::combine_status('A',1,'CHAIR');
+				calendar_so::combine_status('A', 1, 'CHAIR');
 		}
 
 		// Add infolog link to calendar entry
@@ -663,7 +663,7 @@ 
 		$event['link_id'][]  = $infolog['info_link']['id'];
 
 		// Copy infolog's links
-		foreach(egw_link::get_links('infolog',$infolog['info_id'],'','link_lastmod DESC',true) as $link)
+		foreach (egw_link::get_links('infolog', $infolog['info_id'], '', 'link_lastmod DESC', true) as $link)
 		{
 			if ($link['app'] != egw_link::VFS_APPNAME)
 			{
@@ -672,7 +672,7 @@ 
 			}
 		}
 		// Copy same custom fields
-		foreach(array_keys(config::get_customfields('calendar')) as $name)
+		foreach (array_keys(config::get_customfields('calendar')) as $name)
 		{
 			if ($this->bo->customfields[$name]) $event['#'.$name] = $infolog['#'.$name];
 		}
@@ -691,9 +691,9 @@ 
 	 * @param string $own_referer='' this is our own referer
 	 * @param string $action_title='' app_header for the action, if '' we try the link-title
 	 */
-	function index($values = null,$action='',$action_id='',$called_as=0,$extra_app_header=False,$return_html=False,$own_referer='',$action_title='')
+	function index($values = null, $action = '', $action_id = '', $called_as = 0, $extra_app_header = False, $return_html = False, $own_referer = '', $action_title = '')
 	{
-		unset($extra_app_header);	// not used, but dont want to change signature
+		unset($extra_app_header); // not used, but dont want to change signature
 		if (is_array($values))
 		{
 			$called_as = $values['called_as'];
@@ -702,22 +702,22 @@ 
 		elseif ($own_referer === '')
 		{
 			$own_referer = common::get_referer();
-			if (strpos($own_referer,'menuaction=infolog.infolog_ui.edit') !== false)
+			if (strpos($own_referer, 'menuaction=infolog.infolog_ui.edit') !== false)
 			{
-				$own_referer = $GLOBALS['egw']->session->appsession('own_session','infolog');
+				$own_referer = $GLOBALS['egw']->session->appsession('own_session', 'infolog');
 			}
 			else
 			{
-				$GLOBALS['egw']->session->appsession('own_session','infolog',$own_referer);
+				$GLOBALS['egw']->session->appsession('own_session', 'infolog', $own_referer);
 			}
 		}
 
 		// Handle legacy buttons like actions
-		if(is_array($values))
+		if (is_array($values))
 		{
-			foreach(array('document', 'view', 'delete') as $button)
+			foreach (array('document', 'view', 'delete') as $button)
 			{
-				if(isset($values['nm']['rows'][$button]))
+				if (isset($values['nm']['rows'][$button]))
 				{
 					list($id) = @each($values['nm']['rows'][$button]);
 					$values['nm']['multi_action'] = $button;
@@ -737,27 +737,27 @@ 
 				// Some processing to add values in for links and cats
 				$multi_action = $values['nm']['multi_action'];
 				// Action has an additional action - add / delete, etc.  Buttons named <multi-action>_action[action_name]
-				if(in_array($multi_action, array('link', 'responsible')))
+				if (in_array($multi_action, array('link', 'responsible')))
 				{
 					// eTemplate ignores the _popup namespace, but et2 doesn't
-					if($values[$multi_action.'_popup'])
+					if ($values[$multi_action.'_popup'])
 					{
-						$popup =& $values[$multi_action.'_popup'];
+						$popup = & $values[$multi_action.'_popup'];
 					}
 					else
 					{
-						$popup =& $values;
+						$popup = & $values;
 					}
-					$values['nm']['multi_action'] .= '_' . key($popup[$multi_action . '_action']);
-					if($multi_action == 'link')
+					$values['nm']['multi_action'] .= '_'.key($popup[$multi_action.'_action']);
+					if ($multi_action == 'link')
 					{
-						$popup[$multi_action] = $popup['link']['app'] . ':'.$popup['link']['id'];
+						$popup[$multi_action] = $popup['link']['app'].':'.$popup['link']['id'];
 					}
-					else if(is_array($popup[$multi_action]))
+					else if (is_array($popup[$multi_action]))
 					{
-						$popup[$multi_action] = implode(',',$popup[$multi_action]);
+						$popup[$multi_action] = implode(',', $popup[$multi_action]);
 					}
-					$values['nm']['multi_action'] .= '_' . $popup[$multi_action];
+					$values['nm']['multi_action'] .= '_'.$popup[$multi_action];
 					unset($values[$multi_action.'_popup']);
 					unset($values[$multi_action]);
 				}
@@ -765,18 +765,18 @@ 
 				if ($this->action($values['nm']['multi_action'], $values['nm']['selected'], $values['nm']['select_all'],
 					$success, $failed, $action_msg, $values['nm'], $msg, $values['nm']['checkboxes']['no_notifications']))
 				{
-					$msg .= lang('%1 entries %2',$success,$action_msg);
+					$msg .= lang('%1 entries %2', $success, $action_msg);
 					egw_framework::message($msg);
 				}
-				elseif(is_null($msg))
+				elseif (is_null($msg))
 				{
-					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-					egw_framework::message($msg,'error');
+					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+					egw_framework::message($msg, 'error');
 				}
-				elseif($msg)
+				elseif ($msg)
 				{
-					$msg .= "\n".lang('%1 entries %2, %3 failed.',$success,$action_msg,$failed);
-					egw_framework::message($msg,'error');
+					$msg .= "\n".lang('%1 entries %2, %3 failed.', $success, $action_msg, $failed);
+					egw_framework::message($msg, 'error');
 				}
 				unset($values['nm']['multi_action']);
 				unset($values['nm']['select_all']);
@@ -784,9 +784,9 @@ 
 		}
 		if (!$action)
 		{
-			$action = is_array($values) && $values['action'] ? $values['action'] : get_var('action',array('POST','GET'));
-			$action_id = is_array($values) && $values['action_id'] ? $values['action_id'] : get_var('action_id',array('POST','GET'));
-			$action_title = is_array($values) && $values['action_title'] ? $values['action_title'] : get_var('action_title',array('POST','GET'));
+			$action = is_array($values) && $values['action'] ? $values['action'] : get_var('action', array('POST', 'GET'));
+			$action_id = is_array($values) && $values['action_id'] ? $values['action_id'] : get_var('action_id', array('POST', 'GET'));
+			$action_title = is_array($values) && $values['action_title'] ? $values['action_title'] : get_var('action_title', array('POST', 'GET'));
 		}
 		//echo "<p>".__METHOD__."(action='$action/$action_id',called_as='$called_as/$values[referer]',own_referer='$own_referer') values=\n"; _debug_array($values);
 		if (!is_array($values))
@@ -799,7 +799,7 @@ 
 				$action_id = 0;
 				$action_title = '';
 			}
-			if($_GET['ajax'] === 'true')
+			if ($_GET['ajax'] === 'true')
 			{
 				$nm['action'] = '';
 				$nm['action_id'] = 0;
@@ -815,8 +815,7 @@ 
 
 			if (isset($_GET['filter']) && $_GET['filter'] != 'default' || !isset($values['nm']['filter']) && !$this->called_by)
 			{
-				$values['nm']['filter'] = $_GET['filter'] && $_GET['filter'] != 'default' ? $_GET['filter'] :
-					$this->prefs['defaultFilter'];
+				$values['nm']['filter'] = $_GET['filter'] && $_GET['filter'] != 'default' ? $_GET['filter'] : $this->prefs['defaultFilter'];
 			}
 			if (!isset($values['nm']['order']) || !$values['nm']['order'])
 			{
@@ -830,21 +829,21 @@ 
 			$action_title = $values['action_title'] = $action ? $action_title : $nm['action_title'];
 			$action = $values['action'] = $action ? $action : $nm['action'];
 		}
-		if($_GET['search']) $values['nm']['search'] = $_GET['search'];
+		if ($_GET['search']) $values['nm']['search'] = $_GET['search'];
 
 		if ($values['nm']['add'])
 		{
 			$values['add'] = $values['nm']['add'];
 			unset($values['nm']['add']);
 		}
-		unset($values['nm']['rows']['checked']);	// not longer used, but hides button actions
+		unset($values['nm']['rows']['checked']); // not longer used, but hides button actions
 
 		if ($values['add'] || $values['cancel'] || isset($values['main']))
 		{
 			if ($values['add'])
 			{
 				list($type) = each($values['add']);
-				return $this->edit(0,$action,$action_id,$type,$called_as);
+				return $this->edit(0, $action, $action_id, $type, $called_as);
 			}
 			elseif ($values['cancel'] && $own_referer)
 			{
@@ -855,14 +854,14 @@ 
 			}
 			else
 			{
-				list($do,$do2) = each($values['main']);
+				list($do, $do2) = each($values['main']);
 				list($do_id) = @each($do2);
-				switch((string)$do)
+				switch ((string)$do)
 				{
 					case 'close':
-						$closesingle=true;
+						$closesingle = true;
 					case 'close_all':
-						$this->close($do_id,$called_as,$closesingle);
+						$this->close($do_id, $called_as, $closesingle);
 						break;
 					case 'view':
 						$value = array();
@@ -900,7 +899,7 @@ 
 		$this->tmpl->read('infolog.index');
 		$values['nm']['options-filter'] = $this->filters;
 		$values['nm']['get_rows'] = 'infolog.infolog_ui.get_rows';
-		$values['nm']['options-filter2'] = (in_array($this->prefs['show_links'],array('all','no_describtion')) ? array() : array(
+		$values['nm']['options-filter2'] = (in_array($this->prefs['show_links'], array('all', 'no_describtion')) ? array() : array(
 			''               => 'default',
 		)) + array(
 			'no_describtion' => 'no details',
@@ -921,35 +920,35 @@ 
 		else
 		{
 			// Allow saving parent ID into favorites
-			$values['nm']['favorites'] = array('action','action_id');
+			$values['nm']['favorites'] = array('action', 'action_id');
 		}
 
 		// Allow add actions even when there's no rows
 		$values['nm']['placeholder_actions'] = array('new');
 
-		if(!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
+		if (!isset($values['nm']['filter2'])) $values['nm']['filter2'] = $this->prefs['nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows').'-details-pref'];
 
 		// disable columns for main entry as set in the pref for details or no details
 		$values['nm']['columnselection_pref'] = 'nextmatch-'.($action ? 'infolog.'.$action : 'infolog.index.rows')
-			.($values['nm']['filter2']=='all' ? '-details' : '');
+			.($values['nm']['filter2'] == 'all' ? '-details' : '');
 		if ($action == 'sp')
 		{
 			$pref = $values['nm']['columnselection_pref'];
-			foreach(array('info_used_time_info_planned_time_info_replanned_time','info_datemodified','info_owner_info_responsible','customfields') as $name)
+			foreach (array('info_used_time_info_planned_time_info_replanned_time', 'info_datemodified', 'info_owner_info_responsible', 'customfields') as $name)
 			{
-				$values['main']['no_'.$name] = strpos($this->prefs[$pref],$name) === false;
+				$values['main']['no_'.$name] = strpos($this->prefs[$pref], $name) === false;
 			}
 			if (!$values['main']['no_customfields'])
 			{
 				// set the column-header of the main table for the customfields.
-				foreach(array_keys($this->bo->customfields) as $lname)
+				foreach (array_keys($this->bo->customfields) as $lname)
 				{
-					$values['main']['customfields'].=$lname."\n";
+					$values['main']['customfields'] .= $lname."\n";
 				}
 			}
 		}
 		$values['nm']['header_row'] = 'infolog.index.header_right';
-		if ($values['nm']['filter']=='bydate')
+		if ($values['nm']['filter'] == 'bydate')
 		{
 			foreach (array_keys($values['nm']['col_filter']) as $colfk)
 			{
@@ -982,7 +981,7 @@ 
 		{
 			$values['css'] .= '<style type="text/css">@media screen { .infoDes {  '.
 				' max-height: '.
-				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).	// dono why em is not real lines
+				(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35).// dono why em is not real lines
 				'em; overflow: auto; }}</style>';
 		}
 
@@ -994,13 +993,13 @@ 
 
 		// remove group-types user has not any rights to as filter
 		// does not take implicit rights as delegated into account, so they will not be available as filters
-		foreach($this->bo->group_owners as $type => $group)
+		foreach ($this->bo->group_owners as $type => $group)
 		{
 			if (!isset($this->bo->grants[$group])) unset($sel_options['info_type'][$type]);
 		}
 
 
-		return $this->tmpl->exec('infolog.infolog_ui.index',$values,$sel_options,$readonlys,$persist,$return_html ? -1 : 0);
+		return $this->tmpl->exec('infolog.infolog_ui.index', $values, $sel_options, $readonlys, $persist, $return_html ? -1 : 0);
 	}
 
 	/**
@@ -1015,9 +1014,9 @@ 
 		if ($this->bo->group_owners)
 		{
 			// remove types owned by groups the user has no edit grant
-			foreach($this->bo->group_owners as $type => $group)
+			foreach ($this->bo->group_owners as $type => $group)
 			{
-				if (!($this->bo->grants[$group] & EGW_ACL_EDIT))
+				if (!($this->bo->grants[$group]&EGW_ACL_EDIT))
 				{
 					unset($types[$type]);
 				}
@@ -1034,7 +1033,7 @@ 
 	 */
 	private function get_actions(array $query)
 	{
-		for($i = 0; $i <= 100; $i += 10)
+		for ($i = 0; $i <= 100; $i += 10)
 		{
 			$percent[$i] = $i.'%';
 		}
@@ -1043,9 +1042,9 @@ 
 		$types_add = array();
 		// Do not add deleted type to add or change menus
 		unset($types['delete']);
-		foreach($types as $type => &$data)
+		foreach ($types as $type => &$data)
 		{
-			if ($type=='email') continue;//requirement by sales that it should not be shown in right - click - action dialog
+			if ($type == 'email') continue; //requirement by sales that it should not be shown in right - click - action dialog
 			$data = array(
 				'caption' => $data,
 				'icon' => $type,
@@ -1057,7 +1056,7 @@ 
 
 		$icons = null;
 		$statis = $this->bo->get_status($query['col_filter']['info_type'], $icons);
-		foreach($statis as $type => &$data)
+		foreach ($statis as $type => &$data)
 		{
 			$data = array(
 				'caption' => $data,
@@ -1072,7 +1071,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=infolog.infolog_ui.edit&info_id=$id',
 				'popup' => egw_link::get_registry('infolog', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 			),
 			'parent' => array(
 				'caption' => 'View parent with children',
@@ -1143,7 +1142,7 @@ 
 						'icon' => 'completed',
 					),
 					'cat' =>  nextmatch_widget::category_action(
-						'infolog',$group,'Change category','cat_'
+						'infolog', $group, 'Change category', 'cat_'
 					),
 					'responsible' => array(
 						'caption' => 'Delegation',
@@ -1179,7 +1178,7 @@ 
 				'onExecute' => 'javaScript:app.infolog.infolog_menu_print'
 			)
 		);
-		++$group;	// integration with other apps
+		++$group; // integration with other apps
 		if ($GLOBALS['egw_info']['user']['apps']['filemanager'])
 		{
 			$actions['filemanager'] = array(
@@ -1197,7 +1196,7 @@ 
 				'caption' => 'Schedule appointment',
 				'group' => $group,
 				'url' => 'menuaction=calendar.calendar_uiforms.edit&'.
-					egw_link::get_registry('calendar', 'add_app') . '[]=infolog&'.egw_link::get_registry('calendar','add_id').'[]=$id',
+					egw_link::get_registry('calendar', 'add_app').'[]=infolog&'.egw_link::get_registry('calendar', 'add_id').'[]=$id',
 				'allowOnMultiple' => false,
 				'popup' => egw_link::get_registry('calendar', 'add_popup'),
 			);
@@ -1221,7 +1220,7 @@ 
 				'hint' => 'Convert to a ticket',
 				'group' => $group,
 				'url' => 'menuaction=tracker.tracker_ui.edit&'.
-					egw_link::get_registry('tracker', 'add_app') . '[]=infolog&'.egw_link::get_registry('tracker','add_id').'[]=$id',
+					egw_link::get_registry('tracker', 'add_app').'[]=infolog&'.egw_link::get_registry('tracker', 'add_id').'[]=$id',
 				'allowOnMultiple' => false,
 				'popup' => egw_link::get_registry('tracker', 'add_popup'),
 			);
@@ -1234,7 +1233,7 @@ 
 		$actions['ical'] = array(
 			'icon' => 'ical',
 			'caption' => 'Export iCal',
-			'postSubmit' => true,	// download needs post submit to work
+			'postSubmit' => true, // download needs post submit to work
 			'group' => $group,
 			'allowOnMultiple' => true,
 		);
@@ -1286,14 +1285,14 @@ 
 		$success = $failed = 0;
 		if ($use_all)
 		{
-			@set_time_limit(0);                     // switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;        // all
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
 			$result = $readonlys = null;
-			$this->get_rows($query,$result,$readonlys);
+			$this->get_rows($query, $result, $readonlys);
 			$checked = array();
-			foreach($result as $key => $info)
+			foreach ($result as $key => $info)
 			{
-				if(is_numeric($key))
+				if (is_numeric($key))
 				{
 					$checked[] = $info['info_id'];
 				}
@@ -1304,29 +1303,29 @@ 
 		list($action, $settings) = explode('_', $_action, 2);
 
 		// Actions that can handle a list of IDs
-		switch($action)
+		switch ($action)
 		{
 			case 'link':
 				list($add_remove, $link) = explode('_', $settings, 2);
-				list($app, $link_id) = explode(strpos($link,':') !== false ? ':' : ',', $link);
-				if(!$link_id)
+				list($app, $link_id) = explode(strpos($link, ':') !== false ? ':' : ',', $link);
+				if (!$link_id)
 				{
 					$action_msg = 'linked';
 					$msg = lang('You need to select an entry for linking.');
 					break;
 				}
 				$title = egw_link::title($app, $link_id);
-				foreach($checked as $id)
+				foreach ($checked as $id)
 				{
-					if(!$this->bo->check_access($id, EGW_ACL_EDIT))
+					if (!$this->bo->check_access($id, EGW_ACL_EDIT))
 					{
 						$failed++;
 						continue;
 					}
-					if($add_remove == 'add')
+					if ($add_remove == 'add')
 					{
 						$action_msg = lang('linked to %1', $title);
-						if(egw_link::link('infolog', $id, $app, $link_id))
+						if (egw_link::link('infolog', $id, $app, $link_id))
 						{
 							$success++;
 						}
@@ -1353,20 +1352,20 @@ 
 			case 'ical':
 				// infolog_ical lets horde be auto-loaded, so it must go first
 				$boical = new infolog_ical();
-				html::content_header('todo.ics','text/calendar');
+				html::content_header('todo.ics', 'text/calendar');
 				echo $boical->exportvCalendar($checked);
 				common::egw_exit();
 
 		}
 
 		// Actions that need to loop
-		foreach($checked as $id)
+		foreach ($checked as $id)
 		{
-			if(!$entry = $this->bo->read($id))
+			if (!$entry = $this->bo->read($id))
 			{
 				continue;
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'close':
 					$action_msg = lang('closed');
@@ -1376,8 +1375,8 @@ 
 
 				case 'delete':
 					$action_msg = $settings == 'sub' ? lang(' (and children) deleted') : lang('deleted');
-					$result = $this->bo->delete($id, $settings=='sub', false, $skip_notifications);
-					if($result == true)
+					$result = $this->bo->delete($id, $settings == 'sub', false, $skip_notifications);
+					if ($result == true)
 					{
 						$success++;
 					}
@@ -1390,14 +1389,14 @@ 
 				case 'type':
 					$action_msg = lang('changed type');
 					// Dont allow to change the type, if user has no delete rights from the group-owner
-					if ($id && !($this->bo->grants[$entry['info_owner']] & EGW_ACL_DELETE))
+					if ($id && !($this->bo->grants[$entry['info_owner']]&EGW_ACL_DELETE))
 					{
 						$failed++;
 						break;
 					}
 					$entry['info_type'] = $settings;
 					try {
-						$this->bo->write($entry, true,true,true,$skip_notifications,true); // Throw exceptions
+						$this->bo->write($entry, true, true, true, $skip_notifications, true); // Throw exceptions
 					}
 					catch (egw_exception_wrong_userinput $e)
 					{
@@ -1412,11 +1411,11 @@ 
 					$action_msg = lang('changed completion to %1%', $settings);
 					$entry['info_percent'] = $settings;
 					// Done and not-started entries will get changed right back if we don't change the status too
-					if(in_array($entry['info_status'],array('not-started','done','billed','cancelled','archive')))
+					if (in_array($entry['info_status'], array('not-started', 'done', 'billed', 'cancelled', 'archive')))
 					{
 						$entry['info_status'] = 'ongoing';
 					}
-					if($entry['info_percent'] == 0)
+					if ($entry['info_percent'] == 0)
 					{
 						$entry['info_status'] = 'not-started';
 					}
@@ -1424,7 +1423,7 @@ 
 					{
 						$entry['info_status'] = 'done';
 					}
-					if($this->bo->write($entry, true,true,true,$skip_notifications))
+					if ($this->bo->write($entry, true, true, true, $skip_notifications))
 					{
 						$success++;
 					}
@@ -1436,24 +1435,23 @@ 
 
 				case 'undelete':	// set it to valid status != 'deleted' for that type
 					$settings = isset($this->bo->status[$entry['info_type']]['done']) ?
-						$this->bo->status[$entry['info_type']]['done'] :
-						$this->bo->status['defaults'][$entry['info_type']];
+						$this->bo->status[$entry['info_type']]['done'] : $this->bo->status['defaults'][$entry['info_type']];
 					// fall-through
 				case 'status':
-					if(isset($this->bo->status[$entry['info_type']][$settings]))
+					if (isset($this->bo->status[$entry['info_type']][$settings]))
 					{
 						$action_msg = lang('changed status to %1', lang($this->bo->status[$entry['info_type']][$settings]));
-						if(!in_array($settings,array('done','billed','cancelled','archive')) && $entry['info_percent'] == 100)
+						if (!in_array($settings, array('done', 'billed', 'cancelled', 'archive')) && $entry['info_percent'] == 100)
 						{
 							// Done entries will get changed right back if we don't change the completion too
 							$entry['info_percent'] = 10;
 						}
-						if(in_array($settings, array('not-started')) && $entry['info_percent'] > 0)
+						if (in_array($settings, array('not-started')) && $entry['info_percent'] > 0)
 						{
 							$entry['info_percent'] = 0;
 						}
 						$entry['info_status'] = $settings;
-						if($this->bo->write($entry, true,true,true,$skip_notifications))
+						if ($this->bo->write($entry, true, true, true, $skip_notifications))
 						{
 							$success++;
 						}
@@ -1466,7 +1464,7 @@ 
 					break;
 
 				case 'cat':
-					if($settings)
+					if ($settings)
 					{
 						$cat_name = categories::id2name($settings);
 						$action_msg = lang('changed category to %1', $cat_name);
@@ -1476,7 +1474,7 @@ 
 						$action_msg = lang('removed category');
 					}
 					$entry['info_cat'] = $settings;
-					if($this->bo->write($entry, true,true,true,$skip_notifications))
+					if ($this->bo->write($entry, true, true, true, $skip_notifications))
 					{
 						$success++;
 					}
@@ -1488,17 +1486,17 @@ 
 
 				case 'responsible':
 					list($add_remove, $user_str) = explode('_', $settings, 2);
-					$action_msg = ($add_remove == 'add' ? lang('added') : lang('removed')) . ' ';
+					$action_msg = ($add_remove == 'add' ? lang('added') : lang('removed')).' ';
 					$names = array();
 					$users = explode(',', $user_str);
-					foreach($users as $account_id)
+					foreach ($users as $account_id)
 					{
 						$names[] = common::grab_owner_name($account_id);
 					}
 					$action_msg .= implode(', ', $names);
 					$function = $add_remove == 'add' ? 'array_merge' : 'array_diff';
 					$entry['info_responsible'] = array_unique($function($entry['info_responsible'], (array)$users));
-					if($this->bo->write($entry, true,true,true,$skip_notifications))
+					if ($this->bo->write($entry, true, true, true, $skip_notifications))
 					{
 						$success++;
 					}
@@ -1519,10 +1517,10 @@ 
 	 * @param string $_referer=''
 	 * @param boolean $closesingle=false
 	 */
-	function close($values=0,$_referer='',$closesingle=false,$skip_notification = false)
+	function close($values = 0, $_referer = '', $closesingle = false, $skip_notification = false)
 	{
 		//echo "<p>".__METHOD__."($values,$referer,$closeall)</p>\n";
-		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
+		$info_id = (int)(is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $_referer;
 
 		if ($info_id)
@@ -1532,11 +1530,11 @@ 
 			$status = $info['info_status'];
 			// closed stati assumed array('done','billed','cancelled')
 			if (isset($this->bo->status[$info['info_type']]['done'])) {
-				$status ='done';
+				$status = 'done';
 			} elseif (isset($this->bo->status[$info['info_type']]['billed'])) {
-				$status ='billed';
+				$status = 'billed';
 			} elseif (isset($this->bo->status[$info['info_type']]['cancelled'])) {
-				$status ='cancelled';
+				$status = 'cancelled';
 			}
 			#_debug_array($status);
 			$values = array(
@@ -1546,15 +1544,15 @@ 
 				'info_percent'=> 100,
 				'info_datecompleted' => $this->bo->now_su,
 			);
-			$this->bo->write($values, true,true,true,$skip_notification);
+			$this->bo->write($values, true, true, true, $skip_notification);
 
-			$query = array('action'=>'sp','action_id'=>$info_id);
+			$query = array('action'=>'sp', 'action_id'=>$info_id);
 			if (!$closesingle) {
-				foreach((array)$this->bo->search($query) as $info)
+				foreach ((array)$this->bo->search($query) as $info)
 				{
 					if ($info['info_id_parent'] == $info_id)	// search also returns linked entries!
 					{
-						$this->close($info['info_id'],$referer,$closesingle,$skip_notification);	// we call ourselfs recursive to process subs from subs too
+						$this->close($info['info_id'], $referer, $closesingle, $skip_notification); // we call ourselfs recursive to process subs from subs too
 					}
 				}
 			}
@@ -1570,9 +1568,9 @@ 
 	 * @param string $called_by
 	 * @param boolean $skip_notification Do not send notification of deletion
 	 */
-	function delete($values=0,$_referer='',$called_by='',$skip_notification=False)
+	function delete($values = 0, $_referer = '', $called_by = '', $skip_notification = False)
 	{
-		$info_id = (int) (is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
+		$info_id = (int)(is_array($values) ? $values['info_id'] : ($values ? $values : $_GET['info_id']));
 		$referer = is_array($values) ? $values['referer'] : $_referer;
 
 		if (!is_array($values) && $info_id > 0 && !$this->bo->anzSubs($info_id))	// entries without subs get confirmed by javascript
@@ -1583,9 +1581,9 @@ 
 
 		if (is_array($values) || $info_id <= 0)
 		{
-			if (($values['delete'] || $values['delete_subs']) && $info_id > 0 && $this->bo->check_access($info_id,EGW_ACL_DELETE))
+			if (($values['delete'] || $values['delete_subs']) && $info_id > 0 && $this->bo->check_access($info_id, EGW_ACL_DELETE))
 			{
-				$deleted = $this->bo->delete($info_id,$values['delete_subs'],$values['info_id_parent'], $skip_notification);
+				$deleted = $this->bo->delete($info_id, $values['delete_subs'], $values['info_id_parent'], $skip_notification);
 			}
 			if ($called_by)		// direct call from the same request
 			{
@@ -1595,7 +1593,7 @@ 
 			{
 				$this->edit(array(
 					'info_id' => $info_id,
-					'button'  => array('deleted' => true),	// not delete!
+					'button'  => array('deleted' => true), // not delete!
 					'referer' => $referer,
 					'msg'     => $deleted ? lang('Infolog entry deleted') : '',
 				));
@@ -1603,7 +1601,7 @@ 
 			return $referer ? $this->tmpl->location($referer) : $this->index();
 		}
 		$readonlys = $values = array();
-		$values['main'][1] = $this->get_info($info_id,$readonlys['main']);
+		$values['main'][1] = $this->get_info($info_id, $readonlys['main']);
 
 		$this->tmpl->read('infolog.delete');
 
@@ -1624,7 +1622,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog').' - '.lang('Delete');
 		$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualInfologDelete');
 
-		$this->tmpl->exec('infolog.infolog_ui.delete',$values,array(),$readonlys,$persist,$called_by == 'edit' ? 2 : 0);
+		$this->tmpl->exec('infolog.infolog_ui.delete', $values, array(), $readonlys, $persist, $called_by == 'edit' ? 2 : 0);
 	}
 
 	/**
@@ -1636,77 +1634,77 @@ 
 	 * @param string $type Type of log-entry: note,todo,task
 	 * @param string $referer array with param/get-vars of the refering page
 	 */
-	function edit($content = null,$action = '',$action_id=0,$type='',$referer='')
+	function edit($content = null, $action = '', $action_id = 0, $type = '', $referer = '')
 	{
 		if (($submit = is_array($content)))
 		{
 			//echo "infolog_ui::edit: content="; _debug_array($content);
 			$info_id   = $content['info_id'];
-			$action    = $content['action'];    unset($content['action']);
+			$action    = $content['action']; unset($content['action']);
 			$action_id = $content['action_id']; unset($content['action_id']);
-			$referer   = $content['referer'];   unset($content['referer']);
-			$no_popup  = $content['no_popup'];  unset($content['no_popup']);
+			$referer   = $content['referer']; unset($content['referer']);
+			$no_popup  = $content['no_popup']; unset($content['no_popup']);
 
 			list($button) = @each($content['button']);
-			if (!$button && $action) $button = $action;	// action selectbox
+			if (!$button && $action) $button = $action; // action selectbox
 			//info_cc expects an comma separated string
 			//error_log(__METHOD__.__LINE__.array2string($content));
 			if (empty($content['info_cc'])) $content['info_cc'] = "";
 			if (is_array($content['info_cc']))
 			{
-				foreach($content['info_cc'] as $i => $value)
+				foreach ($content['info_cc'] as $i => $value)
 				{
 					//imap_rfc822 should not be used, but it works reliable here, until we have some regex solution or use horde stuff
 					$addresses = imap_rfc822_parse_adrlist($value, '');
 					//error_log(__METHOD__.__LINE__.$value.'->'.array2string($addresses[0]));
-					$content['info_cc'][$i]=$addresses[0]->host ? $addresses[0]->mailbox.'@'.$addresses[0]->host : $addresses[0]->mailbox;
+					$content['info_cc'][$i] = $addresses[0]->host ? $addresses[0]->mailbox.'@'.$addresses[0]->host : $addresses[0]->mailbox;
 				}
-				if (!empty($content['info_cc'])) $content['info_cc'] = implode(',',$content['info_cc']);
+				if (!empty($content['info_cc'])) $content['info_cc'] = implode(',', $content['info_cc']);
 			}
 			unset($content['button']);
 			if ($button)
 			{
 				// Copy or schedule Infolog
-				if (in_array($button,array('copy','schedule','ical','tracker')))
+				if (in_array($button, array('copy', 'schedule', 'ical', 'tracker')))
 				{
 					$action = $button;
-					if (!$info_id || $this->bo->check_access($info_id,EGW_ACL_EDIT))
+					if (!$info_id || $this->bo->check_access($info_id, EGW_ACL_EDIT))
 					{
-						$button = 'apply';	// need to store infolog first
+						$button = 'apply'; // need to store infolog first
 					}
 				}
 				//Validate the enddate must be grather than startdate
 				if (!empty($content['info_enddate']) && !empty($content['info_startdate']))
 				{
-					$duration_date = $content['info_enddate']-$content['info_startdate'];
+					$duration_date = $content['info_enddate'] - $content['info_startdate'];
 					if ($duration_date < 0)
 					{
 						$this->tmpl->set_validation_error('info_startdate', lang('Startdate must be before Enddate!!!'));
-						$button = $action = '';	// stop save or apply
+						$button = $action = ''; // stop save or apply
 					}
 				}
 				//echo "<p>infolog_ui::edit(info_id=$info_id) '$button' button pressed, content="; _debug_array($content);
 				if (($button == 'save' || $button == 'apply') && isset($content['info_subject']) && empty($content['info_subject']))
 				{
-					$this->tmpl->set_validation_error('info_subject',lang('Field must not be empty !!!'));
-					$button = $action = '';	// stop save or apply
+					$this->tmpl->set_validation_error('info_subject', lang('Field must not be empty !!!'));
+					$button = $action = ''; // stop save or apply
 				}
 				if (($button == 'save' || $button == 'apply') && $info_id)
 				{
 					$old = $this->bo->read($info_id);
-					if (!($edit_acl = $this->bo->check_access($info_id,EGW_ACL_EDIT)))
+					if (!($edit_acl = $this->bo->check_access($info_id, EGW_ACL_EDIT)))
 					{
 						$status_only = $this->bo->is_responsible($old);
-						$undelete = $this->bo->check_access($old,EGW_ACL_UNDELETE);
+						$undelete = $this->bo->check_access($old, EGW_ACL_UNDELETE);
 					}
 				}
 				if (($button == 'save' || $button == 'apply') && (!$info_id || $edit_acl || $status_only || $undelete))
 				{
-					$operation = $info_id ?  'edit' : 'add';
+					$operation = $info_id ? 'edit' : 'add';
 					if ($content['info_contact'])
 					{
 						$old_link_id = (int)$content['info_link_id'];
-						if(is_array($content['info_contact']))
+						if (is_array($content['info_contact']))
 						{
 							// eTemplate2 returns the array all ready
 							$app = $content['info_contact']['app'];
@@ -1719,11 +1717,11 @@ 
 						}
 						elseif ($app && $id)
 						{
-							if(!is_array($content['link_to']))
+							if (!is_array($content['link_to']))
 							{
 								$content['link_to'] = array();
 							}
-							$content['info_link_id'] = (int)($info_link_id = egw_link::link('infolog',$content['link_to']['to_id'],$app,$id));
+							$content['info_link_id'] = (int)($info_link_id = egw_link::link('infolog', $content['link_to']['to_id'], $app, $id));
 						}
 						else
 						{
@@ -1733,7 +1731,7 @@ 
 						{
 							$link = egw_link::get_link($old_link_id);
 							// remove selected project, if removed link is that project
-							if($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $content['old_pm_id'])
+							if ($link['link_app2'] == 'projectmanager' && $link['link_id2'] == $content['old_pm_id'])
 							{
 								unset($content['pm_id'], $content['old_pm_id']);
 							}
@@ -1747,39 +1745,38 @@ 
 					}
 					if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 					{
-						$content['info_link_id'] = 0;	// as field has to be int
+						$content['info_link_id'] = 0; // as field has to be int
 					}
 					$active_tab = $content['tabs'];
 					if (!($info_id = $this->bo->write($content, true, true, true, $content['no_notifications'])))
 					{
-						$content['msg'] = $info_id !== 0 || !$content['info_id'] ? lang('Error: saving the entry') :
-							lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
-							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.','<a href="'.
-								htmlspecialchars(egw::link('/index.php',array(
+						$content['msg'] = $info_id !== 0 || !$content['info_id'] ? lang('Error: saving the entry') : lang('Error: the entry has been updated since you opened it for editing!').'<br />'.
+							lang('Copy your changes to the clipboard, %1reload the entry%2 and merge them.', '<a href="'.
+								htmlspecialchars(egw::link('/index.php', array(
 									'menuaction' => 'infolog.infolog_ui.edit',
 									'info_id'    => $content['info_id'],
 									'no_popup'   => $no_popup,
 									'referer'    => $referer,
-								))).'">','</a>');
-						$button = $action = '';	// not exiting edit
+								))).'">', '</a>');
+						$button = $action = ''; // not exiting edit
 						$info_id = $content['info_id'];
 					}
 					else
 					{
-						$GLOBALS['egw']->preferences->add('infolog','preferred_type',$content['info_type']);
-						$GLOBALS['egw']->preferences->save_repository(false,'user',false);
+						$GLOBALS['egw']->preferences->add('infolog', 'preferred_type', $content['info_type']);
+						$GLOBALS['egw']->preferences->save_repository(false, 'user', false);
 						$content['msg'] = lang('InfoLog entry saved');
-						egw_framework::refresh_opener($content['msg'],'infolog',$info_id,$operation);
+						egw_framework::refresh_opener($content['msg'], 'infolog', $info_id, $operation);
 					}
 					$content['tabs'] = $active_tab;
-					if ((int) $content['pm_id'] != (int) $content['old_pm_id'])
+					if ((int)$content['pm_id'] != (int)$content['old_pm_id'])
 					{
 						//echo "<p>pm_id changed: $content[old_pm_id] -> $content[pm_id]</p>\n";
 						// update links accordingly, if selected project changed
 						if ($content['pm_id'])
 						{
 							//echo "<p>this->link->link('infolog',{$content['link_to']['to_id']},'projectmanager',{$content['pm_id']});</p>";
-							egw_link::link('infolog',$content['link_to']['to_id'],'projectmanager',$content['pm_id']);
+							egw_link::link('infolog', $content['link_to']['to_id'], 'projectmanager', $content['pm_id']);
 							// making the project the selected link, if no other link selected
 							if (!$info_link_id || $info_link_id == 'projectmanager:'.$content['old_pm_id'])
 							{
@@ -1789,7 +1786,7 @@ 
 						if ($content['old_pm_id'])
 						{
 							//echo "<p>this->link->unlink2(0,infolog,{$content['link_to']['to_id']},0,'projectmanager',{$content['old_pm_id']});</p>\n";
-							egw_link::unlink2(0,infolog,$content['link_to']['to_id'],0,'projectmanager',$content['old_pm_id']);
+							egw_link::unlink2(0, infolog, $content['link_to']['to_id'], 0, 'projectmanager', $content['old_pm_id']);
 						}
 						$content['old_pm_id'] = $content['pm_id'];
 					}
@@ -1797,14 +1794,14 @@ 
 					if ($info_id && is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 					{
 						//echo "<p>writing links for new entry $info_id</p>\n"; _debug_array($content['link_to']['to_id']);
-						egw_link::link('infolog',$info_id,$content['link_to']['to_id']);
+						egw_link::link('infolog', $info_id, $content['link_to']['to_id']);
 						$content['link_to']['to_id'] = $info_id;
 					}
-					if ($info_link_id && strpos($info_link_id,':') !== false)	// updating info_link_id if necessary
+					if ($info_link_id && strpos($info_link_id, ':') !== false)	// updating info_link_id if necessary
 					{
-						list($app,$id) = explode(':',$info_link_id);
-						$link = egw_link::get_link('infolog',$info_id,$app,$id);
-						if ((int) $content['info_link_id'] != (int) $link['link_id'])
+						list($app, $id) = explode(':', $info_link_id);
+						$link = egw_link::get_link('infolog', $info_id, $app, $id);
+						if ((int)$content['info_link_id'] != (int)$link['link_id'])
 						{
 							$content['info_link_id'] = $link['link_id'];
 
@@ -1816,9 +1813,9 @@ 
 								'info_owner'   => $content['info_owner'],
 							);
 							//echo "<p>updating info_link_id: ".print_r($to_write,true)."</p>\n";
-							$this->bo->write($to_write,False,true,true,true);	// last true = no notifications, as no real change
+							$this->bo->write($to_write, False, true, true, true); // last true = no notifications, as no real change
 							// we need eg. the new modification date, for further updates
-							$content = array_merge($content,$to_write);
+							$content = array_merge($content, $to_write);
 						}
 					}
 				}
@@ -1829,33 +1826,33 @@ 
 						'action' => $action,
 						'action_id' => $action_id
 					);
-					if (!($content['msg'] = $this->delete($info_id,$referer,'edit'))) return;	// checks ACL first
+					if (!($content['msg'] = $this->delete($info_id, $referer, 'edit'))) return; // checks ACL first
 
-					egw_framework::refresh_opener($content['msg'],'infolog',$info_id,'delete');
+					egw_framework::refresh_opener($content['msg'], 'infolog', $info_id, 'delete');
 				}
 				// called again after delete confirmation dialog
-				elseif ($button == 'deleted'  && $content['msg'])
+				elseif ($button == 'deleted' && $content['msg'])
 				{
-					egw_framework::refresh_opener($content['msg'],'infolog',$info_id,'delete');
+					egw_framework::refresh_opener($content['msg'], 'infolog', $info_id, 'delete');
 				}
 				if ($button == 'save' || $button == 'cancel' || $button == 'delete' || $button == 'deleted')
 				{
 					if ($no_popup)
 					{
-						egw::redirect_link($referer,array('msg' => $content['msg']));
+						egw::redirect_link($referer, array('msg' => $content['msg']));
 					}
 					egw_framework::window_close();
 				}
 			}
 			// on a type-change, set the status to the default status of that type, if the actual status is not supported by the new type
-			if (!array_key_exists($content['info_status'],$this->bo->status[$content['info_type']]))
+			if (!array_key_exists($content['info_status'], $this->bo->status[$content['info_type']]))
 			{
 				$content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
 				// Make sure we don't end up with invalid status / percent combinations
 				if ($content['info_status'] != 'done')
 				{
 					$content['info_datecompleted'] = '';
-					if((int)$content['info_percent'] === 100)
+					if ((int)$content['info_percent'] === 100)
 					{
 						$content['info_percent'] = 10;
 					}
@@ -1864,7 +1861,7 @@ 
 				{
 					$content['info_percent'] = 100;
 				}
-				if($content['info_status'] != 'not-started' && (int)$content['info_percent'] == 0)
+				if ($content['info_status'] != 'not-started' && (int)$content['info_percent'] == 0)
 				{
 					$content['info_percent'] = 10;
 				}
@@ -1873,25 +1870,24 @@ 
 		else	// new call via GET
 		{
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
-			$action    = $action    ? $action    : get_var('action',   array('POST','GET'));
-			$action_id = $action_id ? $action_id : get_var('action_id',array('POST','GET'));
-			$info_id   = $content   ? $content   : get_var('info_id',  array('POST','GET'));
-			$type      = $type      ? $type      : get_var('type',     array('POST','GET'));
-			$referer   = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] :
-				common::get_referer('/index.php?menuaction=infolog.infolog_ui.index'));
-			if (strpos($referer, 'msg=') !== false) $referer = preg_replace('/([&?]{1})msg=[^&]+&?/','\\1',$referer);	// remove previou/old msg from referer
+			$action    = $action ? $action : get_var('action', array('POST', 'GET'));
+			$action_id = $action_id ? $action_id : get_var('action_id', array('POST', 'GET'));
+			$info_id   = $content ? $content : get_var('info_id', array('POST', 'GET'));
+			$type      = $type ? $type : get_var('type', array('POST', 'GET'));
+			$referer   = $referer !== '' ? $referer : ($_GET['referer'] ? $_GET['referer'] : common::get_referer('/index.php?menuaction=infolog.infolog_ui.index'));
+			if (strpos($referer, 'msg=') !== false) $referer = preg_replace('/([&?]{1})msg=[^&]+&?/', '\\1', $referer); // remove previou/old msg from referer
 			$no_popup  = $_GET['no_popup'];
-			$print = (int) $_REQUEST['print'];
+			$print = (int)$_REQUEST['print'];
 			//echo "<p>infolog_ui::edit: info_id=$info_id,  action='$action', action_id='$action_id', type='$type', referer='$referer'</p>\n";
 
-			if (!($content = $this->bo->read( $info_id || $action != 'sp' ? $info_id : $action_id )))
+			if (!($content = $this->bo->read($info_id || $action != 'sp' ? $info_id : $action_id)))
 			{
 				egw_framework::window_close(lang('Permission denied!'));
 			}
-			if (!(strpos($content['info_addr'],',')===false) && strpos($content['info_addr'],', ')===false) $content['info_addr'] = str_replace(',',', ',$content['info_addr']);
-			foreach(array('info_subject', 'info_des') as $key)
+			if (!(strpos($content['info_addr'], ',') === false) && strpos($content['info_addr'], ', ') === false) $content['info_addr'] = str_replace(',', ', ', $content['info_addr']);
+			foreach (array('info_subject', 'info_des') as $key)
 			{
-				if(!isset($content[$key]) || strlen($content[$key]) < 75)
+				if (!isset($content[$key]) || strlen($content[$key]) < 75)
 				{
 					continue;
 				}
@@ -1899,66 +1895,66 @@ 
 				$clarray = array();
 				foreach ($contlines as &$line)
 				{
-					if(strlen($line) < 75)
+					if (strlen($line) < 75)
 					{
 						$clarray[] = $line;
 						continue;
 					}
 					$cont = explode(' ', $line);
 					$ckarray = array();
-					foreach($cont as &$word)
+					foreach ($cont as &$word)
 					{
 						// set blank behind all , and . if words are too long, apply wordwrap afterwards to make sure we get
-						if (strlen($word)>75)
+						if (strlen($word) > 75)
 						{
 							$buff = html::activate_links($word);
 							if (strlen($buff) == strlen($word)) // no links -> try to break overlong words
 							{
-								if (!(strpos($word,',')===false) && strpos($word,', ')===false) $word = str_replace(',',', ',$word);
-								if (!(strpos($word,'.')===false) && strpos($word,'. ')===false) $word = str_replace('.','. ',$word);
+								if (!(strpos($word, ',') === false) && strpos($word, ', ') === false) $word = str_replace(',', ', ', $word);
+								if (!(strpos($word, '.') === false) && strpos($word, '. ') === false) $word = str_replace('.', '. ', $word);
 								$word = wordwrap($word, 75, ' ', true);
 							}
 						}
-						$ckarray[] =$word;
+						$ckarray[] = $word;
 					}
-					$line = join(' ',$ckarray);
+					$line = join(' ', $ckarray);
 					unset($ckarray);
 					$clarray[] = $line;
 				}
-				$content[$key] = join("\n",$clarray);
+				$content[$key] = join("\n", $clarray);
 				unset($clarray);
 			}
 			if (is_numeric($_REQUEST['cat_id']))
 			{
-				$content['info_cat'] = (int) $_REQUEST['cat_id'];
+				$content['info_cat'] = (int)$_REQUEST['cat_id'];
 			}
 			if (!$content)
 			{
 				$content['info_cat'] = $this->prefs['cat_add_default'];
 			}
-			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);	// dont allow HTML!
+			if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']); // dont allow HTML!
 
-			switch($this->prefs['set_start'])
+			switch ($this->prefs['set_start'])
 			{
-				case 'date': default: $set_startdate = mktime(0,0,0,date('m',$this->bo->user_time_now),date('d',$this->bo->user_time_now),date('Y',$this->bo->user_time_now)); break;
+				case 'date': default: $set_startdate = mktime(0, 0, 0, date('m', $this->bo->user_time_now), date('d', $this->bo->user_time_now), date('Y', $this->bo->user_time_now)); break;
 				case 'datetime':      $set_startdate = $this->bo->user_time_now; break;
 				case 'empty':         $set_startdate = 0; break;
 			}
 			if ((int)$content['info_link_id'] > 0 && !egw_link::get_link($content['info_link_id']))
 			{
-				$content['info_link_id'] = 0;	// link has been deleted
+				$content['info_link_id'] = 0; // link has been deleted
 				if (!$content['info_custom_link']) $content['info_from'] = '';
 			}
 			if (!$info_id && $action_id && $action == 'sp')    // new SubProject
 			{
-				if (!$this->bo->check_access($action_id,EGW_ACL_ADD))
+				if (!$this->bo->check_access($action_id, EGW_ACL_ADD))
 				{
-					return $referer ? $this->tmpl->location($referer) : $this->index(0,$action,$action_id);
+					return $referer ? $this->tmpl->location($referer) : $this->index(0, $action, $action_id);
 				}
 			}
 			else
 			{
-				$undelete = $this->bo->check_access($info_id,EGW_ACL_UNDELETE);
+				$undelete = $this->bo->check_access($info_id, EGW_ACL_UNDELETE);
 			}
 			$content['links'] = $content['link_to'] = array(
 				'to_id' => $info_id,
@@ -1966,12 +1962,12 @@ 
 			);
 		}
 		// new call via GET or some actions handled here, as they can happen both ways ($_GET[action] or button/action in GUI)
-		if (!$submit || in_array($action,array('sp','copy','schedule','ical','to_tracker')))
+		if (!$submit || in_array($action, array('sp', 'copy', 'schedule', 'ical', 'to_tracker')))
 		{
 			switch ($action)
 			{
 				case 'schedule':
-					egw::redirect_link('/index.php',array(
+					egw::redirect_link('/index.php', array(
 						'menuaction' => 'calendar.calendar_uiforms.edit',
 						'link_app' => 'infolog',
 						'link_id' => $info_id,
@@ -1979,7 +1975,7 @@ 
 					break;
 				case 'ical':
 					$boical = new infolog_ical();
-					$result = $boical->exportVTODO($content,'2.0','PUBLISH',false);
+					$result = $boical->exportVTODO($content, '2.0', 'PUBLISH', false);
 					html::content_header('todo.ics', 'text/calendar');
 					echo $result;
 					common::egw_exit();
@@ -1990,23 +1986,23 @@ 
 					if ($action == 'sp')	// for sub-entries use type or category, like for new entries
 					{
 						if ($type) $content['info_type'] = $type;
-						if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int) $_REQUEST['cat_id'];
+						if (is_numeric($_REQUEST['cat_id'])) $content['info_cat'] = (int)$_REQUEST['cat_id'];
 					}
-					unset($action);	// it get stored in $content and will cause an other copy after [apply]
+					unset($action); // it get stored in $content and will cause an other copy after [apply]
 					break;
 				case 'to_tracker':
-					egw::redirect_link('/index.php',array(
+					egw::redirect_link('/index.php', array(
 						'menuaction' => 'tracker.tracker_ui.edit',
 						egw_link::get_registry('tracker', 'add_app').'[]' => 'infolog',
-						egw_link::get_registry('tracker','add_id').'[]' => $info_id,
+						egw_link::get_registry('tracker', 'add_id').'[]' => $info_id,
 					));
 					break;
 				case 'projectmanager':
 					$pm_links = array($action_id);
 				default:	// to allow other apps to participate
 					$content['info_subject'] = egw_link::title($action, $id);
-					$action_ids = explode(',',$action_id);
-					if(count($action_ids) == 1)
+					$action_ids = explode(',', $action_id);
+					if (count($action_ids) == 1)
 					{
 						$content['info_contact'] = $action.':'.$action_id;
 					}
@@ -2015,11 +2011,11 @@ 
 						egw_link::link('infolog', $content['link_to']['to_id'], $action, $id);
 
 						// calling "infolog_set" hook for first, in case app wants to set some more values
-						if (!$n && ($set = $GLOBALS['egw']->hooks->single(array('location'=>'infolog_set','id'=>$action_id),$action)))
+						if (!$n && ($set = $GLOBALS['egw']->hooks->single(array('location'=>'infolog_set', 'id'=>$action_id), $action)))
 						{
-							foreach((array)$set['link_app'] as $i => $l_app)
+							foreach ((array)$set['link_app'] as $i => $l_app)
 							{
-								if (($l_id=$set['link_id'][$i])) egw_link::link('infolog',$content['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id = $set['link_id'][$i])) egw_link::link('infolog', $content['link_to']['to_id'], $l_app, $l_id);
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
@@ -2033,12 +2029,12 @@ 
 					{
 						if (!isset($pm_links))
 						{
-							$pm_links = egw_link::get_links('infolog',$info_id,'projectmanager');
+							$pm_links = egw_link::get_links('infolog', $info_id, 'projectmanager');
 						}
-						break;	// normal edit
+						break; // normal edit
 					}
 				case 'new':		// new entry, set some defaults, if not set by infolog_set hook
-					if (empty($content['info_startdate'])) $content['info_startdate'] = (int) $_GET['startdate'] ? (int) $_GET['startdate'] : $set_startdate;
+					if (empty($content['info_startdate'])) $content['info_startdate'] = (int)$_GET['startdate'] ? (int)$_GET['startdate'] : $set_startdate;
 					if (empty($content['info_priority'])) $content['info_priority'] = 1; // normal
 					$content['info_owner'] = $this->user;
 					if ($type != '' && empty($content['info_type']))
@@ -2063,9 +2059,9 @@ 
 		if ($this->bo->group_owners)
 		{
 			// remove types owned by groups the user has no edit grant (current type is made readonly)
-			foreach($this->bo->group_owners as $type => $group)
+			foreach ($this->bo->group_owners as $type => $group)
 			{
-				if (!($this->bo->grants[$group] & EGW_ACL_EDIT))
+				if (!($this->bo->grants[$group]&EGW_ACL_EDIT))
 				{
 					if ($type == $content['info_type'])
 					{
@@ -2083,7 +2079,7 @@ 
 			{
 				$content['info_owner'] = $this->bo->group_owners[$content['info_type']];
 				// Dont allow to change the type, if user has no delete rights from the group-owner
-				if ($info_id && !($this->bo->grants[$content['info_owner']] & EGW_ACL_DELETE))
+				if ($info_id && !($this->bo->grants[$content['info_owner']]&EGW_ACL_DELETE))
 				{
 					//echo "<p>setting type to r/o as user has no delete rights from group #$group</p>\n";
 					$readonlys['info_type'] = true;
@@ -2091,7 +2087,7 @@ 
 				// disable info_access for group-owners
 				$readonlys['info_access'] = true;
 			}
-			elseif($GLOBALS['egw']->accounts->get_type($content['info_owner']) == 'g')
+			elseif ($GLOBALS['egw']->accounts->get_type($content['info_owner']) == 'g')
 			{
 				$content['info_owner'] = $this->user;
 			}
@@ -2103,18 +2099,18 @@ 
 		unset($preserv['links']); unset($preserv['link_to']);
 
 		// for no edit rights or implizit edit of responsible user make all fields readonly, but status and percent
-		if ($info_id && !$this->bo->check_access($info_id,EGW_ACL_EDIT) && !$undelete)
+		if ($info_id && !$this->bo->check_access($info_id, EGW_ACL_EDIT) && !$undelete)
 		{
-			$readonlys['__ALL__'] = true;	// make all fields not explicitly set readonly
+			$readonlys['__ALL__'] = true; // make all fields not explicitly set readonly
 			if ($this->bo->is_responsible($content))
 			{
-				foreach($this->bo->responsible_edit as $name)
+				foreach ($this->bo->responsible_edit as $name)
 				{
 					$readonlys[$name] = false;
 				}
 				$readonlys['button[edit]'] = $readonlys['button[save]'] = $readonlys['button[apply]'] = $readonlys['no_notifications'] = false;
 			}
-			$readonlys['action'] = $readonlys['button[cancel]'] = false;	// always allowed
+			$readonlys['action'] = $readonlys['button[cancel]'] = false; // always allowed
 		}
 		elseif (!$info_id)
 		{
@@ -2127,16 +2123,16 @@ 
 			$this->tmpl->setElementAttribute('button[save]', 'label', 'Un-Delete');
 		}
 
-		if (!($readonlys['button[delete]'] = !$info_id || !$this->bo->check_access($info_id,EGW_ACL_DELETE)))
+		if (!($readonlys['button[delete]'] = !$info_id || !$this->bo->check_access($info_id, EGW_ACL_DELETE)))
 		{
-			$content['info_anz_subs'] = $this->bo->anzSubs($info_id);	// to determine js confirmation of delete or not
+			$content['info_anz_subs'] = $this->bo->anzSubs($info_id); // to determine js confirmation of delete or not
 		}
 		$GLOBALS['egw_info']['flags']['app_header'] = lang($this->messages[$info_id ? 'edit' : ($action == 'sp' ? 'add_sub' : 'add')]);
 
 		// use a typ-specific template (infolog.edit.xyz), if one exists, otherwise fall back to the generic one
 		if (!$this->tmpl->read('infolog.edit.'.$content['info_type']))
 		{
-			$this->tmpl->read($print ? 'infolog.edit.print':'infolog.edit');
+			$this->tmpl->read($print ? 'infolog.edit.print' : 'infolog.edit');
 		}
 		if ($this->bo->has_customfields($content['info_type']))
 		{
@@ -2148,14 +2144,14 @@ 
 		}
 		if (!isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
 		{
-			$readonlys['tabs']['project'] = true;	// disable the project tab
+			$readonlys['tabs']['project'] = true; // disable the project tab
 		}
 
 		$content['duration_format'] = $this->duration_format;
 		$content['hours_per_workday'] = $this->hours_per_workday;
 		if ($this->prefs['show_id']) $content['info_number'] = $info_id;
 
-		$content['info_anz_subs'] = (int)$content['info_anz_subs'];	// gives javascript error if empty!
+		$content['info_anz_subs'] = (int)$content['info_anz_subs']; // gives javascript error if empty!
 
 		$old_pm_id = is_array($pm_links) ? array_shift($pm_links) : $content['old_pm_id'];
 		if (!isset($content['pm_id']) && $old_pm_id) $content['pm_id'] = $old_pm_id;
@@ -2173,7 +2169,7 @@ 
 					'Pr' => $this->bo->enums['priority'],
 					'Ow' => 'select-account',
 					//'Ac',	//	info_access: private||public
-					'St' => $this->bo->status[$content['info_type']]+array('deleted' => 'deleted'),
+					'St' => $this->bo->status[$content['info_type']] + array('deleted' => 'deleted'),
 					'Pe' => 'select-percent',
 					'Co' => 'date-time',
 					'st' => 'date-time',
@@ -2190,7 +2186,7 @@ 
 			);
 			$history_stati = array();
 			$tracking = new infolog_tracking($this);
-			foreach($tracking->field2history as $field => $history)
+			foreach ($tracking->field2history as $field => $history)
 			{
 				$history_stati[$history] = $tracking->field2label[$field];
 			}
@@ -2220,7 +2216,7 @@ 
 		{
 			$sel_options['action']['schedule'] = array('label' => 'Schedule', 'title' => 'Schedule appointment');
 		}
-		egw_framework::validate_file('.','edit','infolog');
+		egw_framework::validate_file('.', 'edit', 'infolog');
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog').' - '.
 			($content['status_only'] ? lang('Edit Status') : lang('Edit'));
 		$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => ($info_id ? 'ManualInfologEdit' : 'ManualInfologAdd'));
@@ -2228,15 +2224,15 @@ 
 		//$content['info_des'] = substr($content['info_des'],0,1793);
 		//echo "<p>infolog_ui.edit(info_id='$info_id',action='$action',action_id='$action_id') readonlys="; print_r($readonlys); echo ", content = "; _debug_array($content);
 		//$content['info_cc'] is expected (by the widget) to be an array of emailaddresses, but is stored as comma separated string
-		if (!empty($content['info_cc'])&&!is_array($content['info_cc']))$content['info_cc'] = explode(',',$content['info_cc']);
-		$this->tmpl->exec('infolog.infolog_ui.edit',$content,$sel_options,$readonlys,$preserv+array(	// preserved values
+		if (!empty($content['info_cc']) && !is_array($content['info_cc']))$content['info_cc'] = explode(',', $content['info_cc']);
+		$this->tmpl->exec('infolog.infolog_ui.edit', $content, $sel_options, $readonlys, $preserv + array(	// preserved values
 			'info_id'       => $info_id,
 			'action'        => $action,
 			'action_id'     => $action_id,
 			'referer'       => $referer,
 			'no_popup'      => $no_popup,
 			'old_pm_id'     => $old_pm_id,
-		),$no_popup ? 0 : 2);
+		), $no_popup ? 0 : 2);
 	}
 
 	/**
@@ -2247,16 +2243,16 @@ 
 	 * @param array &$content
 	 * @param boolean $create_sub true: create a sub-entry instead of a copy, default false to create a copy
 	 */
-	private function create_copy(array &$content, $create_sub=false)
+	private function create_copy(array &$content, $create_sub = false)
 	{
-		$info_id = $content['info_id'];	// it will be unset by exclude-fields
+		$info_id = $content['info_id']; // it will be unset by exclude-fields
 
 		// empty fields configured to be excluded (also contains id, uid, ...)
 		$exclude_fields = $create_sub ? $this->bo->sub_excludefields : $this->bo->copy_excludefields;
 		foreach ($exclude_fields as $field)
 		{
 			unset($content[$field]);
-			if ($field == 'info_from') unset($content['info_link_id']);	// both together is called contact in UI
+			if ($field == 'info_from') unset($content['info_link_id']); // both together is called contact in UI
 		}
 		if ($create_sub)
 		{
@@ -2265,9 +2261,9 @@ 
 		// no startdate or startdate in the past --> set startdate from pref
 		if (!isset($content['info_startdate']) || $content['info_startdate'] < $this->bo->user_time_now)
 		{
-			switch($this->prefs['set_start'])
+			switch ($this->prefs['set_start'])
 			{
-				case 'date': default: $set_startdate = mktime(0,0,0,date('m',$this->bo->user_time_now),date('d',$this->bo->user_time_now),date('Y',$this->bo->user_time_now)); break;
+				case 'date': default: $set_startdate = mktime(0, 0, 0, date('m', $this->bo->user_time_now), date('d', $this->bo->user_time_now), date('Y', $this->bo->user_time_now)); break;
 				case 'datetime':      $set_startdate = $this->bo->user_time_now; break;
 				case 'empty':         $set_startdate = 0; break;
 			}
@@ -2286,17 +2282,17 @@ 
 		// get a consistent status, percent and date-completed
 		if (!isset($content['info_status'])) $content['info_status'] = $this->bo->status['defaults'][$content['info_type']];
 		if (!isset($content['info_percent'])) $content['info_percent'] = $content['info_status'] == 'done' ? '100%' : '0%';
-		$content['info_datecompleted'] =$content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
+		$content['info_datecompleted'] = $content['info_status'] == 'done' ? $this->bo->user_time_now : 0;
 
 		if (!isset($content['info_cat'])) $content['info_cat'] = $this->prefs['cat_add_default'];
 
-		if(!is_array($content['link_to'])) $content['link_to'] = array();
+		if (!is_array($content['link_to'])) $content['link_to'] = array();
 		$content['link_to']['to_app'] = 'infolog';
 		$content['link_to']['to_id'] = 0;
 		// Get links to be copied, if not excluded
-		if (!in_array('link_to',$exclude_fields) || !in_array('attachments',$exclude_fields))
+		if (!in_array('link_to', $exclude_fields) || !in_array('attachments', $exclude_fields))
 		{
-			foreach(egw_link::get_links($content['link_to']['to_app'], $info_id) as $link)
+			foreach (egw_link::get_links($content['link_to']['to_app'], $info_id) as $link)
 			{
 				if ($link['app'] != egw_link::VFS_APPNAME && !in_array('link_to', $exclude_fields))
 				{
@@ -2320,19 +2316,19 @@ 
 			if (!isset($content['info_contact']) || empty($content['info_contact']) || $content['info_contact'] === 'copy:')
 			{
 				$linkinfos = egw_link::get_link($info_link_id);
-				$content['info_contact'] = $linkinfos['link_app1']=='infolog'? $linkinfos['link_app2'].':'.$linkinfos['link_id2']:$linkinfos['link_app1'].':'.$linkinfos['link_id1'];
-				if (stripos($content['info_contact'],'projectmanager')!==false) $content['pm_id'] = $linkinfos['link_app1']=='projectmanager'? $linkinfos['link_id1']:$linkinfos['link_id2'];
+				$content['info_contact'] = $linkinfos['link_app1'] == 'infolog' ? $linkinfos['link_app2'].':'.$linkinfos['link_id2'] : $linkinfos['link_app1'].':'.$linkinfos['link_id1'];
+				if (stripos($content['info_contact'], 'projectmanager') !== false) $content['pm_id'] = $linkinfos['link_app1'] == 'projectmanager' ? $linkinfos['link_id1'] : $linkinfos['link_id2'];
 			}
 			unset($content['info_link_id']);
 		}
-		$content['info_owner'] = !(int)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD,0,$this->owner) ? $this->user : $this->owner;
+		$content['info_owner'] = !(int)$this->owner || !$this->bo->check_perms(EGW_ACL_ADD, 0, $this->owner) ? $this->user : $this->owner;
 
 		if (!empty($content['info_subject']))
 		{
 			if ($create_sub)
 			{
 				$config = config::read('infolog');
-				$prefix = lang(empty($config['sub_prefix']) ? 'Re:': $config['sub_prefix']);
+				$prefix = lang(empty($config['sub_prefix']) ? 'Re:' : $config['sub_prefix']);
 			}
 			else
 			{
@@ -2342,17 +2338,17 @@ 
 		}
 		if (!$create_sub)
 		{
-			$content['msg'] .= ($content['msg']?"\n":'').lang('Infolog copied - the copy can now be edited');
+			$content['msg'] .= ($content['msg'] ? "\n" : '').lang('Infolog copied - the copy can now be edited');
 		}
 	}
 
-	function icon($cat,$id,$status='')
+	function icon($cat, $id, $status = '')
 	{
 		if (!$status || !($icon = $this->icons[$cat][$id.'_'.$status]))
 		{
 			$icon = $this->icons[$cat][$id];
 		}
-		if ($icon && !is_readable(common::get_image_dir() . '/' . $icon))
+		if ($icon && !is_readable(common::get_image_dir().'/'.$icon))
 		{
 			$icon = False;
 		}
@@ -2363,7 +2359,7 @@ 
 				$alt = $id;
 			}
 		}
-		return $icon ? html::image('infolog',$icon,lang($alt),'border=0') : lang($alt);
+		return $icon ? html::image('infolog', $icon, lang($alt), 'border=0') : lang($alt);
 	}
 
 	/**
@@ -2375,7 +2371,7 @@ 
 	 */
 	function array_stripslashes($arr)
 	{
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			if (is_array($val))
 			{
@@ -2436,27 +2432,27 @@ 
 			'info_cc' => 'CC',
 		);
 		// add customfields to field list
-		foreach(config::get_customfields('infolog') as $name => $data)
+		foreach (config::get_customfields('infolog') as $name => $data)
 		{
 			$excludefields['#'.$name] = $data['label'];
 		}
 		$sub_excludefields = $excludefields;
-		unset($sub_excludefields['info_id_parent']);	// always set to parent!
+		unset($sub_excludefields['info_id_parent']); // always set to parent!
 
 		$config = config::read('infolog');
 
-		if($content)
+		if ($content)
 		{
 			// Save
 			$button = key($content['button']);
-			if($button == 'save' || $button == 'apply')
+			if ($button == 'save' || $button == 'apply')
 			{
-				$this->bo->responsible_edit = array('info_status','info_percent','info_datecompleted');
+				$this->bo->responsible_edit = array('info_status', 'info_percent', 'info_datecompleted');
 
 				if ($content['responsible_edit'])
 				{
-					$extra = array_intersect($content['responsible_edit'],array_keys($fields));
-					$this->bo->responsible_edit = array_unique(array_merge($this->bo->responsible_edit,$extra));
+					$extra = array_intersect($content['responsible_edit'], array_keys($fields));
+					$this->bo->responsible_edit = array_unique(array_merge($this->bo->responsible_edit, $extra));
 				}
 				config::save_value('copy_excludefields', $content['copy_excludefields'] ? $content['copy_excludefields'] : null, 'infolog');
 				config::save_value('sub_excludefields', $content['sub_excludefields'] ? $content['sub_excludefields'] : array('*NONE*'), 'infolog');
@@ -2467,12 +2463,12 @@ 
 				config::save_value('sub_prefix', $content['sub_prefix'], 'infolog');
 
 				// Notifications
-				$notifications =& $config[infolog_tracking::CUSTOM_NOTIFICATION];
+				$notifications = & $config[infolog_tracking::CUSTOM_NOTIFICATION];
 				$notifications[$content['notification_type']] = $content['notification'];
-				config::save_value(infolog_tracking::CUSTOM_NOTIFICATION, $notifications,'infolog');
+				config::save_value(infolog_tracking::CUSTOM_NOTIFICATION, $notifications, 'infolog');
 			}
 
-			if($button == 'save' || $button == 'cancel')
+			if ($button == 'save' || $button == 'cancel')
 			{
 				egw::redirect_link('/index.php', array(
 					'menuaction' => 'admin.admin_ui.index',
@@ -2495,7 +2491,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog').' - '.lang('Site configuration');
 
 		// Load selected custom notification
-		if(!$content['notification_type'])
+		if (!$content['notification_type'])
 		{
 			$content['notification_type'] = '~global~';
 		}
@@ -2519,7 +2515,7 @@ 
 		);
 		$preserve['notification_old_type'] = $content['notification_type'];
 		$this->tmpl->read('infolog.config');
-		$this->tmpl->exec('infolog.infolog_ui.admin',$content,$sel_options,array(),$preserve);
+		$this->tmpl->exec('infolog.infolog_ui.admin', $content, $sel_options, array(), $preserve);
 	}
 
 	/**
@@ -2528,13 +2524,13 @@ 
 	 * @param array $mailContent = null content of mail
 	 * @return  array
 	 */
-	function mail_import(array $mailContent=null)
+	function mail_import(array $mailContent = null)
 	{
 		// It would get called from compose as a popup with egw_data
 		if (!is_array($mailContent) && ($_GET['egw_data']))
 		{
 			// get the mail raw data
-			egw_link::get_data ($_GET['egw_data']);
+			egw_link::get_data($_GET['egw_data']);
 			return false;
 		}
 
@@ -2565,7 +2561,7 @@ 
 	function hook_view($args)
 	{
 		// Load JS for infolog actions
-		egw_framework::validate_file('.','app','infolog');
+		egw_framework::validate_file('.', 'app', 'infolog');
 
 		switch ($args['location'])
 		{
@@ -2593,7 +2589,7 @@ 
 		{
 			return False;
 		}
-		$this->called_by = $app;	// for read/save_sessiondata, to have different sessions for the hooks
+		$this->called_by = $app; // for read/save_sessiondata, to have different sessions for the hooks
 
 		// Set to calling app, so actions wind up in the correct place client side
 		$GLOBALS['egw_info']['flags']['currentapp'] = $app;
@@ -2601,11 +2597,11 @@ 
 		translation::add_app('infolog');
 
 		// Still want infolog categories though
-		$GLOBALS['egw']->categories = new categories('','infolog');
-		$this->index(null,$app,$args[$view_id],array(
+		$GLOBALS['egw']->categories = new categories('', 'infolog');
+		$this->index(null, $app, $args[$view_id], array(
 			'menuaction' => $view,
 			isset($view_id2) ? $view_id2 : $view_id => $args[$view_id]
-		),True);
+		), True);
 	}
 
 	/**
@@ -2614,26 +2610,26 @@ 
 	 * @param string $type infolog type to include only the matching custom fields if set
 	 * @return array
 	 */
-	function csv_export_fields($type=null)
+	function csv_export_fields($type = null)
 	{
 		$fields = array(
 			'info_type'          => lang('Type'),
 			'info_from'          => lang('Contact'),
 			'info_addr'          => lang('Phone/Email'),
 //			'info_link_id'       => lang('primary link'),
-			'info_cat'           => array('label' => lang('Category'),'type' => 'select-cat'),
+			'info_cat'           => array('label' => lang('Category'), 'type' => 'select-cat'),
 			'info_priority'      => lang('Priority'),
-			'info_owner'         => array('label' => lang('Owner'),'type' => 'select-account'),
+			'info_owner'         => array('label' => lang('Owner'), 'type' => 'select-account'),
 			'info_access'        => lang('Access'),
 			'info_status'        => lang('Status'),
 			'info_percent'       => lang('Completed'),
 			'info_datecompleted' => lang('Date completed'),
 			'info_datemodified'  => lang('Last modified'),
-			'info_modifier'      => array('label' => lang('Modifier'),'type' => 'select-account'),
+			'info_modifier'      => array('label' => lang('Modifier'), 'type' => 'select-account'),
 			'info_location'      => lang('Location'),
 			'info_startdate'     => lang('Startdate'),
 			'info_enddate'       => lang('Enddate'),
-			'info_responsible'   => array('label' => lang('Responsible'),'type' => 'select-account'),
+			'info_responsible'   => array('label' => lang('Responsible'), 'type' => 'select-account'),
 			'info_subject'       => lang('Subject'),
 			'info_des'           => lang('Description'),
 			'info_id'            => lang('Id'),
@@ -2643,13 +2639,13 @@ 
 			'pl_id'              => lang('pricelist'),
 			'info_price'         => lang('price'),
 		);
-		foreach($this->bo->timestamps as $name)
+		foreach ($this->bo->timestamps as $name)
 		{
-			$fields[$name] = array('label' => $fields[$name],'type' => 'date-time');
+			$fields[$name] = array('label' => $fields[$name], 'type' => 'date-time');
 		}
-		foreach($this->bo->customfields as $name => $data)
+		foreach ($this->bo->customfields as $name => $data)
 		{
-			if ($data['type2'] && $type && !in_array($type,explode(',',$data['type2']))) continue;
+			if ($data['type2'] && $type && !in_array($type, explode(',', $data['type2']))) continue;
 
 			$fields['#'.$name] = array(
 				'label' => $data['label'],

infolog/inc/class.infolog_ical.inc.php

Indentation +16 added lines, -16 removed lines

@@ -67,10 +67,10 @@ 
 	var $productName = '';
 
 	/**
-	* Shall we use the UID extensions of the description field?
-	*
-	* @var boolean
-	*/
+	 * Shall we use the UID extensions of the description field?
+	 *
+	 * @var boolean
+	 */
 	var $uidExtension = false;
 
 	/**
@@ -509,10 +509,10 @@ 
 	 * @param boolean $merge =false	merge data with existing entry (no longer used)
 	 * @param int $user =null delegate new task to this account_id, default null
 	 * @param string $charset =null The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     * @param string $caldav_name =null CalDAV URL name-part for new entries
-     * @param array $callback_data =null array with callback and further parameters, first param is task to save
-     * 	signature array callback($task, $param1, ...)
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 * @param string $caldav_name =null CalDAV URL name-part for new entries
+	 * @param array $callback_data =null array with callback and further parameters, first param is task to save
+	 * 	signature array callback($task, $param1, ...)
 	 * @return int|boolean integer info_id or false on error
 	 */
 	function importVTODO(&$_vcalData, $_taskID=-1, $merge=false, $user=null, $charset=null, $caldav_name=null,
@@ -597,7 +597,7 @@ 
 	 * @param int $contentID =null 	infolog_id (or null, if unkown)
 	 * @param boolean $relax =false 	if true, a weaker match algorithm is used
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
+	 *                         utf-8 for new format, iso-8859-1 for old format.
 	 *
 	 * @return array of infolog_ids of matching entries
 	 */
@@ -642,8 +642,8 @@ 
 	 * @param string $_vcalData 	VTODO data
 	 * @param int $_taskID =-1		infolog_id of the entry
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     *
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 *
 	 * @return array infolog entry or false on error
 	 */
 	function vtodotoegw($_vcalData, $_taskID=-1, $charset=null)
@@ -1010,8 +1010,8 @@ 
 	 * @param int $_noteID =-1 info_id, default -1 = new entry
 	 * @param boolean $merge =false	merge data with existing entry (no longer used)
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     *
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 *
 	 * @return int|boolean integer info_id or false on error
 	 */
 	function importVNOTE(&$_vcalData, $_type, $_noteID=-1, $merge=false, $charset=null)
@@ -1045,7 +1045,7 @@ 
 	 * @param int $contentID=null 	infolog_id (or null, if unkown)
 	 * @param boolean $relax=false 	if true, a weaker match algorithm is used
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
+	 *                         utf-8 for new format, iso-8859-1 for old format.
 	 *
 	 * @return infolog_id of a matching entry or false, if nothing was found
 	 */
@@ -1067,8 +1067,8 @@ 
 	 * @param string $_type		content type (eg.g text/plain)
 	 * @param int $_noteID =-1	infolog_id of the entry
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
-     *
+	 *                         utf-8 for new format, iso-8859-1 for old format.
+	 *
 	 * @return array infolog entry or false on error
 	 */
 	function vnotetoegw($_data, $_type, $_noteID=-1, $charset=null)

Braces +72 added lines, -18 removed lines

@@ -104,7 +104,10 @@ 
 	function __construct(&$_clientProperties = array())
 	{
 		parent::__construct();
-		if ($this->log) $this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-infolog-vcal";
+		if ($this->log)
+		{
+			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-infolog-vcal";
+		}
 		$this->clientProperties = $_clientProperties;
 	}
 
@@ -150,7 +153,10 @@ 
 		}
 		else
 		{
-			if (!($taskData = $this->read($task, true, 'server'))) return false;
+			if (!($taskData = $this->read($task, true, 'server')))
+			{
+				return false;
+			}
 		}
 
 		if ($taskData['info_id_parent'])
@@ -190,11 +196,17 @@ 
 				array2string($taskData)."\n",3,$this->logfile);
 		}
 
-		if (!isset($vcal)) $vcal = new Horde_Icalendar;
+		if (!isset($vcal))
+		{
+			$vcal = new Horde_Icalendar;
+		}
 		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']),array(),false);
 		$vcal->setAttribute('VERSION',$_version,array(),false);
-		if ($_method) $vcal->setAttribute('METHOD',$_method,array(),false);
+		if ($_method)
+		{
+			$vcal->setAttribute('METHOD',$_method,array(),false);
+		}
 
 		$tzid = $this->tzid;
 		if ($tzid && $tzid != 'UTC')
@@ -273,7 +285,10 @@ 
 				//	__FILE__, __LINE__, PEAR_LOG_INFO);
 			}
 
-			if (empty($value) && ($size < 0 || $noTruncate)) continue;
+			if (empty($value) && ($size < 0 || $noTruncate))
+			{
+				continue;
+			}
 
 			if ($field == 'RELATED-TO')
 			{
@@ -402,7 +417,10 @@ 
 				{
 					if ($name[2] == ':')
 					{
-						if (($v = json_php_unserialize($value)) && is_array($v)) $value = $v;
+						if (($v = json_php_unserialize($value)) && is_array($v))
+						{
+							$value = $v;
+						}
 						foreach((array)$value as $compvData)
 						{
 							$comp = Horde_Icalendar::newComponent(substr($name,3), $vevent);
@@ -530,7 +548,10 @@ 
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 		}
 
-		if (!$taskData) return false;
+		if (!$taskData)
+		{
+			return false;
+		}
 
 		// keep the dates
 		$this->time2time($taskData, $this->tzid, false);
@@ -576,7 +597,10 @@ 
 			// remove all iCal fields not supported by EGroupware (stored like custom fields)
 			foreach(array_keys($old) as $name)
 			{
-				if (substr($name,0,2) == '##') unset($old[$name]);
+				if (substr($name,0,2) == '##')
+				{
+					unset($old[$name]);
+				}
 			}
 			// merge in again all infolog fields not supported by iCal or not allowed to change
 			$taskData = array_merge($taskData, $old);
@@ -722,7 +746,10 @@ 
 						$component->setAttribute('PERCENT-COMPLETE', $percent_completed = $status == 'COMPLETED' ?
 							100 : ($status == 'NEEDS-ACTION' ? 0 : 10));
 					}
-					if ($this->log) error_log(__METHOD__."() setting STATUS='$status' and PERCENT-COMPLETE=$percent_completed from COMPLETED and X-INFOLOG-STATUS='$x_infolog_status'\n",3,$this->logfile);
+					if ($this->log)
+					{
+						error_log(__METHOD__."() setting STATUS='$status' and PERCENT-COMPLETE=$percent_completed from COMPLETED and X-INFOLOG-STATUS='$x_infolog_status'\n",3,$this->logfile);
+					}
 				}
 				// new task without status --> set a default status of NEEDS-ACTION, as otherwise task is marked closed
 				elseif($_taskID <= 0 && !is_scalar($x_infolog_status) && !is_scalar($completed))
@@ -731,12 +758,18 @@ 
 				}
 				else
 				{
-					if ($this->log) error_log(__METHOD__."() no STATUS, X-INFOLOG-STATUS='$x_infolog_status', COMPLETED".(is_scalar($completed)?'='.$completed:' not set')." --> leaving status and percent unchanged",3,$this->logfile);
+					if ($this->log)
+					{
+						error_log(__METHOD__."() no STATUS, X-INFOLOG-STATUS='$x_infolog_status', COMPLETED".(is_scalar($completed)?'='.$completed:' not set')." --> leaving status and percent unchanged",3,$this->logfile);
+					}
 				}
 			}
 			foreach ($component->getAllAttributes() as $attribute)
 			{
-				if (!$attribute['value'] && $attribute['value'] !== '0') continue;
+				if (!$attribute['value'] && $attribute['value'] !== '0')
+				{
+					continue;
+				}
 
 				switch ($attribute['name'])
 				{
@@ -921,7 +954,10 @@ 
 	 */
 	function exportVNOTE($_noteID, $_type, $charset='UTF-8')
 	{
-		if(!($note = $this->read($_noteID, true, 'server'))) return false;
+		if(!($note = $this->read($_noteID, true, 'server')))
+		{
+			return false;
+		}
 
 		$note = Api\Translation::convert($note,
 			Api\Translation::charset(), $charset);
@@ -1023,11 +1059,20 @@ 
 				array2string($_vcalData)."\n",3,$this->logfile);
 		}
 
-		if (!($note = $this->vnotetoegw($_vcalData, $_type, $_noteID, $charset))) return false;
+		if (!($note = $this->vnotetoegw($_vcalData, $_type, $_noteID, $charset)))
+		{
+			return false;
+		}
 
-		if($_noteID > 0) $note['info_id'] = $_noteID;
+		if($_noteID > 0)
+		{
+			$note['info_id'] = $_noteID;
+		}
 
-		if (empty($note['info_status'])) $note['info_status'] = 'done';
+		if (empty($note['info_status']))
+		{
+			$note['info_status'] = 'done';
+		}
 
 		if ($this->log)
 		{
@@ -1051,9 +1096,15 @@ 
 	 */
 	function searchVNOTE($_vcalData, $_type, $contentID=null, $relax=false, $charset=null)
 	{
-		if (!($note = $this->vnotetoegw($_vcalData, $_type, $contentID, $charset))) return array();
+		if (!($note = $this->vnotetoegw($_vcalData, $_type, $contentID, $charset)))
+		{
+			return array();
+		}
 
-		if ($contentID)	$note['info_id'] = $contentID;
+		if ($contentID)
+		{
+			$note['info_id'] = $contentID;
+		}
 
 		unset($note['info_startdate']);
 
@@ -1105,7 +1156,10 @@ 
 				{
 					$_data = Api\Translation::convert($_data, $charset, 'utf-8');
 				}
-				if (!$vnote->parsevCalendar($_data, 'VCALENDAR'))	return false;
+				if (!$vnote->parsevCalendar($_data, 'VCALENDAR'))
+				{
+					return false;
+				}
 
 				$components = $vnote->getComponent();
 				foreach ($components as $component)

Doc Comments +4 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
 	 * @param string $_version ='2.0'
 	 * @param string $_method =null only set for iTip messages
 	 * @param string $charset ='UTF-8'
-	 * @return string|boolean string with vCal or false on error (eg. no permission to read the event)
+	 * @return false|string string with vCal or false on error (eg. no permission to read the event)
 	 */
 	function exportVCalendar(array $tasks, $_version='2.0', $_method=null, $charset='UTF-8')
 	{
@@ -137,7 +137,7 @@ 
 	 * @param string $charset ='UTF-8' encoding of the vcalendar, default UTF-8
 	 * @param Horde_Icalendar $vcal =null optional iCalendar object to add vtodo to
 	 *
-	 * @return string|boolean string with vCal or false on error (eg. no permission to read the event)
+	 * @return false|string string with vCal or false on error (eg. no permission to read the event)
 	 */
 	function exportVTODO($task, $_version='2.0',$_method='PUBLISH', $charset='UTF-8',Horde_Icalendar $vcal=null)
 	{
@@ -916,7 +916,7 @@ 
 	 * @param string $_type		content type (e.g. text/plain)
 	 * @param string $charset ='UTF-8' encoding of the vcalendar, default UTF-8
 	 *
-	 * @return string|boolean VNOTE representation of the infolog entry or false on error
+	 * @return false|string VNOTE representation of the infolog entry or false on error
 	 */
 	function exportVNOTE($_noteID, $_type, $charset='UTF-8')
 	{
@@ -1041,8 +1041,7 @@ 
 	 * Search a matching infolog entry for the VNOTE data
 	 *
 	 * @param string $_vcalData		VNOTE
-	 * @param int $contentID=null 	infolog_id (or null, if unkown)
-	 * @param boolean $relax=false 	if true, a weaker match algorithm is used
+	 * @param int $contentID 	infolog_id (or null, if unkown)
 	 * @param string $charset  The encoding charset for $text. Defaults to
      *                         utf-8 for new format, iso-8859-1 for old format.
 	 *

Spacing +127 added lines, -130 removed lines

@@ -20,39 +20,39 @@ 
 	 * @var array $priority_egw2ical conversion of the priority egw => ical
 	 */
 	var $priority_egw2ical = array(
-		0 => 9,		// low
-		1 => 5,		// normal
-		2 => 3,		// high
-		3 => 1,		// urgent
+		0 => 9, // low
+		1 => 5, // normal
+		2 => 3, // high
+		3 => 1, // urgent
 	);
 
 	/**
 	 * @var array $priority_ical2egw conversion of the priority ical => egw
 	 */
 	var $priority_ical2egw = array(
-		9 => 0,	8 => 0, 7 => 0,	// low
-		6 => 1, 5 => 1, 4 => 1, 0 => 1,	// normal
-		3 => 2,	2 => 2,	// high
-		1 => 3,			// urgent
+		9 => 0, 8 => 0, 7 => 0, // low
+		6 => 1, 5 => 1, 4 => 1, 0 => 1, // normal
+		3 => 2, 2 => 2, // high
+		1 => 3, // urgent
 	);
 
 	/**
 	 * @var array $priority_egw2funambol conversion of the priority egw => funambol
 	 */
 	var $priority_egw2funambol = array(
-		0 => 0,		// low
-		1 => 1,		// normal
-		2 => 2,		// high
-		3 => 2,		// urgent
+		0 => 0, // low
+		1 => 1, // normal
+		2 => 2, // high
+		3 => 2, // urgent
 	);
 
 	/**
 	 * @var array $priority_funambol2egw conversion of the priority funambol => egw
 	 */
 	var $priority_funambol2egw = array(
-		0 => 0,		// low
-		1 => 1,		// normal
-		2 => 3,		// high
+		0 => 0, // low
+		1 => 1, // normal
+		2 => 3, // high
 	);
 
 	/**
@@ -90,7 +90,7 @@ 
 	 * @var boolean
 	 */
 	var $log = false;
-	var $logfile="/tmp/log-infolog-vcal";
+	var $logfile = "/tmp/log-infolog-vcal";
 
 
 	/**
@@ -114,11 +114,11 @@ 
 	 * @param string $charset ='UTF-8'
 	 * @return string|boolean string with vCal or false on error (eg. no permission to read the event)
 	 */
-	function exportVCalendar(array $tasks, $_version='2.0', $_method=null, $charset='UTF-8')
+	function exportVCalendar(array $tasks, $_version = '2.0', $_method = null, $charset = 'UTF-8')
 	{
 		$vcal = new Horde_Icalendar;
 
-		foreach($tasks as $task)
+		foreach ($tasks as $task)
 		{
 			if (!$this->exportVTODO($task, $_version, $_method, $charset, $vcal))
 			{
@@ -139,7 +139,7 @@ 
 	 *
 	 * @return string|boolean string with vCal or false on error (eg. no permission to read the event)
 	 */
-	function exportVTODO($task, $_version='2.0',$_method='PUBLISH', $charset='UTF-8',Horde_Icalendar $vcal=null)
+	function exportVTODO($task, $_version = '2.0', $_method = 'PUBLISH', $charset = 'UTF-8', Horde_Icalendar $vcal = null)
 	{
 		if (is_array($task))
 		{
@@ -164,10 +164,10 @@ 
 		{
 			if (!preg_match('/\[UID:.+\]/m', $taskData['info_des']))
 			{
-				$taskData['info_des'] .= "\n[UID:" . $taskData['info_uid'] . "]";
+				$taskData['info_des'] .= "\n[UID:".$taskData['info_uid']."]";
 				if ($taskData['info_id_parent'] != '')
 				{
-					$taskData['info_des'] .= "\n[PARENT_UID:" . $taskData['info_id_parent'] . "]";
+					$taskData['info_des'] .= "\n[PARENT_UID:".$taskData['info_id_parent']."]";
 				}
 			}
 		}
@@ -183,15 +183,15 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($taskData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($taskData)."\n", 3, $this->logfile);
 		}
 
 		if (!isset($vcal)) $vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
-			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']),array(),false);
-		$vcal->setAttribute('VERSION',$_version,array(),false);
-		if ($_method) $vcal->setAttribute('METHOD',$_method,array(),false);
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
+			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']), array(), false);
+		$vcal->setAttribute('VERSION', $_version, array(), false);
+		if ($_method) $vcal->setAttribute('METHOD', $_method, array(), false);
 
 		$tzid = $this->tzid;
 		if ($tzid && $tzid != 'UTC')
@@ -209,7 +209,7 @@ 
 			}
 		}
 
-		$vevent = Horde_Icalendar::newComponent('VTODO',$vcal);
+		$vevent = Horde_Icalendar::newComponent('VTODO', $vcal);
 
 		if (!isset($this->clientProperties['SUMMARY']['Size']))
 		{
@@ -233,9 +233,9 @@ 
 				$noTruncate = $this->clientProperties[$field]['NoTruncate'];
 				if ($this->log && $size > 0)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-						"() $field Size: $size, NoTruncate: " .
-						($noTruncate ? 'TRUE' : 'FALSE') . "\n",3,$this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+						"() $field Size: $size, NoTruncate: ".
+						($noTruncate ? 'TRUE' : 'FALSE')."\n", 3, $this->logfile);
 				}
 				//Horde::logMessage("VTODO $field Size: $size, NoTruncate: " .
 				//	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -252,19 +252,19 @@ 
 				{
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-							"() $field omitted due to maximum size $size\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+							"() $field omitted due to maximum size $size\n", 3, $this->logfile);
 					}
 					//Horde::logMessage("VTODO $field omitted due to maximum size $size",
 					//	__FILE__, __LINE__, PEAR_LOG_WARNING);
 					continue; // skip field
 				}
 				// truncate the value to size
-				$value = substr($value, 0, $size -1);
+				$value = substr($value, 0, $size - 1);
 				if ($this->log)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-						"() $field truncated to maximum size $size\n",3,$this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+						"() $field truncated to maximum size $size\n", 3, $this->logfile);
 				}
 				//Horde::logMessage("VTODO $field truncated to maximum size $size",
 				//	__FILE__, __LINE__, PEAR_LOG_INFO);
@@ -283,7 +283,7 @@ 
 
 			if ($_version == '1.0' && preg_match('/[^\x20-\x7F]/', $value))
 			{
-				$options['CHARSET']	= $charset;
+				$options['CHARSET'] = $charset;
 				switch ($this->productManufacturer)
 				{
 					case 'groupdav':
@@ -325,25 +325,23 @@ 
 			self::setDateOrTime($vevent, 'COMPLETED', $taskData['info_datecompleted'], $tzid);
 		}
 
-		$vevent->setAttribute('DTSTAMP',time());
-		$vevent->setAttribute('CREATED', $taskData['info_created'] ? $taskData['info_created'] :
-			$GLOBALS['egw']->contenthistory->getTSforAction('infolog_task',$taskData['info_id'],'add'));
-		$vevent->setAttribute('LAST-MODIFIED', $taskData['info_datemodified'] ? $taskData['info_datemodified'] :
-			$GLOBALS['egw']->contenthistory->getTSforAction('infolog_task',$taskData['info_id'],'modify'));
-		$vevent->setAttribute('CLASS',$taskData['info_access'] == 'public' ? 'PUBLIC' : 'PRIVATE');
-		$vevent->setAttribute('STATUS',$this->status2vtodo($taskData['info_status']));
+		$vevent->setAttribute('DTSTAMP', time());
+		$vevent->setAttribute('CREATED', $taskData['info_created'] ? $taskData['info_created'] : $GLOBALS['egw']->contenthistory->getTSforAction('infolog_task', $taskData['info_id'], 'add'));
+		$vevent->setAttribute('LAST-MODIFIED', $taskData['info_datemodified'] ? $taskData['info_datemodified'] : $GLOBALS['egw']->contenthistory->getTSforAction('infolog_task', $taskData['info_id'], 'modify'));
+		$vevent->setAttribute('CLASS', $taskData['info_access'] == 'public' ? 'PUBLIC' : 'PRIVATE');
+		$vevent->setAttribute('STATUS', $this->status2vtodo($taskData['info_status']));
 		// we try to preserv the original infolog status as X-INFOLOG-STATUS, so we can restore it, if the user does not modify STATUS
-		$vevent->setAttribute('X-INFOLOG-STATUS',$taskData['info_status']);
-		$vevent->setAttribute('PERCENT-COMPLETE',$taskData['info_percent']);
+		$vevent->setAttribute('X-INFOLOG-STATUS', $taskData['info_status']);
+		$vevent->setAttribute('PERCENT-COMPLETE', $taskData['info_percent']);
 		if ($this->productManufacturer == 'funambol' &&
 			(strpos($this->productName, 'outlook') !== false
 				|| strpos($this->productName, 'pocket pc') !== false))
 		{
-			$priority = (int) $this->priority_egw2funambol[$taskData['info_priority']];
+			$priority = (int)$this->priority_egw2funambol[$taskData['info_priority']];
 		}
 		else
 		{
-			$priority = (int) $this->priority_egw2ical[$taskData['info_priority']];
+			$priority = (int)$this->priority_egw2ical[$taskData['info_priority']];
 		}
 		$vevent->setAttribute('PRIORITY', $priority);
 
@@ -352,7 +350,7 @@ 
 			(count($taskData['info_responsible']) > 1 ||
 				$taskData['info_responsible'][0] != $taskData['info_onwer']))
 		{
-			if (($url = $GLOBALS['egw']->accounts->id2name($taskData['info_owner'],'account_email')))
+			if (($url = $GLOBALS['egw']->accounts->id2name($taskData['info_owner'], 'account_email')))
 			{
 				$url = 'MAILTO:'.$url;
 			}
@@ -360,13 +358,13 @@ 
 			{
 				$url = 'urn:uuid:'.common::generate_uid('accounts', $taskData['info_owner']);
 			}
-			$vevent->setAttribute('ORGANIZER',$url,array(
-				'CN'		=>	$GLOBALS['egw']->accounts->id2name($taskData['info_owner'],'account_fullname'),
+			$vevent->setAttribute('ORGANIZER', $url, array(
+				'CN'		=>	$GLOBALS['egw']->accounts->id2name($taskData['info_owner'], 'account_fullname'),
 				'X-EGROUPWARE-UID'	=> $taskData['info_owner'],
 			), true);
-			foreach($taskData['info_responsible'] as $responsible)
+			foreach ($taskData['info_responsible'] as $responsible)
 			{
-				if (($url = $GLOBALS['egw']->accounts->id2name($responsible,'account_email')))
+				if (($url = $GLOBALS['egw']->accounts->id2name($responsible, 'account_email')))
 				{
 					$url = 'MAILTO:'.$url;
 				}
@@ -376,15 +374,15 @@ 
 				}
 				if ($responsible > 0)
 				{
-					$vevent->setAttribute('ATTENDEE',$url,array(
-						'CN'		=>	$GLOBALS['egw']->accounts->id2name($responsible,'account_fullname'),
+					$vevent->setAttribute('ATTENDEE', $url, array(
+						'CN'		=>	$GLOBALS['egw']->accounts->id2name($responsible, 'account_fullname'),
 						'CUTYPE'	=> 'INDIVIDUAL',
 						'X-EGROUPWARE-UID'	=> $responsible,
 					), true);
 				}
 				elseif ($responsible < 0)
 				{
-					$vevent->setAttribute('ATTENDEE',$url,array(
+					$vevent->setAttribute('ATTENDEE', $url, array(
 						'CN'		=>	$GLOBALS['egw']->accounts->id2name($responsible),
 						'CUTYPE'	=> 'GROUP',
 						'X-EGROUPWARE-UID'	=> $responsible,
@@ -395,17 +393,17 @@ 
 		// for CalDAV add all X-Properties previously parsed
 		if ($this->productManufacturer == 'groupdav')
 		{
-			foreach($taskData as $name => $value)
+			foreach ($taskData as $name => $value)
 			{
 				if (substr($name, 0, 2) == '##')
 				{
 					if ($name[2] == ':')
 					{
 						if (($v = json_php_unserialize($value)) && is_array($v)) $value = $v;
-						foreach((array)$value as $compvData)
+						foreach ((array)$value as $compvData)
 						{
-							$comp = Horde_Icalendar::newComponent(substr($name,3), $vevent);
-							$comp->parsevCalendar($compvData,substr($name,3));
+							$comp = Horde_Icalendar::newComponent(substr($name, 3), $vevent);
+							$comp->parsevCalendar($compvData, substr($name, 3));
 							$vevent->addComponent($comp);
 						}
 					}
@@ -425,8 +423,8 @@ 
 		$retval = $vcal->exportvCalendar();
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($retval)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($retval)."\n", 3, $this->logfile);
 		}
 		// Horde::logMessage("exportVTODO:\n" . print_r($retval, true),
 		//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -455,7 +453,7 @@ 
 			}
 			$tz = self::$tz_cache[$tzid];
 		}
-		elseif(is_null($tzid))
+		elseif (is_null($tzid))
 		{
 			$tz = egw_time::$user_timezone;
 		}
@@ -463,9 +461,9 @@ 
 		{
 			$tz = egw_time::$server_timezone;
 		}
-		if (!is_a($time,'DateTime'))
+		if (!is_a($time, 'DateTime'))
 		{
-			$time = new egw_time($time,egw_time::$server_timezone);
+			$time = new egw_time($time, egw_time::$server_timezone);
 		}
 		$time->setTimezone($tz);
 
@@ -514,16 +512,16 @@ 
      * 	signature array callback($task, $param1, ...)
 	 * @return int|boolean integer info_id or false on error
 	 */
-	function importVTODO(&$_vcalData, $_taskID=-1, $merge=false, $user=null, $charset=null, $caldav_name=null,
-		array $callback_data=null)
+	function importVTODO(&$_vcalData, $_taskID = -1, $merge = false, $user = null, $charset = null, $caldav_name = null,
+		array $callback_data = null)
 	{
-		unset($merge);	// no longer used, but required by function signature
+		unset($merge); // no longer used, but required by function signature
 
 		if ($this->tzid)
 		{
 			date_default_timezone_set($this->tzid);
 		}
-		$taskData = $this->vtodotoegw($_vcalData,$_taskID, $charset);
+		$taskData = $this->vtodotoegw($_vcalData, $_taskID, $charset);
 		if ($this->tzid)
 		{
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
@@ -554,8 +552,8 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($taskData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($taskData)."\n", 3, $this->logfile);
 		}
 
 		if ($caldav_name)
@@ -564,18 +562,18 @@ 
 		}
 
 		// make sure not to empty fields not supported by iCal or not allowed to change by CalDAV
-		if ($_taskID > 0 && ($old = $this->read($_taskID,true,'server')))
+		if ($_taskID > 0 && ($old = $this->read($_taskID, true, 'server')))
 		{
 			// remove all values supported by iCal standard
 			$old = array_diff_key($old, array_flip(array(
-				'info_subject','info_des','info_location','info_cat','info_responsible',
-				'info_startdate','info_enddate','info_priority','info_location',
-				'info_access','info_status','info_percent','info_datecompleted',
+				'info_subject', 'info_des', 'info_location', 'info_cat', 'info_responsible',
+				'info_startdate', 'info_enddate', 'info_priority', 'info_location',
+				'info_access', 'info_status', 'info_percent', 'info_datecompleted',
 			)));
 			// remove all iCal fields not supported by EGroupware (stored like custom fields)
-			foreach(array_keys($old) as $name)
+			foreach (array_keys($old) as $name)
 			{
-				if (substr($name,0,2) == '##') unset($old[$name]);
+				if (substr($name, 0, 2) == '##') unset($old[$name]);
 			}
 			// merge in again all infolog fields not supported by iCal or not allowed to change
 			$taskData = array_merge($taskData, $old);
@@ -600,7 +598,7 @@ 
 	 *
 	 * @return array of infolog_ids of matching entries
 	 */
-	function searchVTODO($_vcalData, $contentID=null, $relax=false, $charset=null)
+	function searchVTODO($_vcalData, $contentID = null, $relax = false, $charset = null)
 	{
 		$result = array();
 
@@ -645,12 +643,12 @@ 
      *
 	 * @return array infolog entry or false on error
 	 */
-	function vtodotoegw($_vcalData, $_taskID=-1, $charset=null)
+	function vtodotoegw($_vcalData, $_taskID = -1, $charset = null)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_taskID)\n" .
-				array2string($_vcalData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_taskID)\n".
+				array2string($_vcalData)."\n", 3, $this->logfile);
 		}
 
 		$vcal = new Horde_Icalendar;
@@ -663,7 +661,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"(): No vCalendar Container found!\n",3,$this->logfile);
+					"(): No vCalendar Container found!\n", 3, $this->logfile);
 			}
 			return false;
 		}
@@ -686,7 +684,7 @@ 
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						"(): Not a vTODO container, skipping...\n",3,$this->logfile);
+						"(): Not a vTODO container, skipping...\n", 3, $this->logfile);
 				}
 				continue;
 			}
@@ -713,24 +711,23 @@ 
 					($this->_status2vtodo[$x_infolog_status] === 'COMPLETED') != is_scalar($completed))
 				{
 					$percent_completed = $component->getAttributeDefault('PERCENT-COMPLETE', null);
-					$status = $completed && is_scalar($completed) ? 'COMPLETED' :
-						($percent_completed && is_scalar($percent_completed) && $percent_completed > 0 ? 'IN-PROCESS' : 'NEEDS-ACTION');
+					$status = $completed && is_scalar($completed) ? 'COMPLETED' : ($percent_completed && is_scalar($percent_completed) && $percent_completed > 0 ? 'IN-PROCESS' : 'NEEDS-ACTION');
 					$component->setAttribute('STATUS', $status);
 					if (!is_scalar($percent_completed))
 					{
 						$component->setAttribute('PERCENT-COMPLETE', $percent_completed = $status == 'COMPLETED' ?
 							100 : ($status == 'NEEDS-ACTION' ? 0 : 10));
 					}
-					if ($this->log) error_log(__METHOD__."() setting STATUS='$status' and PERCENT-COMPLETE=$percent_completed from COMPLETED and X-INFOLOG-STATUS='$x_infolog_status'\n",3,$this->logfile);
+					if ($this->log) error_log(__METHOD__."() setting STATUS='$status' and PERCENT-COMPLETE=$percent_completed from COMPLETED and X-INFOLOG-STATUS='$x_infolog_status'\n", 3, $this->logfile);
 				}
 				// new task without status --> set a default status of NEEDS-ACTION, as otherwise task is marked closed
-				elseif($_taskID <= 0 && !is_scalar($x_infolog_status) && !is_scalar($completed))
+				elseif ($_taskID <= 0 && !is_scalar($x_infolog_status) && !is_scalar($completed))
 				{
 					$component->setAttribute('STATUS', 'NEEDS-ACTION');
 				}
 				else
 				{
-					if ($this->log) error_log(__METHOD__."() no STATUS, X-INFOLOG-STATUS='$x_infolog_status', COMPLETED".(is_scalar($completed)?'='.$completed:' not set')." --> leaving status and percent unchanged",3,$this->logfile);
+					if ($this->log) error_log(__METHOD__."() no STATUS, X-INFOLOG-STATUS='$x_infolog_status', COMPLETED".(is_scalar($completed) ? '='.$completed : ' not set')." --> leaving status and percent unchanged", 3, $this->logfile);
 				}
 			}
 			foreach ($component->getAllAttributes() as $attribute)
@@ -774,7 +771,7 @@ 
 					case 'DURATION':
 						if (!isset($taskData['info_startdate']))
 						{
-							$taskData['info_startdate']	= $component->getAttributeDefault('DTSTART', null);
+							$taskData['info_startdate'] = $component->getAttributeDefault('DTSTART', null);
 						}
 						$attribute['value'] += $taskData['info_startdate'];
 						$taskData['##DURATION'] = $attribute['value'];
@@ -786,11 +783,11 @@ 
 						break;
 
 					case 'COMPLETED':
-						$taskData['info_datecompleted']	= self::date2ts($attribute['value']);
+						$taskData['info_datecompleted'] = self::date2ts($attribute['value']);
 						break;
 
 					case 'DTSTART':
-						$taskData['info_startdate']	= self::date2ts($attribute['value']);
+						$taskData['info_startdate'] = self::date2ts($attribute['value']);
 						break;
 
 					case 'PRIORITY':
@@ -800,16 +797,16 @@ 
 								(strpos($this->productName, 'outlook') !== false
 									|| strpos($this->productName, 'pocket pc') !== false))
 							{
-								$taskData['info_priority'] = (int) $this->priority_funambol2egw[$attribute['value']];
+								$taskData['info_priority'] = (int)$this->priority_funambol2egw[$attribute['value']];
 							}
 							else
 							{
-								$taskData['info_priority'] = (int) $this->priority_ical2egw[$attribute['value']];
+								$taskData['info_priority'] = (int)$this->priority_ical2egw[$attribute['value']];
 							}
 						}
 						else
 						{
-							$taskData['info_priority'] = 1;	// default = normal
+							$taskData['info_priority'] = 1; // default = normal
 						}
 						break;
 
@@ -832,7 +829,7 @@ 
 					case 'CATEGORIES':
 						if (!empty($attribute['value']))
 						{
-							$cats = $this->find_or_add_categories(explode(',',$attribute['value']), $_taskID);
+							$cats = $this->find_or_add_categories(explode(',', $attribute['value']), $_taskID);
 							$taskData['info_cat'] = $cats[0];
 						}
 						break;
@@ -845,7 +842,7 @@ 
 						break;
 
 					case 'PERCENT-COMPLETE':
-						$taskData['info_percent'] = (int) $attribute['value'];
+						$taskData['info_percent'] = (int)$attribute['value'];
 						break;
 
 					case 'ATTENDEE':
@@ -887,10 +884,10 @@ 
 			break;
 		}
 		// store included, but unsupported components like valarm as x-properties
-		foreach($component->getComponents() as $comp)
+		foreach ($component->getComponents() as $comp)
 		{
 			$name = '##:'.strtoupper($comp->getType());
-			$compvData = $comp->exportvCalendar($comp,'utf-8');
+			$compvData = $comp->exportvCalendar($comp, 'utf-8');
 			if (isset($taskData[$name]))
 			{
 				$taskData[$name] = array($taskData[$name]);
@@ -903,8 +900,8 @@ 
 		}
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_taskID)\n" .
-				($taskData ? array2string($taskData) : 'FALSE') . "\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_taskID)\n".
+				($taskData ? array2string($taskData) : 'FALSE')."\n", 3, $this->logfile);
 		}
 		return $taskData;
 	}
@@ -918,14 +915,14 @@ 
 	 *
 	 * @return string|boolean VNOTE representation of the infolog entry or false on error
 	 */
-	function exportVNOTE($_noteID, $_type, $charset='UTF-8')
+	function exportVNOTE($_noteID, $_type, $charset = 'UTF-8')
 	{
-		if(!($note = $this->read($_noteID, true, 'server'))) return false;
+		if (!($note = $this->read($_noteID, true, 'server'))) return false;
 
 		$note = translation::convert($note,
 			translation::charset(), $charset);
 
-		switch	($_type)
+		switch ($_type)
 		{
 			case 'text/plain':
 				$txt = $note['info_subject']."\n\n".$note['info_des'];
@@ -939,10 +936,10 @@ 
 						translation::charset(), $charset);
 				}
 				$vnote = new Horde_Icalendar_Vnote();
-				$vnote->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
+				$vnote->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.
 					strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 				$vnote->setAttribute('VERSION', '1.1');
-				foreach (array(	'SUMMARY'		=> $note['info_subject'],
+				foreach (array('SUMMARY'		=> $note['info_subject'],
 								'BODY'			=> $note['info_des'],
 								'CATEGORIES'	=> $note['info_cat'],
 							) as $field => $value)
@@ -950,7 +947,7 @@ 
 					$options = array();
 					if (preg_match('/[^\x20-\x7F]/', $value))
 					{
-						$options['CHARSET']	= $charset;
+						$options['CHARSET'] = $charset;
 						switch ($this->productManufacturer)
 						{
 							case 'groupdav':
@@ -980,21 +977,21 @@ 
 				}
 				if ($note['info_startdate'])
 				{
-					$vnote->setAttribute('CREATED',$note['info_startdate']);
+					$vnote->setAttribute('CREATED', $note['info_startdate']);
 				}
 				else
 				{
-					$vnote->setAttribute('CREATED',$GLOBALS['egw']->contenthistory->getTSforAction('infolog_note',$_noteID,'add'));
+					$vnote->setAttribute('CREATED', $GLOBALS['egw']->contenthistory->getTSforAction('infolog_note', $_noteID, 'add'));
 				}
-				$vnote->setAttribute('LAST-MODIFIED',$GLOBALS['egw']->contenthistory->getTSforAction('infolog_note',$_noteID,'modify'));
+				$vnote->setAttribute('LAST-MODIFIED', $GLOBALS['egw']->contenthistory->getTSforAction('infolog_note', $_noteID, 'modify'));
 
 				#$vnote->setAttribute('CLASS',$taskData['info_access'] == 'public' ? 'PUBLIC' : 'PRIVATE');
 
 				$retval = $vnote->exportvCalendar();
 				if ($this->log)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-						array2string($retval)."\n",3,$this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+						array2string($retval)."\n", 3, $this->logfile);
 				}
 				return $retval;
 		}
@@ -1013,25 +1010,25 @@ 
      *
 	 * @return int|boolean integer info_id or false on error
 	 */
-	function importVNOTE(&$_vcalData, $_type, $_noteID=-1, $merge=false, $charset=null)
+	function importVNOTE(&$_vcalData, $_type, $_noteID = -1, $merge = false, $charset = null)
 	{
-		unset($merge);	// no longer used, but required by function signature
+		unset($merge); // no longer used, but required by function signature
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($_vcalData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($_vcalData)."\n", 3, $this->logfile);
 		}
 
 		if (!($note = $this->vnotetoegw($_vcalData, $_type, $_noteID, $charset))) return false;
 
-		if($_noteID > 0) $note['info_id'] = $_noteID;
+		if ($_noteID > 0) $note['info_id'] = $_noteID;
 
 		if (empty($note['info_status'])) $note['info_status'] = 'done';
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($note)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($note)."\n", 3, $this->logfile);
 		}
 
 		return $this->write($note, true, true, false);
@@ -1048,7 +1045,7 @@ 
 	 *
 	 * @return infolog_id of a matching entry or false, if nothing was found
 	 */
-	function searchVNOTE($_vcalData, $_type, $contentID=null, $relax=false, $charset=null)
+	function searchVNOTE($_vcalData, $_type, $contentID = null, $relax = false, $charset = null)
 	{
 		if (!($note = $this->vnotetoegw($_vcalData, $_type, $contentID, $charset))) return array();
 
@@ -1070,12 +1067,12 @@ 
      *
 	 * @return array infolog entry or false on error
 	 */
-	function vnotetoegw($_data, $_type, $_noteID=-1, $charset=null)
+	function vnotetoegw($_data, $_type, $_noteID = -1, $charset = null)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_type, $_noteID)\n" .
-				array2string($_data)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_type, $_noteID)\n".
+				array2string($_data)."\n", 3, $this->logfile);
 		}
 		$note = false;
 
@@ -1129,7 +1126,7 @@ 
 								case 'CATEGORIES':
 									if ($attribute['value'])
 									{
-										$cats = $this->find_or_add_categories(explode(',',$attribute['value']), $_noteID);
+										$cats = $this->find_or_add_categories(explode(',', $attribute['value']), $_noteID);
 										$note['info_cat'] = $cats[0];
 									}
 									break;
@@ -1140,8 +1137,8 @@ 
 		}
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_type, $_noteID)\n" .
-				($note ? array2string($note) : 'FALSE') ."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($_type, $_noteID)\n".
+				($note ? array2string($note) : 'FALSE')."\n", 3, $this->logfile);
 		}
 		return $note;
 	}
@@ -1154,7 +1151,7 @@ 
 	 * @param string $_productManufacturer
 	 * @param string $_productName
 	 */
-	function setSupportedFields($_productManufacturer='', $_productName='')
+	function setSupportedFields($_productManufacturer = '', $_productName = '')
 	{
 		$state = &$_SESSION['SyncML.state'];
 		if (isset($state))
@@ -1206,10 +1203,10 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'(' . $this->productManufacturer .
-				', '. $this->productName .', ' .
-				($this->tzid ? $this->tzid : egw_time::$user_timezone->getName()) .
-				")\n" , 3, $this->logfile);
+				'('.$this->productManufacturer.
+				', '.$this->productName.', '.
+				($this->tzid ? $this->tzid : egw_time::$user_timezone->getName()).
+				")\n", 3, $this->logfile);
 		}
 
 		//Horde::logMessage('setSupportedFields(' . $this->productManufacturer . ', '

preferences/inc/class.preferences_password.inc.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 
 		if (!is_array($content))
 		{
-			$content= array();
+			$content = array();
 		}
 		else
 		{
@@ -56,7 +56,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Change your password');
 		$tmpl = new Etemplate('preferences.password');
 
-		$tmpl->exec('preferences.preferences_password.change', $content,array(),array(),array(),2);
+		$tmpl->exec('preferences.preferences_password.change', $content, array(), array(), array(), 2);
 	}
 
 	/**

doc/rpm-build/header.inc.php

Indentation +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@
 // dummy setup file
 if (strpos($_SERVER['PHP_SELF'],'/setup/') === false)
 {
-        header('Location: /egroupware/setup/');
-        exit;
+		header('Location: /egroupware/setup/');
+		exit;
 }
 

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 // dummy setup file
-if (strpos($_SERVER['PHP_SELF'],'/setup/') === false)
+if (strpos($_SERVER['PHP_SELF'], '/setup/') === false)
 {
         header('Location: /egroupware/setup/');
         exit;

addressbook/inc/class.addressbook_export_vcard.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;

Spacing +15 added lines, -15 removed lines

@@ -22,7 +22,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 
 		$options = $_definition->plugin_options;
 		$this->uicontacts = new addressbook_ui();
@@ -30,9 +30,9 @@ 
 
 		// Addressbook defines its own export imits
 		$limit_exception = bo_merge::is_export_limit_excepted();
-		$export_limit = bo_merge::getExportLimit($app='addressbook');
+		$export_limit = bo_merge::getExportLimit($app = 'addressbook');
 		if (!$limit_exception) $export_object->export_limit = $export_limit; // we may not need that after all
-		if($export_limit == 'no' && !$limit_exception) {
+		if ($export_limit == 'no' && !$limit_exception) {
 			return;
 		}
 
@@ -42,29 +42,29 @@ 
 
 		if ($options['selection'] == 'search') {
 			// uicontacts selection with checkbox 'use_all'
-			$query = $GLOBALS['egw']->session->appsession('index','addressbook');
-			$query['num_rows'] = -1;	// all
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
-			$this->uicontacts->get_rows($query,$this->selection,$readonlys, true);	// only return the ids
+			$query = $GLOBALS['egw']->session->appsession('index', 'addressbook');
+			$query['num_rows'] = -1; // all
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			if (!array_key_exists('filter', $query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
+			$this->uicontacts->get_rows($query, $this->selection, $readonlys, true); // only return the ids
 		}
-		elseif ( $options['selection'] == 'all' ) {
+		elseif ($options['selection'] == 'all') {
 			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) {
 				$col_filter['account_id'] = null;
 			}
-			$this->selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$col_filter);
+			$this->selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '', '', false, 'AND', false, $col_filter);
 			//$this->uicontacts->get_rows($query,$this->selection,$readonlys,true);
 		} else {
-			$this->selection = explode(',',$options['selection']);
+			$this->selection = explode(',', $options['selection']);
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 
-		if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+		if (bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
 			$this->selection = array_slice($this->selection, 0, $export_limit);
 		}
 
 		foreach ($this->selection as &$_contact) {
-			if(is_array($_contact) && ($_contact['id'] || $_contact['contact_id']))
+			if (is_array($_contact) && ($_contact['id'] || $_contact['contact_id']))
 			{
 				$_contact = $_contact[$_contact['id'] ? 'id' : 'contact_id'];
 			}
@@ -73,7 +73,7 @@ 
 		// vCard opens & closes the resource itself, but this doesn't seem to matter
 		$meta = stream_get_meta_data($_stream);
 
-		$vcard = new addressbook_vcal('addressbook','text/vcard');
+		$vcard = new addressbook_vcal('addressbook', 'text/vcard');
 		$vcard->export($this->selection, $meta['uri']);
 	}
 
@@ -114,7 +114,7 @@ 
 	 */
 	public function get_filename()
 	{
-		if(is_array($this->selection) && count($this->selection) == 1)
+		if (is_array($this->selection) && count($this->selection) == 1)
 		{
 			return $this->uicontacts->link_title($this->selection[0]);
 		}

Braces +40 added lines, -17 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * export addressbook contacts as vcard
  */
-class addressbook_export_vcard implements importexport_iface_export_plugin {
+class addressbook_export_vcard implements importexport_iface_export_plugin
+{
 
 
 	/**
@@ -22,7 +23,8 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 
 		$options = $_definition->plugin_options;
 		$this->uicontacts = new addressbook_ui();
@@ -31,8 +33,13 @@ 
 		// Addressbook defines its own export imits
 		$limit_exception = bo_merge::is_export_limit_excepted();
 		$export_limit = bo_merge::getExportLimit($app='addressbook');
-		if (!$limit_exception) $export_object->export_limit = $export_limit; // we may not need that after all
-		if($export_limit == 'no' && !$limit_exception) {
+		if (!$limit_exception)
+		{
+			$export_object->export_limit = $export_limit;
+		}
+		// we may not need that after all
+		if($export_limit == 'no' && !$limit_exception)
+		{
 			return;
 		}
 
@@ -40,30 +47,40 @@ 
 		$old_app = $GLOBALS['egw_info']['flags']['currentapp'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'addressbook';
 
-		if ($options['selection'] == 'search') {
+		if ($options['selection'] == 'search')
+		{
 			// uicontacts selection with checkbox 'use_all'
 			$query = $GLOBALS['egw']->session->appsession('index','addressbook');
 			$query['num_rows'] = -1;	// all
 			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			if(!array_key_exists('filter',$query)) $query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
+			if(!array_key_exists('filter',$query))
+			{
+				$query['filter'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 			$this->uicontacts->get_rows($query,$this->selection,$readonlys, true);	// only return the ids
 		}
-		elseif ( $options['selection'] == 'all' ) {
-			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) {
+		elseif ( $options['selection'] == 'all' )
+		{
+			if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'])
+			{
 				$col_filter['account_id'] = null;
 			}
 			$this->selection = ExecMethod2('addressbook.addressbook_bo.search', array(), true, '', '','',false,'AND',false,$col_filter);
 			//$this->uicontacts->get_rows($query,$this->selection,$readonlys,true);
-		} else {
+		}
+		else
+		{
 			$this->selection = explode(',',$options['selection']);
 		}
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 
-		if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+		if(bo_merge::hasExportLimit($export_limit) && !$limit_exception)
+		{
 			$this->selection = array_slice($this->selection, 0, $export_limit);
 		}
 
-		foreach ($this->selection as &$_contact) {
+		foreach ($this->selection as &$_contact)
+		{
 			if(is_array($_contact) && ($_contact['id'] || $_contact['contact_id']))
 			{
 				$_contact = $_contact[$_contact['id'] ? 'id' : 'contact_id'];
@@ -82,7 +99,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Addressbook vCard export');
 	}
 
@@ -91,7 +109,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports contacts from your Addressbook into a vCard File.");
 	}
 
@@ -100,11 +119,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'vcf';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/x-vcard';
 	}
 
@@ -127,14 +148,16 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'		=> 'addressbook.export_vcard_selectors',
 			'content'	=> 'all',

calendar/inc/class.calendar_export_ical.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;

Spacing +18 added lines, -18 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 		$this->bo = new calendar_bo();
 		$boical = new calendar_ical();
@@ -32,34 +32,34 @@ 
 		$limit_exception = bo_merge::is_export_limit_excepted();
 		if (!$limit_exception) $export_limit = bo_merge::getExportLimit('calendar');
 
-		if($options['selection'] == 'criteria')
+		if ($options['selection'] == 'criteria')
 		{
 			$query = array(
 				'start' => $options['criteria']['start'],
-				'end'   => strtotime('+1 day',$options['criteria']['end'])-1,
+				'end'   => strtotime('+1 day', $options['criteria']['end']) - 1,
 				'categories'	=> $options['categories'],
 				'daywise'       => false,
 				'users'         => $options['criteria']['owner'],
 				'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 			);
-			if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+			if (bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
 				$query['offset'] = 0;
-				$query['num_rows'] = (int)$export_limit;  // ! int of 'no' is 0
+				$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 			}
-			$events =& $this->bo->search($query);
+			$events = & $this->bo->search($query);
 		}
 		// Scheduled export will use 'all', which we don't allow through UI
 		elseif ($options['selection'] == 'search_results' || $options['selection'] == 'all')
 		{
-			$states = $GLOBALS['egw']->session->appsession('session_data','calendar');
-			if($states['view'] == 'listview')
+			$states = $GLOBALS['egw']->session->appsession('session_data', 'calendar');
+			if ($states['view'] == 'listview')
 			{
-				$query = $GLOBALS['egw']->session->appsession('calendar_list','calendar');
-				$query['num_rows'] = -1;        // all
+				$query = $GLOBALS['egw']->session->appsession('calendar_list', 'calendar');
+				$query['num_rows'] = -1; // all
 				$query['start'] = 0;
 				$query['cfs'] = $cfs;
 
-				if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if (bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
 				$ui = new calendar_uilist();
@@ -68,15 +68,15 @@ 
 			}
 			else
 			{
-				$query = $GLOBALS['egw']->session->appsession('session_data','calendar');
+				$query = $GLOBALS['egw']->session->appsession('session_data', 'calendar');
 				$query['users'] = explode(',', $query['owner']);
 				$query['num_rows'] = -1;
-				if(bo_merge::hasExportLimit($export_limit) && !$limit_exception)
+				if (bo_merge::hasExportLimit($export_limit) && !$limit_exception)
 				{
-					$query['num_rows'] = (int)$export_limit;  // ! int of 'no' is 0
+					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
 
-				switch($states['view'])
+				switch ($states['view'])
 				{
 					case 'month':
 						$query += calendar_export_csv::get_query_month($states);
@@ -90,7 +90,7 @@ 
 					default:
 						// Let UI set the date ranges
 						$ui = new calendar_uiviews($query);
-						if(method_exists($ui, $states['view']))
+						if (method_exists($ui, $states['view']))
 						{
 							ob_start();
 							$ui->$states['view']();
@@ -112,13 +112,13 @@ 
 		// compile list of unique cal_id's, as iCal should contain whole series, not recurrences
 		// calendar_ical->exportVCal needs to read events again, to get them in server-time
 		$ids = array();
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$id = is_array($event) ? $event['id'] : $event;
 			if (($id = (int)$id)) $ids[$id] = $id;
 		}
 
-		$ical =& $boical->exportVCal($ids,'2.0','PUBLISH',false);
+		$ical = & $boical->exportVCal($ids, '2.0', 'PUBLISH', false);
 		fwrite($_stream, $ical);
 	}
 

Braces +28 added lines, -12 removed lines

@@ -14,14 +14,16 @@ 
 /**
  * iCal export plugin of calendar
  */
-class calendar_export_ical extends calendar_export_csv {
+class calendar_export_ical extends calendar_export_csv
+{
 
 	/**
 	 * Exports records as defined in $_definition
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 		$this->bo = new calendar_bo();
 		$boical = new calendar_ical();
@@ -30,7 +32,10 @@ 
 		$cfs = array();
 
 		$limit_exception = bo_merge::is_export_limit_excepted();
-		if (!$limit_exception) $export_limit = bo_merge::getExportLimit('calendar');
+		if (!$limit_exception)
+		{
+			$export_limit = bo_merge::getExportLimit('calendar');
+		}
 
 		if($options['selection'] == 'criteria')
 		{
@@ -42,7 +47,8 @@ 
 				'users'         => $options['criteria']['owner'],
 				'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 			);
-			if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+			if(bo_merge::hasExportLimit($export_limit) && !$limit_exception)
+			{
 				$query['offset'] = 0;
 				$query['num_rows'] = (int)$export_limit;  // ! int of 'no' is 0
 			}
@@ -59,7 +65,8 @@ 
 				$query['start'] = 0;
 				$query['cfs'] = $cfs;
 
-				if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if(bo_merge::hasExportLimit($export_limit) && !$limit_exception)
+				{
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
 				$ui = new calendar_uilist();
@@ -115,7 +122,10 @@ 
 		foreach($events as $event)
 		{
 			$id = is_array($event) ? $event['id'] : $event;
-			if (($id = (int)$id)) $ids[$id] = $id;
+			if (($id = (int)$id))
+			{
+				$ids[$id] = $id;
+			}
 		}
 
 		$ical =& $boical->exportVCal($ids,'2.0','PUBLISH',false);
@@ -127,7 +137,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar iCal export');
 	}
 
@@ -136,7 +147,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports events from your Calendar in iCal format.");
 	}
 
@@ -145,11 +157,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'ics';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/calendar';
 	}
 
@@ -157,14 +171,16 @@ 
 	 * return html for options.
 	 *
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns selectors of this plugin
 	 *
 	 */
-	public function get_selectors_etpl($definition = null) {
+	public function get_selectors_etpl($definition = null)
+	{
 		$data = parent::get_selectors_etpl($definition);
 		return $data;
 	}

filemanager/inc/class.filemanager_admin.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 	/**
 	 * Show files shared
 	 *
-	 * @param array $content=null
-	 * @param string $msg=''
+	 * @param array $content
 	 */
 	public function index(array $content=null)
 	{

Braces +16 added lines, -4 removed lines

@@ -131,7 +131,10 @@ 
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
 					$url = str_replace('$path',$path,$content['mounts']['url']);
-					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
+					if (empty($url) && $this->versioning)
+					{
+						$url = Versioning\StreamWrapper::PREFIX.$path;
+					}
 
 					if ($content['mounts']['enable'] && !$this->versioning)
 					{
@@ -227,16 +230,25 @@ 
 			$content['versionedpath'] = '/';
 			$content['mtime'] = 100;
 		}
-		if (true) $content = array(
+		if (true)
+		{
+			$content = array(
 			'versionedpath' => $content['versionedpath'],
 			'mtime' => $content['mtime'],
 		);
+		}
 		if ($this->versioning)
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files'])
+			{
+				$content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
+			}
+			if ($content['total_size'])
+			{
+				$content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			}
 		}
 		if (!($content['is_root']=Vfs::$is_root))
 		{

Spacing +25 added lines, -25 removed lines

@@ -61,7 +61,7 @@ 
 		}
 		// sudo handling
 		parent::__construct();
-		self::$is_setup = egw_session::appsession('is_setup','filemanager');
+		self::$is_setup = egw_session::appsession('is_setup', 'filemanager');
 
 		if (class_exists('EGroupware\Stylite\Vfs\Versioning\StreamWrapper'))
 		{
@@ -75,14 +75,14 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	public function index(array $content=null, $msg='', $msg_type=null)
+	public function index(array $content = null, $msg = '', $msg_type = null)
 	{
 		if (is_array($content))
 		{
 			//_debug_array($content);
 			if ($content['sudo'])
 			{
-				$msg = $this->sudo($content['user'],$content['password'],self::$is_setup) ?
+				$msg = $this->sudo($content['user'], $content['password'], self::$is_setup) ?
 					lang('Root access granted.') : lang('Wrong username or password!');
 				$msg_type = Vfs::$is_root ? 'success' : 'error';
 			}
@@ -93,14 +93,14 @@ 
 				$backup = Vfs::$is_root;
 				Vfs::$is_root = true;
 				$msg = Vfs::mount($url, $path) ?
-					lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+					lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 				Vfs::$is_root = $backup;
 			}
 			elseif (Vfs::$is_root)
 			{
 				if ($content['logout'])
 				{
-					$msg = $this->sudo('','',self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
+					$msg = $this->sudo('', '', self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
 					$msg_type = !Vfs::$is_root ? 'success' : 'error';
 				}
 				if ($content['mounts']['disable'] || self::$is_setup && $content['mounts']['umount'])
@@ -116,18 +116,18 @@ 
 					if (!in_array($path, self::$protected_path) && $path != '/')
 					{
 						$msg = Vfs::umount($path) ?
-							lang('%1 successful unmounted.',$path) : lang('Error unmounting %1!',$path);
+							lang('%1 successful unmounted.', $path) : lang('Error unmounting %1!', $path);
 					}
 					else	// re-mount / with sqlFS, to disable versioning
 					{
-						$msg = Vfs::mount($url=sqlfs_stream_wrapper::SCHEME.'://default'.$path,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url = sqlfs_stream_wrapper::SCHEME.'://default'.$path, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if (($path = $content['mounts']['path']) &&
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
-					$url = str_replace('$path',$path,$content['mounts']['url']);
+					$url = str_replace('$path', $path, $content['mounts']['url']);
 					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
 
 					if ($content['mounts']['enable'] && !$this->versioning)
@@ -137,7 +137,7 @@ 
 					}
 					elseif (!Vfs::file_exists($path) || !Vfs::is_dir($path))
 					{
-						$msg = lang('Path %1 not found or not a directory!',$path);
+						$msg = lang('Path %1 not found or not a directory!', $path);
 						$msg_type = 'error';
 					}
 					// dont allow to change mount of /apps or /templates (eg. switching on versioning)
@@ -148,8 +148,8 @@ 
 					}
 					else
 					{
-						$msg = Vfs::mount($url,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if ($content['allow_delete_versions'] != $GLOBALS['egw_info']['server']['allow_delete_versions'])
@@ -194,8 +194,8 @@ 
 								'hidden' => true,
 								'depth' => true,
 								'path_preg' => '#/\.(attic|versions)/#',
-							)+(!(int)$content['mtime'] ? array() : array(
-								'mtime' => ($content['mtime']<0?'-':'+').(int)$content['mtime'],
+							) + (!(int)$content['mtime'] ? array() : array(
+								'mtime' => ($content['mtime'] < 0 ? '-' : '+').(int)$content['mtime'],
 							)), function($path) use (&$deleted, &$errors)
 							{
 								if (($is_dir = Vfs::is_dir($path)) && Vfs::rmdir($path) ||
@@ -209,7 +209,7 @@ 
 								}
 							});
 						}
-						$time = number_format(microtime(true)-$starttime, 1);
+						$time = number_format(microtime(true) - $starttime, 1);
 						$msg = ($errors ? lang('%1 errors deleting!', $errors)."\n\n" : '').
 							lang('%1 files or directories deleted in %2 seconds.', $deleted, $time);
 						$msg_type = $errors ? 'error' : 'info';
@@ -232,10 +232,10 @@ 
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files']) $content['percent_files'] = number_format(100.0 * $content['version_files'] / $content['total_files'], 1).'%';
+			if ($content['total_size']) $content['percent_size'] = number_format(100.0 * $content['version_size'] / $content['total_size'], 1).'%';
 		}
-		if (!($content['is_root']=Vfs::$is_root))
+		if (!($content['is_root'] = Vfs::$is_root))
 		{
 			if (empty($msg))
 			{
@@ -251,16 +251,16 @@ 
 
 		$n = 2;
 		$content['mounts'] = array();
-		foreach(Vfs::mount() as $path => $url)
+		foreach (Vfs::mount() as $path => $url)
 		{
 			$content['mounts'][$n++] = array(
 				'path' => $path,
 				'url'  => $url,
 			);
 			$readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root ||
-				Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning;
+				Vfs::parse_url($url, PHP_URL_SCHEME) != $this->versioning;
 		}
-		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true;	// do not allow to unmount / or /apps
+		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true; // do not allow to unmount / or /apps
 		$readonlys['url'] = !self::$is_setup;
 
 		$sel_options['allow_delete_versions'] = array(
@@ -271,13 +271,13 @@ 
 		);
 		// show [Mount /etemplates] button for admin, if not already mounted and available
 		$readonlys['etemplates'] = !class_exists('\EGroupware\Stylite\Vfs\Merge\StreamWrapper') ||
-			($fs_tab=Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
+			($fs_tab = Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
 		//_debug_array($content);
 
 		$tpl = new etemplate_new('filemanager.admin');
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('VFS mounts and versioning');
-		$tpl->exec('filemanager.filemanager_admin.index',$content,$sel_options,$readonlys);
+		$tpl->exec('filemanager.filemanager_admin.index', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -297,9 +297,9 @@ 
 		}
 		$content = '<p>'.implode("</p>\n<p>", (array)$msgs)."</p>\n";
 
-		$content .= html::form('<p>'.($check_only&&is_array($msgs)?html::submit_button('fix', lang('Fix reported problems')):'').
+		$content .= html::form('<p>'.($check_only && is_array($msgs) ? html::submit_button('fix', lang('Fix reported problems')) : '').
 			html::submit_button('cancel', lang('Cancel')).'</p>',
-			'','/index.php',array('menuaction'=>'filemanager.filemanager_admin.fsck'));
+			'', '/index.php', array('menuaction'=>'filemanager.filemanager_admin.fsck'));
 
 		$GLOBALS['egw']->framework->render($content, lang('Admin').' - '.lang('Check virtual filesystem'), true);
 	}

files/webdav.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  * Create a session or if the user has no account return authenticate header and 401 Unauthorized
  *
  * @param array &$account
- * @return int session-id
+ * @return string session-id
  */
 function check_access(&$account)
 {

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
 {
 	if (isset($_GET['auth']))
 	{
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
 	}
 	return egw_digest_auth::autocreate_session_callback($account);
 }
@@ -42,8 +42,8 @@ 
 		'noheader'  => True,
 		'currentapp' => preg_match('|/webdav.php/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
 		'autocreate_session_callback' => 'check_access',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use vfs_webdav_server::REALM as autoloading and include path not yet setup!
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
+		'auth_realm' => 'EGroupware WebDAV server', // cant use vfs_webdav_server::REALM as autoloading and include path not yet setup!
 	)
 );
 require_once('../phpgwapi/inc/class.egw_digest_auth.inc.php');
@@ -72,12 +72,12 @@ 
 
 // temporary mount ownCloud default /clientsync as /home/$user, if not explicitly mounted
 // so ownCloud dir contains users home-dir by default
-if (strpos($_SERVER['REQUEST_URI'],'/webdav.php/clientsync') !== false &&
-	($fstab=egw_vfs::mount()) && !isset($fstab['/clientsync']))
+if (strpos($_SERVER['REQUEST_URI'], '/webdav.php/clientsync') !== false &&
+	($fstab = egw_vfs::mount()) && !isset($fstab['/clientsync']))
 {
 	$is_root_backup = egw_vfs::$is_root;
 	egw_vfs::$is_root = true;
-	$ok = egw_vfs::mount($url='vfs://default/home/$user', $clientsync='/clientsync', null, false);
+	$ok = egw_vfs::mount($url = 'vfs://default/home/$user', $clientsync = '/clientsync', null, false);
 	egw_vfs::$is_root = $is_root_backup;
 	//error_log("mounting ownCloud default '$clientsync' as '$url' ".($ok ? 'successful' : 'failed!'));
 }

home/inc/class.home_link_portlet.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
 	/**
 	 * This portlet accepts files and links
 	 *
-	 * @return boolean|String[]
+	 * @return string[]
 	 */
 	public function accept_drop()
 	{

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 *
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 

Spacing +22 added lines, -22 removed lines

@@ -47,13 +47,13 @@ 
 	public function __construct(Array &$context = array(), &$need_reload = false)
 	{
 		// Process dropped data into something useable
-		if($context['dropped_data'])
+		if ($context['dropped_data'])
 		{
 			list($context['entry']['app'], $context['entry']['id']) = explode('::', $context['dropped_data'][0], 2);
 			unset($context['dropped_data']);
 			$need_reload = true;
 		}
-		if($context['entry'] && is_array($context['entry']));
+		if ($context['entry'] && is_array($context['entry']));
 		{
 			$this->title = $context['entry']['title'] = egw_link::title($context['entry']['app'], $context['entry']['id']);
 
@@ -90,12 +90,12 @@ 
 	 * @param id String unique ID, provided to the portlet so it can make sure content is
 	 * 	unique, if needed.
 	 */
-	public function exec($id = null, etemplate_new &$etemplate = null)
+	public function exec($id = null, etemplate_new&$etemplate = null)
 	{
 		// Check for custom template for app
 		$custom_template = false;
-		if($this->context && $this->context['entry'] && $this->context['entry']['app'] &&
-			$etemplate->read($this->context['entry']['app'] . '.' . $this->template_name))
+		if ($this->context && $this->context['entry'] && $this->context['entry']['app'] &&
+			$etemplate->read($this->context['entry']['app'].'.'.$this->template_name))
 		{
 			// No action needed, custom template loaded as side-effect
 			$custom_template = true;
@@ -113,45 +113,45 @@ 
 		);
 
 		// Try to load entry
-		if($this->context['entry'] && $this->context['entry']['app'])
+		if ($this->context['entry'] && $this->context['entry']['app'])
 		{
 
 			// Always load app's css
 			egw_framework::includeCSS($this->context['entry']['app'], 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
-				egw_framework::includeCSS($this->context['entry']['app'],'app');
+				egw_framework::includeCSS($this->context['entry']['app'], 'app');
 			
 			try
 			{
-				$classname = $this->context['entry']['app'] . '_egw_record';
-				if(class_exists($classname))
+				$classname = $this->context['entry']['app'].'_egw_record';
+				if (class_exists($classname))
 				{
 					$record = new $classname($this->context['entry']['id']);
-					if($record && $record->get_record_array())
+					if ($record && $record->get_record_array())
 					{
 						// If there's a custom template, send the full record
-						if($custom_template)
+						if ($custom_template)
 						{
 							$content += $record->get_record_array();
 						}
-						if($content['image'] == false)
+						if ($content['image'] == false)
 						{
 							$content['image'] = $record->get_icon();
 						}
 					}
 				}
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
-				error_log("Problem loading record " . array2string($this->context['entry']));
+				error_log("Problem loading record ".array2string($this->context['entry']));
 				throw $e;
 			}
 			
 			// Set a fallback image
-			if($content['image'] == false)
+			if ($content['image'] == false)
 			{
-				if($this->context['entry'] && $this->context['entry']['app'])
+				if ($this->context['entry'] && $this->context['entry']['app'])
 				{
-					$content['image'] = $this->context['entry']['app'] . '/navbar';
+					$content['image'] = $this->context['entry']['app'].'/navbar';
 				}
 				else
 				{
@@ -161,22 +161,22 @@ 
 		}
 
 		// Filemanager support - links need app = 'file' and type set
-		if($this->context && $this->context['entry'] && $this->context['entry']['app'] == 'filemanager')
+		if ($this->context && $this->context['entry'] && $this->context['entry']['app'] == 'filemanager')
 		{
 			$this->context['entry']['app'] = 'file';
 			$this->context['entry']['path'] = $this->context['entry']['title'] = $this->context['entry']['id'];
 			$this->context['entry']['type'] = egw_vfs::mime_content_type($this->context['entry']['id']);
-			$content['image'] = egw_framework::link('/etemplate/thumbnail.php',array('path' => $this->context['entry']['id']));
+			$content['image'] = egw_framework::link('/etemplate/thumbnail.php', array('path' => $this->context['entry']['id']));
 		}
 
 		$content += $this->context;
 
-		if(!is_array($content['entry']))
+		if (!is_array($content['entry']))
 		{
 			$content['entry'] = null;
 		}
 
-		$etemplate->exec('home.home_link_portlet.exec',$content);
+		$etemplate->exec('home.home_link_portlet.exec', $content);
 	}
 
 	/**
@@ -240,6 +240,6 @@ 
 	 */
 	public function accept_drop()
 	{
-		return array('file','link');
+		return array('file', 'link');
 	}
 }