EGroupware / egroupware

api/src/Etemplate/Widget/Vfs.php

Doc Comments +1 added lines

@@ -230,6 +230,7 @@
 	* If the entry is not yet created, the file information is stored into the widget's value.
 	* When the form is submitted, the information for all files uploaded is available in the returned
 	* $content array and the application should deal with the file.
+	* @return string
 	*/
 	public static function store_file($path, $file)
 	{

Indentation +7 added lines, -7 removed lines

@@ -224,13 +224,13 @@
 	}
 
 	/**
-	* Ajax callback to receive an incoming file
-	*
-	* The incoming file is automatically placed into the appropriate VFS location.
-	* If the entry is not yet created, the file information is stored into the widget's value.
-	* When the form is submitted, the information for all files uploaded is available in the returned
-	* $content array and the application should deal with the file.
-	*/
+	 * Ajax callback to receive an incoming file
+	 *
+	 * The incoming file is automatically placed into the appropriate VFS location.
+	 * If the entry is not yet created, the file information is stored into the widget's value.
+	 * When the form is submitted, the information for all files uploaded is available in the returned
+	 * $content array and the application should deal with the file.
+	 */
 	public static function store_file($path, $file)
 	{
 		$name = $_REQUEST['widget_id'];

Braces +40 added lines, -10 removed lines

@@ -27,7 +27,10 @@ 
 
 	public function __construct($xml='')
 	{
-		if($xml) parent::__construct($xml);
+		if($xml)
+		{
+			parent::__construct($xml);
+		}
 	}
 
 	/**
@@ -64,9 +67,15 @@ 
 				}
 				$value =& self::get_array(self::$request->content, $form_name, true);
 				$path = Api\Link::vfs_path($app,$id,'',true);
-				if (!empty($relpath)) $path .= '/'.$relpath;
+				if (!empty($relpath))
+				{
+					$path .= '/'.$relpath;
+				}
 
-				if (true) $value = array();
+				if (true)
+				{
+					$value = array();
+				}
 
 				// Single file, already existing
 				if (substr($path,-1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
@@ -194,7 +203,10 @@ 
 				$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
 					Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
 
-				if (!in_array($matches[1], $remove_dir)) $remove_dir[] = $matches[1];
+				if (!in_array($matches[1], $remove_dir))
+				{
+					$remove_dir[] = $matches[1];
+				}
 			}
 		}
 		if ($replace)
@@ -218,7 +230,10 @@ 
 	 */
 	static function get_temp_dir($app, $postfix=null)
 	{
-		if (!isset($postfix)) $postfix = md5(time().session_id());
+		if (!isset($postfix))
+		{
+			$postfix = md5(time().session_id());
+		}
 
 		return '/home/'.$GLOBALS['egw_info']['user']['account_lid'].'/.tmp/'.$app.'_'.$postfix;
 	}
@@ -245,10 +260,13 @@ 
 		{
 			// add extension to path
 			$parts = explode('.',$filename);
-			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))       // really an extension --> add it to path
+			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))
+			{
+				// really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
 			}
+			}
 		}
 		else    // multiple upload with dir given (trailing slash)
 		{
@@ -294,7 +312,10 @@ 
 		switch($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if(!is_array($value))
+				{
+					$value = array();
+				}
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 				//...
@@ -305,7 +326,10 @@ 
 				parent::validate($cname, $content, $validated);
 				break;
 		}
-		if (true) $valid = $value;
+		if (true)
+		{
+			$valid = $value;
+		}
 	}
 
 	/**
@@ -317,14 +341,20 @@ 
 		if (empty($id) || $id == 'undefined')
 		{
 			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			if (!isset($tmppath[$app]))
+			{
+				$tmppath[$app] = self::get_temp_dir ($app);
+			}
 			$path = $tmppath[$app];
 		}
 		else
 		{
 			$path = Api\Link::vfs_path($app,$id,'',true);
 		}
-		if (!empty($relpath)) $path .= '/'.$relpath;
+		if (!empty($relpath))
+		{
+			$path .= '/'.$relpath;
+		}
 		return $path;
 	}
 }

Spacing +40 added lines, -41 removed lines

@@ -25,9 +25,9 @@ 
 	// Legacy option for vfs-upload
 	protected $legacy_options = "mime";
 
-	public function __construct($xml='')
+	public function __construct($xml = '')
 	{
-		if($xml) parent::__construct($xml);
+		if ($xml) parent::__construct($xml);
 	}
 
 	/**
@@ -36,10 +36,10 @@ 
 	 */
 	public function beforeSendToClient($cname, $expand = array())
 	{
-		if($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload')
+		if ($this->type == 'vfs-upload' || $this->attrs['type'] == 'vfs-upload')
 		{
 			$form_name = self::form_name($cname, $this->id, $expand ? $expand : array('cont'=>self::$request->content));
-			if($this->attrs['path'])
+			if ($this->attrs['path'])
 			{
 				$path = $this->attrs['path'];
 			}
@@ -50,26 +50,26 @@ 
 
 			$this->setElementAttribute($form_name, 'path', $path);
 			// ID maps to path - check there for any existing files
-			list($app,$id,$relpath) = explode(':',$path,3);
-			if($app && $id)
+			list($app, $id, $relpath) = explode(':', $path, 3);
+			if ($app && $id)
 			{
-				if(!is_numeric($id))
+				if (!is_numeric($id))
 				{
-					$_id = self::expand_name($id,0,0,0,0,self::$request->content);
-					if($_id != $id)
+					$_id = self::expand_name($id, 0, 0, 0, 0, self::$request->content);
+					if ($_id != $id)
 					{
 						$id = $_id;
 						$form_name = "$app:$id:$relpath";
 					}
 				}
-				$value =& self::get_array(self::$request->content, $form_name, true);
-				$path = Api\Link::vfs_path($app,$id,'',true);
+				$value = & self::get_array(self::$request->content, $form_name, true);
+				$path = Api\Link::vfs_path($app, $id, '', true);
 				if (!empty($relpath)) $path .= '/'.$relpath;
 
 				if (true) $value = array();
 
 				// Single file, already existing
-				if (substr($path,-1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
+				if (substr($path, -1) != '/' && Api\Vfs::file_exists($path) && !Api\Vfs::is_dir($path))
 				{
 					$file = Api\Vfs::stat($path);
 					$file['path'] = $path;
@@ -78,14 +78,14 @@ 
 					$value = array($file);
 				}
 				// Single file, missing extension in path
-				else if (substr($path, -1) != '/' && !Api\Vfs::file_exists($path) && $relpath && substr($relpath,-4,1) !== '.')
+				else if (substr($path, -1) != '/' && !Api\Vfs::file_exists($path) && $relpath && substr($relpath, -4, 1) !== '.')
 				{
-					$find = Api\Vfs::find(substr($path,0, - strlen($relpath)), array(
+					$find = Api\Vfs::find(substr($path, 0, - strlen($relpath)), array(
 						'type' => 'f',
 						'maxdepth' => 1,
-						'name' => $relpath . '*'
+						'name' => $relpath.'*'
 					));
-					foreach($find as $file)
+					foreach ($find as $file)
 					{
 						$file_info = Api\Vfs::stat($file);
 						$file_info['path'] = $file;
@@ -97,7 +97,7 @@ 
 				else if (substr($path, -1) == '/' && Api\Vfs::is_dir($path))
 				{
 					$scan = Api\Vfs::scandir($path);
-					foreach($scan as $file)
+					foreach ($scan as $file)
 					{
 						$file_info = Api\Vfs::stat("$path$file");
 						$file_info['path'] = "$path$file";
@@ -113,7 +113,7 @@ 
 	public static function ajax_upload()
 	{
 		parent::ajax_upload();
-		foreach($_FILES as $file)
+		foreach ($_FILES as $file)
 		{
 			self::store_file($_REQUEST['path'] ? $_REQUEST['path'] : $_REQUEST['widget_id'], $file);
 		}
@@ -126,7 +126,7 @@ 
 	{
 		$request_id = urldecode($_REQUEST['request_id']);
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = Etemplate\Request::read($request_id))
+		if (!self::$request = Etemplate\Request::read($request_id))
 		{
 			$error = lang("Could not read session");
 		}
@@ -143,8 +143,7 @@ 
 		else
 		{
 			$data = self::$request->content[$widget_id];
-			$path = self::store_file($path = (!is_array($data) && $data[0] == '/' ? $data :
-				self::get_vfs_path($data['to_app'].':'.$data['to_id'])).'/', $_FILES['upload']);
+			$path = self::store_file($path = (!is_array($data) && $data[0] == '/' ? $data : self::get_vfs_path($data['to_app'].':'.$data['to_id'])).'/', $_FILES['upload']);
 
 			// store temp. vfs-path like links to be able to move it to correct location after entry is stored
 			if (!$data['to_id'] || is_array($data['to_id']))
@@ -187,10 +186,10 @@ 
 	static function fix_html_dragins($app, $id, array $links, &$html)
 	{
 		$replace = $remove_dir = array();
-		foreach($links as $link)
+		foreach ($links as $link)
 		{
 			$matches = null;
-			if (is_array($link) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX,'|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
+			if (is_array($link) && preg_match('|^'.preg_quote(Api\Vfs::PREFIX, '|').'('.preg_quote(self::get_temp_dir($app, ''), '|').'[^/]+)/|', $link['id']['tmp_name'], $matches))
 			{
 				$replace[substr($link['id']['tmp_name'], strlen(Api\Vfs::PREFIX))] =
 					Api\Link::vfs_path($app, $id, Api\Vfs::basename($link['id']['tmp_name']), true);
@@ -202,7 +201,7 @@ 
 		{
 			$html = strtr($old = $html, $replace);
 			// remove all dirs
-			foreach($remove_dir as $dir)
+			foreach ($remove_dir as $dir)
 			{
 				Api\Vfs::remove($dir);
 			}
@@ -217,7 +216,7 @@ 
 	 * @param string $postfix =null default random id
 	 * @return string vfs path
 	 */
-	static function get_temp_dir($app, $postfix=null)
+	static function get_temp_dir($app, $postfix = null)
 	{
 		if (!isset($postfix)) $postfix = md5(time().session_id());
 
@@ -237,15 +236,15 @@ 
 		$name = $_REQUEST['widget_id'];
 
 		// Find real path
-		if($path[0] != '/')
+		if ($path[0] != '/')
 		{
 			$path = self::get_vfs_path($path);
 		}
 		$filename = $file['name'];
-		if (substr($path,-1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			// add extension to path
-			$parts = explode('.',$filename);
+			$parts = explode('.', $filename);
 			if (($extension = array_pop($parts)) && Api\MimeMagic::ext2mime($extension))       // really an extension --> add it to path
 			{
 				$path .= '.'.$extension;
@@ -257,17 +256,17 @@ 
 		}
 		if (!($dir = Api\Vfs::dirname($path)))
 		{
-			self::set_validation_error($name,lang('Error create parent directory %1!', "dirname('$path') === false"));
+			self::set_validation_error($name, lang('Error create parent directory %1!', "dirname('$path') === false"));
 			return false;
 		}
-		if (!Api\Vfs::file_exists($dir) && !Api\Vfs::mkdir($dir,null,STREAM_MKDIR_RECURSIVE))
+		if (!Api\Vfs::file_exists($dir) && !Api\Vfs::mkdir($dir, null, STREAM_MKDIR_RECURSIVE))
 		{
-			self::set_validation_error($name,lang('Error create parent directory %1!',Api\Vfs::decodePath($dir)));
+			self::set_validation_error($name, lang('Error create parent directory %1!', Api\Vfs::decodePath($dir)));
 			return false;
 		}
-		if (!copy($file['tmp_name'],Api\Vfs::PREFIX.$path))
+		if (!copy($file['tmp_name'], Api\Vfs::PREFIX.$path))
 		{
-			self::set_validation_error($name,lang('Error copying uploaded file to vfs!'));
+			self::set_validation_error($name, lang('Error copying uploaded file to vfs!'));
 			return false;
 		}
 
@@ -286,7 +285,7 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		// do not validate, as it would overwrite preserved values with null!
 		if (in_array($this->type, array('vfs-size', 'vfs-uid', 'vfs-gid', 'vfs', 'vfs-mime')))
@@ -295,12 +294,12 @@ 
 		}
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value = $value_in = self::get_array($content, $form_name);
-		$valid =& self::get_array($validated, $form_name, true);
+		$valid = & self::get_array($validated, $form_name, true);
 
-		switch($this->type)
+		switch ($this->type)
 		{
 			case 'vfs-upload':
-				if(!is_array($value)) $value = array();
+				if (!is_array($value)) $value = array();
 				/* Check & skip files that made it asyncronously
 				list($app,$id,$relpath) = explode(':',$this->id,3);
 				//...
@@ -319,16 +318,16 @@ 
 	 */
 	public static function get_vfs_path($path)
 	{
-		list($app,$id,$relpath) = explode(':',$path,3);
+		list($app, $id, $relpath) = explode(':', $path, 3);
 		if (empty($id) || $id == 'undefined')
 		{
-			static $tmppath = array();      // static var, so all vfs-uploads get created in the same temporary dir
-			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir ($app);
+			static $tmppath = array(); // static var, so all vfs-uploads get created in the same temporary dir
+			if (!isset($tmppath[$app])) $tmppath[$app] = self::get_temp_dir($app);
 			$path = $tmppath[$app];
 		}
 		else
 		{
-			$path = Api\Link::vfs_path($app,$id,'',true);
+			$path = Api\Link::vfs_path($app, $id, '', true);
 		}
 		if (!empty($relpath)) $path .= '/'.$relpath;
 		return $path;

api/src/Storage.php

Indentation +6 added lines, -6 removed lines

@@ -210,12 +210,12 @@
 	}
 
 	/**
-	* saves custom field data
-	*
-	* @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
-	* @param array $extra_cols =array() extra-data to be saved
-	* @return bool false on success, errornumber on failure
-	*/
+	 * saves custom field data
+	 *
+	 * @param array $data data to save (cf's have to be prefixed with self::CF_PREFIX = #)
+	 * @param array $extra_cols =array() extra-data to be saved
+	 * @return bool false on success, errornumber on failure
+	 */
 	function save_customfields($data, array $extra_cols=array())
 	{
 		foreach (array_keys((array)$this->customfields) as $name)

Spacing +100 added lines, -102 removed lines

@@ -118,41 +118,41 @@ 
 	 * @param boolean $allow_multiple_values =false should we allow AND store multiple values (1:N relations)
 	 * @param string $timestamp_type =null default null=leave them as is, 'ts'|'integer' use integer unix timestamps, 'object' use DateTime objects
 	 */
-	function __construct($app,$table,$extra_table,$column_prefix='',
-		$extra_key='_name',$extra_value='_value',$extra_id='_id',
-		Db $db=null,$no_clone=true,$allow_multiple_values=false,$timestamp_type=null)
+	function __construct($app, $table, $extra_table, $column_prefix = '',
+		$extra_key = '_name', $extra_value = '_value', $extra_id = '_id',
+		Db $db = null, $no_clone = true, $allow_multiple_values = false, $timestamp_type = null)
 	{
 		// calling the Storage\Base constructor
-		parent::__construct($app,$table,$db,$column_prefix,$no_clone,$timestamp_type);
+		parent::__construct($app, $table, $db, $column_prefix, $no_clone, $timestamp_type);
 
 		$this->allow_multiple_values = $allow_multiple_values;
 		$this->extra_table = $extra_table;
-		if (!$this->extra_id) $this->extra_id = $this->autoinc_id;	// default to auto id of regular table
+		if (!$this->extra_id) $this->extra_id = $this->autoinc_id; // default to auto id of regular table
 
 		// if names from columns of extra table are only postfixes (starting with _), prepend column prefix
-		if (!($prefix=$column_prefix))
+		if (!($prefix = $column_prefix))
 		{
-			list($prefix) = explode('_',$this->autoinc_id);
+			list($prefix) = explode('_', $this->autoinc_id);
 		}
-		elseif(substr($prefix,-1) == '_')
+		elseif (substr($prefix, -1) == '_')
 		{
-			$prefix = substr($prefix,0,-1);	// remove trailing underscore from column prefix parameter
+			$prefix = substr($prefix, 0, -1); // remove trailing underscore from column prefix parameter
 		}
-		foreach(array(
+		foreach (array(
 			'extra_id' => $extra_id,
 			'extra_key' => $extra_key,
 			'extra_value' => $extra_value
 		) as $col => $val)
 		{
 			$this->$col = $col_name = $val;
-			if ($col_name[0] == '_') $this->$col = $prefix . $val;
+			if ($col_name[0] == '_') $this->$col = $prefix.$val;
 		}
 		// some sanity checks, maybe they should be active only for development
-		if (!($extra_defs = $this->db->get_table_definitions($app,$extra_table)))
+		if (!($extra_defs = $this->db->get_table_definitions($app, $extra_table)))
 		{
 			throw new Exception\WrongParameter("extra table $extra_table is NOT defined!");
 		}
-		foreach(array('extra_id','extra_key','extra_value') as $col)
+		foreach (array('extra_id', 'extra_key', 'extra_value') as $col)
 		{
 			if (!$this->$col || !isset($extra_defs['fd'][$this->$col]))
 			{
@@ -177,23 +177,23 @@ 
 	 * @param array $field_names =null custom fields to read, default all
 	 * @return array id => $this->cf_field(name) => value
 	 */
-	function read_customfields($ids,$field_names=null)
+	function read_customfields($ids, $field_names = null)
 	{
 		if (is_null($field_names)) $field_names = array_keys($this->customfields);
 
-		foreach((array)$ids as $key => $id)
+		foreach ((array)$ids as $key => $id)
 		{
 			if (!(int)$id && is_array($ids)) unset($ids[$key]);
 		}
-		if (!$ids || !$field_names) return array();	// nothing to do
+		if (!$ids || !$field_names) return array(); // nothing to do
 
 		$entries = array();
-		foreach($this->db->select($this->extra_table,'*',array(
+		foreach ($this->db->select($this->extra_table, '*', array(
 			$this->extra_id => $ids,
 			$this->extra_key => $field_names,
-		),__LINE__,__FILE__,false,'',$this->app) as $row)
+		), __LINE__, __FILE__, false, '', $this->app) as $row)
 		{
-			$entry =& $entries[$row[$this->extra_id]];
+			$entry = & $entries[$row[$this->extra_id]];
 			if (!is_array($entry)) $entry = array();
 			$field = $this->get_cf_field($row[$this->extra_key]);
 
@@ -216,7 +216,7 @@ 
 	* @param array $extra_cols =array() extra-data to be saved
 	* @return bool false on success, errornumber on failure
 	*/
-	function save_customfields($data, array $extra_cols=array())
+	function save_customfields($data, array $extra_cols = array())
 	{
 		foreach (array_keys((array)$this->customfields) as $name)
 		{
@@ -229,22 +229,21 @@ 
 			$is_multiple = $this->is_multiple($name);
 
 			// we explicitly need to delete fields, if value is empty or field allows multiple values or we have no unique index
-			if(empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
+			if (empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
 			{
-				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);
-				if (empty($data[$field])) continue;	// nothing else to do for empty values
+				$this->db->delete($this->extra_table, $where, __LINE__, __FILE__, $this->app);
+				if (empty($data[$field])) continue; // nothing else to do for empty values
 			}
-			foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) :
-				// regular custom fields (!$is_multiple) eg. addressbook store multiple values comma-separated
+			foreach ($is_multiple && !is_array($data[$field]) ? explode(',', $data[$field]) : // regular custom fields (!$is_multiple) eg. addressbook store multiple values comma-separated
 				(array)(!$is_multiple && is_array($data[$field]) ? implode(',', $data[$field]) : $data[$field]) as $value)
 			{
-				if (!$this->db->insert($this->extra_table,array($this->extra_value => $value)+$extra_cols,$where,__LINE__,__FILE__,$this->app))
+				if (!$this->db->insert($this->extra_table, array($this->extra_value => $value) + $extra_cols, $where, __LINE__, __FILE__, $this->app))
 				{
 					return $this->db->Errno;
 				}
 			}
 		}
-		return false;	// no error
+		return false; // no error
 	}
 
 	/**
@@ -260,7 +259,7 @@ 
 
 		if ($this->customfields)
 		{
-			foreach(array_keys($this->customfields) as $name)
+			foreach (array_keys($this->customfields) as $name)
 			{
 				if (isset($new[$field = $this->get_cf_field($name)]))
 				{
@@ -280,16 +279,16 @@ 
 	 * @param string $join sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 * @return array|boolean data if row could be retrived else False
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
-		if (!parent::read($keys,$extra_cols,$join))
+		if (!parent::read($keys, $extra_cols, $join))
 		{
 			return false;
 		}
 		if (($id = (int)$this->data[$this->db_key_cols[$this->autoinc_id]]) && $this->customfields &&
 			($cfs = $this->read_customfields($id)))
 		{
-			$this->data = array_merge($this->data,$cfs[$id]);
+			$this->data = array_merge($this->data, $cfs[$id]);
 		}
 		return $this->data;
 	}
@@ -303,14 +302,14 @@ 
 	 * @param string|array $extra_where =null extra where clause, eg. to check an etag, returns true if no affected rows!
 	 * @return int|boolean 0 on success, or errno != 0 on error, or true if $extra_where is given and no rows affected
 	 */
-	function save($keys=null,$extra_where=null)
+	function save($keys = null, $extra_where = null)
 	{
 		if (is_array($keys) && count($keys) && !isset($keys[0]))	// allow to use an etag, eg array('etag=etag+1')
 		{
 			$this->data_merge($keys);
 			$keys = null;
 		}
-		$ret = parent::save($keys,$extra_where);
+		$ret = parent::save($keys, $extra_where);
 
 		if ($ret == 0 && $this->customfields)
 		{
@@ -328,26 +327,26 @@ 
 	 * @param boolean $only_return_ids =false return $ids of delete call to db object, but not run it (can be used by extending classes!)
 	 * @return int|array affected rows, should be 1 if ok, 0 if an error or array with id's if $only_return_ids
 	 */
-	function delete($keys=null,$only_return_ids=false)
+	function delete($keys = null, $only_return_ids = false)
 	{
 		if ($this->customfields || $only_return_ids)
 		{
-			$query = parent::delete($keys,true);
+			$query = parent::delete($keys, true);
 			// check if query contains more then the id's
 			if (!isset($query[$this->autoinc_id]) || count($query) != 1)
 			{
-				foreach($this->db->select($this->table_name,$this->autoinc_id,$query,__LINE__,__FILE__,false,'',$this->app) as $row)
+				foreach ($this->db->select($this->table_name, $this->autoinc_id, $query, __LINE__, __FILE__, false, '', $this->app) as $row)
 				{
 					$ids[] = $row[$this->autoinc_id];
 				}
-				if (!$ids) return 0;	// no rows affected
+				if (!$ids) return 0; // no rows affected
 			}
 			else
 			{
 				$ids = (array)$query[$this->autoinc_id];
 			}
 			if ($only_return_ids) return $ids;
-			$this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__);
+			$this->db->delete($this->extra_table, array($this->extra_id => $ids), __LINE__, __FILE__);
 		}
 		return parent::delete($keys);
 	}
@@ -370,32 +369,32 @@ 
 	 * @param string|array $extra_cols =array()
 	 * @return int total number of rows
 	 */
-	function get_rows($query,&$rows,&$readonlys,$join='',$need_full_no_count=false,$only_keys=false,$extra_cols=array())
+	function get_rows($query, &$rows, &$readonlys, $join = '', $need_full_no_count = false, $only_keys = false, $extra_cols = array())
 	{
-		parent::get_rows($query,$rows,$readonlys,$join,$need_full_no_count,$only_keys,$extra_cols);
+		parent::get_rows($query, $rows, $readonlys, $join, $need_full_no_count, $only_keys, $extra_cols);
 
-		$selectcols = $query['selectcols'] ? explode(',',$query['selectcols']) : array();
+		$selectcols = $query['selectcols'] ? explode(',', $query['selectcols']) : array();
 
-		if ($rows && $this->customfields && (!$selectcols || in_array('customfields',$selectcols)))
+		if ($rows && $this->customfields && (!$selectcols || in_array('customfields', $selectcols)))
 		{
 			$id2keys = array();
-			foreach($rows as $key => $row)
+			foreach ($rows as $key => $row)
 			{
 				$id2keys[$row[$this->db_key_cols[$this->autoinc_id]]] = $key;
 			}
 			// check if only certain cf's to show
 			if (!in_array('customfields', $selectcols))
 			{
-				foreach($selectcols as $col)
+				foreach ($selectcols as $col)
 				{
 					if ($this->is_cf($col)) $fields[] = $this->get_cf_name($col);
 				}
 			}
-			if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
+			if (($cfs = $this->read_customfields(array_keys($id2keys), $fields)))
 			{
-				foreach($cfs as $id => $data)
+				foreach ($cfs as $id => $data)
 				{
-					$rows[$id2keys[$id]] = array_merge($rows[$id2keys[$id]],$data);
+					$rows[$id2keys[$id]] = array_merge($rows[$id2keys[$id]], $data);
 				}
 			}
 		}
@@ -422,12 +421,12 @@ 
 	 * @param boolean $need_full_no_count =false If true an unlimited query is run to determine the total number of rows, default false
 	 * @return array|NULL array of matching rows (the row is an array of the cols) or NULL
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
 		if (!$this->customfields)
 		{
-			return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+			return parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 		}
 		if ($only_keys === false)
 		{
@@ -436,7 +435,7 @@ 
 		// if string given as criteria --> search in all (or $this->columns_to_search) columns including custom fields
 		if ($criteria && is_string($criteria))
 		{
-			$criteria = $this->search2criteria($criteria,$wildcard,$op);
+			$criteria = $this->search2criteria($criteria, $wildcard, $op);
 		}
 		if ($criteria && is_array($criteria))
 		{
@@ -445,10 +444,10 @@ 
 			{
 				if (($negate = $criteria[$this->extra_value][0] === '!'))
 				{
-					$criteria[$this->extra_value] = substr($criteria[$this->extra_value],1);
+					$criteria[$this->extra_value] = substr($criteria[$this->extra_value], 1);
 				}
-				$criteria[] = $this->extra_table.'.'.$this->extra_value . ' ' .($negate ? 'NOT ' : '').
-					$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' .
+				$criteria[] = $this->extra_table.'.'.$this->extra_value.' '.($negate ? 'NOT ' : '').
+					$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.
 					$this->db->quote($wildcard.$criteria[$this->extra_value].$wildcard);
 				unset($criteria[$this->extra_value]);
 			}
@@ -457,14 +456,14 @@ 
 			{
 				if ($criteria[$this->autoinc_id])
 				{
-					$criteria[] = $this->db->expression($this->table_name,$this->table_name.'.',
+					$criteria[] = $this->db->expression($this->table_name, $this->table_name.'.',
 						array($this->autoinc_id => $criteria[$this->autoinc_id]));
 				}
 				unset($criteria[$this->autoinc_id]);
 			}
 			// replace ambiguous column with (an exact match of) table_name.column
 			$extra_join_added = $join && strpos($join, $this->extra_join) !== false;
-			foreach($criteria as $name => $val)
+			foreach ($criteria as $name => $val)
 			{
 				// only add extra_join, if we really need it
 				if (!$extra_join_added && (
@@ -476,9 +475,9 @@ 
 					$extra_join_added = true;
 				}
 				$extra_columns = $this->db->get_table_definitions($this->app, $this->extra_table);
-				if(is_string($name) && $extra_columns['fd'][array_search($name, $this->db_cols)])
+				if (is_string($name) && $extra_columns['fd'][array_search($name, $this->db_cols)])
 				{
-					$criteria[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
+					$criteria[] = $this->db->expression($this->table_name, $this->table_name.'.', array(
 						array_search($name, $this->db_cols) => $val,
 					));
 					unset($criteria[$name]);
@@ -490,12 +489,12 @@ 
 						$name = substr($name, 1);
 						if (($negate = $criteria[$name][0] === '!'))
 						{
-							$val = substr($val,1);
+							$val = substr($val, 1);
 						}
-						$cfcriteria[] = '(' . $this->extra_table.'.'.$this->extra_value . ' ' .($negate ? 'NOT ' : '').
-							$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE]. ' ' .
-							$this->db->quote($wildcard.$val.$wildcard) . ' AND ' .
-							$this->extra_table.'.'.$this->extra_key . ' = ' . $this->db->quote($name) .
+						$cfcriteria[] = '('.$this->extra_table.'.'.$this->extra_value.' '.($negate ? 'NOT ' : '').
+							$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.
+							$this->db->quote($wildcard.$val.$wildcard).' AND '.
+							$this->extra_table.'.'.$this->extra_key.' = '.$this->db->quote($name).
 							')';
 						unset($criteria[self::CF_PREFIX.$name]);
 					}
@@ -507,38 +506,38 @@ 
 					}
 				}
 			}
-			if ($cfcriteria && $op =='OR') $criteria[] = implode(' OR ',$cfcriteria);
+			if ($cfcriteria && $op == 'OR') $criteria[] = implode(' OR ', $cfcriteria);
 		}
-		if($only_keys === true)
+		if ($only_keys === true)
 		{
 			// Expand to keys here, so table_name can be prepended below
 			$only_keys = array_values($this->db_key_cols);
 		}
 		// replace ambiguous column with (an exact match of) table_name.column
-		if(is_array($only_keys))
+		if (is_array($only_keys))
 		{
-			foreach($only_keys as $key => &$col)
+			foreach ($only_keys as $key => &$col)
 			{
-				if(is_numeric($key) && in_array($col, $this->db_cols, true))
+				if (is_numeric($key) && in_array($col, $this->db_cols, true))
 				{
-					$col = $this->table_name .'.'.array_search($col, $this->db_cols).' AS '.$col;
+					$col = $this->table_name.'.'.array_search($col, $this->db_cols).' AS '.$col;
 				}
 			}
 		}
 		// check if we order by a custom field --> join cf table for given cf and order by it's value
-		if (strpos($order_by,self::CF_PREFIX) !== false)
+		if (strpos($order_by, self::CF_PREFIX) !== false)
 		{
 			// fields to order by, as cutomfields may have names with spaces, we examine each order by criteria
-			$fields2order = explode(',',$order_by);
-			foreach($fields2order as $v)
+			$fields2order = explode(',', $order_by);
+			foreach ($fields2order as $v)
 			{
-				if (strpos($v,self::CF_PREFIX) !== false)
+				if (strpos($v, self::CF_PREFIX) !== false)
 				{
 					// we found a customfield, so we split that part by space char in order to get Sorting Direction and Fieldname
-					$buff = explode(' ',trim($v));
+					$buff = explode(' ', trim($v));
 					$orderDir = array_pop($buff);
-					$key = substr(trim(implode(' ',$buff)), 1);
-					switch($this->customfields[$key]['type'])
+					$key = substr(trim(implode(' ', $buff)), 1);
+					switch ($this->customfields[$key]['type'])
 					{
 						case 'int':
 							$order_by = str_replace($v, 'extra_order.'.$this->extra_value.' IS NULL,'.
@@ -571,26 +570,26 @@ 
 		{
 			$_cfnames = array_keys($this->customfields);
 			$extra_filter = null;
-			foreach($filter as $name => $val)
+			foreach ($filter as $name => $val)
 			{
 				// replace ambiguous auto-id with (an exact match of) table_name.autoid
 				if (is_string($name) && $name == $this->autoinc_id)
 				{
 					if ((int)$filter[$this->autoinc_id])
 					{
-						$filter[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
+						$filter[] = $this->db->expression($this->table_name, $this->table_name.'.', array(
 							$this->autoinc_id => $filter[$this->autoinc_id],
 						));
 					}
 					unset($filter[$this->autoinc_id]);
 				}
 				// replace ambiguous column with (an exact match of) table_name.column
-				elseif (is_string($name) && $val!=null && in_array($name, $this->db_cols))
+				elseif (is_string($name) && $val != null && in_array($name, $this->db_cols))
 				{
 					$extra_columns = $this->db->get_table_definitions($this->app, $this->extra_table);
 					if ($extra_columns['fd'][array_search($name, $this->db_cols)])
 					{
-						$filter[] = $this->db->expression($this->table_name,$this->table_name.'.',array(
+						$filter[] = $this->db->expression($this->table_name, $this->table_name.'.', array(
 							array_search($name, $this->db_cols) => $val,
 						));
 						unset($filter[$name]);
@@ -602,61 +601,61 @@ 
 					{
 						if ($val[0] === '!')	// negative filter
 						{
-							$sql_filter = 'extra_filter.'.$this->extra_value.'!='.$this->db->quote(substr($val,1));
+							$sql_filter = 'extra_filter.'.$this->extra_value.'!='.$this->db->quote(substr($val, 1));
 						}
 						else	// using Db::expression to allow to use array() with possible values or NULL
 						{
-							if($this->customfields[$this->get_cf_name($name)]['type'] == 'select' &&
+							if ($this->customfields[$this->get_cf_name($name)]['type'] == 'select' &&
 								$this->customfields[$this->get_cf_name($name)]['rows'] > 1)
 							{
 								// Multi-select - any entry with the filter value selected matches
-								$sql_filter = str_replace($this->extra_value,'extra_filter.'.
-									$this->extra_value,$this->db->expression($this->extra_table,array(
-										$this->db->concat("','",$this->extra_value,"','").' '.$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$val.',%')
+								$sql_filter = str_replace($this->extra_value, 'extra_filter.'.
+									$this->extra_value, $this->db->expression($this->extra_table, array(
+										$this->db->concat("','", $this->extra_value, "','").' '.$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$val.',%')
 									))
 								);
 							}
 							elseif ($this->customfields[$this->get_cf_name($name)]['type'] == 'text')
 							{
-								$sql_filter = str_replace($this->extra_value,'extra_filter.'.$this->extra_value,
-										$this->db->expression($this->extra_table,array(
+								$sql_filter = str_replace($this->extra_value, 'extra_filter.'.$this->extra_value,
+										$this->db->expression($this->extra_table, array(
 										$this->extra_value.' '.$this->db->capabilities[Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote($wildcard.$val.$wildcard)
 									))
 								);
 							}
 							else
 							{
-								$sql_filter = str_replace($this->extra_value,'extra_filter.'.
-									$this->extra_value,$this->db->expression($this->extra_table,array($this->extra_value => $val)));
+								$sql_filter = str_replace($this->extra_value, 'extra_filter.'.
+									$this->extra_value, $this->db->expression($this->extra_table, array($this->extra_value => $val)));
 							}
 						}
 						// need to use a LEFT JOIN for negative search or to allow NULL values
-						$need_left_join = $val[0] === '!' || strpos($sql_filter,'IS NULL') !== false ? ' LEFT ' : '';
-						$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$need_left_join.$this->extra_join_filter.
+						$need_left_join = $val[0] === '!' || strpos($sql_filter, 'IS NULL') !== false ? ' LEFT ' : '';
+						$join .= str_replace('extra_filter', 'extra_filter'.$extra_filter, $need_left_join.$this->extra_join_filter.
 							' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($name)).
 							' AND '.$sql_filter);
 						++$extra_filter;
 					}
 					unset($filter[$name]);
 				}
-				elseif(is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
+				elseif (is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
 				{
-					$_cf = explode(' ',$val);
-					foreach($_cf as $cf_np)
+					$_cf = explode(' ', $val);
+					foreach ($_cf as $cf_np)
 					{
 						// building cf_name by glueing parts together (, in case someone used whitespace in their custom field names)
-						$tcf_name = ($tcf_name?$tcf_name.' ':'').$cf_np;
+						$tcf_name = ($tcf_name ? $tcf_name.' ' : '').$cf_np;
 						// reacts on the first one found that matches an existing customfield, should be better then the old behavior of
 						// simply splitting by " " and using the first part
-						if ($this->is_cf($tcf_name) && ($cfn = $this->get_cf_name($tcf_name)) && array_search($cfn,(array)$_cfnames,true)!==false )
+						if ($this->is_cf($tcf_name) && ($cfn = $this->get_cf_name($tcf_name)) && array_search($cfn, (array)$_cfnames, true) !== false)
 						{
 							$cf = $tcf_name;
 							break;
 						}
 					}
-					$join .= str_replace('extra_filter','extra_filter'.$extra_filter,$this->extra_join_filter.
+					$join .= str_replace('extra_filter', 'extra_filter'.$extra_filter, $this->extra_join_filter.
 						' AND extra_filter.'.$this->extra_key.'='.$this->db->quote($this->get_cf_name($cf)).
-						' AND '.str_replace($cf,'extra_filter.'.$this->extra_value,$val));
+						' AND '.str_replace($cf, 'extra_filter.'.$this->extra_value, $val));
 					++$extra_filter;
 					unset($filter[$name]);
 				}
@@ -668,15 +667,14 @@ 
 			if (is_array($only_keys))
 			{
 				$only_keys = array_values($only_keys);
-				$only_keys[0] = 'DISTINCT '.($only_keys[0] != $this->autoinc_id ? $only_keys[0] :
-					$this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id);
+				$only_keys[0] = 'DISTINCT '.($only_keys[0] != $this->autoinc_id ? $only_keys[0] : $this->table_name.'.'.$this->autoinc_id.' AS '.$this->autoinc_id);
 			}
 			else
 			{
 				$only_keys = 'DISTINCT '.$only_keys;
 			}
 		}
-		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		return parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 	}
 
 	/**
@@ -716,7 +714,7 @@ 
 	 */
 	function get_cf_name($field)
 	{
-		return substr($field,1);
+		return substr($field, 1);
 	}
 
 	/**
@@ -738,7 +736,7 @@ 
 	 */
 	function is_multiple($name)
 	{
-		return $this->allow_multiple_values && in_array($this->customfields[$name]['type'],array('select','select-account')) &&
+		return $this->allow_multiple_values && in_array($this->customfields[$name]['type'], array('select', 'select-account')) &&
 			$this->customfields[$name]['rows'] > 1;
 	}
 }

Braces +64 added lines, -15 removed lines

@@ -127,7 +127,11 @@ 
 
 		$this->allow_multiple_values = $allow_multiple_values;
 		$this->extra_table = $extra_table;
-		if (!$this->extra_id) $this->extra_id = $this->autoinc_id;	// default to auto id of regular table
+		if (!$this->extra_id)
+		{
+			$this->extra_id = $this->autoinc_id;
+		}
+		// default to auto id of regular table
 
 		// if names from columns of extra table are only postfixes (starting with _), prepend column prefix
 		if (!($prefix=$column_prefix))
@@ -145,7 +149,10 @@ 
 		) as $col => $val)
 		{
 			$this->$col = $col_name = $val;
-			if ($col_name[0] == '_') $this->$col = $prefix . $val;
+			if ($col_name[0] == '_')
+			{
+				$this->$col = $prefix . $val;
+			}
 		}
 		// some sanity checks, maybe they should be active only for development
 		if (!($extra_defs = $this->db->get_table_definitions($app,$extra_table)))
@@ -179,13 +186,23 @@ 
 	 */
 	function read_customfields($ids,$field_names=null)
 	{
-		if (is_null($field_names)) $field_names = array_keys($this->customfields);
+		if (is_null($field_names))
+		{
+			$field_names = array_keys($this->customfields);
+		}
 
 		foreach((array)$ids as $key => $id)
 		{
-			if (!(int)$id && is_array($ids)) unset($ids[$key]);
+			if (!(int)$id && is_array($ids))
+			{
+				unset($ids[$key]);
+			}
 		}
-		if (!$ids || !$field_names) return array();	// nothing to do
+		if (!$ids || !$field_names)
+		{
+			return array();
+		}
+		// nothing to do
 
 		$entries = array();
 		foreach($this->db->select($this->extra_table,'*',array(
@@ -194,7 +211,10 @@ 
 		),__LINE__,__FILE__,false,'',$this->app) as $row)
 		{
 			$entry =& $entries[$row[$this->extra_id]];
-			if (!is_array($entry)) $entry = array();
+			if (!is_array($entry))
+			{
+				$entry = array();
+			}
 			$field = $this->get_cf_field($row[$this->extra_key]);
 
 			if ($this->allow_multiple_values && $this->is_multiple($row[$this->extra_key]))
@@ -220,7 +240,10 @@ 
 	{
 		foreach (array_keys((array)$this->customfields) as $name)
 		{
-			if (!isset($data[$field = $this->get_cf_field($name)])) continue;
+			if (!isset($data[$field = $this->get_cf_field($name)]))
+			{
+				continue;
+			}
 
 			$where = array(
 				$this->extra_id    => isset($data[$this->autoinc_id]) ? $data[$this->autoinc_id] : $data[$this->db_key_cols[$this->autoinc_id]],
@@ -232,7 +255,11 @@ 
 			if(empty($data[$field]) || $is_multiple || !$this->extra_has_unique_index)
 			{
 				$this->db->delete($this->extra_table,$where,__LINE__,__FILE__,$this->app);
-				if (empty($data[$field])) continue;	// nothing else to do for empty values
+				if (empty($data[$field]))
+				{
+					continue;
+				}
+				// nothing else to do for empty values
 			}
 			foreach($is_multiple && !is_array($data[$field]) ? explode(',',$data[$field]) :
 				// regular custom fields (!$is_multiple) eg. addressbook store multiple values comma-separated
@@ -305,9 +332,12 @@ 
 	 */
 	function save($keys=null,$extra_where=null)
 	{
-		if (is_array($keys) && count($keys) && !isset($keys[0]))	// allow to use an etag, eg array('etag=etag+1')
+		if (is_array($keys) && count($keys) && !isset($keys[0]))
+		{
+			// allow to use an etag, eg array('etag=etag+1')
 		{
 			$this->data_merge($keys);
+		}
 			$keys = null;
 		}
 		$ret = parent::save($keys,$extra_where);
@@ -340,13 +370,20 @@ 
 				{
 					$ids[] = $row[$this->autoinc_id];
 				}
-				if (!$ids) return 0;	// no rows affected
+				if (!$ids)
+				{
+					return 0;
+				}
+				// no rows affected
 			}
 			else
 			{
 				$ids = (array)$query[$this->autoinc_id];
 			}
-			if ($only_return_ids) return $ids;
+			if ($only_return_ids)
+			{
+				return $ids;
+			}
 			$this->db->delete($this->extra_table,array($this->extra_id => $ids),__LINE__,__FILE__);
 		}
 		return parent::delete($keys);
@@ -388,7 +425,10 @@ 
 			{
 				foreach($selectcols as $col)
 				{
-					if ($this->is_cf($col)) $fields[] = $this->get_cf_name($col);
+					if ($this->is_cf($col))
+					{
+						$fields[] = $this->get_cf_name($col);
+					}
 				}
 			}
 			if (($cfs = $this->read_customfields(array_keys($id2keys),$fields)))
@@ -507,7 +547,10 @@ 
 					}
 				}
 			}
-			if ($cfcriteria && $op =='OR') $criteria[] = implode(' OR ',$cfcriteria);
+			if ($cfcriteria && $op =='OR')
+			{
+				$criteria[] = implode(' OR ',$cfcriteria);
+			}
 		}
 		if($only_keys === true)
 		{
@@ -598,11 +641,14 @@ 
 				}
 				elseif (is_string($name) && $this->is_cf($name))
 				{
-					if (!empty($val))	// empty -> dont filter
+					if (!empty($val))
+					{
+						// empty -> dont filter
 					{
 						if ($val[0] === '!')	// negative filter
 						{
 							$sql_filter = 'extra_filter.'.$this->extra_value.'!='.$this->db->quote(substr($val,1));
+					}
 						}
 						else	// using Db::expression to allow to use array() with possible values or NULL
 						{
@@ -639,9 +685,12 @@ 
 					}
 					unset($filter[$name]);
 				}
-				elseif(is_int($name) && $this->is_cf($val))	// lettersearch: #cfname LIKE 's%'
+				elseif(is_int($name) && $this->is_cf($val))
+				{
+					// lettersearch: #cfname LIKE 's%'
 				{
 					$_cf = explode(' ',$val);
+				}
 					foreach($_cf as $cf_np)
 					{
 						// building cf_name by glueing parts together (, in case someone used whitespace in their custom field names)

api/src/Etemplate/Widget/File.php

Spacing +37 added lines, -37 removed lines

@@ -27,12 +27,12 @@ 
 	 *
 	 * @param string $xml
 	 */
-	public function __construct($xml='')
+	public function __construct($xml = '')
 	{
-		if($xml) parent::__construct($xml);
+		if ($xml) parent::__construct($xml);
 
 		// Legacy multiple - id ends in []
-		if(substr($this->id,-2) == '[]')
+		if (substr($this->id, -2) == '[]')
 		{
 			$this->setElementAttribute($this->id, 'multiple', true);
 		}
@@ -52,7 +52,7 @@ 
 		$response = Api\Json\Response::get();
 		$request_id = str_replace(' ', '+', rawurldecode($_REQUEST['request_id']));
 		$widget_id = $_REQUEST['widget_id'];
-		if(!self::$request = Etemplate\Request::read($request_id)) {
+		if (!self::$request = Etemplate\Request::read($request_id)) {
 			$response->error("Could not read session");
 			return;
 		}
@@ -70,20 +70,20 @@ 
 		foreach ($_FILES as $field => &$files)
 		{
 			$widget = $template->getElementById($widget_id ? $widget_id : $field);
-			if($widget && $widget->attrs['mime']) {
+			if ($widget && $widget->attrs['mime']) {
 				$mime = $widget->attrs['mime'];
 			}
 
 			// Check for legacy [] in id to indicate multiple - it changes format
-			if(is_array($files['name'])) {
+			if (is_array($files['name'])) {
 				$file_list = array();
-				foreach($files as $f_field => $values)
+				foreach ($files as $f_field => $values)
 				{
-					foreach($values as $key => $f_value) {
+					foreach ($values as $key => $f_value) {
 						$file_list[$key][$f_field] = $f_value;
 					}
 				}
-				foreach($file_list as $file)
+				foreach ($file_list as $file)
 				{
 					self::process_uploaded_file($field, $file, $mime, $file_data);
 				}
@@ -99,13 +99,13 @@ 
 		$response->data($file_data);
 
 		// Check for a callback, call it if there is one
-		foreach($_FILES as $field => $file)
+		foreach ($_FILES as $field => $file)
 		{
-			if(($element = $template->getElementById($field)))
+			if (($element = $template->getElementById($field)))
 			{
 				$callback = $element->attrs['callback'];
-				if(!$callback) $callback = $template->getElementAttribute($field, 'callback');
-				if($callback)
+				if (!$callback) $callback = $template->getElementAttribute($field, 'callback');
+				if ($callback)
 				{
 					ExecMethod($callback, $_FILES[$field]);
 				}
@@ -118,10 +118,10 @@ 
 	 */
 	protected static function process_uploaded_file($field, Array &$file, $mime, Array &$file_data)
 	{
-		unset($field);	// not used
+		unset($field); // not used
 
 		// Chunks get mangled a little
-		if($file['name'] == 'blob')
+		if ($file['name'] == 'blob')
 		{
 			$file['name'] = $_POST['resumableFilename'];
 			$file['type'] = $_POST['resumableType'];
@@ -129,14 +129,14 @@ 
 
 		if ($file['error'] == UPLOAD_ERR_OK && trim($file['name']) != '' && $file['size'] > 0 && is_uploaded_file($file['tmp_name'])) {
 			// Mime check
-			if($mime)
+			if ($mime)
 			{
 				$type = $file['type'];
 				$is_preg = $mime[0] == '/';
-				if (!$is_preg && strcasecmp($mime,$type) ||
-					$is_preg && !preg_match($mime,$type))
+				if (!$is_preg && strcasecmp($mime, $type) ||
+					$is_preg && !preg_match($mime, $type))
 				{
-					$file_data[$file['name']] = $file['name'].':'.lang('File is of wrong type (%1 != %2)!',$type,$mime);
+					$file_data[$file['name']] = $file['name'].':'.lang('File is of wrong type (%1 != %2)!', $type, $mime);
 					//error_log(__METHOD__.__LINE__.array2string($file_data[$file['name']]));
 					return false;
 				}
@@ -145,8 +145,8 @@ 
 			// Resumable / chunked uploads
 			// init the destination file (format <filename.ext>.part<#chunk>
 			// the file is stored in a temporary directory
-			$temp_dir = $GLOBALS['egw_info']['server']['temp_dir'].'/'.str_replace('/','_',$_POST['resumableIdentifier']);
-			$dest_file = $temp_dir.'/'.str_replace('/','_',$_POST['resumableFilename']).'.part'.(int)$_POST['resumableChunkNumber'];
+			$temp_dir = $GLOBALS['egw_info']['server']['temp_dir'].'/'.str_replace('/', '_', $_POST['resumableIdentifier']);
+			$dest_file = $temp_dir.'/'.str_replace('/', '_', $_POST['resumableFilename']).'.part'.(int)$_POST['resumableChunkNumber'];
 
 			// create the temporary directory
 			if (!is_dir($temp_dir))
@@ -162,10 +162,10 @@ 
 			else
 			{
 				// check if all the parts present, and create the final destination file
-				$new_file = self::createFileFromChunks($temp_dir, str_replace('/','_',$_POST['resumableFilename']),
+				$new_file = self::createFileFromChunks($temp_dir, str_replace('/', '_', $_POST['resumableFilename']),
 						$_POST['resumableChunkSize'], $_POST['resumableTotalSize']);
 			}
-			if( $new_file) {
+			if ($new_file) {
 				$file['tmp_name'] = $new_file;
 
 				// Data to send back to client
@@ -194,7 +194,7 @@ 
 
 		// count all the parts of this file
 		$total_files = 0;
-		foreach(scandir($temp_dir) as $file) {
+		foreach (scandir($temp_dir) as $file) {
 			if (stripos($file, $fileName) !== false) {
 				$total_files++;
 			}
@@ -202,10 +202,10 @@ 
 
 		// check that all the parts are present
 		// the size of the last part is between chunkSize and 2*$chunkSize
-		if ($total_files * $chunkSize >=  ($totalSize - $chunkSize + 1)) {
+		if ($total_files * $chunkSize >= ($totalSize - $chunkSize + 1)) {
 			if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 			{
-				$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'egw_');
+				$new_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'egw_');
 			}
 			else
 			{
@@ -214,7 +214,7 @@ 
 
 			// create the final destination file
 			if (($fp = fopen($new_file, 'w')) !== false) {
-				for ($i=1; $i<=$total_files; $i++) {
+				for ($i = 1; $i <= $total_files; $i++) {
 					fwrite($fp, file_get_contents($temp_dir.'/'.$fileName.'.part'.$i));
 				}
 				fclose($fp);
@@ -250,13 +250,13 @@ 
 			{
 				if ($object != "." && $object != "..")
 				{
-					if (filetype($dir . "/" . $object) == "dir")
+					if (filetype($dir."/".$object) == "dir")
 					{
-						self::rrmdir($dir . "/" . $object);
+						self::rrmdir($dir."/".$object);
 					}
 					else
 					{
-						unlink($dir . "/" . $object);
+						unlink($dir."/".$object);
 					}
 				}
 			}
@@ -273,23 +273,23 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value = $value_in = self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 
-			if(!is_array($value)) $value = array();
+			if (!is_array($value)) $value = array();
 
 			// Incoming values indexed by temp name
-			if($value[0]) $value = $value[0];
+			if ($value[0]) $value = $value[0];
 
-			foreach($value as $tmp => $file)
+			foreach ($value as $tmp => $file)
 			{
-				if(!$file) continue;
+				if (!$file) continue;
 				if (is_dir($GLOBALS['egw_info']['server']['temp_dir']) && is_writable($GLOBALS['egw_info']['server']['temp_dir']))
 				{
 					$path = $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmp;
@@ -309,7 +309,7 @@ 
 				);
 			}
 
-			if($valid && !$this->attrs['multiple']) $valid = $valid[0];
+			if ($valid && !$this->attrs['multiple']) $valid = $valid[0];
 		}
 	}
 }

calendar/inc/class.calendar_so.inc.php

Doc Comments +12 added lines, -36 removed lines

@@ -211,23 +211,11 @@ 
 	 * @param int $start startdate of the search/list (servertime)
 	 * @param int $end enddate of the search/list (servertime)
 	 * @param int|array $users user-id or array of user-id's, !$users means all entries regardless of users
-	 * @param int|array $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
+	 * @param integer $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
 	 * @param string $filter ='default' string filter-name: all (not rejected), accepted, unknown, tentative, rejected or everything (incl. rejected, deleted)
 	 * @param int|boolean $offset =False offset for a limited query or False (default)
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @param array $params =array()
-	 * @param string|array $params['query'] string: pattern so search for, if unset or empty all matching entries are returned (no search)
-	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
-	 *      array: everything is directly used as $where
-	 * @param string $params['order'] ='cal_start' column-names plus optional DESC|ASC separted by comma
-	 * @param string $params['sql_filter'] sql to be and'ed into query (fully quoted)
-	 * @param string|array $params['cols'] what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
-	 * 						if specified and not false an iterator for the rows is returned
-	 * @param string $params['append'] SQL to append to the query before $order, eg. for a GROUP BY clause
-	 * @param array $params['cfs'] custom fields to query, null = none, array() = all, or array with cfs names
-	 * @param array $params['users'] raw parameter as passed to calendar_bo::search() no memberships resolved!
-	 * @param boolean $params['master_only'] =false, true only take into account participants/status from master (for AS)
-	 * @param boolean $params['enum_recuring'] =true enumerate recuring events
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return array of events
 	 */
@@ -594,7 +582,7 @@ 
 	/**
 	 * generate SQL to filter after a given category (incl. subcategories)
 	 *
-	 * @param array|int $cat_id cat-id or array of cat-ids, or !$cat_id for none
+	 * @param integer $cat_id cat-id or array of cat-ids, or !$cat_id for none
 	 * @return string SQL to include in the query
 	 */
 	function cat_filter($cat_id)
@@ -682,24 +670,11 @@ 
 	 * @param int $start startdate of the search/list (servertime)
 	 * @param int $end enddate of the search/list (servertime)
 	 * @param int|array $users user-id or array of user-id's, !$users means all entries regardless of users
-	 * @param int|array $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
+	 * @param integer $cat_id =0 mixed category-id or array of cat-id's (incl. all sub-categories), default 0 = all
 	 * @param string $filter ='all' string filter-name: all (not rejected), accepted, unknown, tentative, rejected or everything (incl. rejected, deleted)
 	 * @param int|boolean $offset =False offset for a limited query or False (default)
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @param array $params =array()
-	 * @param string|array $params['query'] string: pattern so search for, if unset or empty all matching entries are returned (no search)
-	 *		Please Note: a search never returns repeating events more then once AND does not honor start+end date !!!
-	 *      array: everything is directly used as $where
-	 * @param string $params['order'] ='cal_start' column-names plus optional DESC|ASC separted by comma
-	 * @param string|array $params['sql_filter'] sql to be and'ed into query (fully quoted), or usual filter array
-	 * @param string|array $params['cols'] what to select, default "$this->repeats_table.*,$this->cal_table.*,cal_start,cal_end,cal_recur_date",
-	 * 						if specified and not false an iterator for the rows is returned
-	 * @param string $params['append'] SQL to append to the query before $order, eg. for a GROUP BY clause
-	 * @param array $params['cfs'] custom fields to query, null = none, array() = all, or array with cfs names
-	 * @param array $params['users'] raw parameter as passed to calendar_bo::search() no memberships resolved!
-	 * @param boolean $params['master_only'] =false, true only take into account participants/status from master (for AS)
-	 * @param boolean $params['enum_recuring'] =true enumerate recuring events
-	 * @param boolean $params['use_so_events'] =false, true return result of new $this->events()
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return Iterator|array of events
 	 */
@@ -1140,11 +1115,11 @@ 
 	 * Ask other apps if they want to participate in calendar search / display
 	 *
 	 * @param &$selects parts of union query
-	 * @param $start see search()
-	 * @param $end
+	 * @param integer $start see search()
+	 * @param integer $end
 	 * @param $users as used in calendar_so ($users_raw plus all members and memberships added by calendar_bo)
-	 * @param $cat_id
-	 * @param $filter
+	 * @param integer $cat_id
+	 * @param string $filter
 	 * @param $query
 	 * @param $users_raw as passed to calendar_bo::search (no members and memberships added)
 	 */
@@ -1312,6 +1287,7 @@ 
 	 * @param int &$set_recurrences_start=0 on return: time from which on the recurrences should be rebuilt, default 0=all
 	 * @param int $change_since =0 time from which on the repetitions should be changed, default 0=all
 	 * @param int &$etag etag=null etag to check or null, on return new etag
+	 * @param boolean $set_recurrences
 	 * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
 	 */
 	function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
@@ -1722,7 +1698,7 @@ 
 	 * @param int $cal_id
 	 * @param int $start new starttime
 	 * @param int $end new endtime
-	 * @param int|boolean $change_since =0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
+	 * @param integer $change_since =0 false=new entry, > 0 time from which on the repetitions should be changed, default 0=all
 	 * @param int $old_start =0 old starttime or (default) 0, to query it from the db
 	 * @param int $old_end =0 old starttime or (default) 0
 	 * @todo Recalculate recurrences, if timezone changes
@@ -1899,7 +1875,7 @@ 
 	 *
 	 * @param int $cal_id
 	 * @param array $participants uid => status pairs
-	 * @param int|boolean $change_since =0, false=new event,
+	 * @param integer $change_since =0, false=new event,
 	 * 		0=all, > 0 time from which on the repetitions should be changed
 	 * @param boolean $add_only =false
 	 *		false = add AND delete participants if needed (full list of participants required in $participants)
@@ -2045,7 +2021,7 @@ 
 	 * set the status of one participant for a given recurrence or for all recurrences since now (includes recur_date=0)
 	 *
 	 * @param int $cal_id
-	 * @param char $user_type 'u' regular user, 'r' resource, 'c' contact
+	 * @param string $user_type 'u' regular user, 'r' resource, 'c' contact
 	 * @param int|string $user_id
 	 * @param int|char $status numeric status (defines) or 1-char code: 'R', 'U', 'T' or 'A'
 	 * @param int $recur_date =0 date to change, or 0 = all since now
@@ -2962,7 +2938,7 @@ 
 	 * Updates the modification timestamp to force an etag, ctag and sync-token change
 	 *
 	 * @param int $id event id
-	 * @param int|boolean $update_master =false id of series master or true, to update series master too
+	 * @param boolean $update_master =false id of series master or true, to update series master too
 	 * @param int $time =null new timestamp, default current (server-)time
 	 * @param int $modifier =null uid of the modifier, default current user
 	 */

Spacing +391 added lines, -394 removed lines

@@ -19,40 +19,40 @@ 
 /**
  * some necessary defines used by the calendar
  */
-if(!extension_loaded('mcal'))
+if (!extension_loaded('mcal'))
 {
-	define('MCAL_RECUR_NONE',0);
-	define('MCAL_RECUR_DAILY',1);
-	define('MCAL_RECUR_WEEKLY',2);
-	define('MCAL_RECUR_MONTHLY_MDAY',3);
-	define('MCAL_RECUR_MONTHLY_WDAY',4);
-	define('MCAL_RECUR_YEARLY',5);
-	define('MCAL_RECUR_SECONDLY',6);
-	define('MCAL_RECUR_MINUTELY',7);
-	define('MCAL_RECUR_HOURLY',8);
-
-	define('MCAL_M_SUNDAY',1);
-	define('MCAL_M_MONDAY',2);
-	define('MCAL_M_TUESDAY',4);
-	define('MCAL_M_WEDNESDAY',8);
-	define('MCAL_M_THURSDAY',16);
-	define('MCAL_M_FRIDAY',32);
-	define('MCAL_M_SATURDAY',64);
-
-	define('MCAL_M_WEEKDAYS',62);
-	define('MCAL_M_WEEKEND',65);
-	define('MCAL_M_ALLDAYS',127);
+	define('MCAL_RECUR_NONE', 0);
+	define('MCAL_RECUR_DAILY', 1);
+	define('MCAL_RECUR_WEEKLY', 2);
+	define('MCAL_RECUR_MONTHLY_MDAY', 3);
+	define('MCAL_RECUR_MONTHLY_WDAY', 4);
+	define('MCAL_RECUR_YEARLY', 5);
+	define('MCAL_RECUR_SECONDLY', 6);
+	define('MCAL_RECUR_MINUTELY', 7);
+	define('MCAL_RECUR_HOURLY', 8);
+
+	define('MCAL_M_SUNDAY', 1);
+	define('MCAL_M_MONDAY', 2);
+	define('MCAL_M_TUESDAY', 4);
+	define('MCAL_M_WEDNESDAY', 8);
+	define('MCAL_M_THURSDAY', 16);
+	define('MCAL_M_FRIDAY', 32);
+	define('MCAL_M_SATURDAY', 64);
+
+	define('MCAL_M_WEEKDAYS', 62);
+	define('MCAL_M_WEEKEND', 65);
+	define('MCAL_M_ALLDAYS', 127);
 }
 
-define('REJECTED',0);
-define('NO_RESPONSE',1);
-define('TENTATIVE',2);
-define('ACCEPTED',3);
-define('DELEGATED',4);
+define('REJECTED', 0);
+define('NO_RESPONSE', 1);
+define('TENTATIVE', 2);
+define('ACCEPTED', 3);
+define('DELEGATED', 4);
 
-define('HOUR_s',60*60);
-define('DAY_s',24*HOUR_s);
-define('WEEK_s',7*DAY_s);
+define('HOUR_s', 60 * 60);
+define('DAY_s', 24 * HOUR_s);
+define('WEEK_s', 7 * DAY_s);
 
 /**
  * Class to store all calendar data (storage object)
@@ -100,7 +100,7 @@ 
 	 * name of the main calendar table and prefix for all other calendar tables
 	 */
 	var $cal_table = 'egw_cal';
-	var $extra_table,$repeats_table,$user_table,$dates_table,$all_tables;
+	var $extra_table, $repeats_table, $user_table, $dates_table, $all_tables;
 
 	/**
 	 * reference to global db-object
@@ -136,7 +136,7 @@ 
 		$this->db = $GLOBALS['egw']->db;
 
 		$this->all_tables = array($this->cal_table);
-		foreach(array('extra','repeats','user','dates') as $name)
+		foreach (array('extra', 'repeats', 'user', 'dates') as $name)
 		{
 			$vname = $name.'_table';
 			$this->all_tables[] = $this->$vname = $this->cal_table.'_'.$name;
@@ -152,11 +152,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function cal_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function cal_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)	// using view without start-date is slower!
 		{
-			return $this->cal_table;	// no need / use for a view
+			return $this->cal_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -182,11 +182,11 @@ 
 	 * @param boolean $deleted =false
 	 * @return string
 	 */
-	protected function dates_range_view($start, $end, array $_where=null, $deleted=false)
+	protected function dates_range_view($start, $end, array $_where = null, $deleted = false)
 	{
 		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)	// using view without start- AND end-date is slower!
 		{
-			return $this->dates_table;	// no need / use for a view
+			return $this->dates_table; // no need / use for a view
 		}
 
 		$where = array();
@@ -231,14 +231,14 @@ 
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return array of events
 	 */
-	function &events($start,$end,$users,$cat_id=0,$filter='all',$offset=False,$num_rows=0,array $params=array(),$remove_rejected_by_user=null)
+	function &events($start, $end, $users, $cat_id = 0, $filter = 'all', $offset = False, $num_rows = 0, array $params = array(), $remove_rejected_by_user = null)
 	{
-		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
+		error_log(__METHOD__.'('.($start ? date('Y-m-d H:i', $start) : '').','.($end ? date('Y-m-d H:i', $end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
 		$start_time = microtime(true);
 		// not everything is supported by now
 		if (!$start || !$end || is_string($params['query']) ||
 			//in_array($filter,array('owner','deleted')) ||
-			$params['enum_recuring']===false)
+			$params['enum_recuring'] === false)
 		{
 			throw new Api\Exception\AssertionFailed("Unsupported value for parameters!");
 		}
@@ -265,7 +265,7 @@ 
 		{
 			// fix $users to also prefix system users and groups (with 'u')
 			if (!is_array($users)) $users = $users ? (array)$users : array();
-			foreach($users as &$uid)
+			foreach ($users as &$uid)
 			{
 				$user_type = $user_id = null;
 				self::split_user($uid, $user_type, $user_id, true);
@@ -286,7 +286,7 @@ 
 
 		if ($params['order'])	// only order if requested
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			if (!preg_match('/^[a-z_ ,c]+$/i', $params['order'])) $params['order'] = 'cal_start'; // gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
@@ -295,8 +295,8 @@ 
 			$offset = 0;
 			$num_rows = -1;
 		}
-		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
-		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true)-$start_time, 3));
+		$events = & $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
+		error_log(__METHOD__."(...) $sql --> ".number_format(microtime(true) - $start_time, 3));
 		return $events;
 	}
 
@@ -309,12 +309,12 @@ 
 	 * @param int $recur_date =0 if set read the next recurrence at or after the timestamp, default 0 = read the initital one
 	 * @return array|boolean array with cal_id => event array pairs or false if entry not found
 	 */
-	function read($ids,$recur_date=0)
+	function read($ids, $recur_date = 0)
 	{
 		//error_log(__METHOD__.'('.array2string($ids).",$recur_date) ".function_backtrace());
 		$cols = self::get_columns('calendar', $this->cal_table);
 		$cols[0] = $this->db->to_varchar($this->cal_table.'.cal_id');
-		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',',$cols);
+		$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".implode(',', $cols);
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
@@ -324,23 +324,23 @@ 
 			$where['cal_uid'] = $ids;
 			$where['cal_reference'] = 0;
 		}
-		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
+		elseif (is_array($ids) && isset($ids[count($ids) - 1]) || is_scalar($ids))	// one or more cal_id's
 		{
 			$where['cal_id'] = $ids;
 		}
 		else	// array with column => value pairs
 		{
 			$where = $ids;
-			unset($ids);	// otherwise users get not read!
+			unset($ids); // otherwise users get not read!
 		}
 		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
 		{
-			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
+			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.', array(
 				'cal_id' => $where['cal_id'],
 			));
 			unset($where['cal_id']);
 		}
-		if ((int) $recur_date)
+		if ((int)$recur_date)
 		{
 			$where[] = 'cal_start >= '.(int)$recur_date;
 			$group_by = 'GROUP BY '.$cols;
@@ -353,7 +353,7 @@ 
 		}
 		$cols .= ',range_end-1 AS recur_enddate';
 
-		$events =& $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
+		$events = & $this->get_events($this->db->select($this->cal_table, $cols, $where, __LINE__, __FILE__, false, $group_by, 'calendar', 0, $join), $recur_date);
 
 		return $events ? $events : false;
 	}
@@ -365,7 +365,7 @@ 
 	 * @param int $recur_date =0
 	 * @return array
 	 */
-	protected function &get_events($rs, $recur_date=0)
+	protected function &get_events($rs, $recur_date = 0)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -377,7 +377,7 @@ 
 		}
 
 		$events = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			if (!$row['recur_type'])
 			{
@@ -385,7 +385,7 @@ 
 				unset($row['recur_enddate']);
 			}
 			$row['recur_exception'] = $row['alarm'] = array();
-			$events[$row['cal_id']] = Api\Db::strip_array_keys($row,'cal_');
+			$events[$row['cal_id']] = Api\Db::strip_array_keys($row, 'cal_');
 		}
 		if (!$events) return $events;
 
@@ -397,26 +397,26 @@ 
 			if (!isset($event['uid']) || strlen($event['uid']) < $minimum_uid_length)
 			{
 				// event (without uid), not strong enough uid => create new uid
-				$event['uid'] = Api\CalDAV::generate_uid('calendar',$event['id']);
+				$event['uid'] = Api\CalDAV::generate_uid('calendar', $event['id']);
 				$this->db->update($this->cal_table, array('cal_uid' => $event['uid']),
-					array('cal_id' => $event['id']),__LINE__,__FILE__,'calendar');
+					array('cal_id' => $event['id']), __LINE__, __FILE__, 'calendar');
 			}
 			if (!(int)$recur_date && $event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $ids,
 					'recur_exception' => true,
 				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row)
 				{
 					$events[$row['cal_id']]['recur_exception'][] = $row['cal_start'];
 				}
-				break;	// as above select read all exceptions (and I dont think too short uid problem still exists)
+				break; // as above select read all exceptions (and I dont think too short uid problem still exists)
 			}
 			// make sure we fetch only real exceptions (deleted occurrences of a series should not show up)
-			if (($recur_date &&	$event['recur_type'] != MCAL_RECUR_NONE))
+			if (($recur_date && $event['recur_type'] != MCAL_RECUR_NONE))
 			{
 				//_debug_array(__METHOD__.__LINE__.' recur_date:'.$recur_date.' check cal_start:'.$event['start']);
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $event['id'],
 					'cal_start' => $event['start'],
 					'recur_exception' => true,
@@ -432,7 +432,7 @@ 
 						'cal_deleted' => NULL
 					), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn())
 					{
-						$e = $this->read($event['id'],$event['start']+1);
+						$e = $this->read($event['id'], $event['start'] + 1);
 						$event = $e[$event['id']];
 						break;
 					}
@@ -454,21 +454,21 @@ 
 			if ($recur_date)
 			{
 				// also remember recur_date, maybe we need it later, duno now
-				$recur_date = array(0,$events[$ids]['recur_date'] = $events[$ids]['start']);
+				$recur_date = array(0, $events[$ids]['recur_date'] = $events[$ids]['start']);
 			}
 		}
 
 		// participants, if a recur_date give, we read that recurance, plus the one users from the default entry with recur_date=0
 		// sorting by cal_recur_date ASC makes sure recurence status always overwrites series status
-		foreach($this->db->select($this->user_table,'*',array(
+		foreach ($this->db->select($this->user_table, '*', array(
 			'cal_id'      => $ids,
 			'cal_recur_date' => $recur_date,
 			"cal_status NOT IN ('X','E')",
-		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+		), __LINE__, __FILE__, false, 'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT, 'calendar') as $row)	// DESC puts users before resources and contacts
 		{
 			// combine all participant data in uid and status values
 			$uid    = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
-			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+			$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
 			$events[$row['cal_id']]['participant_types'][$row['cal_user_type']][is_numeric($uid) ? $uid : substr($uid, 1)] = $status;
@@ -477,7 +477,7 @@ 
 		}
 
 		// custom fields
-		foreach($this->db->select($this->extra_table,'*',array('cal_id'=>$ids),__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->extra_table, '*', array('cal_id'=>$ids), __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			$events[$row['cal_id']]['#'.$row['cal_extra_name']] = $row['cal_extra_value'];
 		}
@@ -485,7 +485,7 @@ 
 		// alarms
 		if (is_array($ids))
 		{
-			foreach($this->read_alarms((array)$ids) as $cal_id => $alarms)
+			foreach ($this->read_alarms((array)$ids) as $cal_id => $alarms)
 			{
 				$events[$cal_id]['alarm'] = $alarms;
 			}
@@ -514,11 +514,11 @@ 
 	 * @param boolean $master_only =false only check recurance master (egw_cal_user.recur_date=0)
 	 * @return int maximum modification timestamp
 	 */
-	function get_ctag($users, $owner_too=false,$master_only=false)
+	function get_ctag($users, $owner_too = false, $master_only = false)
 	{
-		static $ctags = array();	// some per-request caching
+		static $ctags = array(); // some per-request caching
 		static $last_request = null;
-		if (!isset($last_request) || time()-$last_request > self::MAX_CTAG_CACHE_TIME)
+		if (!isset($last_request) || time() - $last_request > self::MAX_CTAG_CACHE_TIME)
 		{
 			$ctags = array();
 			$last_request = time();
@@ -527,13 +527,13 @@ 
 		if (isset($ctags[$signature])) return $ctags[$signature];
 
 		$types = array();
-		foreach((array)$users as $uid)
+		foreach ((array)$users as $uid)
 		{
 			$type = $id = null;
 			self::split_user($uid, $type, $id, true);
 			$types[$type][] = $id;
 		}
-		foreach($types as $type => $ids)
+		foreach ($types as $type => $ids)
 		{
 			$where = array(
 				'cal_user_type' => $type,
@@ -555,17 +555,17 @@ 
 		if ($owner_too)
 		{
 			// owner can only by users, no groups or resources
-			foreach($users as $key => $user)
+			foreach ($users as $key => $user)
 			{
 				if (!($user > 0)) unset($users[$key]);
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
 					'cal_owner' => $users,
-				),')');
+				), ')');
 		}
-		return $ctags[$signature] = $this->db->select($this->user_table,'MAX(cal_modified)',
-			$where,__LINE__,__FILE__,false,'','calendar',0,'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
+		return $ctags[$signature] = $this->db->select($this->user_table, 'MAX(cal_modified)',
+			$where, __LINE__, __FILE__, false, '', 'calendar', 0, 'JOIN egw_cal ON egw_cal.cal_id=egw_cal_user.cal_id')->fetchColumn();
 	}
 
 	/**
@@ -577,7 +577,7 @@ 
 	 * @param string|array $cols ='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified' cols to query
 	 * @return Iterator as Api\Db::select
 	 */
-	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
+	function get_cal_data(array $query, $cols = 'cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
 		if (!is_array($cols)) $cols = explode(',', $cols);
 
@@ -603,12 +603,12 @@ 
 		if ($cat_id)
 		{
 			$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
-			array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
-			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','",$cats)."')" : '='.$this->db->quote((int)$cat_id));
-			foreach($cats as $cat)
+			array_walk($cats, create_function('&$val,$key', '$val = (int) $val;'));
+			if (is_array($cat_id) && count($cat_id) == 1) $cat_id = $cat_id[0];
+			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','", $cats)."')" : '='.$this->db->quote((int)$cat_id));
+			foreach ($cats as $cat)
 			{
-				$sql .= ' OR '.$this->db->concat("','",'cal_category',"','").' LIKE '.$this->db->quote('%,'.$cat.',%');
+				$sql .= ' OR '.$this->db->concat("','", 'cal_category', "','").' LIKE '.$this->db->quote('%,'.$cat.',%');
 			}
 			$sql .= ') ';
 		}
@@ -623,13 +623,13 @@ 
 	 * @param array $where =array() array to add filters too
 	 * @return array
 	 */
-	protected function status_filter($filter, $enum_recuring=true, array $where=array())
+	protected function status_filter($filter, $enum_recuring = true, array $where = array())
 	{
-		if($filter != 'deleted' && $filter != 'everything')
+		if ($filter != 'deleted' && $filter != 'everything')
 		{
 			$where[] = 'cal_deleted IS NULL';
 		}
-		switch($filter)
+		switch ($filter)
 		{
 			case 'everything':	// no filter at all
 				break;
@@ -703,7 +703,7 @@ 
 	 * @param int $remove_rejected_by_user =null add join to remove entry, if given user has rejected it
 	 * @return Iterator|array of events
 	 */
-	function &search($start,$end,$users,$cat_id=0,$filter='all',$offset=False,$num_rows=0,array $params=array(),$remove_rejected_by_user=null)
+	function &search($start, $end, $users, $cat_id = 0, $filter = 'all', $offset = False, $num_rows = 0, array $params = array(), $remove_rejected_by_user = null)
 	{
 		//error_log(__METHOD__.'('.($start ? date('Y-m-d H:i',$start) : '').','.($end ? date('Y-m-d H:i',$end) : '').','.array2string($users).','.array2string($cat_id).",'$filter',".array2string($offset).",$num_rows,".array2string($params).') '.function_backtrace());
 
@@ -726,7 +726,7 @@ 
 		{
 			$all_cols = self::get_columns('calendar', $this->cal_table);
 			$all_cols[0] = $this->db->to_varchar($this->cal_table.'.cal_id');
-			$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end AS recur_enddate,".implode(',',$all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
+			$cols = "$this->repeats_table.recur_type,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,range_end AS recur_enddate,".implode(',', $all_cols).",cal_start,cal_end,$this->user_table.cal_recur_date";
 		}
 		$where = array();
 		if (is_array($params['query']))
@@ -735,26 +735,26 @@ 
 		}
 		elseif ($params['query'])
 		{
-			if(is_numeric($params['query']))
+			if (is_numeric($params['query']))
 			{
-				$where[] = $this->cal_table.'.cal_id = ' . (int)$params['query'];
+				$where[] = $this->cal_table.'.cal_id = '.(int)$params['query'];
 			}
 			else
 			{
-				foreach(array('cal_title','cal_description','cal_location') as $col)
+				foreach (array('cal_title', 'cal_description', 'cal_location') as $col)
 				{
 					$to_or[] = $col.' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%'.$params['query'].'%');
 				}
-				$where[] = '('.implode(' OR ',$to_or).')';
+				$where[] = '('.implode(' OR ', $to_or).')';
 			}
 
 			// Searching - restrict private to own or private grant
 			if (!isset($params['private_grants']))
 			{
 				$params['private_grants'] = $GLOBALS['egw']->acl->get_ids_for_location($GLOBALS['egw_info']['user']['account_id'], Acl::PRIVAT, 'calendar');
-				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id'];	// db query does NOT return current user
+				$params['private_grants'][] = $GLOBALS['egw_info']['user']['account_id']; // db query does NOT return current user
 			}
-			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])) . ')';
+			$private_filter = '(cal_public=1 OR cal_public=0 AND '.$this->db->expression($this->cal_table, array('cal_owner' => $params['private_grants'])).')';
 			$where[] = $private_filter;
 		}
 		if (!empty($params['sql_filter']))
@@ -763,7 +763,7 @@ 
 			{
 				$where[] = $params['sql_filter'];
 			}
-			elseif(is_array($params['sql_filter']))
+			elseif (is_array($params['sql_filter']))
 			{
 				$where = array_merge($where, $params['sql_filter']);
 			}
@@ -772,11 +772,11 @@ 
 		if ($users)
 		{
 			$users_by_type = array();
-			foreach((array)$users as $user)
+			foreach ((array)$users as $user)
 			{
 				if (is_numeric($user))
 				{
-					$users_by_type['u'][] = (int) $user;
+					$users_by_type['u'][] = (int)$user;
 				}
 				else
 				{
@@ -787,45 +787,45 @@ 
 			}
 			$to_or = $user_or = array();
 			$owner_or = null;
-			$table_def = $this->db->get_table_definitions('calendar',$this->user_table);
-			foreach($users_by_type as $type => $ids)
+			$table_def = $this->db->get_table_definitions('calendar', $this->user_table);
+			foreach ($users_by_type as $type => $ids)
 			{
 				// when we are able to use Union Querys, we do not OR our query, we save the needed parts for later construction of the union
 				if ($useUnionQuery)
 				{
-					$user_or[] = $this->db->expression($table_def,$this->user_table.'.',array(
+					$user_or[] = $this->db->expression($table_def, $this->user_table.'.', array(
 						'cal_user_type' => $type,
-					),' AND '.$this->user_table.'.',array(
+					), ' AND '.$this->user_table.'.', array(
 						'cal_user_id'   => $ids,
 					));
 					if ($type == 'u' && $filter == 'owner')
 					{
-						$cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
+						$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
 						// only users can be owners, no need to add groups
 						$user_ids = array();
-						foreach($ids as $user_id)
+						foreach ($ids as $user_id)
 						{
 							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u') $user_ids[] = $user_id;
 						}
-						$owner_or = $this->db->expression($cal_table_def,array('cal_owner' => $user_ids));
+						$owner_or = $this->db->expression($cal_table_def, array('cal_owner' => $user_ids));
 					}
 				}
 				else
 				{
-					$to_or[] = $this->db->expression($table_def,$this->user_table.'.',array(
+					$to_or[] = $this->db->expression($table_def, $this->user_table.'.', array(
 						'cal_user_type' => $type,
-					),' AND '.$this->user_table.'.',array(
+					), ' AND '.$this->user_table.'.', array(
 						'cal_user_id'   => $ids,
 					));
 					if ($type == 'u' && $filter == 'owner')
 					{
-						$cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
-						$to_or[] = $this->db->expression($cal_table_def,array('cal_owner' => $ids));
+						$cal_table_def = $this->db->get_table_definitions('calendar', $this->cal_table);
+						$to_or[] = $this->db->expression($cal_table_def, array('cal_owner' => $ids));
 					}
 				}
 			}
 			// this is only used, when we cannot use UNIONS
-			if (!$useUnionQuery) $where[] = '('.implode(' OR ',$to_or).')';
+			if (!$useUnionQuery) $where[] = '('.implode(' OR ', $to_or).')';
 
 			$where = $this->status_filter($filter, $params['enum_recuring'], $where);
 		}
@@ -844,15 +844,15 @@ 
 				$where[] = '('.((int)$start).' < range_end OR range_end IS NULL)';
 			}
 		}
-		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+		if (!preg_match('/^[a-z_ ,c]+$/i', $params['order'])) $params['order'] = 'cal_start'; // gard against SQL injection
 
 		// if not enum recuring events, we have to use minimum start- AND end-dates, otherwise we get more then one event per cal_id!
 		if (!$params['enum_recuring'])
 		{
 			$where[] = "$this->user_table.cal_recur_date=0";
-			$cols = str_replace(array('cal_start','cal_end'),array('range_start AS cal_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id) AS cal_end'),$cols);
+			$cols = str_replace(array('cal_start', 'cal_end'), array('range_start AS cal_start', '(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id) AS cal_end'), $cols);
 			// in case cal_start is used in a query, eg. calendar_ical::find_event
-			$where = str_replace(array('cal_start','cal_end'), array('range_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
+			$where = str_replace(array('cal_start', 'cal_end'), array('range_start', '(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
 			$params['order'] = str_replace('cal_start', 'range_start', $params['order']);
 			if ($end) $where[] = (int)$end.' > range_start';
   		}
@@ -864,14 +864,13 @@ 
 				" ON $this->cal_table.cal_id=rejected_by_user.cal_id".
 				" AND rejected_by_user.cal_user_type='u'".
 				" AND rejected_by_user.cal_user_id=".$this->db->quote($remove_rejected_by_user).
-				" AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' :
-					'(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)');
+				" AND ".(!$params['enum_recuring'] ? 'rejected_by_user.cal_recur_date=0' : '(recur_type IS NULL AND rejected_by_user.cal_recur_date=0 OR cal_start=rejected_by_user.cal_recur_date)');
 			$or_required = array(
 				'rejected_by_user.cal_status IS NULL',
 				"rejected_by_user.cal_status NOT IN ('R','X')",
 			);
 			if ($filter == 'owner') $or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
-			$where[] = '('.implode(' OR ',$or_required).')';
+			$where[] = '('.implode(' OR ', $or_required).')';
 		}
 		// using a time-range and deleted attribute limited view instead of full table
 		$cal_table = $this->cal_range_view($start, $end, null, $filter == 'everything' ? null : $filter != 'deleted');
@@ -883,18 +882,18 @@ 
 		// dates table join only needed to enum recuring events, we use a time-range limited view here too
 		if ($params['enum_recuring'])
 		{
-			$join = "JOIN ".$this->dates_table.	// using dates_table direct seems quicker then an other view
+			$join = "JOIN ".$this->dates_table.// using dates_table direct seems quicker then an other view
 				//$this->dates_range_view($start, $end, null, $filter == 'everything' ? null : $filter == 'deleted').
 				" ON $this->cal_table.cal_id=$this->dates_table.cal_id ".$join;
 		}
 
 		// Check for some special sorting, used by planner views
-		if($params['order'] == 'participants , cal_non_blocking DESC')
+		if ($params['order'] == 'participants , cal_non_blocking DESC')
 		{
 			$order = ($GLOBALS['egw_info']['user']['preferences']['common']['account_display'] == 'lastname' ? 'n_family' : 'n_fileas');
 			$cols .= ",egw_addressbook.{$order}";
 			$join .= "LEFT JOIN egw_addressbook ON ".
-					($this->db->Type == 'pgsql'? "egw_addressbook.account_id::varchar = ":"egw_addressbook.account_id = ").
+					($this->db->Type == 'pgsql' ? "egw_addressbook.account_id::varchar = " : "egw_addressbook.account_id = ").
 					"{$this->user_table}.cal_user_id";
 			$params['order'] = "$order, cal_non_blocking DESC";
 		}
@@ -927,29 +926,29 @@ 
 			// as replace the OR by construction of a suitable UNION for performance reasons
 			if ($owner_or || $user_or)
 			{
-				foreach($user_or as $user_sql)
+				foreach ($user_or as $user_sql)
 				{
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = $user_sql;
+					$selects[count($selects) - 1]['where'][] = $user_sql;
 					if ($params['enum_recuring'])
 					{
-						$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+						$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 						$selects[] = $select;
-						$selects[count($selects)-1]['where'][] = $user_sql;
-						$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+						$selects[count($selects) - 1]['where'][] = $user_sql;
+						$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 					}
 				}
 				// if the query is to be filtered by owner we need to add more selects for the union
 				if ($owner_or)
 				{
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = $owner_or;
+					$selects[count($selects) - 1]['where'][] = $owner_or;
 					if ($params['enum_recuring'])
 					{
-						$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+						$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 						$selects[] = $select;
-						$selects[count($selects)-1]['where'][] = $owner_or;
-						$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+						$selects[count($selects) - 1]['where'][] = $owner_or;
+						$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 					}
 				}
 			}
@@ -959,34 +958,34 @@ 
 				$selects[] = $select;
 				if ($params['enum_recuring'])
 				{
-					$selects[count($selects)-1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
+					$selects[count($selects) - 1]['where'][] = "recur_type IS NULL AND $this->user_table.cal_recur_date=0";
 					$selects[] = $select;
-					$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
+					$selects[count($selects) - 1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 				}
 			}
 			if (is_numeric($offset) && !$params['no_total'])	// get the total too
 			{
 				$save_selects = $selects;
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
-				foreach(array_keys($selects) as $key)
+				foreach (array_keys($selects) as $key)
 				{
 					$selects[$key]['cols'] = "$this->repeats_table.recur_type,range_end AS recur_enddate,$this->repeats_table.recur_interval,$this->repeats_table.recur_data,".$this->db->to_varchar($this->cal_table.'.cal_id').",cal_start,cal_end,$this->user_table.cal_recur_date";
 					if (!$params['enum_recuring'])
 					{
-						$selects[$key]['cols'] = str_replace(array('cal_start','cal_end'),
-							array('range_start AS cal_start','range_end AS cal_end'), $selects[$key]['cols']);
+						$selects[$key]['cols'] = str_replace(array('cal_start', 'cal_end'),
+							array('range_start AS cal_start', 'range_end AS cal_end'), $selects[$key]['cols']);
 					}
 				}
-				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 
-				$this->total = $this->db->union($selects,__LINE__,__FILE__)->NumRows();
+				$this->total = $this->db->union($selects, __LINE__, __FILE__)->NumRows();
 
 				// restore original cols / selects
 				$selects = $save_selects; unset($save_selects);
 			}
-			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 
-			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
+			$rs = $this->db->union($selects, __LINE__, __FILE__, $params['order'], $offset, $num_rows);
 		}
 		else	// MsSQL oder MySQL 3.23
 		{
@@ -1009,27 +1008,27 @@ 
 				$selects[0]['cols'] = "$this->cal_table.cal_id,cal_start";
 				if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
 				{
-					self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+					self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 				}
 				$this->total = $this->db->union($selects, __LINE__, __FILE__)->NumRows();
 				$selects = $save_selects;
 			}
 			if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
 			{
-				self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				self::get_union_selects($selects, $start, $end, $users, $cat_id, $filter, $params['query'], $params['users']);
 			}
-			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
+			$rs = $this->db->union($selects, __LINE__, __FILE__, $params['order'], $offset, $num_rows);
 		}
 		//error_log(__METHOD__."() useUnionQuery=$useUnionQuery --> query took ".(microtime(true)-$starttime).'s '.$rs->sql);
 
 		if (isset($params['cols']))
 		{
-			return $rs;	// if colums are specified we return the recordset / iterator
+			return $rs; // if colums are specified we return the recordset / iterator
 		}
 		// Todo: return $this->get_events($rs);
 
 		$events = $ids = $recur_dates = $recur_ids = array();
-		foreach($rs as $row)
+		foreach ($rs as $row)
 		{
 			$id = $row['cal_id'];
 			if (is_numeric($id)) $ids[] = $id;
@@ -1041,9 +1040,9 @@ 
 			}
 			if ($row['participants'])
 			{
-				$row['participants'] = explode(',',$row['participants']);
+				$row['participants'] = explode(',', $row['participants']);
 				$row['participants'] = array_combine($row['participants'],
-					array_fill(0,count($row['participants']),''));
+					array_fill(0, count($row['participants']), ''));
 			}
 			else
 			{
@@ -1052,9 +1051,9 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 
 			// compile a list of recurrences per cal_id
-			if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
+			if (!in_array($id, (array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
 
-			$events[$id] = Api\Db::strip_array_keys($row,'cal_');
+			$events[$id] = Api\Db::strip_array_keys($row, 'cal_');
 		}
 		//_debug_array($events);
 		if (count($ids))
@@ -1064,26 +1063,26 @@ 
 			// now ready all users with the given cal_id AND (cal_recur_date=0 or the fitting recur-date)
 			// This will always read the first entry of each recuring event too, we eliminate it later
 			$recur_dates[] = 0;
-			$utcal_id_view = " (SELECT * FROM ".$this->user_table." WHERE cal_id IN (".implode(',',$ids).")".
+			$utcal_id_view = " (SELECT * FROM ".$this->user_table." WHERE cal_id IN (".implode(',', $ids).")".
 				($filter != 'everything' ? " AND cal_status NOT IN ('X','E')" : '').") utcalid ";
 			//$utrecurdate_view = " (select * from ".$this->user_table." where cal_recur_date in (".implode(',',array_unique($recur_dates)).")) utrecurdates ";
-			foreach($this->db->select($utcal_id_view,'*',array(
+			foreach ($this->db->select($utcal_id_view, '*', array(
 					//'cal_id' => array_unique($ids),
 					'cal_recur_date' => $recur_dates,
-				),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar',-1,$join='',
-				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)	// DESC puts users before resources and contacts
+				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT, 'calendar', -1, $join = '',
+				$this->db->get_table_definitions('calendar', $this->user_table)) as $row)	// DESC puts users before resources and contacts
 			{
 				$id = $row['cal_id'];
 				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
 
 				// combine all participant data in uid and status values
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
-				$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+				$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 
 				// set accept/reject/tentative of series for all recurrences
 				if (!$row['cal_recur_date'])
 				{
-					foreach((array)$recur_ids[$row['cal_id']] as $i)
+					foreach ((array)$recur_ids[$row['cal_id']] as $i)
 					{
 						if (isset($events[$i]) && !isset($events[$i]['participants'][$uid]))
 						{
@@ -1098,16 +1097,16 @@ 
 			// query recurrance exceptions, if needed: enum_recuring && !daywise is used in calendar_groupdav::get_series($uid,...)
 			if (!$params['enum_recuring'] || !$params['daywise'])
 			{
-				foreach($this->db->select($this->dates_table, 'cal_id,cal_start', array(
+				foreach ($this->db->select($this->dates_table, 'cal_id,cal_start', array(
 					'cal_id' => $ids,
 					'recur_exception' => true,
 				), __LINE__, __FILE__, false, 'ORDER BY cal_id,cal_start', 'calendar') as $row)
 				{
 					// for enum_recurring events are not indexed by cal_id, but $cal_id.'-'.$cal_start
 					// find master, which is first recurrence
-					if (!isset($events[$id=$row['cal_id']]))
+					if (!isset($events[$id = $row['cal_id']]))
 					{
-						foreach($events as $id => $event)
+						foreach ($events as $id => $event)
 						{
 							if ($event['id'] == $row['cal_id']) break;
 						}
@@ -1120,10 +1119,10 @@ 
 			{
 				$where = array('cal_id' => $ids);
 				if ($params['cfs']) $where['cal_extra_name'] = $params['cfs'];
-				foreach($this->db->select($this->extra_table,'*',$where,
-					__LINE__,__FILE__,false,'','calendar') as $row)
+				foreach ($this->db->select($this->extra_table, '*', $where,
+					__LINE__, __FILE__, false, '', 'calendar') as $row)
 				{
-					foreach((array)$recur_ids[$row['cal_id']] as $id)
+					foreach ((array)$recur_ids[$row['cal_id']] as $id)
 					{
 						if (isset($events[$id]))
 						{
@@ -1133,9 +1132,9 @@ 
 				}
 			}
 			// alarms
-			foreach($this->read_alarms($ids) as $cal_id => $alarms)
+			foreach ($this->read_alarms($ids) as $cal_id => $alarms)
 			{
-				foreach($alarms as $id => $alarm)
+				foreach ($alarms as $id => $alarm)
 				{
 					$event_start = $alarm['time'] + $alarm['offset'];
 
@@ -1172,16 +1171,16 @@ 
 	 * @param $query
 	 * @param $users_raw as passed to calendar_bo::search (no members and memberships added)
 	 */
-	private static function get_union_selects(array &$selects,$start,$end,$users,$cat_id,$filter,$query,$users_raw)
+	private static function get_union_selects(array &$selects, $start, $end, $users, $cat_id, $filter, $query, $users_raw)
 	{
-		if (in_array(basename($_SERVER['SCRIPT_FILENAME']),array('groupdav.php','rpc.php','xmlrpc.php','/activesync/index.php')) ||
-			!in_array($GLOBALS['egw_info']['flags']['currentapp'],array('calendar','home')))
+		if (in_array(basename($_SERVER['SCRIPT_FILENAME']), array('groupdav.php', 'rpc.php', 'xmlrpc.php', '/activesync/index.php')) ||
+			!in_array($GLOBALS['egw_info']['flags']['currentapp'], array('calendar', 'home')))
 		{
-			return;    // disable integration for GroupDAV, SyncML, ...
+			return; // disable integration for GroupDAV, SyncML, ...
 		}
 		self::$integration_data = Api\Hooks::process(array(
 			'location' => 'calendar_search_union',
-			'cols'  => $selects[0]['cols'],    // cols to return
+			'cols'  => $selects[0]['cols'], // cols to return
 			'start' => $start,
 			'end'   => $end,
 			'users' => $users,
@@ -1190,12 +1189,12 @@ 
 			'filter'=> $filter,
 			'query' => $query,
 		));
-		foreach(self::$integration_data as $data)
+		foreach (self::$integration_data as $data)
 		{
 			if (is_array($data['selects']))
 			{
 				//echo $app; _debug_array($data);
-				$selects = array_merge($selects,$data['selects']);
+				$selects = array_merge($selects, $data['selects']);
 			}
 		}
 	}
@@ -1220,35 +1219,35 @@ 
 	 * @param string $required_app ='calendar'
 	 * @return string cols for union query to match ones supplied in $required
 	 */
-	public static function union_cols(array $app_cols,$required,$required_app='calendar')
+	public static function union_cols(array $app_cols, $required, $required_app = 'calendar')
 	{
 		// remove evtl. used DISTINCT, we currently dont need it
-		if (($distinct = substr($required,0,9) == 'DISTINCT '))
+		if (($distinct = substr($required, 0, 9) == 'DISTINCT '))
 		{
-			$required = substr($required,9);
+			$required = substr($required, 9);
 		}
 		$return_cols = array();
-		foreach(is_array($required) ? $required : explode(',',$required) as $cols)
+		foreach (is_array($required) ? $required : explode(',', $required) as $cols)
 		{
 			$matches = null;
-			if (substr($cols,-2) == '.*')
+			if (substr($cols, -2) == '.*')
 			{
-				$cols = self::get_columns($required_app,substr($cols,0,-2));
+				$cols = self::get_columns($required_app, substr($cols, 0, -2));
 			}
 			// remove CAST added for PostgreSQL from eg. "CAST(egw_cal.cal_id AS varchar)"
 			elseif (preg_match('/CAST\(([a-z0-9_.]+) AS [a-z0-9_]+\)/i', $cols, $matches))
 			{
 				$cols = $matches[1];
 			}
-			elseif (strpos($cols,' AS ') !== false)
+			elseif (strpos($cols, ' AS ') !== false)
 			{
-				list(,$cols) = explode(' AS ',$cols);
+				list(,$cols) = explode(' AS ', $cols);
 			}
-			foreach((array)$cols as $col)
+			foreach ((array)$cols as $col)
 			{
-				if (substr($col,0,7) == 'egw_cal')	// remove table name
+				if (substr($col, 0, 7) == 'egw_cal')	// remove table name
 				{
-					$col = preg_replace('/^egw_cal[a-z_]*\./','',$col);
+					$col = preg_replace('/^egw_cal[a-z_]*\./', '', $col);
 				}
 				if (isset($app_cols[$col]))
 				{
@@ -1261,7 +1260,7 @@ 
 			}
 		}
 		//error_log(__METHOD__."(".array2string($app_cols).", ".array2string($required).", '$required_app') returning ".array2string(implode(',',$return_cols)));
-		return implode(',',$return_cols);
+		return implode(',', $return_cols);
 	}
 
 	/**
@@ -1271,21 +1270,21 @@ 
 	 * @param string $table
 	 * @return array of column names
 	 */
-	static private function get_columns($app,$table)
+	static private function get_columns($app, $table)
 	{
 		if ($table != 'egw_cal')
 		{
-			$table_def = $GLOBALS['egw']->db->get_table_definitions($app,$table);
+			$table_def = $GLOBALS['egw']->db->get_table_definitions($app, $table);
 			$cols = array_keys($table_def['fd']);
 		}
 		else
 		{
 			// special handling for egw_cal, as old databases have a different column order!!!
-			$cols =& Api\Cache::getSession(__CLASS__,$table);
+			$cols = & Api\Cache::getSession(__CLASS__, $table);
 
 			if (is_null($cols))
 			{
-				$meta = $GLOBALS['egw']->db->metadata($table,true);
+				$meta = $GLOBALS['egw']->db->metadata($table, true);
 				$cols = array_keys($meta['meta']);
 			}
 		}
@@ -1338,12 +1337,12 @@ 
 	 * @param int &$etag etag=null etag to check or null, on return new etag
 	 * @return boolean|int false on error, 0 if etag does not match, cal_id otherwise
 	 */
-	function save($event,&$set_recurrences,&$set_recurrences_start=0,$change_since=0,&$etag=null)
+	function save($event, &$set_recurrences, &$set_recurrences_start = 0, $change_since = 0, &$etag = null)
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-			if (empty($minimum_uid_length) || $minimum_uid_length<=1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
+			if (empty($minimum_uid_length) || $minimum_uid_length <= 1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
 		}
 		else
 		{
@@ -1354,7 +1353,7 @@ 
 
 		//error_log(__METHOD__.'('.array2string($event).",$set_recurrences,$change_since,$etag) ".function_backtrace());
 
-		$cal_id = (int) $event['id'];
+		$cal_id = (int)$event['id'];
 		unset($event['id']);
 		$set_recurrences = $set_recurrences || !$cal_id && $event['recur_type'] != MCAL_RECUR_NONE;
 
@@ -1365,9 +1364,9 @@ 
 		}
 
 		// add colum prefix 'cal_' if there's not already a 'recur_' prefix
-		foreach($event as $col => $val)
+		foreach ($event as $col => $val)
 		{
-			if ($col[0] != '#' && substr($col,0,6) != 'recur_' && substr($col,0,6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
+			if ($col[0] != '#' && substr($col, 0, 6) != 'recur_' && substr($col, 0, 6) != 'range_' && $col != 'alarm' && $col != 'tz_id' && $col != 'caldav_name')
 			{
 				$event['cal_'.$col] = $val;
 				unset($event[$col]);
@@ -1377,13 +1376,12 @@ 
 		if (isset($event['cal_start'])) $event['range_start'] = $event['cal_start'];
 		if (isset($event['cal_end']))
 		{
-			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] :
-				($event['recur_enddate'] ? $event['recur_enddate'] : null);
+			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] : ($event['recur_enddate'] ? $event['recur_enddate'] : null);
 		}
 		// ensure that we find mathing entries later on
 		if (!is_array($event['cal_category']))
 		{
-			$categories = array_unique(explode(',',$event['cal_category']));
+			$categories = array_unique(explode(',', $event['cal_category']));
 			sort($categories);
 		}
 		else
@@ -1392,7 +1390,7 @@ 
 		}
 		sort($categories, SORT_NUMERIC);
 
-		$event['cal_category'] = implode(',',$categories);
+		$event['cal_category'] = implode(',', $categories);
 
 		// make sure recurring events never reference to an other recurrent event
 		if ($event['recur_type'] != MCAL_RECUR_NONE) $event['cal_reference'] = 0;
@@ -1410,18 +1408,18 @@ 
 			// read only timezone id, to check if it is changed
 			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
+				$old_tz_id = $this->db->select($this->cal_table, 'tz_id', $where, __LINE__, __FILE__, 'calendar')->fetchColumn();
 			}
 			if (!is_null($etag)) $where['cal_etag'] = $etag;
 
 			unset($event['cal_etag']);
-			$event[] = 'cal_etag=cal_etag+1';	// always update the etag, even if none given to check
+			$event[] = 'cal_etag=cal_etag+1'; // always update the etag, even if none given to check
 
-			$this->db->update($this->cal_table,$event,$where,__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, $event, $where, __LINE__, __FILE__, 'calendar');
 
 			if (!is_null($etag) && $this->db->affected_rows() < 1)
 			{
-				return 0;	// wrong etag, someone else updated the entry
+				return 0; // wrong etag, someone else updated the entry
 			}
 			if (!is_null($etag)) ++$etag;
 		}
@@ -1430,10 +1428,10 @@ 
 			// new event
 			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
-			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = ''; // uid is NOT NULL!
 
-			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
-			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
+			$this->db->insert($this->cal_table, $event, false, __LINE__, __FILE__, 'calendar');
+			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table, 'cal_id')))
 			{
 				return false;
 			}
@@ -1443,7 +1441,7 @@ 
 		// event without uid or not strong enough uid
 		if (!isset($event['cal_uid']) || strlen($event['cal_uid']) < $minimum_uid_length)
 		{
-			$update['cal_uid'] = $event['cal_uid'] = Api\CalDAV::generate_uid('calendar',$cal_id);
+			$update['cal_uid'] = $event['cal_uid'] = Api\CalDAV::generate_uid('calendar', $cal_id);
 		}
 		// set caldav_name, if not given by caller
 		if (empty($event['caldav_name']) && version_compare($GLOBALS['egw_info']['apps']['calendar']['version'], '1.9.003', '>='))
@@ -1452,37 +1450,37 @@ 
 		}
 		if ($update)
 		{
-			$this->db->update($this->cal_table, $update, array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, $update, array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
 		}
 
 		if ($event['recur_type'] == MCAL_RECUR_NONE)
 		{
-			$this->db->delete($this->dates_table,array(
+			$this->db->delete($this->dates_table, array(
 				'cal_id' => $cal_id),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
 			// delete all user-records, with recur-date != 0
-			$this->db->delete($this->user_table,array(
+			$this->db->delete($this->user_table, array(
 				'cal_id' => $cal_id, 'cal_recur_date != 0'),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
-			$this->db->delete($this->repeats_table,array(
+			$this->db->delete($this->repeats_table, array(
 				'cal_id' => $cal_id),
-				__LINE__,__FILE__,'calendar');
+				__LINE__, __FILE__, 'calendar');
 
 			// add exception marker to master, so participants added to exceptions *only* get found
 			if ($event['cal_reference'])
 			{
 				$master_participants = array();
-				foreach($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee', array(
+				foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee', array(
 					'cal_id' => $event['cal_reference'],
 					'cal_recur_date' => 0,
-					"cal_status != 'X'",	// deleted need to be replaced with exception marker too
+					"cal_status != 'X'", // deleted need to be replaced with exception marker too
 				), __LINE__, __FILE__, 'calendar') as $row)
 				{
 					$master_participants[] = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				}
-				foreach(array_diff(array_keys((array)$event['cal_participants']), $master_participants) as $uid)
+				foreach (array_diff(array_keys((array)$event['cal_participants']), $master_participants) as $uid)
 				{
 					$user_type = $user_id = null;
 					self::split_user($uid, $user_type, $user_id, true);
@@ -1501,10 +1499,10 @@ 
 		else // write information about recuring event, if recur_type is present in the array
 		{
 			// fetch information about the currently saved (old) event
-			$old_min = (int) $this->db->select($this->dates_table,'MIN(cal_start)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
-			$old_duration = (int) $this->db->select($this->dates_table,'MIN(cal_end)',array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn() - $old_min;
+			$old_min = (int)$this->db->select($this->dates_table, 'MIN(cal_start)', array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
+			$old_duration = (int)$this->db->select($this->dates_table, 'MIN(cal_end)', array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn() - $old_min;
 			$old_exceptions = array();
-			foreach($this->db->select($this->dates_table, 'cal_start', array(
+			foreach ($this->db->select($this->dates_table, 'cal_start', array(
 				'cal_id' => $cal_id,
 				'recur_exception' => true
 			), __LINE__, __FILE__, false, 'ORDER BY cal_start', 'calendar') as $row)
@@ -1523,8 +1521,8 @@ 
 				'cal_recur_date' => 0,
 			);
 			$old_participants = array();
-			foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status,cal_quantity,cal_role', $where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status,cal_quantity,cal_role', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
@@ -1534,7 +1532,7 @@ 
 			// re-check: did so much recurrence data change that we have to rebuild it from scratch?
 			if (!$set_recurrences)
 			{
-				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int) $event['cal_start']) ||
+				$set_recurrences = (isset($event['cal_start']) && (int)$old_min != (int)$event['cal_start']) ||
 				    $event['recur_type'] != $old_repeats['recur_type'] || $event['recur_data'] != $old_repeats['recur_data'] ||
 					(int)$event['recur_interval'] != (int)$old_repeats['recur_interval'] || $event['tz_id'] != $old_tz_id;
 			}
@@ -1543,22 +1541,22 @@ 
 			{
 				// too much recurrence data has changed, we have to do a rebuild from scratch
 				// delete all, but the lowest dates record
-				$this->db->delete($this->dates_table,array(
+				$this->db->delete($this->dates_table, array(
 					'cal_id' => $cal_id,
 					'cal_start > '.(int)$old_min,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 
 				// delete all user-records, with recur-date != 0
-				$this->db->delete($this->user_table,array(
+				$this->db->delete($this->user_table, array(
 					'cal_id' => $cal_id,
 					'cal_recur_date != 0',
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 			}
 			else
 			{
 				// we adjust some possibly changed recurrences manually
 				// deleted exceptions: re-insert recurrences into the user and dates table
-				if (count($deleted_exceptions = array_diff($old_exceptions,$event['recur_exception'])))
+				if (count($deleted_exceptions = array_diff($old_exceptions, $event['recur_exception'])))
 				{
 					if (isset($event['cal_participants']))
 					{
@@ -1569,7 +1567,7 @@ 
 						// use old default
 						$participants = $old_participants;
 					}
-					foreach($deleted_exceptions as $id => $deleted_exception)
+					foreach ($deleted_exceptions as $id => $deleted_exception)
 					{
 						// rebuild participants for the re-inserted recurrence
 						$this->recurrence($cal_id, $deleted_exception, $deleted_exception + $old_duration, $participants);
@@ -1577,24 +1575,24 @@ 
 				}
 
 				// check if recurrence enddate was adjusted
-				if(isset($event['recur_enddate']))
+				if (isset($event['recur_enddate']))
 				{
 					// recurrences need to be truncated
-					if((int)$event['recur_enddate'] > 0 &&
+					if ((int)$event['recur_enddate'] > 0 &&
 						((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate'])
 					)
 					{
-						$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
-						$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
+						$this->db->delete($this->user_table, array('cal_id' => $cal_id, 'cal_recur_date >= '.($event['recur_enddate'] + 1 * DAY_s)), __LINE__, __FILE__, 'calendar');
+						$this->db->delete($this->dates_table, array('cal_id' => $cal_id, 'cal_start >= '.($event['recur_enddate'] + 1 * DAY_s)), __LINE__, __FILE__, 'calendar');
 					}
 
 					// recurrences need to be expanded
-					if(((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
+					if (((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
 						|| ((int)$event['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] < (int)$event['recur_enddate'])
 					)
 					{
 						$set_recurrences = true;
-						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1*DAY_s);
+						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1 * DAY_s);
 					}
 					//error_log(__METHOD__."() event[recur_enddate]=$event[recur_enddate], old_repeats[recur_enddate]=$old_repeats[recur_enddate] --> set_recurrences=".array2string($set_recurrences).", set_recurrences_start=$set_recurrences_start");
 				}
@@ -1603,9 +1601,9 @@ 
 				if (count($event['recur_exception']))
 				{
 					// added and existing exceptions: delete the execeptions from the user table, it could be the first time
-					$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date' => $event['recur_exception']),__LINE__,__FILE__,'calendar');
+					$this->db->delete($this->user_table, array('cal_id' => $cal_id, 'cal_recur_date' => $event['recur_exception']), __LINE__, __FILE__, 'calendar');
 					// update recur_exception flag based on current exceptions
-					$this->db->update($this->dates_table, 'recur_exception='.$this->db->expression($this->dates_table,array(
+					$this->db->update($this->dates_table, 'recur_exception='.$this->db->expression($this->dates_table, array(
 						'cal_start' => $event['recur_exception'],
 					)), array(
 						'cal_id' => $cal_id,
@@ -1614,25 +1612,25 @@ 
 			}
 
 			// write the repeats table
-			unset($event[0]);	// unset the 'etag=etag+1', as it's not in the repeats table
-			$this->db->insert($this->repeats_table,$event,array('cal_id' => $cal_id),__LINE__,__FILE__,'calendar');
+			unset($event[0]); // unset the 'etag=etag+1', as it's not in the repeats table
+			$this->db->insert($this->repeats_table, $event, array('cal_id' => $cal_id), __LINE__, __FILE__, 'calendar');
 		}
 		// update start- and endtime if present in the event-array, evtl. we need to move all recurrences
 		if (isset($event['cal_start']) && isset($event['cal_end']))
 		{
-			$this->move($cal_id,$event['cal_start'],$event['cal_end'],!$cal_id ? false : $change_since, $old_min, $old_min +  $old_duration);
+			$this->move($cal_id, $event['cal_start'], $event['cal_end'], !$cal_id ? false : $change_since, $old_min, $old_min + $old_duration);
 		}
 		// update participants if present in the event-array
 		if (isset($event['cal_participants']))
 		{
-			$this->participants($cal_id,$event['cal_participants'],!$cal_id ? false : $change_since);
+			$this->participants($cal_id, $event['cal_participants'], !$cal_id ? false : $change_since);
 		}
 		// Custom fields
-		foreach($event as $name => $value)
+		foreach ($event as $name => $value)
 		{
 			if ($name[0] == '#')
 			{
-				if (is_array($value) && array_key_exists('id',$value))
+				if (is_array($value) && array_key_exists('id', $value))
 				{
 					//error_log(__METHOD__.__LINE__."$name => ".array2string($value).function_backtrace());
 					$value = $value['id'];
@@ -1640,19 +1638,19 @@ 
 				}
 				if ($value)
 				{
-					$this->db->insert($this->extra_table,array(
-						'cal_extra_value'	=> is_array($value) ? implode(',',$value) : $value,
-					),array(
+					$this->db->insert($this->extra_table, array(
+						'cal_extra_value'	=> is_array($value) ? implode(',', $value) : $value,
+					), array(
 						'cal_id'			=> $cal_id,
-						'cal_extra_name'	=> substr($name,1),
-					),__LINE__,__FILE__,'calendar');
+						'cal_extra_name'	=> substr($name, 1),
+					), __LINE__, __FILE__, 'calendar');
 				}
 				else
 				{
-					$this->db->delete($this->extra_table,array(
+					$this->db->delete($this->extra_table, array(
 						'cal_id'			=> $cal_id,
-						'cal_extra_name'	=> substr($name,1),
-					),__LINE__,__FILE__,'calendar');
+						'cal_extra_name'	=> substr($name, 1),
+					), __LINE__, __FILE__, 'calendar');
 				}
 			}
 		}
@@ -1663,9 +1661,9 @@ 
 			{
 				if ($alarm['id'] && strpos($alarm['id'], 'cal:'.$cal_id.':') !== 0)
 				{
-					unset($alarm['id']);	// unset the temporary id to add the alarm
+					unset($alarm['id']); // unset the temporary id to add the alarm
 				}
-				if(!isset($alarm['offset']))
+				if (!isset($alarm['offset']))
 				{
 					$alarm['offset'] = $event['cal_start'] - $alarm['time'];
 				}
@@ -1676,14 +1674,14 @@ 
 
 				if ($alarm['time'] < time() && !self::shift_alarm($event, $alarm))
 				{
-					continue;	// pgoerzen: don't add alarm in the past
+					continue; // pgoerzen: don't add alarm in the past
 				}
-				$this->save_alarm($cal_id, $alarm, false);	// false: not update modified, we do it anyway
+				$this->save_alarm($cal_id, $alarm, false); // false: not update modified, we do it anyway
 			}
 		}
 		if (is_null($etag))
 		{
-			$etag = $this->db->select($this->cal_table,'cal_etag',array('cal_id' => $cal_id),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
+			$etag = $this->db->select($this->cal_table, 'cal_etag', array('cal_id' => $cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
 		}
 
 		// if event is an exception: update modified of master, to force etag, ctag and sync-token change
@@ -1703,7 +1701,7 @@ 
 	 *	are dealing with, default is now.
 	 * @return boolean true if alarm could be shifted, false if not
 	 */
-	public static function shift_alarm(array $_event, array &$alarm, $timestamp=null)
+	public static function shift_alarm(array $_event, array &$alarm, $timestamp = null)
 	{
 		if ($_event['recur_type'] == MCAL_RECUR_NONE)
 		{
@@ -1714,7 +1712,7 @@ 
 		$rrule = calendar_rrule::event2rrule($event, false);
 		foreach ($rrule as $time)
 		{
-			if ($start < ($ts = Api\DateTime::to($time,'server')))
+			if ($start < ($ts = Api\DateTime::to($time, 'server')))
 			{
 				$alarm['time'] = $ts - $alarm['offset'];
 				return true;
@@ -1735,34 +1733,34 @@ 
 	 * @todo Recalculate recurrences, if timezone changes
 	 * @return int|boolean number of moved recurrences or false on error
 	 */
-	function move($cal_id,$start,$end,$change_since=0,$old_start=0,$old_end=0)
+	function move($cal_id, $start, $end, $change_since = 0, $old_start = 0, $old_end = 0)
 	{
 		//echo "<p>socal::move($cal_id,$start,$end,$change_since,$old_start,$old_end)</p>\n";
 
-		if (!(int) $cal_id) return false;
+		if (!(int)$cal_id) return false;
 
 		if (!$old_start)
 		{
-			if ($change_since !== false) $row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
-				array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
+			if ($change_since !== false) $row = $this->db->select($this->dates_table, 'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
+				array('cal_id'=>$cal_id), __LINE__, __FILE__, false, '', 'calendar')->fetch();
 			// if no recurrence found, create one with the new dates
 			if ($change_since === false || !$row || !$row['cal_start'] || !$row['cal_end'])
 			{
-				$this->db->insert($this->dates_table,array(
+				$this->db->insert($this->dates_table, array(
 					'cal_id'    => $cal_id,
 					'cal_start' => $start,
 					'cal_end'   => $end,
-				),false,__LINE__,__FILE__,'calendar');
+				), false, __LINE__, __FILE__, 'calendar');
 
 				return 1;
 			}
-			$move_start = (int) ($start-$row['cal_start']);
-			$move_end   = (int) ($end-$row['cal_end']);
+			$move_start = (int)($start - $row['cal_start']);
+			$move_end   = (int)($end - $row['cal_end']);
 		}
 		else
 		{
-			$move_start = (int) ($start-$old_start);
-			$move_end   = (int) ($end-$old_end);
+			$move_start = (int)($start - $old_start);
+			$move_end   = (int)($end - $old_end);
 		}
 		$where = 'cal_id='.(int)$cal_id;
 
@@ -1770,13 +1768,13 @@ 
 		{
 			// move the recur-date of the participants
 			$this->db->query("UPDATE $this->user_table SET cal_recur_date=cal_recur_date+$move_start WHERE $where AND cal_recur_date ".
-				((int)$change_since ? '>= '.(int)$change_since : '!= 0'),__LINE__,__FILE__);
+				((int)$change_since ? '>= '.(int)$change_since : '!= 0'), __LINE__, __FILE__);
 		}
 		if ($move_start || $move_end)
 		{
 			// move the event and it's recurrences
 			$this->db->query("UPDATE $this->dates_table SET cal_start=cal_start+$move_start,cal_end=cal_end+$move_end WHERE $where".
-				((int) $change_since ? ' AND cal_start >= '.(int) $change_since : ''),__LINE__,__FILE__);
+				((int)$change_since ? ' AND cal_start >= '.(int)$change_since : ''), __LINE__, __FILE__);
 		}
 		return $this->db->affected_rows();
 	}
@@ -1795,8 +1793,7 @@ 
 		}
 		if (is_array($attendee))
 		{
-			$email = !empty($attendee['email']) ? $user_attendee['email'] :
-				(strtolower(substr($attendee['url'], 0, 7)) == 'mailto:' ? substr($user_attendee['url'], 7) : $attendee['url']);
+			$email = !empty($attendee['email']) ? $user_attendee['email'] : (strtolower(substr($attendee['url'], 0, 7)) == 'mailto:' ? substr($user_attendee['url'], 7) : $attendee['url']);
 			$attendee = !empty($attendee['cn']) ? $attendee['cn'].' <'.$email.'>' : $email;
 		}
 		return $attendee;
@@ -1809,11 +1806,11 @@ 
 	 * @param string|array $attendee attendee information: email, json or array with attr cn and url
 	 * @return string|int combined id
 	 */
-	static function combine_user($user_type, $user_id, $attendee=null)
+	static function combine_user($user_type, $user_id, $attendee = null)
 	{
 		if (!$user_type || $user_type == 'u')
 		{
-			return (int) $user_id;
+			return (int)$user_id;
 		}
 		if ($user_type == 'e' && $attendee)
 		{
@@ -1833,12 +1830,12 @@ 
 	 * @param string|int &$user_id id
 	 * @param boolean $md5_email =false md5 hash user_id for email / user_type=="e"
 	 */
-	static function split_user($uid, &$user_type, &$user_id, $md5_email=false)
+	static function split_user($uid, &$user_type, &$user_id, $md5_email = false)
 	{
 		if (is_numeric($uid))
 		{
 			$user_type = 'u';
-			$user_id = (int) $uid;
+			$user_id = (int)$uid;
 		}
 		// create md5 hash from lowercased and trimed raw email ("rb@stylite.de", not "Ralf Becker <rb@stylite.de>")
 		elseif ($md5_email && $uid[0] == 'e')
@@ -1852,7 +1849,7 @@ 
 		else
 		{
 			$user_type = $uid[0];
-			$user_id = substr($uid,1);
+			$user_id = substr($uid, 1);
 		}
 	}
 
@@ -1864,7 +1861,7 @@ 
 	 * @param string $role ='REQ-PARTICIPANT'
 	 * @return string
 	 */
-	static function combine_status($status,$quantity=1,$role='REQ-PARTICIPANT')
+	static function combine_status($status, $quantity = 1, $role = 'REQ-PARTICIPANT')
 	{
 		if ((int)$quantity > 1) $status .= (int)$quantity;
 		if ($role != 'REQ-PARTICIPANT') $status .= $role;
@@ -1880,13 +1877,13 @@ 
 	 * @param string &$role=null only O: role
 	 * @return string status U, T, A or R, same as $status parameter on return
 	 */
-	static function split_status(&$status,&$quantity=null,&$role=null)
+	static function split_status(&$status, &$quantity = null, &$role = null)
 	{
 		$quantity = 1;
 		$role = 'REQ-PARTICIPANT';
 		//error_log(__METHOD__.__LINE__.array2string($status));
 		$matches = null;
-		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/',$status,$matches))
+		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/', $status, $matches))
 		{
 			if ((int)$matches[1] > 0) $quantity = (int)$matches[1];
 			if ($matches[2]) $role = $matches[2];
@@ -1913,14 +1910,14 @@ 
 	 *		true = only add participants if needed, no participant will be deleted (participants to check/add required in $participants)
 	 * @return int|boolean number of updated recurrences or false on error
 	 */
-	function participants($cal_id,$participants,$change_since=0,$add_only=false)
+	function participants($cal_id, $participants, $change_since = 0, $add_only = false)
 	{
 		//error_log(__METHOD__."($cal_id,".array2string($participants).",$change_since,$add_only");
 
 		$recurrences = array();
 
 		// remove group-invitations, they are NOT stored in the db
-		foreach($participants as $uid => $status)
+		foreach ($participants as $uid => $status)
 		{
 			if ($status[0] == 'G')
 			{
@@ -1929,7 +1926,7 @@ 
 		}
 		$where = array('cal_id' => $cal_id);
 
-		if ((int) $change_since)
+		if ((int)$change_since)
 		{
 			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.(int)$change_since.')';
 		}
@@ -1937,31 +1934,31 @@ 
 		if ($change_since !== false)
 		{
 			// find all existing recurrences
-			foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'DISTINCT cal_recur_date', $where, __LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$recurrences[] = $row['cal_recur_date'];
 			}
 
 			// update existing entries
-			$existing_entries = $this->db->select($this->user_table,'*',$where,__LINE__,__FILE__,false,'ORDER BY cal_recur_date DESC','calendar');
+			$existing_entries = $this->db->select($this->user_table, '*', $where, __LINE__, __FILE__, false, 'ORDER BY cal_recur_date DESC', 'calendar');
 
 			// create a full list of participants which already exist in the db
 			// with status, quantity and role of the earliest recurence
 			$old_participants = array();
-			foreach($existing_entries as $row)
+			foreach ($existing_entries as $row)
 			{
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 				if ($row['cal_recur_date'] || !isset($old_participants[$uid]))
 				{
-					$old_participants[$uid] = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+					$old_participants[$uid] = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 				}
 			}
 
 			// tag participants which should be deleted
-			if($add_only === false)
+			if ($add_only === false)
 			{
 				$deleted = array();
-				foreach($existing_entries as $row)
+				foreach ($existing_entries as $row)
 				{
 					$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
 					// delete not longer set participants
@@ -1974,7 +1971,7 @@ 
 
 			// only keep added OR status (incl. quantity!) changed participants for further steps
 			// we do not touch unchanged (!) existing ones
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
 				if ($old_participants[$uid] === $status)
 				{
@@ -1986,46 +1983,46 @@ 
 			if ($add_only === false && count($deleted))
 			{
 				$to_or = array();
-				$table_def = $this->db->get_table_definitions('calendar',$this->user_table);
-				foreach($deleted as $type => $ids)
+				$table_def = $this->db->get_table_definitions('calendar', $this->user_table);
+				foreach ($deleted as $type => $ids)
 				{
-					$to_or[] = $this->db->expression($table_def,array(
+					$to_or[] = $this->db->expression($table_def, array(
 						'cal_user_type' => $type,
 						'cal_user_id'   => $ids,
 					));
 				}
-				$where[] = '('.implode(' OR ',$to_or).')';
-				$where[] = "cal_status!='E'";	// do NOT delete exception marker
-				$this->db->update($this->user_table,array('cal_status'=>'X'),$where,__LINE__,__FILE__,'calendar');
+				$where[] = '('.implode(' OR ', $to_or).')';
+				$where[] = "cal_status!='E'"; // do NOT delete exception marker
+				$this->db->update($this->user_table, array('cal_status'=>'X'), $where, __LINE__, __FILE__, 'calendar');
 			}
 		}
 
 		if (count($participants))	// participants which need to be added
 		{
-			if (!count($recurrences)) $recurrences[] = 0;   // insert the default recurrence
+			if (!count($recurrences)) $recurrences[] = 0; // insert the default recurrence
 
 			$delete_deleted = array();
 
 			// update participants
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
 				$type = $id = $quantity = $role = null;
 				self::split_user($uid, $type, $id, true);
-				self::split_status($status,$quantity,$role);
+				self::split_status($status, $quantity, $role);
 				$set = array(
 					'cal_status'	  => $status,
 					'cal_quantity'	  => $quantity,
 					'cal_role'        => $role,
 					'cal_user_attendee' => $type == 'e' ? substr($uid, 1) : null,
 				);
-				foreach($recurrences as $recur_date)
+				foreach ($recurrences as $recur_date)
 				{
-					$this->db->insert($this->user_table,$set,array(
+					$this->db->insert($this->user_table, $set, array(
 						'cal_id'	      => $cal_id,
 						'cal_recur_date'  => $recur_date,
 						'cal_user_type'   => $type,
 						'cal_user_id' 	  => $id,
-					),__LINE__,__FILE__,'calendar');
+					), __LINE__, __FILE__, 'calendar');
 				}
 				// for new or changed group-invitations, remove previously deleted members, so they show up again
 				if ($uid < 0)
@@ -2035,13 +2032,13 @@ 
 			}
 			if ($delete_deleted)
 			{
-				$this->db->delete($this->user_table, $where=array(
+				$this->db->delete($this->user_table, $where = array(
 					'cal_id' => $cal_id,
 					'cal_recur_date' => $recurrences,
 					'cal_user_type' => 'u',
 					'cal_user_id' => array_unique($delete_deleted),
 					'cal_status' => 'X',
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 				//error_log(__METHOD__."($cal_id, ".array2string($participants).", since=$change_since, add_only=$add_only) db->delete('$this->user_table', ".array2string($where).") affected ".$this->db->affected_rows().' rows');
 			}
 		}
@@ -2060,7 +2057,7 @@ 
 	 * @param string $attendee =null extra attendee information to set for all types (incl. accounts!)
 	 * @return int number of changed recurrences
 	 */
-	function set_status($cal_id,$user_type,$user_id,$status,$recur_date=0,$role=null,$attendee=null)
+	function set_status($cal_id, $user_type, $user_id, $status, $recur_date = 0, $role = null, $attendee = null)
 	{
 		static $status_code_short = array(
 			REJECTED 	=> 'R',
@@ -2085,7 +2082,7 @@ 
 			'cal_user_type'	=> $user_type,
 			'cal_user_id'   => $user_id_md5,
 		);
-		if ((int) $recur_date)
+		if ((int)$recur_date)
 		{
 			$where['cal_recur_date'] = $recur_date;
 		}
@@ -2096,7 +2093,7 @@ 
 
 		if ($status == 'G')		// remove group invitations, as we dont store them in the db
 		{
-			$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');
+			$this->db->delete($this->user_table, $where, __LINE__, __FILE__, 'calendar');
 			$ret = $this->db->affected_rows();
 		}
 		else
@@ -2104,7 +2101,7 @@ 
 			$set = array('cal_status' => $status);
 			if ($user_type == 'e' || $attendee) $set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
 			if (!is_null($role) && $role != 'REQ-PARTICIPANT') $set['cal_role'] = $role;
-			$this->db->insert($this->user_table,$set,$where,__LINE__,__FILE__,'calendar');
+			$this->db->insert($this->user_table, $set, $where, __LINE__, __FILE__, 'calendar');
 			// for new or changed group-invitations, remove previously deleted members, so they show up again
 			if (($ret = $this->db->affected_rows()) && $user_type == 'u' && $user_id < 0)
 			{
@@ -2117,7 +2114,7 @@ 
 		// update modified and modifier in main table
 		if ($ret)
 		{
-			$this->updateModified($cal_id, true);	// true = update series master too
+			$this->updateModified($cal_id, true); // true = update series master too
 		}
 		//error_log(__METHOD__."($cal_id,$user_type,$user_id,$status,$recur_date) = $ret");
 		return $ret;
@@ -2132,7 +2129,7 @@ 
 	 * @param array $participants uid => status pairs
 	 * @param boolean $exception =null true or false to set recure_exception flag, null leave it unchanged (new are by default no exception)
 	 */
-	function recurrence($cal_id,$start,$end,$participants,$exception=null)
+	function recurrence($cal_id, $start, $end, $participants, $exception = null)
 	{
 		//error_log(__METHOD__."($cal_id, $start, $end, ".array2string($participants).", ".array2string($exception));
 		$update = array('cal_end' => $end);
@@ -2141,7 +2138,7 @@ 
 		$this->db->insert($this->dates_table, $update, array(
 			'cal_id' => $cal_id,
 			'cal_start'  => $start,
-		),__LINE__,__FILE__,'calendar');
+		), __LINE__, __FILE__, 'calendar');
 
 		if (!is_array($participants))
 		{
@@ -2149,26 +2146,26 @@ 
 		}
 		if ($exception !== true)
 		{
-			foreach($participants as $uid => $status)
+			foreach ($participants as $uid => $status)
 			{
-				if ($status == 'G') continue;	// dont save group-invitations
+				if ($status == 'G') continue; // dont save group-invitations
 
 				$type = '';
 				$id = null;
 				self::split_user($uid, $type, $id, true);
 				$quantity = $role = null;
-				self::split_status($status,$quantity,$role);
-				$this->db->insert($this->user_table,array(
+				self::split_status($status, $quantity, $role);
+				$this->db->insert($this->user_table, array(
 					'cal_status'	=> $status,
 					'cal_quantity'	=> $quantity,
 					'cal_role'		=> $role,
 					'cal_user_attendee' => $type == 'e' ? substr($uid, 1) : null,
-				),array(
+				), array(
 					'cal_id'		 => $cal_id,
 					'cal_recur_date' => $start,
 					'cal_user_type'  => $type,
 					'cal_user_id' 	 => $id,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 			}
 		}
 	}
@@ -2182,7 +2179,7 @@ 
 	function unfinished_recuring($time)
 	{
 		$ids = array();
-		foreach($rs=$this->db->select($this->repeats_table, "$this->repeats_table.cal_id,MAX(cal_start) AS cal_start",
+		foreach ($rs = $this->db->select($this->repeats_table, "$this->repeats_table.cal_id,MAX(cal_start) AS cal_start",
 			'(range_end IS NULL OR range_end > '.(int)$time.')',
 			__LINE__, __FILE__, false, "GROUP BY $this->repeats_table.cal_id,range_end", 'calendar', 0,
 			" JOIN $this->cal_table ON $this->repeats_table.cal_id=$this->cal_table.cal_id".
@@ -2208,9 +2205,9 @@ 
 		// update timestamp of series master, updates own timestamp too, which does not hurt ;-)
 		$this->updateModified($cal_id, true);
 
-		foreach($this->all_tables as $table)
+		foreach ($this->all_tables as $table)
 		{
-			$this->db->delete($table,array('cal_id'=>$cal_id),__LINE__,__FILE__,'calendar');
+			$this->db->delete($table, array('cal_id'=>$cal_id), __LINE__, __FILE__, 'calendar');
 		}
 	}
 
@@ -2226,19 +2223,19 @@ 
 	function purge($date)
 	{
 		// with new range_end we simple delete all with range_end < $date (range_end NULL is never returned)
-		foreach($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
+		foreach ($this->db->select($this->cal_table, 'cal_id', 'range_end < '.(int)$date, __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			//echo __METHOD__." About to delete".$row['cal_id']."\r\n";
-			foreach($this->all_tables as $table)
+			foreach ($this->all_tables as $table)
 			{
 				$this->db->delete($table, array('cal_id'=>$row['cal_id']), __LINE__, __FILE__, 'calendar');
 			}
 			// handle sync
-			$this->db->update('egw_api_content_history',array(
+			$this->db->update('egw_api_content_history', array(
 				'sync_deleted' => time(),
-			),array(
+			), array(
 				'sync_appname' => 'calendar',
-				'sync_contentid' => $row['cal_id'],	// sync_contentid is varchar(60)!
+				'sync_contentid' => $row['cal_id'], // sync_contentid is varchar(60)!
 			), __LINE__, __FILE__);
 			// handle links
 			Link::unlink('', 'calendar', $row['cal_id']);
@@ -2261,23 +2258,23 @@ 
 	 * @param boolean $update_cache =null true: re-read given $cal_id, false: delete given $cal_id
 	 * @return array of (cal_id => array of) alarms with alarm-id as key
 	 */
-	function read_alarms($cal_id, $update_cache=null)
+	function read_alarms($cal_id, $update_cache = null)
 	{
 		if (!isset(self::$alarm_cache) && is_array($cal_id))
 		{
 			self::$alarm_cache = array();
 			if (($jobs = $this->async->read('cal:%')))
 			{
-				foreach($jobs as $id => $job)
+				foreach ($jobs as $id => $job)
 				{
-					$alarm         = $job['data'];	// text, enabled
+					$alarm         = $job['data']; // text, enabled
 					$alarm['id']   = $id;
 					$alarm['time'] = $job['next'];
 
 					self::$alarm_cache[$alarm['cal_id']][$id] = $alarm;
 				}
 			}
-			unset($update_cache);	// just done
+			unset($update_cache); // just done
 		}
 		$alarms = array();
 
@@ -2285,13 +2282,13 @@ 
 		{
 			if (isset($update_cache))
 			{
-				foreach((array)$cal_id as $id)
+				foreach ((array)$cal_id as $id)
 				{
 					if ($update_cache === false)
 					{
 						unset(self::$alarm_cache[$cal_id]);
 					}
-					elseif($update_cache === true)
+					elseif ($update_cache === true)
 					{
 						self::$alarm_cache[$cal_id] = $this->read_alarms_nocache($cal_id);
 					}
@@ -2303,7 +2300,7 @@ 
 			}
 			else
 			{
-				foreach($cal_id as $id)
+				foreach ($cal_id as $id)
 				{
 					$alarms[$id] = (array)self::$alarm_cache[$id];
 				}
@@ -2318,9 +2315,9 @@ 
 	{
 		if (($jobs = $this->async->read('cal:'.(int)$cal_id.':%')))
 		{
-			foreach($jobs as $id => $job)
+			foreach ($jobs as $id => $job)
 			{
-				$alarm         = $job['data'];	// text, enabled
+				$alarm         = $job['data']; // text, enabled
 				$alarm['id']   = $id;
 				$alarm['time'] = $job['next'];
 
@@ -2343,8 +2340,8 @@ 
 		{
 			return False;
 		}
-		list($alarm_id,$job) = each($jobs);
-		$alarm         = $job['data'];	// text, enabled
+		list($alarm_id, $job) = each($jobs);
+		$alarm         = $job['data']; // text, enabled
 		$alarm['id']   = $alarm_id;
 		$alarm['time'] = $job['next'];
 
@@ -2360,12 +2357,12 @@ 
 	 * @param boolean $update_modified =true call update modified, default true
 	 * @return string id of the alarm
 	 */
-	function save_alarm($cal_id, $alarm, $update_modified=true)
+	function save_alarm($cal_id, $alarm, $update_modified = true)
 	{
 		//error_log(__METHOD__."($cal_id, ".array2string($alarm).', '.array2string($update_modified).') '.function_backtrace());
 		if (!($id = $alarm['id']))
 		{
-			$alarms = $this->read_alarms($cal_id);	// find a free alarm#
+			$alarms = $this->read_alarms($cal_id); // find a free alarm#
 			$n = count($alarms);
 			do
 			{
@@ -2378,12 +2375,12 @@ 
 		{
 			$this->async->cancel_timer($id);
 		}
-		$alarm['cal_id'] = $cal_id;		// we need the back-reference
+		$alarm['cal_id'] = $cal_id; // we need the back-reference
 		// add an alarm uid, if none is given
 		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
 		//error_log(__METHOD__.__LINE__.' Save Alarm for CalID:'.$cal_id.'->'.array2string($alarm).'-->'.$id.'#'.function_backtrace());
 		// allways store job with the alarm owner as job-owner to get eg. the correct from address
-		if (!$this->async->set_timer($alarm['time'],$id,'calendar.calendar_boupdate.send_alarm',$alarm,$alarm['owner']))
+		if (!$this->async->set_timer($alarm['time'], $id, 'calendar.calendar_boupdate.send_alarm', $alarm, $alarm['owner']))
 		{
 			return False;
 		}
@@ -2410,7 +2407,7 @@ 
 		//error_log(__METHOD__."($cal_id) ".function_backtrace());
 		if (($alarms = $this->read_alarms($cal_id)))
 		{
-			foreach(array_keys($alarms) as $id)
+			foreach (array_keys($alarms) as $id)
 			{
 				$this->async->cancel_timer($id);
 			}
@@ -2430,7 +2427,7 @@ 
 	{
 		//error_log(__METHOD__."('$id') ".function_backtrace());
 		// update the modification information of the related event
-		list(,$cal_id) = explode(':',$id);
+		list(,$cal_id) = explode(':', $id);
 		if ($cal_id)
 		{
 			$this->updateModified($cal_id, true);
@@ -2449,7 +2446,7 @@ 
 	 * @param array|int $old_user integer old user or array with keys 'account_id' and 'new_owner' as the deleteaccount hook uses it
 	 * @param int $new_user =null
 	 */
-	function deleteaccount($old_user, $new_user=null)
+	function deleteaccount($old_user, $new_user = null)
 	{
 		if (is_array($old_user))
 		{
@@ -2460,52 +2457,52 @@ 
 		{
 			$user_type = '';
 			$user_id = null;
-			self::split_user($old_user,$user_type,$user_id);
+			self::split_user($old_user, $user_type, $user_id);
 
 			if ($user_type == 'u')	// only accounts can be owners of events
 			{
-				foreach($this->db->select($this->cal_table,'cal_id',array('cal_owner' => $old_user),__LINE__,__FILE__,false,'','calendar') as $row)
+				foreach ($this->db->select($this->cal_table, 'cal_id', array('cal_owner' => $old_user), __LINE__, __FILE__, false, '', 'calendar') as $row)
 				{
 					$this->delete($row['cal_id']);
 				}
 			}
-			$this->db->delete($this->user_table,array(
+			$this->db->delete($this->user_table, array(
 				'cal_user_type' => $user_type,
 				'cal_user_id'   => $user_id,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 
 			// delete calendar entries without participants (can happen if the deleted user is the only participants, but not the owner)
-			foreach($this->db->select($this->cal_table,"DISTINCT $this->cal_table.cal_id",'cal_user_id IS NULL',__LINE__,__FILE__,
-				False,'','calendar',0,"LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
+			foreach ($this->db->select($this->cal_table, "DISTINCT $this->cal_table.cal_id", 'cal_user_id IS NULL', __LINE__, __FILE__,
+				False, '', 'calendar', 0, "LEFT JOIN $this->user_table ON $this->cal_table.cal_id=$this->user_table.cal_id") as $row)
 			{
 				$this->delete($row['cal_id']);
 			}
 		}
 		else
 		{
-			$this->db->update($this->cal_table,array('cal_owner' => $new_user),array('cal_owner' => $old_user),__LINE__,__FILE__,'calendar');
+			$this->db->update($this->cal_table, array('cal_owner' => $new_user), array('cal_owner' => $old_user), __LINE__, __FILE__, 'calendar');
 			// delete participation of old user, if new user is already a participant
 			$ids = array();
-			foreach($this->db->select($this->user_table,'cal_id',array(		// MySQL does NOT allow to run this as delete!
+			foreach ($this->db->select($this->user_table, 'cal_id', array(		// MySQL does NOT allow to run this as delete!
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				"cal_id IN (SELECT cal_id FROM $this->user_table other WHERE other.cal_id=cal_id AND other.cal_user_id=".$this->db->quote($new_user)." AND cal_user_type='u')",
-			),__LINE__,__FILE__,false,'','calendar') as $row)
+			), __LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				$ids[] = $row['cal_id'];
 			}
-			if ($ids) $this->db->delete($this->user_table,array(
+			if ($ids) $this->db->delete($this->user_table, array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				'cal_id' => $ids,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 			// now change participant in the rest to contain new user instead of old user
-			$this->db->update($this->user_table,array(
+			$this->db->update($this->user_table, array(
 				'cal_user_id' => $new_user,
-			),array(
+			), array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
-			),__LINE__,__FILE__,'calendar');
+			), __LINE__, __FILE__, 'calendar');
 		}
 	}
 
@@ -2519,18 +2516,18 @@ 
 	 *
 	 * @return array recur_date => status pairs (index 0 => main status)
 	 */
-	function get_recurrences($cal_id, $uid=null, $start=0, $end=0)
+	function get_recurrences($cal_id, $uid = null, $start = 0, $end = 0)
 	{
 		$participant_status = array();
 		$where = array('cal_id' => $cal_id);
-		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= '.(int)$start.')';
+		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= '.(int)$end.')';
 		if ($start != 0 && $end != 0)
 		{
-			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
-						' AND cal_recur_date <= ' . (int)$end . '))';
+			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= '.(int)$start.
+						' AND cal_recur_date <= '.(int)$end.'))';
 		}
-		foreach($this->db->select($this->user_table,'DISTINCT cal_recur_date',$where,__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'DISTINCT cal_recur_date', $where, __LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			// inititalize the array
 			$participant_status[$row['cal_recur_date']] = null;
@@ -2544,17 +2541,17 @@ 
 			'cal_user_type'	=> $user_type ? $user_type : 'u',
 			'cal_user_id'   => $user_id,
 		);
-		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= '.(int)$start.')';
+		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= '.(int)$end.')';
 		if ($start != 0 && $end != 0)
 		{
-			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
-						' AND cal_recur_date <= ' . (int)$end . '))';
+			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= '.(int)$start.
+						' AND cal_recur_date <= '.(int)$end.'))';
 		}
-		foreach ($this->db->select($this->user_table,'cal_recur_date,cal_status,cal_quantity,cal_role',$where2,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'cal_recur_date,cal_status,cal_quantity,cal_role', $where2,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
-			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
+			$status = self::combine_status($row['cal_status'], $row['cal_quantity'], $row['cal_role']);
 			$participant_status[$row['cal_recur_date']] = $status;
 		}
 		return $participant_status;
@@ -2603,8 +2600,8 @@ 
 			'cal_uid'		=> $uid,
 		);
 		$related = array();
-		foreach ($this->db->select($this->cal_table,'cal_id,cal_reference',$where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->cal_table, 'cal_id,cal_reference', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			if ($row['cal_reference'] != 0)
 			{
@@ -2633,10 +2630,10 @@ 
 	 *
 	 * @return array		Array of exception days (false for non-recurring events).
 	 */
-	function get_recurrence_exceptions($event, $tz_id=null, $start=0, $end=0, $filter='all')
+	function get_recurrence_exceptions($event, $tz_id = null, $start = 0, $end = 0, $filter = 'all')
 	{
 		if (!is_array($event)) return false;
-		$cal_id = (int) $event['id'];
+		$cal_id = (int)$event['id'];
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//		"($cal_id, $tz_id, $filter): " . $event['tzid']);
 		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE) return false;
@@ -2660,27 +2657,27 @@ 
 		while ($egw_rrule->valid())
 		{
 			while ($egw_rrule->exceptions &&
-				in_array($egw_rrule->current->format('Ymd'),$egw_rrule->exceptions))
+				in_array($egw_rrule->current->format('Ymd'), $egw_rrule->exceptions))
 			{
-				if (in_array($filter, array('map','tz_map','rrule','tz_rrule')))
+				if (in_array($filter, array('map', 'tz_map', 'rrule', 'tz_rrule')))
 				{
 					 // real exception
-					$locts = (int)Api\DateTime::to($egw_rrule->current(),'server');
+					$locts = (int)Api\DateTime::to($egw_rrule->current(), 'server');
 					if ($expand_all)
 					{
-						$remts = (int)Api\DateTime::to($remote_rrule->current(),'server');
+						$remts = (int)Api\DateTime::to($remote_rrule->current(), 'server');
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 				if ($expand_all)
@@ -2691,14 +2688,14 @@ 
 				if (!$egw_rrule->valid()) return $days;
 			}
 			$day = $egw_rrule->current();
-			$locts = (int)Api\DateTime::to($day,'server');
+			$locts = (int)Api\DateTime::to($day, 'server');
 			$tz_exception = ($filter == 'tz_rrule');
 			//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 			//	'()[EVENT Server]: ' . $day->format('Ymd\THis') . " ($locts)");
 			if ($expand_all)
 			{
 				$remote_day = $remote_rrule->current();
-				$remts = (int)Api\DateTime::to($remote_day,'server');
+				$remts = (int)Api\DateTime::to($remote_day, 'server');
 			//	error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 			//	'()[EVENT Device]: ' . $remote_day->format('Ymd\THis') . " ($remts)");
 			}
@@ -2717,11 +2714,11 @@ 
 						//	'() tz exception: ' . $day->format('Ymd\THis'));
 						if ($remote)
 						{
-							$days[$locts]= $remts;
+							$days[$locts] = $remts;
 						}
 						else
 						{
-							$days[$remts]= $locts;
+							$days[$remts] = $locts;
 						}
 					}
 				}
@@ -2743,18 +2740,18 @@ 
 							{
 								if ($remote)
 								{
-									$days[$locts]= $remts;
+									$days[$locts] = $remts;
 								}
 								else
 								{
-									$days[$remts]= $locts;
+									$days[$remts] = $locts;
 								}
 							}
 						}
 					}
 					elseif ($filter != 'map')
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 				elseif (($filter == 'map' || filter == 'tz_map') &&
@@ -2764,11 +2761,11 @@ 
 					if ($expand_all)
 					{
 
-						$days[$remts]= $locts;
+						$days[$remts] = $locts;
 					}
 					else
 					{
-						$days[$locts]= $locts;
+						$days[$locts] = $locts;
 					}
 				}
 			}
@@ -2792,9 +2789,9 @@ 
 	 */
 	function status_pseudo_exception($cal_id, $recur_date, $filter)
 	{
-		static $recurrence_zero=null;
-		static $cached_id=null;
-		static $user=null;
+		static $recurrence_zero = null;
+		static $cached_id = null;
+		static $user = null;
 
 		if (!isset($cached_id) || $cached_id != $cal_id)
 		{
@@ -2805,8 +2802,8 @@ 
 				'cal_id' => $cal_id,
 				'cal_recur_date' => 0,
 			);
-			foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status',$where,
-				__LINE__,__FILE__,false,'','calendar') as $row)
+			foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status', $where,
+				__LINE__, __FILE__, false, '', 'calendar') as $row)
 			{
 				switch ($row['cal_user_type'])
 				{
@@ -2829,8 +2826,8 @@ 
 			'cal_id' => $cal_id,
 			'cal_recur_date' => $recur_date,
 		);
-		foreach ($this->db->select($this->user_table,'cal_user_type,cal_user_id,cal_user_attendee,cal_status',$where,
-			__LINE__,__FILE__,false,'','calendar') as $row)
+		foreach ($this->db->select($this->user_table, 'cal_user_type,cal_user_id,cal_user_attendee,cal_status', $where,
+			__LINE__, __FILE__, false, '', 'calendar') as $row)
 		{
 			switch ($row['cal_user_type'])
 			{
@@ -2927,14 +2924,14 @@ 
 			}
 			$timezone = self::$tz_cache[$event['tzid']];
 		}
-		$start_time = new Api\DateTime($event['start'],Api\DateTime::$server_timezone);
+		$start_time = new Api\DateTime($event['start'], Api\DateTime::$server_timezone);
 		$start_time->setTimezone($timezone);
-		$end_time = new Api\DateTime($event['end'],Api\DateTime::$server_timezone);
+		$end_time = new Api\DateTime($event['end'], Api\DateTime::$server_timezone);
 		$end_time->setTimezone($timezone);
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//	'(): ' . $start . '-' . $end);
-		$start = Api\DateTime::to($start_time,'array');
-		$end = Api\DateTime::to($end_time,'array');
+		$start = Api\DateTime::to($start_time, 'array');
+		$end = Api\DateTime::to($end_time, 'array');
 
 
 		return !$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59;
@@ -2948,7 +2945,7 @@ 
 	 *
 	 * @return DateTime
 	 */
-	function &startOfDay(Api\DateTime $time, $tz_id=null)
+	function &startOfDay(Api\DateTime $time, $tz_id = null)
 	{
 		if (empty($tz_id))
 		{
@@ -2973,14 +2970,14 @@ 
 	 * @param int $time =null new timestamp, default current (server-)time
 	 * @param int $modifier =null uid of the modifier, default current user
 	 */
-	function updateModified($id, $update_master=false, $time=null, $modifier=null)
+	function updateModified($id, $update_master = false, $time = null, $modifier = null)
 	{
 		if (is_null($time) || !$time) $time = time();
 		if (is_null($modifier)) $modifier = $GLOBALS['egw_info']['user']['account_id'];
 
 		$this->db->update($this->cal_table,
 			array('cal_modified' => $time, 'cal_modifier' => $modifier),
-			array('cal_id' => $id), __LINE__,__FILE__, 'calendar');
+			array('cal_id' => $id), __LINE__, __FILE__, 'calendar');
 
 		// if event is an exception: update modified of master, to force etag, ctag and sync-token change
 		if ($update_master)

api/src/Contacts/Sql.php

Spacing +117 added lines, -119 removed lines

@@ -44,7 +44,7 @@ 
 	 *
 	 * @var string
 	 */
-	var $contacts_id='id';
+	var $contacts_id = 'id';
 
 	/**
 	 * Name of the table for distribution lists
@@ -67,7 +67,7 @@ 
 	 *
 	 * @param Api\Db $db =null
 	 */
-	function __construct(Api\Db $db=null)
+	function __construct(Api\Db $db = null)
 	{
 		parent::__construct('api', 'egw_addressbook', self::EXTRA_TABLE,
 			'contact_', '_name', '_value', '_id', $db);
@@ -114,8 +114,8 @@ 
 		if (isset($param['op']) && !empty($param['op'])) $op = $param['op'];
 		$advanced_search = false;
 		if (isset($param['advanced_search']) && !empty($param['advanced_search'])) $advanced_search = true;
-		$wildcard ='%';
-		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard']?$param['wildcard']:'');
+		$wildcard = '%';
+		if ($advanced_search || (isset($param['wildcard']) && !empty($param['wildcard']))) $wildcard = ($param['wildcard'] ? $param['wildcard'] : '');
 
 		// fix cat_id filter to search in comma-separated multiple cats and return subcats
 		if ($filter['cat_id'])
@@ -133,7 +133,7 @@ 
 			// we have no private grants in addressbook at the moment, they have then to be added here too
 			if ($param['owner'])
 			{
-				if (!$this->grants[(int) $filter['owner']]) return false;	// we have no access to that addressbook
+				if (!$this->grants[(int)$filter['owner']]) return false; // we have no access to that addressbook
 
 				$filter['owner'] = $param['owner'];
 				$filter['private'] = 0;
@@ -142,11 +142,11 @@ 
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "(".$this->table_name.".contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR contact_private=0 AND ".$this->table_name.".contact_owner IN (".
-					implode(',',array_keys($this->grants))."))";
+					implode(',', array_keys($this->grants))."))";
 			}
 		}
 		if ($param['searchletter'])
@@ -155,11 +155,11 @@ 
 		}
 		else
 		{
-			$filter[] = "org_name != ''";// AND org_name IS NOT NULL";
+			$filter[] = "org_name != ''"; // AND org_name IS NOT NULL";
 		}
 		$sort = $param['sort'] == 'DESC' ? 'DESC' : 'ASC';
 
-		list(,$by) = explode(',',$param['org_view']);
+		list(,$by) = explode(',', $param['org_view']);
 		if (!$by)
 		{
 			$extra = array(
@@ -172,50 +172,49 @@ 
 		else	// by adr_one_location or org_unit
 		{
 			// org total for more then one $by
-			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" :
-				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
-			parent::search($param['search'],array('org_name'),
+			$by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" : "COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
+			parent::search($param['search'], array('org_name'),
 				"GROUP BY org_name HAVING $by_expr > 1 ORDER BY org_name $sort", array(
 				"NULL AS $by",
 				'1 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter);
 			// org by location
-			parent::search($param['search'],array('org_name'),
+			parent::search($param['search'], array('org_name'),
 				"GROUP BY org_name,$by ORDER BY org_name $sort,$by $sort", array(
 				"CASE WHEN $by IS NULL THEN '' ELSE $by END AS $by",
 				'0 AS is_main',
 				'COUNT(DISTINCT egw_addressbook.contact_id) AS org_count',
 				"COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END) AS org_unit_count",
 				"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END) AS adr_one_locality_count",
-			),$wildcard,false,$op/*'OR'*/,'UNION',$filter);
+			), $wildcard, false, $op/*'OR'*/, 'UNION', $filter);
 			$append = "ORDER BY org_name $sort,is_main DESC,$by $sort";
 		}
-		$rows = parent::search($param['search'],array('org_name'),$append,$extra,$wildcard,false,$op/*'OR'*/,
-			array($param['start'],$param['num_rows']),$filter);
+		$rows = parent::search($param['search'], array('org_name'), $append, $extra, $wildcard, false, $op/*'OR'*/,
+			array($param['start'], $param['num_rows']), $filter);
 
 		if (!$rows) return false;
 
 		// query the values for *_count == 1, to display them instead
 		$filter['org_name'] = $orgs = array();
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
 			if ($row['org_unit_count'] == 1 || $row['adr_one_locality_count'] == 1)
 			{
-				$filter['org_name'][$row['org_name']] = $row['org_name'];	// use as key too to have every org only once
+				$filter['org_name'][$row['org_name']] = $row['org_name']; // use as key too to have every org only once
 			}
-			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count']==1 ? $row[$by] : '|||') : '');
+			$org_key = $row['org_name'].($by ? '|||'.($row[$by] || $row[$by.'_count'] == 1 ? $row[$by] : '|||') : '');
 			$orgs[$org_key] = $row;
 		}
 		unset($rows);
 
 		if (count($filter['org_name']))
 		{
-			foreach((array) parent::search(null, array('org_name','org_unit','adr_one_locality'),
+			foreach ((array)parent::search(null, array('org_name', 'org_unit', 'adr_one_locality'),
 				'GROUP BY org_name,org_unit,adr_one_locality',
-				'',$wildcard,false,$op/*'AND'*/,false,$filter) as $row)
+				'', $wildcard, false, $op/*'AND'*/, false, $filter) as $row)
 			{
 				$org_key = $row['org_name'].($by ? '|||'.$row[$by] : '');
 				if ($orgs[$org_key]['org_unit_count'] == 1)
@@ -265,9 +264,9 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return boolean/array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false, $ignore_acl=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false, $ignore_acl = false)
 	{
-		if ((int) $this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
+		if ((int)$this->debug >= 4) echo '<p>'.__METHOD__.'('.array2string($criteria).','.array2string($only_keys).",'$order_by','$extra_cols','$wildcard','$empty','$op',$start,".array2string($filter).",'$join')</p>\n";
 		//error_log(__METHOD__.'('.array2string($criteria,true).','.array2string($only_keys).",'$order_by', ".array2string($extra_cols).",'$wildcard','$empty','$op',$start,".array2string($filter).",'$join')");
 
 		$owner = isset($filter['owner']) ? $filter['owner'] : (isset($criteria['owner']) ? $criteria['owner'] : null);
@@ -283,10 +282,10 @@ 
 		{
 			if ($filter['cat_id'][0] == '!')
 			{
-				$filter['cat_id'] = substr($filter['cat_id'],1);
+				$filter['cat_id'] = substr($filter['cat_id'], 1);
 				$not = 'NOT';
 			}
-			$filter[] = $this->_cat_filter($filter['cat_id'],$not);
+			$filter[] = $this->_cat_filter($filter['cat_id'], $not);
 			unset($filter['cat_id']);
 		}
 
@@ -296,17 +295,17 @@ 
 		{
 			// add read ACL for groupmembers (they have no
 			if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
-				(!isset($filter['owner']) || in_array('0',(array)$filter['owner'])))
+				(!isset($filter['owner']) || in_array('0', (array)$filter['owner'])))
 			{
 				$groupmembers = array();
-				foreach($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $group_id)
+				foreach ($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $group_id)
 				{
-					if (($members = $GLOBALS['egw']->accounts->members($group_id,true)))
+					if (($members = $GLOBALS['egw']->accounts->members($group_id, true)))
 					{
-						$groupmembers = array_merge($groupmembers,$members);
+						$groupmembers = array_merge($groupmembers, $members);
 					}
 				}
-				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.',array(
+				$groupmember_sql = $this->db->expression($this->table_name, ' OR '.$this->table_name.'.', array(
 					'account_id' => array_unique($groupmembers),
 				));
 			}
@@ -314,34 +313,34 @@ 
 			if (isset($filter['owner']))
 			{
 				// no grants for selected owner/addressbook
-				if (!($filter['owner'] = array_intersect((array)$filter['owner'],array_keys($this->grants))))
+				if (!($filter['owner'] = array_intersect((array)$filter['owner'], array_keys($this->grants))))
 				{
 					if (!isset($groupmember_sql)) return false;
-					$filter[] = substr($groupmember_sql,4);
+					$filter[] = substr($groupmember_sql, 4);
 					unset($filter['owner']);
 				}
 				// for an owner filter, which does NOT include current user, filter out private entries
-				elseif (!in_array($GLOBALS['egw_info']['user']['account_id'],$filter['owner']))
+				elseif (!in_array($GLOBALS['egw_info']['user']['account_id'], $filter['owner']))
 				{
 					$filter['private'] = 0;
 				}
 				// if multiple addressbooks (incl. current owner) are searched, we need full acl filter
-				elseif(count($filter['owner']) > 1)
+				elseif (count($filter['owner']) > 1)
 				{
 					$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 						" OR contact_private=0 AND $this->table_name.contact_owner IN (".
-						implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
+						implode(',', array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 				}
 			}
 			else	// search all addressbooks, incl. accounts
 			{
 				if ($this->account_repository != 'sql' && $this->contact_repository != 'sql-ldap')
 				{
-					$filter[] = $this->table_name.'.contact_owner != 0';	// in case there have been accounts in sql previously
+					$filter[] = $this->table_name.'.contact_owner != 0'; // in case there have been accounts in sql previously
 				}
 				$filter[] = "($this->table_name.contact_owner=".(int)$GLOBALS['egw_info']['user']['account_id'].
 					" OR contact_private=0 AND $this->table_name.contact_owner IN (".
-					implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
+					implode(',', array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 			}
 		}
 		if (isset($filter['list']))
@@ -351,21 +350,21 @@ 
 			unset($filter['list']);
 		}
 		// add join to show only active accounts (only if accounts are shown and in sql and we not already join the accounts table, eg. used by admin)
-		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository,0,3) == 'sql' &&
-			strpos($join,$GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id',$filter))
+		if ((is_array($owner) ? in_array(0, $owner) : !$owner) && substr($this->account_repository, 0, 3) == 'sql' &&
+			strpos($join, $GLOBALS['egw']->accounts->backend->table) === false && !array_key_exists('account_id', $filter))
 		{
 			$join .= self::ACCOUNT_ACTIVE_JOIN;
-			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())',time(),self::ACOUNT_ACTIVE_FILTER);
+			$filter[] = str_replace('UNIX_TIMESTAMP(NOW())', time(), self::ACOUNT_ACTIVE_FILTER);
 		}
 		if ($join || ($criteria && is_string($criteria)) || ($criteria && is_array($criteria) && $order_by))	// search also adds a join for custom fields!
 		{
-			switch(gettype($only_keys))
+			switch (gettype($only_keys))
 			{
 				case 'boolean':
 					// Correctly handled by parent class
 					break;
 				case 'string':
-					$only_keys = explode(',',$only_keys);
+					$only_keys = explode(',', $only_keys);
 					// fall through
 			}
 			// postgres requires that expressions in order by appear in the columns of a distinct select
@@ -373,14 +372,14 @@ 
 			if ($this->db->Type != 'mysql' && preg_match_all("/(#?[a-zA-Z_.]+) *(<> *''|IS NULL|IS NOT NULL)? *(ASC|DESC)?(,|$)/ui",
 				$order_by, $all_matches, PREG_SET_ORDER))
 			{
-				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
-				foreach($all_matches as $matches)
+				if (!is_array($extra_cols))	$extra_cols = $extra_cols ? explode(',', $extra_cols) : array();
+				foreach ($all_matches as $matches)
 				{
 					$table = '';
 					$column = $matches[1];
-					if ($column[0] == '#') continue;	// order by custom field is handeled in so_sql_cf anyway
+					if ($column[0] == '#') continue; // order by custom field is handeled in so_sql_cf anyway
 					if (($key = array_search($column, $this->db_cols)) !== false) $column = $key;
-					if (strpos($column,'.') === false)
+					if (strpos($column, '.') === false)
 					{
 						$table = $column == $this->extra_value ? $this->extra_table : $this->table_name;
 						if (isset($this->db_cols[$column]))
@@ -396,34 +395,34 @@ 
 					//_debug_array($matches);
 					if (!empty($order_by) && $table) // postgres requires explizit order by
 					{
-						$order_by = str_replace($matches[0],$table.$column.' '.$matches[2].' '.$matches[3].$matches[4],$order_by);
+						$order_by = str_replace($matches[0], $table.$column.' '.$matches[2].' '.$matches[3].$matches[4], $order_by);
 					}
 				}
 				//_debug_array($order_by); _debug_array($extra_cols);
 			}
 
 			// Understand search by date with wildcard (????.10.??) according to user date preference
-			if(is_string($criteria) && strpos($criteria, '?') !== false)
+			if (is_string($criteria) && strpos($criteria, '?') !== false)
 			{
 				// First, check for a 'date', with wildcards, in the user's format
-				$date_regex = str_replace('Q','d',
-					str_replace(array('Y','m','d','.','-'),
-						array('(?P<Y>(?:\?|\Q){4})','(?P<m>(?:\?|\Q){2})','(?P<d>(?:\?|\Q){2})','\.','\-'),
+				$date_regex = str_replace('Q', 'd',
+					str_replace(array('Y', 'm', 'd', '.', '-'),
+						array('(?P<Y>(?:\?|\Q){4})', '(?P<m>(?:\?|\Q){2})', '(?P<d>(?:\?|\Q){2})', '\.', '\-'),
 							$GLOBALS['egw_info']['user']['preferences']['common']['dateformat']));
 
-				if(preg_match_all('$'.$date_regex.'$', $criteria, $matches))
+				if (preg_match_all('$'.$date_regex.'$', $criteria, $matches))
 				{
-					foreach($matches[0] as $m_id => $match)
+					foreach ($matches[0] as $m_id => $match)
 					{
 						// Birthday is Y-m-d
-						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*",$criteria);
+						$criteria = str_replace($match, "*{$matches['Y'][$m_id]}-{$matches['m'][$m_id]}-{$matches['d'][$m_id]}*", $criteria);
 					}
 				}
 			}
 		}
-		$rows =& parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		$rows = & parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 
-		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0;	// so_sql sets total only for $start !== false!
+		if ($start === false) $this->total = is_array($rows) ? count($rows) : 0; // so_sql sets total only for $start !== false!
 
 		return $rows;
 	}
@@ -435,18 +434,18 @@ 
 	 * @param int|array $cat_id
 	 * @return string sql to filter by given cat
 	 */
-	function _cat_filter($cat_id, $not='')
+	function _cat_filter($cat_id, $not = '')
 	{
 		if (!is_object($GLOBALS['egw']->categories))
 		{
 			$GLOBALS['egw']->categories = new Api\Categories;
 		}
-		foreach($GLOBALS['egw']->categories->return_all_children($cat_id) as $cat)
+		foreach ($GLOBALS['egw']->categories->return_all_children($cat_id) as $cat)
 		{
-			$cat_filter[] = $this->db->concat("','",cat_id,"','")." $not LIKE '%,$cat,%'";
+			$cat_filter[] = $this->db->concat("','", cat_id, "','")." $not LIKE '%,$cat,%'";
 		}
-		$cfilter = '('.implode(' OR ',$cat_filter).')';
-		if(!empty($not))
+		$cfilter = '('.implode(' OR ', $cat_filter).')';
+		if (!empty($not))
 		{
 			$cfilter = "( $cfilter OR cat_id IS NULL )";
 		}
@@ -463,9 +462,9 @@ 
 	function _cat_search($cats)
 	{
 		$cat_filter = array();
-		foreach(is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',',$cats)) as $cat)
+		foreach (is_array($cats) ? $cats : (is_numeric($cats) ? array($cats) : explode(',', $cats)) as $cat)
 		{
-			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','",cat_id,"','")." LIKE '%,$cat,%'";
+			if (is_numeric($cat)) $cat_filter[] = $this->db->concat("','", cat_id, "','")." LIKE '%,$cat,%'";
 		}
 		return $cat_filter;
 	}
@@ -476,32 +475,32 @@ 
 	 * @param int $account_id account-id of the old owner
 	 * @param int $new_owner account-id of the new owner
 	 */
-	function change_owner($account_id,$new_owner)
+	function change_owner($account_id, $new_owner)
 	{
 		if (!$new_owner)	// otherwise we would create an account (contact_owner==0)
 		{
 			throw Api\Exception\WrongParameter(__METHOD__."($account_id, $new_owner) new owner must not be 0!");
 		}
 		// contacts
-		$this->db->update($this->table_name,array(
+		$this->db->update($this->table_name, array(
 			'contact_owner' => $new_owner,
-		),array(
+		), array(
 			'contact_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		// cfs
 		$this->db->update(self::EXTRA_TABLE, array(
 			'contact_owner' => $new_owner
-		),array(
+		), array(
 			'contact_owner' => $account_id
 		), __LINE__, __FILE__);
 
 		// lists
 		$this->db->update($this->lists_table, array(
 			'list_owner' => $new_owner,
-		),array(
+		), array(
 			'list_owner' => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -515,21 +514,21 @@ 
 	 * 	if int|array only return members from the given owners addressbook(s)
 	 * @return array with list_id => array(list_id,list_name,list_owner,...) pairs
 	 */
-	function get_lists($uids,$uid_column='list_owner',$member_attr=null,$limit_in_ab=false)
+	function get_lists($uids, $uid_column = 'list_owner', $member_attr = null, $limit_in_ab = false)
 	{
 		if (is_array($uids) && array_key_exists('list_id', $uids))
 		{
-			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.',array('list_id' => $uids['list_id']));
+			$uids[] = $this->db->expression($this->lists_table, $this->lists_table.'.', array('list_id' => $uids['list_id']));
 			unset($uids['list_id']);
 		}
 		$lists = array();
-		foreach($this->db->select($this->lists_table,'*',$uid_column?array($uid_column=>$uids):$uids,__LINE__,__FILE__,
-			false,'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
+		foreach ($this->db->select($this->lists_table, '*', $uid_column ? array($uid_column=>$uids) : $uids, __LINE__, __FILE__,
+			false, 'ORDER BY list_owner<>'.(int)$GLOBALS['egw_info']['user']['account_id'].',list_name') as $row)
 		{
 			if ($member_attr) $row['members'] = array();
 			$lists[$row['list_id']] = $row;
 		}
-		if ($lists && $member_attr && in_array($member_attr,array('contact_id','contact_uid','caldav_name')))
+		if ($lists && $member_attr && in_array($member_attr, array('contact_id', 'contact_uid', 'caldav_name')))
 		{
 			if ($limit_in_ab)
 			{
@@ -543,10 +542,9 @@ 
 					$in_ab_join .= "list_owner=$this->table_name.contact_owner";
 				}
 			}
-			foreach($this->db->select($this->ab2list_table,"$this->ab2list_table.list_id,$this->table_name.$member_attr",
+			foreach ($this->db->select($this->ab2list_table, "$this->ab2list_table.list_id,$this->table_name.$member_attr",
 				$this->db->expression($this->ab2list_table, $this->ab2list_table.'.', array('list_id'=>array_keys($lists))),
-				__LINE__,__FILE__,false,$member_attr=='contact_id' ? '' :
-				'',false,0,"JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
+				__LINE__, __FILE__, false, $member_attr == 'contact_id' ? '' : '', false, 0, "JOIN $this->table_name ON $this->ab2list_table.contact_id=$this->table_name.contact_id".$in_ab_join) as $row)
 			{
 				$lists[$row['list_id']]['members'][] = $row[$member_attr];
 			}
@@ -564,7 +562,7 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ".array2string($contacts).', '.array2string($data).') '.function_backtrace());
 		if (!$keys && !$data || !(int)$owner) return false;
@@ -578,7 +576,7 @@ 
 		{
 			$data['list_owner'] = $owner;
 		}
-		if (!$keys || !($list_id = $this->db->select($this->lists_table,'list_id',$keys,__LINE__,__FILE__)->fetchColumn()))
+		if (!$keys || !($list_id = $this->db->select($this->lists_table, 'list_id', $keys, __LINE__, __FILE__)->fetchColumn()))
 		{
 			$data['list_created'] = time();
 			$data['list_creator'] = $GLOBALS['egw_info']['user']['account_id'];
@@ -591,9 +589,9 @@ 
 		$data['list_modifier'] = $GLOBALS['egw_info']['user']['account_id'];
 		if (!$data['list_id']) unset($data['list_id']);
 
-		if (!$this->db->insert($this->lists_table,$data,$keys,__LINE__,__FILE__)) return false;
+		if (!$this->db->insert($this->lists_table, $data, $keys, __LINE__, __FILE__)) return false;
 
-		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table,'list_id')) &&
+		if (!$list_id && ($list_id = $this->db->get_last_insert_id($this->lists_table, 'list_id')) &&
 			(!isset($data['list_uid']) || !isset($data['list_carddav_name'])))
 		{
 			$update = array();
@@ -605,9 +603,9 @@ 
 			{
 				$update['list_carddav_name'] = $data['list_carddav_name'] = $data['list_uid'].'.vcf';
 			}
-			$this->db->update($this->lists_table,$update,array('list_id'=>$list_id),__LINE__,__FILE__);
+			$this->db->update($this->lists_table, $update, array('list_id'=>$list_id), __LINE__, __FILE__);
 
-			$this->add2list($list_id,$contacts,array());
+			$this->add2list($list_id, $contacts, array());
 		}
 		if ($keys) $data += $keys;
 		//error_log(__METHOD__.'('.array2string($keys).", $owner, ...) data=".array2string($data).' returning '.array2string($list_id));
@@ -622,39 +620,39 @@ 
 	 * @param array $existing =null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
 		if (!(int)$list || !is_array($contact) && !(int)$contact) return false;
 
 		if (!is_array($existing))
 		{
 			$existing = array();
-			foreach($this->db->select($this->ab2list_table,'contact_id',array('list_id'=>$list),__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'contact_id', array('list_id'=>$list), __LINE__, __FILE__) as $row)
 			{
 				$existing[] = $row['contact_id'];
 			}
 		}
-		if (!($to_add = array_diff((array)$contact,$existing)))
+		if (!($to_add = array_diff((array)$contact, $existing)))
 		{
-			return true;	// no need to insert it, would give sql error
+			return true; // no need to insert it, would give sql error
 		}
-		foreach($to_add as $contact)
+		foreach ($to_add as $contact)
 		{
-			$this->db->insert($this->ab2list_table,array(
+			$this->db->insert($this->ab2list_table, array(
 				'contact_id' => $contact,
 				'list_id' => $list,
 				'list_added' => time(),
 				'list_added_by' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(),__LINE__,__FILE__);
+			), array(), __LINE__, __FILE__);
 		}
 		// update etag
-		return $this->db->update($this->lists_table,array(
+		return $this->db->update($this->lists_table, array(
 			'list_etag=list_etag+1',
 			'list_modified' => time(),
 			'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-		),array(
+		), array(
 			'list_id' => $list,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 	}
 
 	/**
@@ -664,7 +662,7 @@ 
 	 * @param int $list =null list-id or null to remove from all lists
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
 		if (!(int)$list && !is_null($list) || !is_array($contact) && !(int)$contact) return false;
 
@@ -678,24 +676,24 @@ 
 		else
 		{
 			$list = array();
-			foreach($this->db->select($this->ab2list_table,'list_id',$where,__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->ab2list_table, 'list_id', $where, __LINE__, __FILE__) as $row)
 			{
 				$list[] = $row['list_id'];
 			}
 		}
-		if (!$this->db->delete($this->ab2list_table,$where,__LINE__,__FILE__))
+		if (!$this->db->delete($this->ab2list_table, $where, __LINE__, __FILE__))
 		{
 			return false;
 		}
-		foreach((array)$list as $list_id)
+		foreach ((array)$list as $list_id)
 		{
-			$this->db->update($this->lists_table,array(
+			$this->db->update($this->lists_table, array(
 				'list_etag=list_etag+1',
 				'list_modified' => time(),
 				'list_modifier' => $GLOBALS['egw_info']['user']['account_id'],
-			),array(
+			), array(
 				'list_id' => $list_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		return true;
 	}
@@ -708,9 +706,9 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->db->delete($this->lists_table,array('list_id' => $list),__LINE__,__FILE__)) return false;
+		if (!$this->db->delete($this->lists_table, array('list_id' => $list), __LINE__, __FILE__)) return false;
 
-		$this->db->delete($this->ab2list_table,array('list_id' => $list),__LINE__,__FILE__);
+		$this->db->delete($this->ab2list_table, array('list_id' => $list), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -721,12 +719,12 @@ 
 	 * @param int|array $owner =null null for all lists user has access too
 	 * @return int
 	 */
-	function lists_ctag($owner=null)
+	function lists_ctag($owner = null)
 	{
 		if (is_null($owner)) $owner = array_keys($this->grants);
 
-		if (!($modified = $this->db->select($this->lists_table,'MAX(list_modified)',array('list_owner'=>$owner),
-			__LINE__,__FILE__)->fetchColumn()))
+		if (!($modified = $this->db->select($this->lists_table, 'MAX(list_modified)', array('list_owner'=>$owner),
+			__LINE__, __FILE__)->fetchColumn()))
 		{
 			return 0;
 		}
@@ -741,7 +739,7 @@ 
 	 * @param string $join
 	 * @return array|boolean
 	 */
-	function read($keys,$extra_cols='',$join='')
+	function read($keys, $extra_cols = '', $join = '')
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
@@ -754,11 +752,11 @@ 
 			$keys = array('uid' => $keys);
 		}
 		try {
-			$contact = parent::read($keys,$extra_cols,$join);
+			$contact = parent::read($keys, $extra_cols, $join);
 		}
 		// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
 		// caused by non-ascii chars compared with ascii field uid
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			_egw_log_exception($e);
 			return false;
 		}
@@ -766,7 +764,7 @@ 
 		// enforce a minium uid strength
 		if (is_array($contact) && (!isset($contact['uid'])
 				|| strlen($contact['uid']) < $minimum_uid_length)) {
-			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook',$contact['id'])));
+			parent::update(array('uid' => Api\CalDAV::generate_uid('addressbook', $contact['id'])));
 		}
 		return $contact;
 	}
@@ -780,7 +778,7 @@ 
 	 */
 	function save($keys = NULL, $extra_where = NULL)
 	{
-		unset($extra_where);	// not used, but required by function signature
+		unset($extra_where); // not used, but required by function signature
 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'])) {
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
@@ -796,9 +794,9 @@ 
 		{
 			$etag = $this->data['etag'];
 			unset($this->data['etag']);
-			if (!($err = parent::save(array('contact_etag=contact_etag+1'),array('contact_etag' => $etag))))
+			if (!($err = parent::save(array('contact_etag=contact_etag+1'), array('contact_etag' => $etag))))
 			{
-				$this->data['etag'] = $etag+1;
+				$this->data['etag'] = $etag + 1;
 			}
 			else
 			{
@@ -818,7 +816,7 @@ 
 		// enforce a minium uid strength
 		if (!isset($this->data['uid']) || strlen($this->data['uid']) < $minimum_uid_length)
 		{
-			$update['uid'] = Api\CalDAV::generate_uid('addressbook',$this->data['id']);
+			$update['uid'] = Api\CalDAV::generate_uid('addressbook', $this->data['id']);
 			//echo "<p>set uid={$this->data['uid']}, etag={$this->data['etag']}</p>";
 		}
 		// set carddav_name, if not given by caller
@@ -844,7 +842,7 @@ 
 	{
 		if (!$list) return false;
 
-		return $this->db->select($this->lists_table,'*',array('list_id'=>$list),__LINE__,__FILE__)->fetch();
+		return $this->db->select($this->lists_table, '*', array('list_id'=>$list), __LINE__, __FILE__)->fetch();
 	}
 
 	/**
@@ -855,9 +853,9 @@ 
 	 * @param array $extra_cols =array() extra-data to be saved
 	 * @return bool false on success, errornumber on failure
 	 */
-	function save_customfields($data, array $extra_cols=array())
+	function save_customfields($data, array $extra_cols = array())
 	{
-		return parent::save_customfields($data, array('contact_owner' => $data['owner'])+$extra_cols);
+		return parent::save_customfields($data, array('contact_owner' => $data['owner']) + $extra_cols);
 	}
 
 	/**
@@ -866,6 +864,6 @@ 
 	*/
 	function delete_customfields($data)
 	{
-		$this->db->delete($this->extra_table,$data,__LINE__,__FILE__);
+		$this->db->delete($this->extra_table, $data, __LINE__, __FILE__);
 	}
 }

api/src/Etemplate/Widget/Customfields.php

Spacing +59 added lines, -59 removed lines

@@ -42,12 +42,12 @@ 
 		'date'     => 'Date',
 		'date-time'=> 'Date+Time',
 		'select-account' => 'Select account',
-		'button'   => 'Button',         // button to execute javascript
+		'button'   => 'Button', // button to execute javascript
 		'url'      => 'Url',
 		'url-email'=> 'EMail',
 		'url-phone'=> 'Phone number',
 		'htmlarea' => 'Formatted Text (HTML)',
-		'link-entry' => 'Select entry',         // should be last type, as the individual apps get added behind
+		'link-entry' => 'Select entry', // should be last type, as the individual apps get added behind
 	);
 
 	/**
@@ -86,24 +86,24 @@ 
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
 		// No name, no way to get parameters client-side.
-		if(!$this->id) $this->id = self::GLOBAL_ID;
+		if (!$this->id) $this->id = self::GLOBAL_ID;
 
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		// Store properties at top level, so all customfield widgets can share
-		if($this->attrs['app'])
+		if ($this->attrs['app'])
 		{
 			$app = $this->attrs['app'];
 		}
 		else
 		{
-			$app =& $this->getElementAttribute(self::GLOBAL_VALS, 'app');
-			if($this->getElementAttribute($form_name, 'app'))
+			$app = & $this->getElementAttribute(self::GLOBAL_VALS, 'app');
+			if ($this->getElementAttribute($form_name, 'app'))
 			{
-				$app =& $this->getElementAttribute($form_name, 'app');
+				$app = & $this->getElementAttribute($form_name, 'app');
 			}
 			else
 			{
@@ -112,21 +112,21 @@ 
 			}
 		}
 
-		if($this->getElementAttribute($form_name, 'customfields'))
+		if ($this->getElementAttribute($form_name, 'customfields'))
 		{
-			$customfields =& $this->getElementAttribute($form_name, 'customfields');
+			$customfields = & $this->getElementAttribute($form_name, 'customfields');
 		}
-		elseif($app)
+		elseif ($app)
 		{
 			// Checking creates it even if it wasn't there
 			unset(self::$request->modifications[$form_name]['customfields']);
-			$customfields =& $this->getElementAttribute(self::GLOBAL_VALS, 'customfields');
+			$customfields = & $this->getElementAttribute(self::GLOBAL_VALS, 'customfields');
 		}
 
-		if(!$app)
+		if (!$app)
 		{
-			$app =& $this->setElementAttribute(self::GLOBAL_VALS, 'app', $GLOBALS['egw_info']['flags']['currentapp']);
-			$customfields =& $this->setElementAttribute(self::GLOBAL_VALS, 'customfields', Api\Storage\Customfields::get($app));
+			$app = & $this->setElementAttribute(self::GLOBAL_VALS, 'app', $GLOBALS['egw_info']['flags']['currentapp']);
+			$customfields = & $this->setElementAttribute(self::GLOBAL_VALS, 'customfields', Api\Storage\Customfields::get($app));
 		}
 
 		// if we are in the etemplate editor or the app has no cf's, load the cf's from the app the tpl belongs too
@@ -134,29 +134,29 @@ 
 			($GLOBALS['egw_info']['flags']['currentapp'] == 'etemplate' || !$this->attrs['customfields']) || !isset($customfields))
 		{
 			// app changed
-			$customfields =& Api\Storage\Customfields::get($app);
+			$customfields = & Api\Storage\Customfields::get($app);
 		}
 		// Filter fields
-		if($this->attrs['field-names'])
+		if ($this->attrs['field-names'])
 		{
 			$fields_name = explode(',', $this->attrs['field-names']);
-			foreach($fields_name as &$f)
+			foreach ($fields_name as &$f)
 			{
 				if ($f[0] == "!")
 				{
-					$f= substr($f,1);
-					$negate_fields[]= $f;
+					$f = substr($f, 1);
+					$negate_fields[] = $f;
 				}
-				$field_filters []= $f;
+				$field_filters [] = $f;
 			}
 		}
 
 		$fields = $customfields;
 
-		$use_private = self::expand_name($this->attrs['use-private'],0,0,'','',self::$cont);
-		$this->attrs['sub-type'] = self::expand_name($this->attrs['sub-type'],0,0,'','',self::$cont);
+		$use_private = self::expand_name($this->attrs['use-private'], 0, 0, '', '', self::$cont);
+		$this->attrs['sub-type'] = self::expand_name($this->attrs['sub-type'], 0, 0, '', '', self::$cont);
 
-		foreach((array)$fields as $key => $field)
+		foreach ((array)$fields as $key => $field)
 		{
 			// remove private or non-private cf's, if only one kind should be displayed
 			if ((string)$use_private !== '' && (boolean)$field['private'] != (boolean)$use_private)
@@ -165,36 +165,36 @@ 
 			}
 
 			// Remove filtered fields
-			if($field_filters && in_array($key, $negate_fields) && in_array($key, $field_filters))
+			if ($field_filters && in_array($key, $negate_fields) && in_array($key, $field_filters))
 			{
 				unset($fields[$key]);
 			}
 		}
 		// check if name refers to a single custom field --> show only that
 		$matches = null;
-		if (($pos=strpos($form_name,self::$prefix)) !== false && // allow the prefixed name to be an array index too
-			preg_match($preg = '/'.self::$prefix.'([^\]]+)/',$form_name,$matches) && isset($fields[$name=$matches[1]]))
+		if (($pos = strpos($form_name, self::$prefix)) !== false && // allow the prefixed name to be an array index too
+			preg_match($preg = '/'.self::$prefix.'([^\]]+)/', $form_name, $matches) && isset($fields[$name = $matches[1]]))
 		{
 			$fields = array($name => $fields[$name]);
 			$value = array(self::$prefix.$name => $value);
 			$form_name = self::$prefix.$name;
 		}
 
-		if(!is_array($fields)) $fields = array();
-		switch($type = $this->type)
+		if (!is_array($fields)) $fields = array();
+		switch ($type = $this->type)
 		{
 			case 'customfields-types':
-				foreach(self::$cf_types as $lname => $label)
+				foreach (self::$cf_types as $lname => $label)
 				{
 					$sel_options[$lname] = lang($label);
-					$fields_with_vals[]=$lname;
+					$fields_with_vals[] = $lname;
 				}
 				$link_types = array_intersect_key(Api\Link::app_list('query'), Api\Link::app_list('title'));
 				// Explicitly add in filemanager, which does not support query or title
 				$link_types['filemanager'] = lang('filemanager');
 
 				ksort($link_types);
-				foreach($link_types as $lname => $label)
+				foreach ($link_types as $lname => $label)
 				{
 					$sel_options[$lname] = '- '.$label;
 				}
@@ -202,32 +202,32 @@ 
 				self::$transformation['type'][$type]['no_lang'] = true;
 				return parent::beforeSendToClient($cname, $expand);
 			case 'customfields-list':
-				foreach(array_reverse($fields) as $lname => $field)
+				foreach (array_reverse($fields) as $lname => $field)
 				{
 					if (!empty($this->attrs['sub-type']) && !empty($field['type2']) &&
-						strpos(','.$field['type2'].',',','.$field['type2'].',') === false) continue;    // not for our content type//
+						strpos(','.$field['type2'].',', ','.$field['type2'].',') === false) continue; // not for our content type//
 					if (isset($value[self::$prefix.$lname]) && $value[self::$prefix.$lname] !== '') //break;
 					{
-						$fields_with_vals[]=$lname;
+						$fields_with_vals[] = $lname;
 					}
 					//$stop_at_field = $name;
 				}
 				break;
 			default:
-				foreach(array_reverse($fields) as $lname => $field)
+				foreach (array_reverse($fields) as $lname => $field)
 				{
-					$fields_with_vals[]=$lname;
+					$fields_with_vals[] = $lname;
 				}
 		}
 		// need to encode values/select-options to keep their order
-		foreach($customfields as &$data)
+		foreach ($customfields as &$data)
 		{
 			if (!empty($data['values']))
 			{
 				Select::fix_encoded_options($data['values']);
 			}
 		}
-		if($fields != $customfields)
+		if ($fields != $customfields)
 		{
 			// This widget has different settings from global
 			$this->setElementAttribute($form_name, 'customfields', $fields);
@@ -239,14 +239,14 @@ 
 		parent::beforeSendToClient($cname, $expand);
 
 		// Re-format date custom fields from Y-m-d
-		$field_settings =& self::get_array(self::$request->modifications, "{$this->id}[customfields]",true);
+		$field_settings = & self::get_array(self::$request->modifications, "{$this->id}[customfields]", true);
 		if (true) $field_settings = array();
 		$link_types = Api\Link::app_list();
-		foreach($fields as $fname => $field)
+		foreach ($fields as $fname => $field)
 		{
 			// Run beforeSendToClient for each field
 			$widget = $this->_widget($fname, $field);
-			if(method_exists($widget, 'beforeSendToClient'))
+			if (method_exists($widget, 'beforeSendToClient'))
 			{
 				$widget->beforeSendToClient($this->id == self::GLOBAL_ID ? '' : $this->id, $expand);
 			}
@@ -263,13 +263,13 @@ 
 	protected function _widget($fname, array $field)
 	{
 		static $link_types = null;
-		if (!isset($link_types)) $link_types = Api\Link::app_list ();
+		if (!isset($link_types)) $link_types = Api\Link::app_list();
 
 		$type = $field['type'];
 		// Link-tos needs to change from appname to link-to
-		if($link_types[$field['type']])
+		if ($link_types[$field['type']])
 		{
-			if($type == 'filemanager')
+			if ($type == 'filemanager')
 			{
 				$type = 'vfs-upload';
 			}
@@ -285,18 +285,18 @@ 
 		$widget->set_attrs($xml);
 		
 		// some type-specific (default) attributes
-		switch($type)
+		switch ($type)
 		{
 			case 'date':
 			case 'date-time':
 				$widget->attrs['dataformat'] = $type == 'date' ? 'Y-m-d' : 'Y-m-d H:i:s';
-				if($field['values']['min']) $widget->attrs['min'] = $field['values']['min'];
-				if($field['values']['max']) $widget->attrs['min'] = $field['values']['max'];
+				if ($field['values']['min']) $widget->attrs['min'] = $field['values']['min'];
+				if ($field['values']['max']) $widget->attrs['min'] = $field['values']['max'];
 				break;
 
 			case 'vfs-upload':
-				$widget->attrs['path'] = $field['app'] . ':' .
-					self::expand_name('$cont['.Api\Link::get_registry($field['app'],'view_id').']',0,0,0,0,self::$request->content).
+				$widget->attrs['path'] = $field['app'].':'.
+					self::expand_name('$cont['.Api\Link::get_registry($field['app'], 'view_id').']', 0, 0, 0, 0, self::$request->content).
 					':'.$field['label'];
 				break;
 
@@ -355,7 +355,7 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		if ($this->id)
 		{
@@ -371,14 +371,14 @@ 
 		// if we have no id / use self::GLOBAL_ID, we have to set $value_in in global namespace for regular widgets validation to find
 		if (!$this->id) $content = array_merge($content, $value_in);
 		//error_log(__METHOD__."($cname, ...) form_name=$form_name, use-private={$this->attrs['use-private']}, value_in=".array2string($value_in));
-		$customfields =& $this->getElementAttribute(self::GLOBAL_VALS, 'customfields');
-		if(is_array($value_in))
+		$customfields = & $this->getElementAttribute(self::GLOBAL_VALS, 'customfields');
+		if (is_array($value_in))
 		{
-			foreach($value_in as $field => $value)
+			foreach ($value_in as $field => $value)
 			{
-				$field_settings = $customfields[$fname=substr($field,1)];
+				$field_settings = $customfields[$fname = substr($field, 1)];
 
-				if ((string)$this->attrs['use-private'] !== '' &&	// are only (non-)private fields requested
+				if ((string)$this->attrs['use-private'] !== '' && // are only (non-)private fields requested
 					(boolean)$field_settings['private'] != ($this->attrs['use-private'] != '0'))
 				{
 					continue;
@@ -396,8 +396,8 @@ 
 				// widget has no validate method, eg. is only displaying stuff --> nothing to validate
 				if (!method_exists($widget, 'validate')) continue;
 				$widget->validate($form_name != self::GLOBAL_ID ? $form_name : $cname, $expand, $content, $validated);
-				$field_name = $this->id[0] == self::$prefix && $customfields[substr($this->id,1)] ? $this->id : self::form_name($form_name != self::GLOBAL_ID ? $form_name : $cname, $field);
-				$valid =& self::get_array($validated, $field_name, true);
+				$field_name = $this->id[0] == self::$prefix && $customfields[substr($this->id, 1)] ? $this->id : self::form_name($form_name != self::GLOBAL_ID ? $form_name : $cname, $field);
+				$valid = & self::get_array($validated, $field_name, true);
 
 				if (is_array($valid)) $valid = implode(',', $valid);
 				// NULL is valid for most fields, but not custom fields due to backend handling
@@ -409,7 +409,7 @@ 
 		elseif ($this->type == 'customfields-types')
 		{
 			// Transformation doesn't handle validation
-			$valid =& self::get_array($validated, $this->id ? $form_name : $field, true);
+			$valid = & self::get_array($validated, $this->id ? $form_name : $field, true);
 			if (true) $valid = $value_in;
 			//error_log(__METHOD__."() $form_name $field: ".array2string($value).' --> '.array2string($value));
 		}

Braces +57 added lines, -14 removed lines

@@ -89,7 +89,10 @@ 
 	public function beforeSendToClient($cname, array $expand=null)
 	{
 		// No name, no way to get parameters client-side.
-		if(!$this->id) $this->id = self::GLOBAL_ID;
+		if(!$this->id)
+		{
+			$this->id = self::GLOBAL_ID;
+		}
 
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -180,7 +183,10 @@ 
 			$form_name = self::$prefix.$name;
 		}
 
-		if(!is_array($fields)) $fields = array();
+		if(!is_array($fields))
+		{
+			$fields = array();
+		}
 		switch($type = $this->type)
 		{
 			case 'customfields-types':
@@ -205,11 +211,18 @@ 
 				foreach(array_reverse($fields) as $lname => $field)
 				{
 					if (!empty($this->attrs['sub-type']) && !empty($field['type2']) &&
-						strpos(','.$field['type2'].',',','.$field['type2'].',') === false) continue;    // not for our content type//
-					if (isset($value[self::$prefix.$lname]) && $value[self::$prefix.$lname] !== '') //break;
+						strpos(','.$field['type2'].',',','.$field['type2'].',') === false)
+					{
+						continue;
+					}
+					// not for our content type//
+					if (isset($value[self::$prefix.$lname]) && $value[self::$prefix.$lname] !== '')
+					{
+						//break;
 					{
 						$fields_with_vals[]=$lname;
 					}
+					}
 					//$stop_at_field = $name;
 				}
 				break;
@@ -240,7 +253,10 @@ 
 
 		// Re-format date custom fields from Y-m-d
 		$field_settings =& self::get_array(self::$request->modifications, "{$this->id}[customfields]",true);
-		if (true) $field_settings = array();
+		if (true)
+		{
+			$field_settings = array();
+		}
 		$link_types = Api\Link::app_list();
 		foreach($fields as $fname => $field)
 		{
@@ -263,7 +279,10 @@ 
 	protected function _widget($fname, array $field)
 	{
 		static $link_types = null;
-		if (!isset($link_types)) $link_types = Api\Link::app_list ();
+		if (!isset($link_types))
+		{
+			$link_types = Api\Link::app_list ();
+		}
 
 		$type = $field['type'];
 		// Link-tos needs to change from appname to link-to
@@ -290,8 +309,14 @@ 
 			case 'date':
 			case 'date-time':
 				$widget->attrs['dataformat'] = $type == 'date' ? 'Y-m-d' : 'Y-m-d H:i:s';
-				if($field['values']['min']) $widget->attrs['min'] = $field['values']['min'];
-				if($field['values']['max']) $widget->attrs['min'] = $field['values']['max'];
+				if($field['values']['min'])
+				{
+					$widget->attrs['min'] = $field['values']['min'];
+				}
+				if($field['values']['max'])
+				{
+					$widget->attrs['min'] = $field['values']['max'];
+				}
 				break;
 
 			case 'vfs-upload':
@@ -308,7 +333,10 @@ 
 				break;
 
 			default:
-				if (substr($type, 0, 7) !== 'select-' && $type != 'ajax_select') break;
+				if (substr($type, 0, 7) !== 'select-' && $type != 'ajax_select')
+				{
+					break;
+				}
 				// fall-through for all select-* widgets
 			case 'select':
 				$this->attrs['multiple'] = $field['rows'] > 1;
@@ -369,7 +397,10 @@ 
 		$all_readonly = $this->is_readonly($cname, $form_name);
 		$value_in = self::get_array($content, $form_name);
 		// if we have no id / use self::GLOBAL_ID, we have to set $value_in in global namespace for regular widgets validation to find
-		if (!$this->id) $content = array_merge($content, $value_in);
+		if (!$this->id)
+		{
+			$content = array_merge($content, $value_in);
+		}
 		//error_log(__METHOD__."($cname, ...) form_name=$form_name, use-private={$this->attrs['use-private']}, value_in=".array2string($value_in));
 		$customfields =& $this->getElementAttribute(self::GLOBAL_VALS, 'customfields');
 		if(is_array($value_in))
@@ -394,15 +425,24 @@ 
 				// run validation method of widget implementing this custom field
 				$widget = $this->_widget($fname, $field_settings);
 				// widget has no validate method, eg. is only displaying stuff --> nothing to validate
-				if (!method_exists($widget, 'validate')) continue;
+				if (!method_exists($widget, 'validate'))
+				{
+					continue;
+				}
 				$widget->validate($form_name != self::GLOBAL_ID ? $form_name : $cname, $expand, $content, $validated);
 				$field_name = $this->id[0] == self::$prefix && $customfields[substr($this->id,1)] ? $this->id : self::form_name($form_name != self::GLOBAL_ID ? $form_name : $cname, $field);
 				$valid =& self::get_array($validated, $field_name, true);
 
-				if (is_array($valid)) $valid = implode(',', $valid);
+				if (is_array($valid))
+				{
+					$valid = implode(',', $valid);
+				}
 				// NULL is valid for most fields, but not custom fields due to backend handling
 				// See so_sql_cf->save()
-				if (is_null($valid)) $valid = false;
+				if (is_null($valid))
+				{
+					$valid = false;
+				}
 				//error_log(__METHOD__."() $field_name: ".array2string($value).' --> '.array2string($valid));
 			}
 		}
@@ -410,7 +450,10 @@ 
 		{
 			// Transformation doesn't handle validation
 			$valid =& self::get_array($validated, $this->id ? $form_name : $field, true);
-			if (true) $valid = $value_in;
+			if (true)
+			{
+				$valid = $value_in;
+			}
 			//error_log(__METHOD__."() $form_name $field: ".array2string($value).' --> '.array2string($value));
 		}
 	}

infolog/inc/class.infolog_so.inc.php

Spacing +160 added lines, -161 removed lines

@@ -71,7 +71,7 @@ 
 	 * @param array $grants =array()
 	 * @return soinfolog
 	 */
-	function __construct( $grants=array() )
+	function __construct($grants = array())
 	{
 		$this->db     = clone($GLOBALS['egw']->db);
 		$this->db->set_app('infolog');
@@ -87,18 +87,18 @@ 
 	 * @param array $info infolog entry as array
 	 * @return boolean
 	 */
-	function is_responsible($info,$user=null)
+	function is_responsible($info, $user = null)
 	{
 		if (!$user) $user = $this->user;
 
 		static $um_cache = array();
-		if ($user == $this->user) $user_and_memberships =& $um_cache[$user];
+		if ($user == $this->user) $user_and_memberships = & $um_cache[$user];
 		if (!isset($user_and_memberships))
 		{
-			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user,true);
+			$user_and_memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$user_and_memberships[] = $user;
 		}
-		return $info['info_responsible'] && array_intersect((array)$info['info_responsible'],$user_and_memberships);
+		return $info['info_responsible'] && array_intersect((array)$info['info_responsible'], $user_and_memberships);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @param int $user =null user to check, default (null) $this->user
 	 * @return boolean True if access is granted else False
 	 */
-	function check_access( $info,$required_rights,$implicit_edit=false,array $grants=null,$user=null )
+	function check_access($info, $required_rights, $implicit_edit = false, array $grants = null, $user = null)
 	{
 		if (is_null($grants)) $grants = $this->grants;
 		if (!$user) $user = $this->user;
@@ -123,7 +123,7 @@ 
 		{
 
 		}
-		elseif ((int) $info != $this->data['info_id'])      	// already loaded?
+		elseif ((int)$info != $this->data['info_id'])      	// already loaded?
 		{
 			// dont change our own internal data,
 			$backup_data = $this->data;
@@ -139,12 +139,12 @@ 
 			return False;
 		}
 		$owner = $info['info_owner'];
-		$access_ok = $owner == $user ||	// user has all rights
+		$access_ok = $owner == $user || // user has all rights
 			// ACL only on public entrys || $owner granted _PRIVATE
-			(!!($grants[$owner] & $required_rights) ||
-				$this->is_responsible($info,$user) &&	// implicite rights for responsible user(s) and his memberships
+			(!!($grants[$owner]&$required_rights) ||
+				$this->is_responsible($info, $user) && // implicite rights for responsible user(s) and his memberships
 				($required_rights == Acl::READ || $required_rights == Acl::ADD || $implicit_edit && $required_rights == Acl::EDIT)) &&
-			($info['info_access'] == 'public' || !!($this->grants[$user] & Acl::PRIVAT));
+			($info['info_access'] == 'public' || !!($this->grants[$user]&Acl::PRIVAT));
 
 		// error_log(__METHOD__."($info[info_id],$required_rights,$implicit_edit,".array2string($grants).",$user) returning ".array2string($access_ok));
 		return $access_ok;
@@ -163,23 +163,22 @@ 
 		if (!$users) return '0';
 
 		$responsible = array();
-		foreach((array)$users as $user)
+		foreach ((array)$users as $user)
 		{
-			$responsible = array_merge($responsible,(array)
-				($user > 0 ? $GLOBALS['egw']->accounts->memberships($user,true) :
-					$GLOBALS['egw']->accounts->members($user,true)));
+			$responsible = array_merge($responsible, (array)
+				($user > 0 ? $GLOBALS['egw']->accounts->memberships($user, true) : $GLOBALS['egw']->accounts->members($user, true)));
 			$responsible[] = $user;
 		}
 		if (is_array($users))
 		{
 			$responsible = array_unique($responsible);
 		}
-		foreach($responsible as $key => $uid)
+		foreach ($responsible as $key => $uid)
 		{
-			$responsible[$key] = $this->db->concat("','",'info_responsible',"','")." LIKE '%,$uid,%'";
+			$responsible[$key] = $this->db->concat("','", 'info_responsible', "','")." LIKE '%,$uid,%'";
 		}
 		//echo "<p align=right>responsible_filter($user) = ".'('.implode(' OR ',$responsible).')'."</p>\n";
-		return '('.implode(' OR ',$responsible).')';
+		return '('.implode(' OR ', $responsible).')';
 	}
 
 	/**
@@ -194,17 +193,17 @@ 
 	function aclFilter($_filter = False)
 	{
 		$vars = null;
-		preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)/',$_filter,$vars);
+		preg_match('/(my|responsible|delegated|own|privat|private|all|user)([0-9,-]*)/', $_filter, $vars);
 		$filter = $vars[1];
 		$f_user = $vars[2];
 
 		if (isset($this->acl_filter[$filter.$f_user]))
 		{
-			return $this->acl_filter[$filter.$f_user];  // used cached filter if found
+			return $this->acl_filter[$filter.$f_user]; // used cached filter if found
 		}
-		if ($f_user && strpos($f_user,',') !== false)
+		if ($f_user && strpos($f_user, ',') !== false)
 		{
-			$f_user = explode(',',$f_user);
+			$f_user = explode(',', $f_user);
 		}
 
 		$filtermethod = " (info_owner=$this->user"; // user has all rights
@@ -221,24 +220,24 @@ 
 		{
 			if (is_array($this->grants))
 			{
-				foreach($this->grants as $user => $grant)
+				foreach ($this->grants as $user => $grant)
 				{
 					// echo "<p>grants: user=$user, grant=$grant</p>";
-					if ($grant & (EGW_ACL_READ|EGW_ACL_EDIT))
+					if ($grant&(EGW_ACL_READ|EGW_ACL_EDIT))
 					{
 						$public_user_list[] = $user;
 					}
-					if ($grant & Acl::PRIVAT)
+					if ($grant&Acl::PRIVAT)
 					{
 						$private_user_list[] = $user;
 					}
 				}
 				if (count($private_user_list))
 				{
-					$has_private_access = $this->db->expression($this->info_table,array('info_owner' => $private_user_list));
+					$has_private_access = $this->db->expression($this->info_table, array('info_owner' => $private_user_list));
 				}
 			}
-			$public_access = $this->db->expression($this->info_table,array('info_owner' => $public_user_list));
+			$public_access = $this->db->expression($this->info_table, array('info_owner' => $public_user_list));
 			// implicit read-rights for responsible user
 			$filtermethod .= " OR (".$this->responsible_filter($this->user).')';
 
@@ -246,9 +245,9 @@ 
 			if ($filter == 'private' || $filter == 'privat' || $filter == 'own')
 			{
 				$filtermethod .= " OR (".$this->responsible_filter($this->user).
-					($filter == 'own' && count($public_user_list) ?	// offer's should show up in own, eg. startpage, but need read-access
+					($filter == 'own' && count($public_user_list) ? // offer's should show up in own, eg. startpage, but need read-access
 						" OR info_status = 'offer' AND $public_access" : '').")".
-				                 " AND (info_access='public'".($has_private_access?" OR $has_private_access":'').')';
+				                 " AND (info_access='public'".($has_private_access ? " OR $has_private_access" : '').')';
 			}
 			elseif ($filter != 'my' && $filter != 'responsible')	// none --> all entrys user has rights to see
 			{
@@ -265,13 +264,13 @@ 
 
 			if ($filter == 'user' && $f_user)
 			{
-				$filtermethod .= $this->db->expression($this->info_table,' AND (',array(
+				$filtermethod .= $this->db->expression($this->info_table, ' AND (', array(
 					'info_owner' => $f_user,
-				)," AND info_responsible='0' OR ",$this->responsible_filter($f_user),')');
+				), " AND info_responsible='0' OR ", $this->responsible_filter($f_user), ')');
 			}
 		}
 		//echo "<p>aclFilter(filter='$_filter',user='$f_user') = '$filtermethod', privat_user_list=".print_r($privat_user_list,True).", public_user_list=".print_r($public_user_list,True)."</p>\n";
-		return $this->acl_filter[$filter.$f_user] = $filtermethod;  // cache the filter
+		return $this->acl_filter[$filter.$f_user] = $filtermethod; // cache the filter
 	}
 
 	/**
@@ -281,18 +280,18 @@ 
 	 * @param boolean $prefix_and =true if true prefix the fileter with ' AND '
 	 * @return string the necesary sql
 	 */
-	function statusFilter($_filter = '',$prefix_and=true)
+	function statusFilter($_filter = '', $prefix_and = true)
 	{
 		$vars = null;
-		preg_match('/(done|open|offer|deleted|\+deleted)/',$_filter,$vars);
+		preg_match('/(done|open|offer|deleted|\+deleted)/', $_filter, $vars);
 		$filter = $vars[1];
 
 		switch ($filter)
 		{
 			case 'done':	$filter = "info_status IN ('done','billed','cancelled')"; break;
 			case 'open':	$filter = "NOT (info_status IN ('done','billed','cancelled','deleted','template','nonactive','archive'))"; break;
-			case 'offer':	$filter = "info_status = 'offer'";    break;
-			case 'deleted': $filter = "info_status = 'deleted'";  break;
+			case 'offer':	$filter = "info_status = 'offer'"; break;
+			case 'deleted': $filter = "info_status = 'deleted'"; break;
 			case '+deleted':$filter = "NOT (info_status IN ('template','nonactive','archive'))"; break;
 			default:        $filter = "NOT (info_status IN ('deleted','template','nonactive','archive'))"; break;
 		}
@@ -313,18 +312,18 @@ 
 	function dateFilter($_filter = '')
 	{
 		$vars = null;
-		preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/',$_filter,$vars);
+		preg_match('/(open-upcoming|upcoming|today|overdue|date|enddate)([-\\/.0-9]*)/', $_filter, $vars);
 		$filter = $vars[1];
 
-		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/',$vars[2])))
+		if (isset($vars[2]) && !empty($vars[2]) && ($date = preg_split('/[-\\/.]/', $vars[2])))
 		{
-			$today = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2]),intval($date[0]));
-			$tomorrow = mktime(-$this->tz_offset,0,0,intval($date[1]),intval($date[2])+1,intval($date[0]));
+			$today = mktime(-$this->tz_offset, 0, 0, intval($date[1]), intval($date[2]), intval($date[0]));
+			$tomorrow = mktime(-$this->tz_offset, 0, 0, intval($date[1]), intval($date[2]) + 1, intval($date[0]));
 		}
 		else
 		{
-			$now = getdate(time()-60*60*$this->tz_offset);
-			$tomorrow = mktime(-$this->tz_offset,0,0,$now['mon'],$now['mday']+1,$now['year']);
+			$now = getdate(time() - 60 * 60 * $this->tz_offset);
+			$tomorrow = mktime(-$this->tz_offset, 0, 0, $now['mon'], $now['mday'] + 1, $now['year']);
 		}
 		switch ($filter)
 		{
@@ -388,7 +387,7 @@ 
 			$minimum_uid_length = 8;
 		}
 
-		if (!$where || !($this->data = $this->db->select($this->info_table,'*',$where,__LINE__,__FILE__)->fetch()))
+		if (!$where || !($this->data = $this->db->select($this->info_table, '*', $where, __LINE__, __FILE__)->fetch()))
 		{
 			$this->init( );
 			//error_log(__METHOD__.'('.array2string($where).') returning FALSE');
@@ -400,15 +399,15 @@ 
 			$this->data['info_uid'] = Api\CalDAV::generate_uid('infolog', $this->data['info_id']);
 			$this->db->update($this->info_table,
 				array('info_uid' => $this->data['info_uid']),
-				array('info_id' => $this->data['info_id']), __LINE__,__FILE__);
+				array('info_id' => $this->data['info_id']), __LINE__, __FILE__);
 		}
 		if (!is_array($this->data['info_responsible']))
 		{
-			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',',$this->data['info_responsible']) : array();
+			$this->data['info_responsible'] = $this->data['info_responsible'] ? explode(',', $this->data['info_responsible']) : array();
 		}
 		// Cast back to integer
 		$this->data['info_id_parent'] = (int)$this->data['info_id_parent'];
-		foreach($this->db->select($this->extra_table,'info_extra_name,info_extra_value',array('info_id'=>$this->data['info_id']),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->extra_table, 'info_extra_name,info_extra_value', array('info_id'=>$this->data['info_id']), __LINE__, __FILE__) as $row)
 		{
 			$this->data['#'.$row['info_extra_name']] = $row['info_extra_value'];
 		}
@@ -423,16 +422,16 @@ 
 	 * @param boolean $delete_children delete the children, if not set there parent-id to $new_parent
 	 * @param int $new_parent new parent-id to set for subs
 	 */
-	function delete($info_id,$delete_children=True,$new_parent=0)  // did _not_ ensure ACL
+	function delete($info_id, $delete_children = True, $new_parent = 0)  // did _not_ ensure ACL
 	{
 		//echo "<p>soinfolog::delete($info_id,'$delete_children',$new_parent)</p>\n";
-		if ((int) $info_id <= 0)
+		if ((int)$info_id <= 0)
 		{
 			return;
 		}
-		$this->db->delete($this->info_table,array('info_id'=>$info_id),__LINE__,__FILE__);
-		$this->db->delete($this->extra_table,array('info_id'=>$info_id),__LINE__,__FILE__);
-		Link::unlink(0,'infolog',$info_id);
+		$this->db->delete($this->info_table, array('info_id'=>$info_id), __LINE__, __FILE__);
+		$this->db->delete($this->extra_table, array('info_id'=>$info_id), __LINE__, __FILE__);
+		Link::unlink(0, 'infolog', $info_id);
 
 		if ($this->data['info_id'] == $info_id)
 		{
@@ -441,17 +440,17 @@ 
 		// delete children, if they are owned by the user
 		if ($delete_children)
 		{
-			$db2 = clone($this->db);	// we need an extra result-set
-			foreach($db2->select($this->info_table,'info_id',array(
+			$db2 = clone($this->db); // we need an extra result-set
+			foreach ($db2->select($this->info_table, 'info_id', array(
 					'info_id_parent'	=> $info_id,
 					'info_owner'		=> $this->user,
-				),__LINE__,__FILE__) as $row)
+				), __LINE__, __FILE__) as $row)
 			{
 				$this->delete($row['info_id'], $delete_children);
 			}
 		}
 		// set parent_id to $new_parent or 0 for all not deleted children
-		$this->db->update($this->info_table,array('info_id_parent'=>$new_parent),array('info_id_parent'=>$info_id),__LINE__,__FILE__);
+		$this->db->update($this->info_table, array('info_id_parent'=>$new_parent), array('info_id_parent'=>$info_id), __LINE__, __FILE__);
 	}
 
 	/**
@@ -463,9 +462,9 @@ 
 	function get_children($info_id)
 	{
 		$children = array();
-		foreach($this->db->select($this->info_table, 'info_id,info_owner', array(
+		foreach ($this->db->select($this->info_table, 'info_id,info_owner', array(
 			'info_id_parent'	=> $info_id,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$children[$row['info_id']] = $row['info_owner'];
 		}
@@ -481,27 +480,27 @@ 
 	 */
 	function change_delete_owner(array $args)  // new_owner=0 means delete
 	{
-		if (!(int) $args['new_owner'])
+		if (!(int)$args['new_owner'])
 		{
-			foreach($this->db->select($this->info_table,'info_id',array('info_owner'=>$args['account_id']),__LINE__,__FILE__,false,'','infolog') as $row)
+			foreach ($this->db->select($this->info_table, 'info_id', array('info_owner'=>$args['account_id']), __LINE__, __FILE__, false, '', 'infolog') as $row)
 			{
-				$this->delete($row['info_id'],False);
+				$this->delete($row['info_id'], False);
 			}
 		}
 		else
 		{
-			$this->db->update($this->info_table,array('info_owner'=>$args['new_owner']),array('info_owner'=>$args['account_id']),__LINE__,__FILE__,'infolog');
+			$this->db->update($this->info_table, array('info_owner'=>$args['new_owner']), array('info_owner'=>$args['account_id']), __LINE__, __FILE__, 'infolog');
 		}
-		foreach($this->db->select($this->info_table,'info_id,info_responsible',
-			$this->db->concat("','",'info_responsible',"','").' LIKE '.$this->db->quote('%,'.(int)$args['account_id'].',%'),
-			__LINE__,__FILE__,false,'','infolog') as $row)
+		foreach ($this->db->select($this->info_table, 'info_id,info_responsible',
+			$this->db->concat("','", 'info_responsible', "','").' LIKE '.$this->db->quote('%,'.(int)$args['account_id'].',%'),
+			__LINE__, __FILE__, false, '', 'infolog') as $row)
 		{
-			$new_responsible = explode(',',$row['info_responsible']);
-			unset($new_responsible[array_search($args['account_id'],$new_responsible)]);
+			$new_responsible = explode(',', $row['info_responsible']);
+			unset($new_responsible[array_search($args['account_id'], $new_responsible)]);
 			if ((int)$args['new_owner']) $new_responsible[] = (int)$args['new_owner'];
-			$this->db->update($this->info_table,array(
-				'info_responsible' => implode(',',$new_responsible),
-			),array('info_id' => $row['info_id']),__LINE__,__FILE__,'infolog');
+			$this->db->update($this->info_table, array(
+				'info_responsible' => implode(',', $new_responsible),
+			), array('info_id' => $row['info_id']), __LINE__, __FILE__, 'infolog');
 		}
 	}
 
@@ -514,7 +513,7 @@ 
 	 * @param boolean $force_insert =false force using insert, even if an id is given eg. for import
 	 * @return int|boolean info_id, false on error or 0 if the entry has been updated in the meantime
 	 */
-	function write($values, $check_modified=0, $purge_cfs=null, $force_insert=false)  // did _not_ ensure ACL
+	function write($values, $check_modified = 0, $purge_cfs = null, $force_insert = false)  // did _not_ ensure ACL
 	{
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
@@ -526,19 +525,19 @@ 
 		}
 
 		//echo "soinfolog::write(,$check_modified) values="; _debug_array($values);
-		$info_id = (int) $values['info_id'];
+		$info_id = (int)$values['info_id'];
 
-		if (array_key_exists('info_responsible',$values))	// isset($values['info_responsible']) returns false for NULL!
+		if (array_key_exists('info_responsible', $values))	// isset($values['info_responsible']) returns false for NULL!
 		{
-			$values['info_responsible'] = $values['info_responsible'] ? implode(',',$values['info_responsible']) : '0';
+			$values['info_responsible'] = $values['info_responsible'] ? implode(',', $values['info_responsible']) : '0';
 		}
-		$table_def = $this->db->get_table_definitions('infolog',$this->info_table);
+		$table_def = $this->db->get_table_definitions('infolog', $this->info_table);
 		$to_write = array();
-		foreach($values as $key => $val)
+		foreach ($values as $key => $val)
 		{
 			if (($key != 'info_id' || $force_insert && $info_id > 0) && isset($table_def['fd'][$key]))
 			{
-				$to_write[$key] = $this->data[$key] = $val;   // update internal data
+				$to_write[$key] = $this->data[$key] = $val; // update internal data
 			}
 		}
 		// writing no price as SQL NULL (required by postgres)
@@ -548,23 +547,23 @@ 
 		{
 			$where = array('info_id' => $info_id);
 			if ($check_modified) $where['info_datemodified'] = $check_modified;
-			if (!$this->db->update($this->info_table,$to_write,$where,__LINE__,__FILE__))
+			if (!$this->db->update($this->info_table, $to_write, $where, __LINE__, __FILE__))
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning false");
-				return false;	// Error
+				return false; // Error
 			}
 			if ($check_modified && $this->db->affected_rows() < 1)
 			{
 				//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning 0 (nothing updated, eg. condition not met)");
-				return 0;	// someone else updated the modtime or deleted the entry
+				return 0; // someone else updated the modtime or deleted the entry
 			}
 		}
 		else
 		{
-			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0;	// must not be null
+			if (!isset($to_write['info_id_parent'])) $to_write['info_id_parent'] = 0; // must not be null
 
-			$this->db->insert($this->info_table,$to_write,false,__LINE__,__FILE__);
-			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table,'info_id');
+			$this->db->insert($this->info_table, $to_write, false, __LINE__, __FILE__);
+			$info_id = $this->data['info_id'] = $this->db->get_last_insert_id($this->info_table, 'info_id');
 		}
 
 		$update = array();
@@ -580,8 +579,8 @@ 
 		}
 		if ($update)
 		{
-			$this->db->update($this->info_table,$update,
-				array('info_id' => $info_id), __LINE__,__FILE__);
+			$this->db->update($this->info_table, $update,
+				array('info_id' => $info_id), __LINE__, __FILE__);
 		}
 
 		//echo "<p>soinfolog.write values= "; _debug_array($values);
@@ -591,38 +590,38 @@ 
 		{
 			$where = array('info_id' => $info_id);
 			if ($purge_cfs == 'ical') $where[] = "info_extra_name LIKE '#%'";
-			$this->db->delete($this->extra_table,$where,__LINE__,__FILE__);
+			$this->db->delete($this->extra_table, $where, __LINE__, __FILE__);
 		}
 		$to_delete = array();
-		foreach($values as $key => $val)
+		foreach ($values as $key => $val)
 		{
 			if ($key[0] != '#')
 			{
-				continue;	// no customfield
+				continue; // no customfield
 			}
-			$this->data[$key] = $val;	// update internal data
+			$this->data[$key] = $val; // update internal data
 
 			if ($val)
 			{
-				$this->db->insert($this->extra_table,array(
+				$this->db->insert($this->extra_table, array(
 						// store multivalued CalDAV properties as serialized array, everything else get comma-separated
-						'info_extra_value'	=> is_array($val) ? ($key[1] == '#' ? serialize($val) : implode(',',$val)) : $val,
-					),array(
+						'info_extra_value'	=> is_array($val) ? ($key[1] == '#' ? serialize($val) : implode(',', $val)) : $val,
+					), array(
 						'info_id'			=> $info_id,
-						'info_extra_name'	=> substr($key,1),
-					),__LINE__,__FILE__);
+						'info_extra_name'	=> substr($key, 1),
+					), __LINE__, __FILE__);
 			}
 			else
 			{
-				$to_delete[] = substr($key,1);
+				$to_delete[] = substr($key, 1);
 			}
 		}
 		if ($to_delete && !$purge_cfs)
 		{
-			$this->db->delete($this->extra_table,array(
+			$this->db->delete($this->extra_table, array(
 					'info_id'			=> $info_id,
 					'info_extra_name'	=> $to_delete,
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 		}
 		// echo "<p>soinfolog.write this->data= "; _debug_array($this->data);
 		//error_log("### soinfolog::write(".print_r($to_write,true).") where=".print_r($where,true)." returning id=".$this->data['info_id']);
@@ -638,18 +637,18 @@ 
 	 * @param int|array $info_id id(s) of log-entry
 	 * @return int|array the number of sub-entries or indexed by info_id, if array as param given
 	 */
-	function anzSubs( $info_id )
+	function anzSubs($info_id)
 	{
 		if (!is_array($info_id) || !$info_id)
 		{
 			if ((int)$info_id <= 0) return 0;
 		}
 		$counts = array();
-		foreach($this->db->select($this->info_table,'info_id_parent,COUNT(*) AS info_anz_subs',array(
+		foreach ($this->db->select($this->info_table, 'info_id_parent,COUNT(*) AS info_anz_subs', array(
 			'info_id_parent' => $info_id,
-			"info_status != 'deleted'",	// dont count deleted subs as subs, as they are not shown by default
-		),__LINE__,__FILE__,
-			false,'GROUP BY info_id_parent','infolog') as $row)
+			"info_status != 'deleted'", // dont count deleted subs as subs, as they are not shown by default
+		), __LINE__, __FILE__,
+			false, 'GROUP BY info_id_parent', 'infolog') as $row)
 		{
 			$counts[$row['info_id_parent']] = (int)$row['info_anz_subs'];
 		}
@@ -676,7 +675,7 @@ 
 	 * @param boolean $no_acl =false true: ignore all acl
 	 * @return array|iterator with id's as key of the matching log-entries or recordset/iterator if cols is set
 	 */
-	function search(&$query, $no_acl=false)
+	function search(&$query, $no_acl = false)
 	{
 		//error_log(__METHOD__.'('.array2string($query).')');
 		$action2app = array(
@@ -690,102 +689,102 @@ 
 			$action = isset($action2app[$query['action']]) ? $action2app[$query['action']] : $query['action'];
 			if ($action)
 			{
-				$links = Link\Storage::get_links($action=='sp'?'infolog':$action,
-					is_array($query['action_id']) ? $query['action_id'] : explode(',',$query['action_id']),'infolog','',$query['col_filter']['info_status'] =='deleted');
+				$links = Link\Storage::get_links($action == 'sp' ? 'infolog' : $action,
+					is_array($query['action_id']) ? $query['action_id'] : explode(',', $query['action_id']), 'infolog', '', $query['col_filter']['info_status'] == 'deleted');
 
 				if (count($links))
 				{
-					$links = call_user_func_array('array_merge',$links);	// flatten the array
-					$link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',',$links).')';
+					$links = call_user_func_array('array_merge', $links); // flatten the array
+					$link_extra = ($action == 'sp' ? 'OR' : 'AND')." main.info_id IN (".implode(',', $links).')';
 				}
 			}
 		}
-		$sortbycf='';
-		if (!empty($query['order']) && (preg_match('/^[a-z_0-9, ]+$/i',$query['order']) || stripos($query['order'],'#')!==FALSE ) &&
-			(empty($query['sort']) || preg_match('/^(DESC|ASC)$/i',$query['sort'])))
+		$sortbycf = '';
+		if (!empty($query['order']) && (preg_match('/^[a-z_0-9, ]+$/i', $query['order']) || stripos($query['order'], '#') !== FALSE) &&
+			(empty($query['sort']) || preg_match('/^(DESC|ASC)$/i', $query['sort'])))
 		{
 			$order = array();
-			foreach(explode(',',$query['order']) as $val)
+			foreach (explode(',', $query['order']) as $val)
 			{
 				$val = trim($val);
 				if ($val[0] == '#')
 				{
-					$sortbycf = substr($val,1);
+					$sortbycf = substr($val, 1);
 					$val = "cfsortcrit IS NULL,cfsortcrit";
 				}
 				else
 				{
 					static $table_def = null;
-					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog',$this->info_table);
-					if (substr($val,0,5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
+					if (is_null($table_def)) $table_def = $this->db->get_table_definitions('infolog', $this->info_table);
+					if (substr($val, 0, 5) != 'info_' && isset($table_def['fd']['info_'.$val])) $val = 'info_'.$val;
 					if ($val == 'info_des' && $this->db->capabilities['order_on_text'] !== true)
 					{
 						if (!$this->db->capabilities['order_on_text']) continue;
 
-						$val = sprintf($this->db->capabilities['order_on_text'],$val);
+						$val = sprintf($this->db->capabilities['order_on_text'], $val);
 					}
 				}
 				$order[] = $val;
 			}
-			$ordermethod = 'ORDER BY ' . implode(',',$order) . ' ' . $query['sort'];
+			$ordermethod = 'ORDER BY '.implode(',', $order).' '.$query['sort'];
 		}
 		else
 		{
-			$ordermethod = 'ORDER BY info_datemodified DESC';   // newest first
+			$ordermethod = 'ORDER BY info_datemodified DESC'; // newest first
 		}
 		$filtermethod = $no_acl ? '1=1' : $this->aclFilter($query['filter']);
 		if (!$query['col_filter']['info_status'])  $filtermethod .= $this->statusFilter($query['filter']);
 		$filtermethod .= $this->dateFilter($query['filter']);
-		$cfcolfilter=0;
+		$cfcolfilter = 0;
 		if (is_array($query['col_filter']))
 		{
-			foreach($query['col_filter'] as $col => $data)
+			foreach ($query['col_filter'] as $col => $data)
 			{
 				if (is_int($col))
 				{
 					$filtermethod .= ' AND '.$data;
 					continue;
 				}
-				if ($col[0] != '#' && substr($col,0,5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
-				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i',$col))
+				if ($col[0] != '#' && substr($col, 0, 5) != 'info_' && isset($table_def['fd']['info_'.$col])) $col = 'info_'.$col;
+				if ((string)$data !== '' && preg_match('/^[a-z_0-9]+$/i', $col))
 				{
 					switch ($col)
 					{
 						case 'info_responsible':
-							$data = (int) $data;
+							$data = (int)$data;
 							if (!$data) continue;
 							$filtermethod .= ' AND ('.$this->responsible_filter($data)." OR info_responsible='0' AND ".
-								$this->db->expression($this->info_table,array(
-									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data,true)
+								$this->db->expression($this->info_table, array(
+									'info_owner' => $data > 0 ? $data : $GLOBALS['egw']->accounts->members($data, true)
 								)).')';
 							break;
 
 						case 'info_id':	// info_id itself is ambigous
-							$filtermethod .= ' AND '.$this->db->expression($this->info_table,'main.',array('info_id' => $data));
+							$filtermethod .= ' AND '.$this->db->expression($this->info_table, 'main.', array('info_id' => $data));
 							break;
 
 						default:
-							$filtermethod .= ' AND '.$this->db->expression($this->info_table,array($col => $data));
+							$filtermethod .= ' AND '.$this->db->expression($this->info_table, array($col => $data));
 							break;
 					}
 				}
-				if ($col[0] == '#' &&  $query['custom_fields'] && $data)
+				if ($col[0] == '#' && $query['custom_fields'] && $data)
 				{
 					$filtermethod .= " AND main.info_id IN (SELECT DISTINCT info_id FROM $this->extra_table WHERE ";
 					$custom_fields = Api\Storage\Customfields::get('infolog');
 
-					if($custom_fields[substr($col,1)]['type'] == 'select' && $custom_fields[substr($col,1)]['rows'] > 1)
+					if ($custom_fields[substr($col, 1)]['type'] == 'select' && $custom_fields[substr($col, 1)]['rows'] > 1)
 					{
 						// Multi-select - any entry with the filter value selected matches
 						$filtermethod .= $this->db->expression($this->extra_table, array(
-							'info_extra_name' => substr($col,1),
-							$this->db->concat("','",'info_extra_value',"','").' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$data.',%'),
+							'info_extra_name' => substr($col, 1),
+							$this->db->concat("','", 'info_extra_value', "','").' '.$this->db->capabilities[Api\Db::CAPABILITY_CASE_INSENSITIV_LIKE].' '.$this->db->quote('%,'.$data.',%'),
 						)).')';
 					}
 					else
 					{
-						$filtermethod .= $this->db->expression($this->extra_table,array(
-							'info_extra_name'  => substr($col,1),
+						$filtermethod .= $this->db->expression($this->extra_table, array(
+							'info_extra_name'  => substr($col, 1),
 							'info_extra_value' => $data,
 						)).')';
 					}
@@ -797,15 +796,15 @@ 
 
 		if ((int)$query['cat_id'])
 		{
-			$categories = new Api\Categories('','infolog');
+			$categories = new Api\Categories('', 'infolog');
 			$cats = $categories->return_all_children((int)$query['cat_id']);
-			$filtermethod .= ' AND info_cat'.(count($cats)>1? ' IN ('.implode(',',$cats).') ' : '='.(int)$query['cat_id']);
+			$filtermethod .= ' AND info_cat'.(count($cats) > 1 ? ' IN ('.implode(',', $cats).') ' : '='.(int)$query['cat_id']);
 		}
 		$join = $distinct = '';
-		if ($query['query']) $query['search'] = $query['query'];	// allow both names
+		if ($query['query']) $query['search'] = $query['query']; // allow both names
 		if ($query['search'])			  // we search in _from, _subject, _des and _extra_value for $query
 		{
-			$columns = array('info_from','info_addr','info_location','info_subject','info_extra_value');
+			$columns = array('info_from', 'info_addr', 'info_location', 'info_subject', 'info_extra_value');
 			// at the moment MaxDB 7.5 cant cast nor search text columns, it's suppost to change in 7.6
 			if ($this->db->capabilities['like_on_text']) $columns[] = 'info_des';
 
@@ -814,13 +813,13 @@ 
 			$so_sql->table_name = 'main';
 			$search = $so_sql->search2criteria($query['search'], $wildcard, $op, null, $columns);
 			$sql_query = 'AND ('.(is_numeric($query['search']) ? 'main.info_id='.(int)$query['search'].' OR ' : '').
-				implode($op, $search) .')';
+				implode($op, $search).')';
 
-			$join = ($cfcolfilter>0 ? '':'LEFT')." JOIN $this->extra_table ON main.info_id=$this->extra_table.info_id ";
+			$join = ($cfcolfilter > 0 ? '' : 'LEFT')." JOIN $this->extra_table ON main.info_id=$this->extra_table.info_id ";
 			// mssql and others cant use DISTICT if text columns (info_des) are involved
 			$distinct = $this->db->capabilities['distinct_on_text'] ? 'DISTINCT' : '';
 		}
-		$pid = 'AND ' . $this->db->expression($this->info_table,array('info_id_parent' => ($action == 'sp' ?$query['action_id'] : 0)));
+		$pid = 'AND '.$this->db->expression($this->info_table, array('info_id_parent' => ($action == 'sp' ? $query['action_id'] : 0)));
 
 		if ($GLOBALS['egw_info']['user']['preferences']['infolog']['listNoSubs'] != '1' && $action != 'sp' ||
 			(string)$query['col_filter']['info_id_parent'] !== '' ||
@@ -841,14 +840,14 @@ 
 			}
 			else
 			{
-				$query['total'] = $this->db->query($sql="SELECT $distinct main.info_id ".$sql_query,__LINE__,__FILE__)->NumRows();
+				$query['total'] = $this->db->query($sql = "SELECT $distinct main.info_id ".$sql_query, __LINE__, __FILE__)->NumRows();
 			}
 			$info_customfield = '';
 			if ($sortbycf != '')
 			{
 				$sort_col = "(SELECT DISTINCT info_extra_value FROM $this->extra_table sub2 WHERE sub2.info_id=main.info_id AND info_extra_name=".$this->db->quote($sortbycf).")";
 				if (!isset($custom_fields)) $custom_fields = Api\Storage\Customfields::get('infolog');
-				switch($custom_fields[$sortbycf]['type'])
+				switch ($custom_fields[$sortbycf]['type'])
 				{
 					case 'int':
 						$sort_col = $this->db->to_int($sort_col);
@@ -867,9 +866,9 @@ 
 					$query['start'] = 0;
 				}
 				$cols = isset($query['cols']) ? $query['cols'] : 'main.*';
-				if (is_array($cols)) $cols = implode(',',$cols);
-				$rs = $this->db->query($sql='SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod,__LINE__,__FILE__,
-					(int) $query['start'],isset($query['start']) ? (int) $query['num_rows'] : -1,false,Api\Db::FETCH_ASSOC);
+				if (is_array($cols)) $cols = implode(',', $cols);
+				$rs = $this->db->query($sql = 'SELECT '.$mysql_calc_rows.' '.$distinct.' '.$cols.' '.$info_customfield.' '.$sql_query.$query['append'].' '.$ordermethod, __LINE__, __FILE__,
+					(int)$query['start'], isset($query['start']) ? (int)$query['num_rows'] : -1, false, Api\Db::FETCH_ASSOC);
 				//echo "<p>db::query('$sql',,,".(int)$query['start'].','.(isset($query['start']) ? (int) $query['num_rows'] : -1).")</p>\n";
 
 				if ($mysql_calc_rows)
@@ -884,9 +883,9 @@ 
 			{
 				return $rs;
 			}
-			foreach($rs as $info)
+			foreach ($rs as $info)
 			{
-				$info['info_responsible'] = $info['info_responsible'] ? explode(',',$info['info_responsible']) : array();
+				$info['info_responsible'] = $info['info_responsible'] ? explode(',', $info['info_responsible']) : array();
 
 				$ids[$info['info_id']] = $info;
 			}
@@ -899,19 +898,19 @@ 
 			}
 			// if no specific custom field is selected, show/query all custom fields
 			if ($ids && ($query['custom_fields'] || $query['csv_export'] ||
-				$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
+				$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'], $index_load_cfs)))
 			{
 				$where = array('info_id' => array_keys($ids));
-				if (!($query['csv_export'] || strchr(is_array($query['selectcols']) ? implode(',',$query['selectcols']):$query['selectcols'],'#') === false ||
-					$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'],$index_load_cfs)))
+				if (!($query['csv_export'] || strchr(is_array($query['selectcols']) ? implode(',', $query['selectcols']) : $query['selectcols'], '#') === false ||
+					$index_load_cfs && $query['col_filter']['info_type'] && in_array($query['col_filter']['info_type'], $index_load_cfs)))
 				{
 					$where['info_extra_name'] = array();
-					foreach(is_array($query['selectcols']) ? $query['selectcols'] : explode(',',$query['selectcols']) as $col)
+					foreach (is_array($query['selectcols']) ? $query['selectcols'] : explode(',', $query['selectcols']) as $col)
 					{
-						if ($col[0] == '#') $where['info_extra_name'][] = substr($col,1);
+						if ($col[0] == '#') $where['info_extra_name'][] = substr($col, 1);
 					}
 				}
-				foreach($this->db->select($this->extra_table,'*',$where,__LINE__,__FILE__) as $row)
+				foreach ($this->db->select($this->extra_table, '*', $where, __LINE__, __FILE__) as $row)
 				{
 					$ids[$row['info_id']]['#'.$row['info_extra_name']] = $row['info_extra_value'];
 				}
@@ -936,27 +935,27 @@ 
 	{
 		$users = array();
 
-		foreach($this->db->select($this->info_table,'DISTINCT info_owner',array(
-			str_replace(' AND ','',$this->statusFilter('open')),
-			'(ABS(info_startdate-'.time().')<'.(4*24*60*60).' OR '.	// start_day within 4 days
-			'ABS(info_enddate-'.time().')<'.(4*24*60*60).')',		// end_day within 4 days
-		),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->info_table, 'DISTINCT info_owner', array(
+			str_replace(' AND ', '', $this->statusFilter('open')),
+			'(ABS(info_startdate-'.time().')<'.(4 * 24 * 60 * 60).' OR '.// start_day within 4 days
+			'ABS(info_enddate-'.time().')<'.(4 * 24 * 60 * 60).')', // end_day within 4 days
+		), __LINE__, __FILE__) as $row)
 		{
 			$users[] = $row['info_responsible'];
 		}
-		foreach($this->db->select($this->info_table,'DISTINCT info_responsible',$this->statusFilter('open',false),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select($this->info_table, 'DISTINCT info_responsible', $this->statusFilter('open', false), __LINE__, __FILE__) as $row)
 		{
-			foreach(explode(',', $row['info_responsible']) as $responsible)
+			foreach (explode(',', $row['info_responsible']) as $responsible)
 			{
 				if ($GLOBALS['egw']->accounts->get_type($responsible) == 'g')
 				{
-					$responsible = $GLOBALS['egw']->accounts->members($responsible,true);
+					$responsible = $GLOBALS['egw']->accounts->members($responsible, true);
 				}
 				if ($responsible)
 				{
-					foreach(is_array($responsible) ? $responsible : array($responsible) as $user)
+					foreach (is_array($responsible) ? $responsible : array($responsible) as $user)
 					{
-						if ($user && !in_array($user,$users)) $users[] = $user;
+						if ($user && !in_array($user, $users)) $users[] = $user;
 					}
 				}
 			}

calendar/inc/class.calendar_uiforms.inc.php

Spacing +461 added lines, -463 removed lines

@@ -55,18 +55,18 @@ 
 	 *
 	 * @var locktime in seconds
 	 */
-	var $locktime_default=1;
+	var $locktime_default = 1;
 
 	/**
 	 * Constructor
 	 */
 	function __construct()
 	{
-		parent::__construct(true);	// call the parent's constructor
+		parent::__construct(true); // call the parent's constructor
 
-		for ($n=15; $n <= 16*60; $n+=($n < 60 ? 15 : ($n < 240 ? 30 : ($n < 600 ? 60 : 120))))
+		for ($n = 15; $n <= 16 * 60; $n += ($n < 60 ? 15 : ($n < 240 ? 30 : ($n < 600 ? 60 : 120))))
 		{
-			$this->durations[$n*60] = sprintf('%d:%02d',$n/60,$n%60);
+			$this->durations[$n * 60] = sprintf('%d:%02d', $n / 60, $n % 60);
 		}
 	}
 
@@ -78,11 +78,10 @@ 
 	function &default_add_event()
 	{
 		$extra_participants = $_GET['participants'] ?
-			(!is_array($_GET['participants']) ? explode(',',$_GET['participants']) : $_GET['participants']) :
-			array();
+			(!is_array($_GET['participants']) ? explode(',', $_GET['participants']) : $_GET['participants']) : array();
 
 		// if participant is a contact, add its link title as title
-		foreach($extra_participants as $uid)
+		foreach ($extra_participants as $uid)
 		{
 			if ($uid[0] == 'c')
 			{
@@ -94,14 +93,14 @@ 
 		if (isset($_GET['owner']))
 		{
 			$owner = $_GET['owner'];
-			if(!is_array($owner) && strpos($owner, ','))
+			if (!is_array($owner) && strpos($owner, ','))
 			{
-				$owner = explode(',',$owner);
+				$owner = explode(',', $owner);
 			}
-			if(is_array($owner))
+			if (is_array($owner))
 			{
 				// old behavior "selected" should also be used for not set preference, therefore we need to test for !== '0'
-				if($this->cal_prefs['default_participant'] !== '0' || count($extra_participants) === 0 && count($owner) === 1)
+				if ($this->cal_prefs['default_participant'] !== '0' || count($extra_participants) === 0 && count($owner) === 1)
 				{
 					$extra_participants += $owner;
 				}
@@ -117,21 +116,21 @@ 
 			// old behavior "selected" should also be used for not set preference, therefore we need to test for === '0'
 			$owner = $this->cal_prefs['default_participant'] === '0' ? $this->user : $this->owner;
 		}
-		error_log(__METHOD__ . ' owner: ' . array2string($owner));
+		error_log(__METHOD__.' owner: '.array2string($owner));
 
 		if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
-			!$this->bo->check_perms(Acl::ADD,0,$owner))
+			!$this->bo->check_perms(Acl::ADD, 0, $owner))
 		{
 			if ($owner)	// make an owner who is no user or we have no add-rights a participant
 			{
-				if(!is_array($owner))
+				if (!is_array($owner))
 				{
-					$owner = explode(',',$owner);
+					$owner = explode(',', $owner);
 				}
 				// if we come from ressources we don't need any users selected in calendar
 				if (!isset($_GET['participants']) || $_GET['participants'][0] != 'r')
 				{
-					foreach($owner as $uid)
+					foreach ($owner as $uid)
 					{
 						$extra_participants[] = $uid;
 					}
@@ -141,71 +140,71 @@ 
 		}
 		//error_log("this->owner=$this->owner, _GET[owner]=$_GET[owner], user=$this->user => owner=$owner, extra_participants=".implode(',',$extra_participants).")");
 
-		if(isset($_GET['start']))
+		if (isset($_GET['start']))
 		{
 			$start = Api\DateTime::to($_GET['start'], 'ts');
 		}
 		else
 		{
 			$start = $this->bo->date2ts(array(
-				'full' => isset($_GET['date']) && (int) $_GET['date'] ? (int) $_GET['date'] : $this->date,
-				'hour' => (int) (isset($_GET['hour']) ? $_GET['hour'] : $this->bo->cal_prefs['workdaystarts']),
-				'minute' => (int) $_GET['minute'],
+				'full' => isset($_GET['date']) && (int)$_GET['date'] ? (int)$_GET['date'] : $this->date,
+				'hour' => (int)(isset($_GET['hour']) ? $_GET['hour'] : $this->bo->cal_prefs['workdaystarts']),
+				'minute' => (int)$_GET['minute'],
 			));
 		}
 		//echo "<p>_GET[date]=$_GET[date], _GET[hour]=$_GET[hour], _GET[minute]=$_GET[minute], this->date=$this->date ==> start=$start=".date('Y-m-d H:i',$start)."</p>\n";
 
 		$participant_types['u'] = $participant_types = $participants = array();
-		foreach($extra_participants as $uid)
+		foreach ($extra_participants as $uid)
 		{
-			if (isset($participants[$uid])) continue;	// already included
+			if (isset($participants[$uid])) continue; // already included
 
-			if (!$this->bo->check_acl_invite($uid)) continue;	// no right to invite --> ignored
+			if (!$this->bo->check_acl_invite($uid)) continue; // no right to invite --> ignored
 
 			if (is_numeric($uid))
 			{
 				$participants[$uid] = $participant_types['u'][$uid] =
-					calendar_so::combine_status($uid == $this->user ? 'A' : 'U',1,
-					($uid == $this->user || ($uid == $owner && $this->bo->check_perms(Acl::ADD,0,$owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
+					calendar_so::combine_status($uid == $this->user ? 'A' : 'U', 1,
+					($uid == $this->user || ($uid == $owner && $this->bo->check_perms(Acl::ADD, 0, $owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
 			}
 			elseif (is_array($this->bo->resources[$uid[0]]))
 			{
 				// Expand mailing lists
-				if($uid[0] == 'l')
+				if ($uid[0] == 'l')
 				{
-					foreach($this->bo->enum_mailing_list($uid) as $contact)
+					foreach ($this->bo->enum_mailing_list($uid) as $contact)
 					{
-						$participants[$contact] = $participant_types['c'][substr($contact,1)] =
-							calendar_so::combine_status('U',1,'REQ-PARTICIPANT');
+						$participants[$contact] = $participant_types['c'][substr($contact, 1)] =
+							calendar_so::combine_status('U', 1, 'REQ-PARTICIPANT');
 					}
 					continue;
 				}
 				// if contact is a user, use the user instead (as the GUI)
-				if ($uid[0] == 'c' && ($account_id = $GLOBALS['egw']->accounts->name2id(substr($uid,1),'person_id')))
+				if ($uid[0] == 'c' && ($account_id = $GLOBALS['egw']->accounts->name2id(substr($uid, 1), 'person_id')))
 				{
 					$uid = $account_id;
 					$participants[$uid] = $participant_types['u'][$uid] =
-						calendar_so::combine_status($uid == $this->user ? 'A' : 'U',1,
-						($uid == $this->user || ($uid == $owner && $this->bo->check_perms(Acl::ADD,0,$owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
+						calendar_so::combine_status($uid == $this->user ? 'A' : 'U', 1,
+						($uid == $this->user || ($uid == $owner && $this->bo->check_perms(Acl::ADD, 0, $owner))) ? 'CHAIR' : 'REQ-PARTICIPANT');
 					continue;
 				}
 				$res_data = $this->bo->resources[$uid[0]];
-				list($id,$quantity) = explode(':',substr($uid,1));
-				if (($status = $res_data['new_status'] ? ExecMethod($res_data['new_status'],$id) : 'U'))
+				list($id, $quantity) = explode(':', substr($uid, 1));
+				if (($status = $res_data['new_status'] ? ExecMethod($res_data['new_status'], $id) : 'U'))
 				{
 					$participants[$uid] = $participant_types[$uid[0]][$id] =
-						calendar_so::combine_status($status,$quantity,'REQ-PARTICIPANT');
+						calendar_so::combine_status($status, $quantity, 'REQ-PARTICIPANT');
 				}
 			}
 		}
 		if (!$participants)	// if all participants got removed, include current user
 		{
-			$participants[$this->user] = $participant_types['u'][$this->user] = calendar_so::combine_status('A',1,'CHAIR');
+			$participants[$this->user] = $participant_types['u'][$this->user] = calendar_so::combine_status('A', 1, 'CHAIR');
 		}
-		if(isset($_GET['cat_id']))
+		if (isset($_GET['cat_id']))
 		{
-			$cat_id = explode(',',$_GET['cat_id']);
-			foreach($cat_id as &$cat)
+			$cat_id = explode(',', $_GET['cat_id']);
+			foreach ($cat_id as &$cat)
 			{
 				$cat = (int)$cat;
 			}
@@ -216,16 +215,16 @@ 
 		if ((string)$this->cal_prefs['default-alarm'] !== '')
 		{
 			$offset = 60 * $this->cal_prefs['default-alarm'];
-			$alarms[1] =  array(
+			$alarms[1] = array(
 				'default' => 1,
-				'offset' => $offset ,
+				'offset' => $offset,
 				'time'   => $start - $offset,
 				'all'    => false,
 				'owner'  => $owner,
 				'id'	=> 1,
 			);
 		}
-		$duration = isset($_GET['duration']) ? (int)$_GET['duration'] : (int) $this->bo->cal_prefs['defaultlength']*60;
+		$duration = isset($_GET['duration']) ? (int)$_GET['duration'] : (int)$this->bo->cal_prefs['defaultlength'] * 60;
 		$end = isset($_GET['end']) ? Api\DateTime::to($_GET['end'], 'ts') : $start + $duration;
 		return array(
 			'participant_types' => $participant_types,
@@ -234,7 +233,7 @@ 
 			'start' => $start,
 			'end'   => $end,
 			'tzid'  => $this->bo->common_prefs['tz'],
-			'priority' => 2,	// normal
+			'priority' => 2, // normal
 			'public'=> $this->cal_prefs['default_private'] ? 0 : 1,
 			'alarm' => $alarms,
 			'recur_exception' => array(),
@@ -253,7 +252,7 @@ 
 	{
 		if (!is_array($content))	// redirect from etemplate, if POST empty
 		{
-			return $this->edit(null,null,strip_tags($_GET['msg']));
+			return $this->edit(null, null, strip_tags($_GET['msg']));
 		}
 		// clear notification errors
 		notifications::errors(true);
@@ -267,22 +266,22 @@ 
 		$update_type = $content['id'] ? ($content['recur_type'] == MCAL_RECUR_NONE ? 'update' : 'edit') : 'add';
 
 		list($button) = @each($content['button']);
-		if (!$button && $content['action']) $button = $content['action'];	// action selectbox
+		if (!$button && $content['action']) $button = $content['action']; // action selectbox
 		unset($content['button']); unset($content['action']);
 
 		$view = $content['view'];
 		if ($button == 'ical')
 		{
-			$msg = $this->export($content['id'],true);
+			$msg = $this->export($content['id'], true);
 		}
 		// delete a recur-exception
 		if ($content['recur_exception']['delete_exception'])
 		{
 			list($date) = each($content['recur_exception']['delete_exception']);
 			// eT2 converts time to
-			if (!is_numeric($date)) $date = Api\DateTime::to (str_replace('Z','', $date), 'ts');
+			if (!is_numeric($date)) $date = Api\DateTime::to(str_replace('Z', '', $date), 'ts');
 			unset($content['recur_exception']['delete_exception']);
-			if (($key = array_search($date,$content['recur_exception'])) !== false)
+			if (($key = array_search($date, $content['recur_exception'])) !== false)
 			{
 				// propagate the exception to a single event
 				$recur_exceptions = $this->bo->so->get_related($content['uid']);
@@ -292,7 +291,7 @@ 
 							$exception['recurrence'] != $content['recur_exception'][$key]) continue;
 					$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 					$exception['reference'] = $exception['recurrence'] = 0;
-					$this->bo->update($exception, true, true,false,true,$messages,$content['no_notifications']);
+					$this->bo->update($exception, true, true, false, true, $messages, $content['no_notifications']);
 					break;
 				}
 				unset($content['recur_exception'][$key]);
@@ -333,7 +332,7 @@ 
 			$def_alarm = $this->cal_prefs['default-alarm'.($content['whole_day'] ? '-wholeday' : '')];
 			if ((string)$def_alarm === '')
 			{
-				unset($content['alarm'][1]);	// '' = no alarm on whole day --> delete it
+				unset($content['alarm'][1]); // '' = no alarm on whole day --> delete it
 			}
 			else
 			{
@@ -347,7 +346,7 @@ 
 		unset($event['alarm']['delete_alarm']);
 		unset($event['duration']);
 
-		if (in_array($button,array('ignore','freetime','reedit','confirm_edit_series')))
+		if (in_array($button, array('ignore', 'freetime', 'reedit', 'confirm_edit_series')))
 		{
 			// no conversation necessary, event is already in the right format
 		}
@@ -367,7 +366,7 @@ 
 			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data']) $event['recur_type'] = MCAL_RECUR_WEEKLY;
 			if ($event['recur_type'] == MCAL_RECUR_WEEKLY && !$event['recur_data'])
 			{
-				$event['recur_data'] = 1 << (int)date('w',$event['start']);
+				$event['recur_data'] = 1 << (int)date('w', $event['start']);
 			}
 			if ($event['recur_type'] != MCAL_RECUR_NONE && !isset($event['recur_enddate']))
 			{
@@ -379,9 +378,9 @@ 
 
 				$event['participants'] = $event['participant_types'] = array();
 
-				foreach($content['participants'] as $key => $data)
+				foreach ($content['participants'] as $key => $data)
 				{
-					switch($key)
+					switch ($key)
 					{
 						case 'delete':		// handled in default
 						case 'quantity':	// handled in new_resource
@@ -390,7 +389,7 @@ 
 						case 'status_date':
 							break;
 						case 'participant':
-							foreach($data as $participant)
+							foreach ($data as $participant)
 							{
 								if (is_null($participant))
 								{
@@ -399,17 +398,17 @@ 
 
 								// email or rfc822 addresse (eg. "Ralf Becker <ralf@domain.com>")
 								$email = array();
-								if(preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i',$participant,$email))
+								if (preg_match('/^(.*<)?([a-z0-9_.-]+@[a-z0-9_.-]{5,})>?$/i', $participant, $email))
 								{
-									$status = calendar_so::combine_status('U',$content['participants']['quantity'],$content['participants']['role']);
-									if (($data = $GLOBALS['egw']->accounts->name2id($email[2],'account_email')) && $this->bo->check_acl_invite($data))
+									$status = calendar_so::combine_status('U', $content['participants']['quantity'], $content['participants']['role']);
+									if (($data = $GLOBALS['egw']->accounts->name2id($email[2], 'account_email')) && $this->bo->check_acl_invite($data))
 									{
 										$event['participants'][$data] = $event['participant_types']['u'][$data] = $status;
 									}
-									elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search',array(
+									elseif ((list($data) = ExecMethod2('addressbook.addressbook_bo.search', array(
 										'email' => $email[2],
 										'email_home' => $email[2],
-									),true,'','','',false,'OR')))
+									), true, '', '', '', false, 'OR')))
 									{
 										$event['participants']['c'.$data['id']] = $event['participant_types']['c'][$data['id']] = $status;
 									}
@@ -420,7 +419,7 @@ 
 								}
 								else
 								{
-									if(is_numeric($participant))
+									if (is_numeric($participant))
 									{
 										$uid = $participant;
 										$id = $participant;
@@ -429,12 +428,12 @@ 
 									else
 									{
 										$uid = $participant;
-										$id = substr($participant,1);
+										$id = substr($participant, 1);
 										$resource = $this->bo->resources[$participant[0]];
 									}
-									if(!$this->bo->check_acl_invite($uid))
+									if (!$this->bo->check_acl_invite($uid))
 									{
-										if(!$msg_permission_denied_added)
+										if (!$msg_permission_denied_added)
 										{
 											$msg .= lang('Permission denied!');
 											$msg_permission_denied_added = true;
@@ -444,19 +443,18 @@ 
 
 									$type = $resource['type'];
 									$status = isset($this->bo->resources[$type]['new_status']) ?
-										ExecMethod($this->bo->resources[$type]['new_status'],$id) :
-										($uid == $this->bo->user ? 'A' : 'U');
+										ExecMethod($this->bo->resources[$type]['new_status'], $id) : ($uid == $this->bo->user ? 'A' : 'U');
 
 									// Expand mailing lists
-									if($type == 'l')
+									if ($type == 'l')
 									{
-										foreach($this->bo->enum_mailing_list($participant) as $contact)
+										foreach ($this->bo->enum_mailing_list($participant) as $contact)
 										{
 											// Mailing lists can contain users, so allow for that possibility
 											$_type = is_numeric($contact) ? '' : $contact[0];
-											$_uid = is_numeric($contact) ? $contact : substr($contact,1);
+											$_uid = is_numeric($contact) ? $contact : substr($contact, 1);
 											$event['participants'][$contact] = $event['participant_types'][$_type][$_uid] =
-												calendar_so::combine_status($status,$content['participants']['quantity'],$content['participants']['role']);
+												calendar_so::combine_status($status, $content['participants']['quantity'], $content['participants']['role']);
 										}
 										continue;
 									}
@@ -466,8 +464,8 @@ 
 										// todo check real availability = maximum - already booked quantity
 										if (isset($res_info['useable']) && $content['participants']['quantity'] > $res_info['useable'])
 										{
-											$msg .= lang('Maximum available quantity of %1 exceeded!',$res_info['useable']);
-											foreach(array('quantity','resource','role') as $n)
+											$msg .= lang('Maximum available quantity of %1 exceeded!', $res_info['useable']);
+											foreach (array('quantity', 'resource', 'role') as $n)
 											{
 												$event['participants'][$n] = $content['participants'][$n];
 											}
@@ -476,7 +474,7 @@ 
 										else
 										{
 											$event['participants'][$uid] = $event['participant_types'][$type][$id] =
-												calendar_so::combine_status($status,$content['participants']['quantity'],$content['participants']['role']);
+												calendar_so::combine_status($status, $content['participants']['quantity'], $content['participants']['role']);
 										}
 									}
 								}
@@ -490,14 +488,14 @@ 
 							break;
 
 						default:		// existing participant row
-							if (!is_array($data)) continue;	// widgets in participant tab, above participant list
-							foreach(array('uid','status','quantity','role') as $name)
+							if (!is_array($data)) continue; // widgets in participant tab, above participant list
+							foreach (array('uid', 'status', 'quantity', 'role') as $name)
 							{
 								$$name = $data[$name];
 							}
 							if ($content['participants']['delete'][$uid] || $content['participants']['delete'][md5($uid)])
 							{
-								$uid = false;	// entry has been deleted
+								$uid = false; // entry has been deleted
 							}
 							elseif ($uid)
 							{
@@ -508,27 +506,27 @@ 
 								}
 								else
 								{
-									$id = substr($uid,1);
+									$id = substr($uid, 1);
 									$type = $uid[0];
 								}
 								if ($data['old_status'] != $status && !(!$data['old_status'] && $status == 'G'))
 								{
 									//echo "<p>$uid: status changed '$data[old_status]' --> '$status<'/p>\n";
 									$new_status = calendar_so::combine_status($status, $quantity, $role);
-									if ($this->bo->set_status($event['id'],$uid,$new_status,isset($content['edit_single']) ? $content['participants']['status_date'] : 0, false, true, $content['no_notifications']))
+									if ($this->bo->set_status($event['id'], $uid, $new_status, isset($content['edit_single']) ? $content['participants']['status_date'] : 0, false, true, $content['no_notifications']))
 									{
 										// Update main window
 										$d = new Api\DateTime($content['edit_single'], Api\DateTime::$user_timezone);
 										$client_updated = $this->update_client($event['id'], $d);
 
 										// refreshing the calendar-view with the changed participant-status
-										if($event['recur_type'] != MCAL_RECUR_NONE)
+										if ($event['recur_type'] != MCAL_RECUR_NONE)
 										{
 											$msg = lang('Status for all future scheduled days changed');
 										}
 										else
 										{
-											if(isset($content['edit_single']))
+											if (isset($content['edit_single']))
 											{
 												$msg = lang('Status for this particular day changed');
 												// prevent accidentally creating a real exception afterwards
@@ -549,7 +547,7 @@ 
 										if ($status == 'R' && $event['alarm'])
 										{
 											// remove from bo->set_status deleted alarms of rejected users from UI too
-											foreach($event['alarm'] as $alarm_id => $alarm)
+											foreach ($event['alarm'] as $alarm_id => $alarm)
 											{
 												if ((string)$alarm['owner'] === (string)$uid)
 												{
@@ -562,7 +560,7 @@ 
 								if ($uid && $status != 'G')
 								{
 									$event['participants'][$uid] = $event['participant_types'][$type][$id] =
-										calendar_so::combine_status($status,$quantity,$role);
+										calendar_so::combine_status($status, $quantity, $role);
 								}
 							}
 							break;
@@ -581,26 +579,26 @@ 
 			'tabs'			=> $content['tabs'],
 			'template'      => $content['template'],
 		);
-		$noerror=true;
+		$noerror = true;
 
 		//error_log(__METHOD__.$button.'#'.array2string($content['edit_single']).'#');
 
 		$ignore_conflicts = $status_reset_to_unknown = false;
 
-		switch((string)$button)
+		switch ((string)$button)
 		{
 			case 'ignore':
 				$ignore_conflicts = true;
-				$button = $event['button_was'];	// save or apply
+				$button = $event['button_was']; // save or apply
 				unset($event['button_was']);
 				break;
 
 		}
 
-		switch((string)$button)
+		switch ((string)$button)
 		{
 		case 'exception':	// create an exception in a recuring event
-			$msg = $this->_create_exception($event,$preserv);
+			$msg = $this->_create_exception($event, $preserv);
 			break;
 
 		case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
@@ -611,29 +609,29 @@ 
 			unset($event['recurrence']);
 			unset($preserv['recurrence']);
 			unset($event['recur_exception']);
-			unset($event['edit_single']);	// in case it has been set
+			unset($event['edit_single']); // in case it has been set
 			unset($event['modified']);
 			unset($event['modifier']);
 			unset($event['caldav_name']);
-			$event['owner'] = !(int)$event['owner'] || !$this->bo->check_perms(Acl::ADD,0,$event['owner']) ? $this->user : $event['owner'];
+			$event['owner'] = !(int)$event['owner'] || !$this->bo->check_perms(Acl::ADD, 0, $event['owner']) ? $this->user : $event['owner'];
 
 			// Clear participant stati
-			foreach($event['participant_types'] as $type => &$participants)
+			foreach ($event['participant_types'] as $type => &$participants)
 			{
-				foreach($participants as $id => &$p_response)
+				foreach ($participants as $id => &$p_response)
 				{
-					if($type == 'u' && $id == $event['owner']) continue;
+					if ($type == 'u' && $id == $event['owner']) continue;
 					calendar_so::split_status($p_response, $quantity, $role);
 					// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
-					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
-					$p_response = calendar_so::combine_status($status,$quantity,$role);
+					$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'], $id) : 'U';
+					$p_response = calendar_so::combine_status($status, $quantity, $role);
 				}
 			}
 
 			// Copy alarms
 			if (is_array($event['alarm']))
 			{
-				foreach($event['alarm'] as $n => &$alarm)
+				foreach ($event['alarm'] as $n => &$alarm)
 				{
 					unset($alarm['id']);
 					unset($alarm['cal_id']);
@@ -643,7 +641,7 @@ 
 			// Get links to be copied
 			// With no ID, $content['link_to']['to_id'] is used
 			$content['link_to']['to_id'] = array('to_app' => 'calendar', 'to_id' => 0);
-			foreach(Link::get_links('calendar', $content['id']) as $link)
+			foreach (Link::get_links('calendar', $content['id']) as $link)
 			{
 				if ($link['app'] != Link::VFS_APPNAME)
 				{
@@ -659,7 +657,7 @@ 
 			}
 			unset($link);
 			$preserv['view'] = $preserv['edit_single'] = false;
-			$msg = lang('%1 copied - the copy can now be edited', lang(Link::get_registry('calendar','entry')));
+			$msg = lang('%1 copied - the copy can now be edited', lang(Link::get_registry('calendar', 'entry')));
 			$event['title'] = lang('Copy of:').' '.$event['title'];
 			break;
 
@@ -669,7 +667,7 @@ 
 		case 'print':
 		case 'apply':
 		case 'infolog':
-			if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
+			if ($event['id'] && !$this->bo->check_perms(Acl::EDIT, $event))
 			{
 				$msg = lang('Permission denied');
 				$button = '';
@@ -687,7 +685,7 @@ 
 				$button = '';
 				break;
 			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end']-$event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
+			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['end'] - $event['start'] > calendar_rrule::recurrence_interval($event['recur_type'], $event['recur_interval']))
 			{
 				$msg = lang('Error: Duration of event longer then recurrence interval!');
 				$button = '';
@@ -717,14 +715,14 @@ 
 				$event['reference'] = $event['id'];
 				$event['recurrence'] = $content['edit_single'];
 				unset($event['id']);
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+				$conflicts = $this->bo->update($event, $ignore_conflicts, true, false, true, $messages, $content['no_notifications']);
 				if (!is_array($conflicts) && $conflicts)
 				{
 					// now we need to add the original start as recur-execption to the series
 					$recur_event = $this->bo->read($event['reference']);
 					$recur_event['recur_exception'][] = $content['edit_single'];
 					// check if we need to move the alarms, because they are next on that exception
-					foreach($recur_event['alarm'] as $id => $alarm)
+					foreach ($recur_event['alarm'] as $id => $alarm)
 					{
 						if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
 						{
@@ -740,11 +738,11 @@ 
 							}
 						}
 					}
-					unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-					unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-					$this->bo->update($recur_event,true);	// no conflict check here
+					unset($recur_event['start']); unset($recur_event['end']); // no update necessary
+					unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start!
+					$this->bo->update($recur_event, true); // no conflict check here
 
-					if(Api\Json\Response::isJSONResponse())
+					if (Api\Json\Response::isJSONResponse())
 					{
 						// Sending null will trigger a removal of the original
 						// for that date
@@ -752,7 +750,7 @@ 
 					}
 
 					unset($recur_event);
-					unset($event['edit_single']);			// if we further edit it, it's just a single event
+					unset($event['edit_single']); // if we further edit it, it's just a single event
 					unset($preserv['edit_single']);
 				}
 				else	// conflict or error, we need to reset everything to the state befor we tried to save it
@@ -783,8 +781,8 @@ 
 							{
 								$offset = $off2;
 							}
-							$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
-							if($msg)
+							$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset, $content['no_notifications']);
+							if ($msg)
 							{
 								$noerror = false;
 							}
@@ -797,10 +795,10 @@ 
 							$event['whole_day'] != $old_event['whole_day'])
 						{
 							$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-							foreach((array)$event['participants'] as $uid => $status)
+							foreach ((array)$event['participants'] as $uid => $status)
 							{
 								$q = $r = null;
-								calendar_so::split_status($status,$q,$r);
+								calendar_so::split_status($status, $q, $r);
 								if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 								{
 									$preferences = new Api\Preferences($uid);
@@ -813,7 +811,7 @@ 
 											if ($sameday) break;
 										default:
 											$status_reset_to_unknown = true;
-											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
+											$event['participants'][$uid] = calendar_so::combine_status('U', $q, $r);
 											// todo: report reset status to user
 									}
 								}
@@ -825,43 +823,43 @@ 
 				}
 				// Adding participants needs to be done as an edit, in case we
 				// have participants visible in seperate calendars
-				if(is_array($old_event['participants']) && count(array_diff_key($event['participants'], $old_event['participants'])))
+				if (is_array($old_event['participants']) && count(array_diff_key($event['participants'], $old_event['participants'])))
 				{
 					$update_type = 'edit';
 				}
 				// Changing category may affect event filtering
-				if($this->cal_prefs['saved_states']['cat_id'] && $old_event['category'] != $event['category'])
+				if ($this->cal_prefs['saved_states']['cat_id'] && $old_event['category'] != $event['category'])
 				{
 					$update_type = 'edit';
 				}
-				$conflicts = $this->bo->update($event,$ignore_conflicts,true,false,true,$messages,$content['no_notifications']);
+				$conflicts = $this->bo->update($event, $ignore_conflicts, true, false, true, $messages, $content['no_notifications']);
 				unset($event['ignore']);
 			}
 			if (is_array($conflicts))
 			{
-				$event['button_was'] = $button;	// remember for ignore
-				return $this->conflicts($event,$conflicts,$preserv);
+				$event['button_was'] = $button; // remember for ignore
+				return $this->conflicts($event, $conflicts, $preserv);
 			}
 
 			// Event spans multiple days, need an edit to make sure they all get updated
 			// We could check old date, as removing from days could still be an update
-			if(date('Ymd', $event['start']) != date('Ymd', $event['end']))
+			if (date('Ymd', $event['start']) != date('Ymd', $event['end']))
 			{
 				$update_type = 'edit';
 			}
 			// check if there are messages from update, eg. removed participants or Api\Categories because of missing rights
 			if ($messages)
 			{
-				$msg  .= ($msg ? ', ' : '').implode(', ',$messages);
+				$msg .= ($msg ? ', ' : '').implode(', ', $messages);
 			}
 			if ($conflicts === 0)
 			{
-				$msg .= ($msg ? ', ' : '') .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(
+				$msg .= ($msg ? ', ' : '').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' => 'calendar.calendar_uiforms.edit',
 								'cal_id'    => $content['id'],
-							))).'">','</a>');
+							))).'">', '</a>');
 				$noerror = false;
 			}
 			elseif ($conflicts > 0)
@@ -883,19 +881,19 @@ 
 						// if alarm would be in the past (eg. event moved back) --> move to next possible recurrence
 						if ($alarm['time'] < $this->bo->now_su)
 						{
-							if (($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su+$alarm['offset'], true)))
+							if (($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $alarm['offset'], true)))
 							{
-								$alarm['time'] =  $next_occurrence['start'] - $alarm['offset'];
+								$alarm['time'] = $next_occurrence['start'] - $alarm['offset'];
 							}
 							else
 							{
-								$alarm = false;	// no (further) recurence found --> ignore alarm
+								$alarm = false; // no (further) recurence found --> ignore alarm
 							}
 						}
 						// alarm is currently on a previous recurrence --> set for first recurrence of new series
 						elseif ($event_time < $event['start'])
 						{
-							$alarm['time'] =  $event['start'] - $alarm['offset'];
+							$alarm['time'] = $event['start'] - $alarm['offset'];
 						}
 						if ($alarm)
 						{
@@ -904,9 +902,9 @@ 
 						}
 					}
 					// attach all future exceptions to the new series
-					$events =& $this->bo->search(array(
+					$events = & $this->bo->search(array(
 						'query' => array('cal_uid' => $old_event['uid']),
-						'filter' => 'owner',  // return all possible entries
+						'filter' => 'owner', // return all possible entries
 						'daywise' => false,
 						'date_format' => 'ts',
 					));
@@ -917,7 +915,7 @@ 
 							$exception['recurrence'] += $offset;
 							$exception['reference'] = $event['id'];
 							$exception['uid'] = $event['uid'];
-							$this->bo->update($exception, true, true, true, true, $msg=null, $content['no_notifications']);
+							$this->bo->update($exception, true, true, true, true, $msg = null, $content['no_notifications']);
 						}
 					}
 				}
@@ -925,12 +923,12 @@ 
 				$message = lang('Event saved');
 				if ($status_reset_to_unknown)
 				{
-					foreach((array)$event['participants'] as $uid => $status)
+					foreach ((array)$event['participants'] as $uid => $status)
 					{
 						if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user)
 						{
-							calendar_so::split_status($status,$q,$r);
-							$status = calendar_so::combine_status('U',$q,$r);
+							calendar_so::split_status($status, $q, $r);
+							$status = calendar_so::combine_status('U', $q, $r);
 							$this->bo->set_status($event['id'], $uid, $status, 0, true);
 						}
 					}
@@ -938,17 +936,17 @@ 
 				}
 
 				$response = Api\Json\Response::get();
-				if($response && $update_type != 'delete')
+				if ($response && $update_type != 'delete')
 				{
 					$client_updated = $this->update_client($event['id']);
 				}
 
-				$msg = $message . ($msg ? ', ' . $msg : '');
+				$msg = $message.($msg ? ', '.$msg : '');
 				Framework::refresh_opener($msg, 'calendar', $event['id'], $client_updated ? ($event['recur_type'] ? 'edit' : $update_type) : 'delete');
 				// writing links for new entry, existing ones are handled by the widget itself
 				if (!$content['id'] && is_array($content['link_to']['to_id']))
 				{
-					Link::link('calendar',$event['id'],$content['link_to']['to_id']);
+					Link::link('calendar', $event['id'], $content['link_to']['to_id']);
 				}
 			}
 			else
@@ -958,7 +956,7 @@ 
 			break;
 
 		case 'cancel':
-			if($content['cancel_needs_refresh'])
+			if ($content['cancel_needs_refresh'])
 			{
 				Framework::refresh_opener($msg, 'calendar');
 			}
@@ -996,7 +994,7 @@ 
 			{
 				$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
 			}
-			if ($this->bo->check_perms(Acl::EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
+			if ($this->bo->check_perms(Acl::EDIT, !$content['new_alarm']['owner'] ? $event : 0, $content['new_alarm']['owner']))
 			{
 				$alarm = array(
 					'offset' => $offset,
@@ -1010,13 +1008,13 @@ 
 				}
 				elseif ($event['id'])	// save the alarm immediatly
 				{
-					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+					if (($alarm_id = $this->bo->save_alarm($event['id'], $alarm)))
 					{
 						$alarm['id'] = $alarm_id;
 						$event['alarm'][$alarm_id] = $alarm;
 
 						$msg = lang('Alarm added');
-						Framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+						Framework::refresh_opener($msg, 'calendar', $event['id'], 'update');
 					}
 					else
 					{
@@ -1025,7 +1023,7 @@ 
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+					for ($alarm['id'] = 1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
 					$event['alarm'][$alarm['id']] = $alarm;
 				}
 			}
@@ -1042,31 +1040,31 @@ 
 		}
 		// New event, send data before updating so it's there
 		$response = Api\Json\Response::get();
-		if($response && !$content['id'] && $event['id'])
+		if ($response && !$content['id'] && $event['id'])
 		{
 			$client_updated = $this->update_client($event['id']);
 		}
-		if (in_array($button,array('cancel','save','delete','delete_exceptions','delete_keep_exceptions')) && $noerror)
+		if (in_array($button, array('cancel', 'save', 'delete', 'delete_exceptions', 'delete_keep_exceptions')) && $noerror)
 		{
 			if ($content['lock_token'])	// remove an existing lock
 			{
-				Vfs::unlock(Vfs::app_entry_lock_path('calendar',$content['id']),$content['lock_token'],false);
+				Vfs::unlock(Vfs::app_entry_lock_path('calendar', $content['id']), $content['lock_token'], false);
 			}
 			if ($content['no_popup'])
 			{
-				Egw::redirect_link('/index.php',array(
+				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'calendar.calendar_uiviews.index',
 					'msg'        => $msg,
 				));
 			}
-			if (in_array($button,array('delete_exceptions','delete_keep_exceptions')) || $content['recur_type'] && $button == 'delete')
+			if (in_array($button, array('delete_exceptions', 'delete_keep_exceptions')) || $content['recur_type'] && $button == 'delete')
 			{
-				Framework::refresh_opener($msg,'calendar');
+				Framework::refresh_opener($msg, 'calendar');
 			}
 			else
 			{
 				Framework::refresh_opener($msg, 'calendar',
-					$event['id'] . ($content['edit_single'] ? ':' . (int)$content['edit_single'] : '' ),
+					$event['id'].($content['edit_single'] ? ':'.(int)$content['edit_single'] : ''),
 					$button == 'save' && $client_updated ? ($content['id'] ? $update_type : 'add') : 'delete'
 				);
 			}
@@ -1074,7 +1072,7 @@ 
 			exit();
 		}
 		unset($event['no_notifications']);
-		return $this->edit($event,$preserv,$msg,$event['id'] ? $event['id'] : $content['link_to']['to_id']);
+		return $this->edit($event, $preserv, $msg, $event['id'] ? $event['id'] : $content['link_to']['to_id']);
 	}
 
 	/**
@@ -1086,7 +1084,7 @@ 
 	 * @param array &$preserv
 	 * @return string message that exception was created
 	 */
-	function _create_exception(&$event,&$preserv)
+	function _create_exception(&$event, &$preserv)
 	{
 		// In some cases where the user makes the first day an exception, actual_date may be missing
 		$preserv['actual_date'] = $preserv['actual_date'] ? $preserv['actual_date'] : $event['start'];
@@ -1096,17 +1094,17 @@ 
 		$event['recurrence'] = $preserv['recurrence'] = $preserv['actual_date'];
 		$event['start'] = $preserv['edit_single'] = $preserv['actual_date'];
 		$event['recur_type'] = MCAL_RECUR_NONE;
-		foreach(array('recur_enddate','recur_interval','recur_exception','recur_data') as $name)
+		foreach (array('recur_enddate', 'recur_interval', 'recur_exception', 'recur_data') as $name)
 		{
 			unset($event[$name]);
 		}
 		// add all alarms as new alarms to execption
 		$event['alarm'] = array_values((array)$event['alarm']);
-		foreach($event['alarm'] as &$alarm)
+		foreach ($event['alarm'] as &$alarm)
 		{
 			unset($alarm['uid'], $alarm['id'], $alarm['time']);
 		}
-		if($this->bo->check_perms(Acl::EDIT,$event))
+		if ($this->bo->check_perms(Acl::EDIT, $event))
 		{
 			return lang('Save event as exception - Delete single occurrence - Edit status or alarms for this particular day');
 		}
@@ -1133,14 +1131,14 @@ 
 	{
 		$msg = false;
 
-		if(!$as_of_date )
+		if (!$as_of_date)
 		{
 			$as_of_date = time();
 		}
 
 		//error_log(__METHOD__ . Api\DateTime::to($old_event['start']) . ' -> '. Api\DateTime::to($event['start']) . ' as of ' . Api\DateTime::to($as_of_date));
 
-		if(!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
+		if (!($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + 1, true)))
 		{
 			$msg = lang("Error: You can't shift a series from the past!");
 			return $msg;
@@ -1153,11 +1151,11 @@ 
 		$duration = $event['duration'] ? $event['duration'] : $event['end'] - $event['start'];
 
 		// base start-date of new series on actual / clicked date
-		$event['start'] = $as_of_date ;
+		$event['start'] = $as_of_date;
 
-		if (Api\DateTime::to($old_event['start'],'Ymd') < Api\DateTime::to($as_of_date,'Ymd') ||
+		if (Api\DateTime::to($old_event['start'], 'Ymd') < Api\DateTime::to($as_of_date, 'Ymd') ||
 			// Adjust for requested date in the past
-			Api\DateTime::to($as_of_date,'ts') < time()
+			Api\DateTime::to($as_of_date, 'ts') < time()
 		)
 		{
 
@@ -1177,17 +1175,17 @@ 
 				$rriter->next_no_exception();
 				$occurrence = $rriter->current();
 			}
-			while ($rriter->valid()  && (
+			while ($rriter->valid() && (
 				Api\DateTime::to($occurrence, 'ts') <= time() ||
-				Api\DateTime::to($occurrence, 'Ymd') < Api\DateTime::to($as_of_date,'Ymd')
+				Api\DateTime::to($occurrence, 'Ymd') < Api\DateTime::to($as_of_date, 'Ymd')
 			) && ($last = $occurrence));
 
 
 			// Make sure as_of_date is still valid, may have to move forward
-			if(Api\DateTime::to($as_of_date,'ts') < Api\DateTime::to($last,'ts') ||
+			if (Api\DateTime::to($as_of_date, 'ts') < Api\DateTime::to($last, 'ts') ||
 				Api\DateTime::to($as_of_date, 'Ymd') == Api\DateTime::to($last, 'Ymd'))
 			{
-				$event['start'] = Api\DateTime::to($rriter->current(),'ts') + $offset;
+				$event['start'] = Api\DateTime::to($rriter->current(), 'ts') + $offset;
 			}
 
 			//error_log(__METHOD__ ." Series should end at " . Api\DateTime::to($last) . " New series starts at " . Api\DateTime::to($event['start']));
@@ -1195,7 +1193,7 @@ 
 			{
 				$event['end'] = $event['start'] + $duration;
 			}
-			elseif($event['end'] < $event['start'])
+			elseif ($event['end'] < $event['start'])
 			{
 				$event['end'] = $old_event['end'] - $old_event['start'] + $event['start'];
 			}
@@ -1204,7 +1202,7 @@ 
 			$event['participants'] = $old_event['participants'];
 			foreach ($old_event['recur_exception'] as $key => $exdate)
 			{
-				if ($exdate > Api\DateTime::to($last,'ts'))
+				if ($exdate > Api\DateTime::to($last, 'ts'))
 				{
 					//error_log("Moved exception on " . Api\DateTime::to($exdate));
 					unset($old_event['recur_exception'][$key]);
@@ -1218,18 +1216,18 @@ 
 			}
 			$last->setTime(0, 0, 0);
 			$old_event['recur_enddate'] = Api\DateTime::to($last, 'ts');
-			if (!$this->bo->update($old_event,true,true,false,true,$dummy=null,$no_notifications))
+			if (!$this->bo->update($old_event, true, true, false, true, $dummy = null, $no_notifications))
 			{
-				$msg .= ($msg ? ', ' : '') .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(
+				$msg .= ($msg ? ', ' : '').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' => 'calendar.calendar_uiforms.edit',
 							'cal_id'    => $event['id'],
-						))).'">','</a>');
+						))).'">', '</a>');
 				$event = $orig_event;
 			}
 		}
-		$event['start'] = Api\DateTime::to($event['start'],'ts');
+		$event['start'] = Api\DateTime::to($event['start'], 'ts');
 		return $msg;
 	}
 
@@ -1240,11 +1238,11 @@ 
 	 * @param boolean $added
 	 * @return string javascript window.open command
 	 */
-	function ajax_custom_mail($event,$added,$asrequest=false)
+	function ajax_custom_mail($event, $added, $asrequest = false)
 	{
 		$to = array();
 
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$uid.':'.array2string($status));
 			if (empty($status)) continue;
@@ -1253,32 +1251,32 @@ 
 
 			if (isset($status['uid']) && is_numeric($status['uid']) && $GLOBALS['egw']->accounts->get_type($status['uid']) == 'u')
 			{
-				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'],'account_email'))) continue;
+				if (!($email = $GLOBALS['egw']->accounts->id2name($status['uid'], 'account_email'))) continue;
 
 				$toadd = $GLOBALS['egw']->accounts->id2name($status['uid'], 'account_firstname').' '.
 					$GLOBALS['egw']->accounts->id2name($status['uid'], 'account_lastname').' <'.$email.'>';
 
-				if (!in_array($toadd,$to)) $to[] = $toadd;
+				if (!in_array($toadd, $to)) $to[] = $toadd;
 			}
 			elseif ($uid < 0)
 			{
-				foreach($GLOBALS['egw']->accounts->members($uid,true) as $uid)
+				foreach ($GLOBALS['egw']->accounts->members($uid, true) as $uid)
 				{
-					if (!($email = $GLOBALS['egw']->accounts->id2name($uid,'account_email'))) continue;
+					if (!($email = $GLOBALS['egw']->accounts->id2name($uid, 'account_email'))) continue;
 
 					$toadd = $GLOBALS['egw']->accounts->id2name($uid, 'account_firstname').' '.
 						$GLOBALS['egw']->accounts->id2name($uid, 'account_lastname').' <'.$email.'>';
 
 					// dont add groupmembers if they already rejected the event, or are the current user
-					if (!in_array($toadd,$to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
+					if (!in_array($toadd, $to) && ($event['participants'][$uid] !== 'R' && $uid != $this->user)) $to[] = $toadd;
 				}
 			}
-			elseif(!empty($status['uid'])&& !is_numeric(substr($status['uid'],0,1)) && ($info = $this->bo->resource_info($status['uid'])))
+			elseif (!empty($status['uid']) && !is_numeric(substr($status['uid'], 0, 1)) && ($info = $this->bo->resource_info($status['uid'])))
 			{
 				$to[] = $info['email'];
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
-			elseif(!is_numeric(substr($uid,0,1)) && ($info = $this->bo->resource_info($uid)))
+			elseif (!is_numeric(substr($uid, 0, 1)) && ($info = $this->bo->resource_info($uid)))
 			{
 				$to[] = $info['email'];
 				//error_log(__METHOD__.__LINE__.array2string($to));
@@ -1287,7 +1285,7 @@ 
 		// prefer event description over standard notification text
 		if (empty($event['description']))
 		{
-			list(,$body) = $this->bo->get_update_message($event,$added ? MSG_ADDED : MSG_MODIFIED);	// update-message is in TZ of the user
+			list(,$body) = $this->bo->get_update_message($event, $added ? MSG_ADDED : MSG_MODIFIED); // update-message is in TZ of the user
 		}
 		else
 		{
@@ -1302,12 +1300,12 @@ 
 		$boical = new calendar_ical();
 		// we need to pass $event[id] so iCal class reads event again,
 		// as event is in user TZ, but iCal class expects server TZ!
-		$ics = $boical->exportVCal(array($event['id']),'2.0','REQUEST',false);
+		$ics = $boical->exportVCal(array($event['id']), '2.0', 'REQUEST', false);
 
-		$ics_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'ics');
-		if(($f = fopen($ics_file,'w')))
+		$ics_file = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'ics');
+		if (($f = fopen($ics_file, 'w')))
 		{
-			fwrite($f,$ics);
+			fwrite($f, $ics);
 			fclose($f);
 		}
 		//error_log(__METHOD__.__LINE__.array2string($to));
@@ -1319,7 +1317,7 @@ 
 			'preset[body]'    => $body,
 			'preset[name]'    => 'event.ics',
 			'preset[file]'    => $ics_file,
-			'preset[type]'    => 'text/calendar'.($asrequest?'; method=REQUEST':''),
+			'preset[type]'    => 'text/calendar'.($asrequest ? '; method=REQUEST' : ''),
 			'preset[size]'    => filesize($ics_file),
 		);
 		if ($asrequest) $vars['preset[msg]'] = lang('You attempt to mail a meetingrequest to the recipients above. Depending on the client this mail is opened with, the recipient may or may not see the mailbody below, but only see the meeting request attached.');
@@ -1375,7 +1373,7 @@ 
 	 * @param mixed $link_to_id ='' from or for the link-widget
 	 * @param string $msg_type =null default automatic detect, if it contains "error"
 	 */
-	function edit($event=null,$preserv=null,$msg='',$link_to_id='',$msg_type=null)
+	function edit($event = null, $preserv = null, $msg = '', $link_to_id = '', $msg_type = null)
 	{
 		$sel_options = array(
 			'recur_type' => &$this->bo->recur_types,
@@ -1399,8 +1397,8 @@ 
 				'no_popup' => isset($_GET['no_popup']),
 				'template' => isset($_GET['template']) ? $_GET['template'] : (isset($_REQUEST['print']) ? 'calendar.print' : 'calendar.edit'),
 			);
-			$cal_id = (int) $_GET['cal_id'];
-			if($_GET['action'])
+			$cal_id = (int)$_GET['cal_id'];
+			if ($_GET['action'])
 			{
 				$event = $this->bo->read($cal_id);
 				$event['action'] = $_GET['action'];
@@ -1418,14 +1416,14 @@ 
 			{
 				//error_log(__METHOD__."() Error: importing the iCal: vfs file not found '$_GET[ical_vfs]'!");
 				$msg = lang('Error: importing the iCal').': '.lang('VFS file not found').': '.$_GET['ical_vfs'];
-				$event =& $this->default_add_event();
+				$event = & $this->default_add_event();
 			}
 			if (!empty($_GET['ical_data']) &&
 				!($_GET['ical'] = Link::get_data($_GET['ical_data'])))
 			{
 				//error_log(__METHOD__."() Error: importing the iCal: data not found '$_GET[ical_data]'!");
 				$msg = lang('Error: importing the iCal').': '.lang('Data not found').': '.$_GET['ical_data'];
-				$event =& $this->default_add_event();
+				$event = & $this->default_add_event();
 			}
 			if (!empty($_GET['ical']))
 			{
@@ -1434,14 +1432,14 @@ 
 				{
 					error_log(__METHOD__."('$_GET[ical]') error parsing iCal!");
 					$msg = lang('Error: importing the iCal');
-					$event =& $this->default_add_event();
+					$event = & $this->default_add_event();
 				}
 				else
 				{
 					if (count($events) > 1)
 					{
 						$msg = lang('%1 events in iCal file, only first one imported and displayed!', count($events));
-						$msg_type = 'notice';	// no not hide automatic
+						$msg_type = 'notice'; // no not hide automatic
 					}
 					// as icaltoegw returns timestamps in server-time, we have to convert them here to user-time
 					$this->bo->db2data($events, 'ts');
@@ -1454,7 +1452,7 @@ 
 					else
 					{
 						$event['participant_types'] = array();
-						foreach($event['participants'] as $uid => $status)
+						foreach ($event['participants'] as $uid => $status)
 						{
 							$user_type = $user_id = null;
 							calendar_so::split_user($uid, $user_type, $user_id);
@@ -1475,15 +1473,15 @@ 
 					}
 					else
 					{
-						$GLOBALS['egw']->framework->render('<p class="message" align="center">'.lang('Permission denied')."</p>\n",null,true);
+						$GLOBALS['egw']->framework->render('<p class="message" align="center">'.lang('Permission denied')."</p>\n", null, true);
 						exit();
 					}
 				}
-				$event =& $this->default_add_event();
+				$event = & $this->default_add_event();
 			}
 			else
 			{
-				$preserv['actual_date'] = $event['start'];		// remember the date clicked
+				$preserv['actual_date'] = $event['start']; // remember the date clicked
 				if ($event['recur_type'] != MCAL_RECUR_NONE)
 				{
 					if (empty($event['whole_day']))
@@ -1496,10 +1494,10 @@ 
 						$date->setUser();
 					}
 					$event = $this->bo->read($cal_id, $date, true);
-					$preserv['actual_date'] = $event['start'];		// remember the date clicked
+					$preserv['actual_date'] = $event['start']; // remember the date clicked
 					if ($_GET['exception'])
 					{
-						$msg = $this->_create_exception($event,$preserv);
+						$msg = $this->_create_exception($event, $preserv);
 					}
 					else
 					{
@@ -1508,9 +1506,9 @@ 
 				}
 			}
 			// set new start and end if given by $_GET
-			if(isset($_GET['start'])) { $event['start'] = Api\DateTime::to($_GET['start'],'ts'); }
-			if(isset($_GET['end'])) { $event['end'] = Api\DateTime::to($_GET['end'],'ts'); }
-			if(isset($_GET['non_blocking'])) { $event['non_blocking'] = (bool)$_GET['non_blocking']; }
+			if (isset($_GET['start'])) { $event['start'] = Api\DateTime::to($_GET['start'], 'ts'); }
+			if (isset($_GET['end'])) { $event['end'] = Api\DateTime::to($_GET['end'], 'ts'); }
+			if (isset($_GET['non_blocking'])) { $event['non_blocking'] = (bool)$_GET['non_blocking']; }
 			// check if the event is the whole day
 			$start = $this->bo->date2array($event['start']);
 			$end = $this->bo->date2array($event['end']);
@@ -1520,30 +1518,30 @@ 
 			if (!$event['id'] && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']))
 			{
 				$link_ids = is_array($_REQUEST['link_id']) ? $_REQUEST['link_id'] : array($_REQUEST['link_id']);
-				foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
+				foreach (is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 				{
 					$link_id = $link_ids[$n];
-					if(!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// guard against XSS
+					if (!preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i', $link_app.':'.$link_id))	// guard against XSS
 					{
 						continue;
 					}
-					if(!$n)
+					if (!$n)
 					{
-						$event['title'] = Link::title($link_app,$link_id);
+						$event['title'] = Link::title($link_app, $link_id);
 						// ask first linked app via "calendar_set" hook, for further data to set, incl. links
-						if (($set = Api\Hooks::single($event+array('location'=>'calendar_set','entry_id'=>$link_id),$link_app)))
+						if (($set = Api\Hooks::single($event + array('location'=>'calendar_set', 'entry_id'=>$link_id), $link_app)))
 						{
-							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])) Link::link('calendar',$event['link_to']['to_id'],$l_app,$l_id);
+								if (($l_id = $set['link_id'][$i])) Link::link('calendar', $event['link_to']['to_id'], $l_app, $l_id);
 							}
 							unset($set['link_app']);
 							unset($set['link_id']);
 
-							$event = array_merge($event,$set);
+							$event = array_merge($event, $set);
 						}
 					}
-					Link::link('calendar',$link_to_id,$link_app,$link_id);
+					Link::link('calendar', $link_to_id, $link_app, $link_id);
 				}
 			}
 		}
@@ -1553,44 +1551,44 @@ 
 		{
 			$etpl->read($preserv['template'] = 'calendar.edit');
 		}
-		$view = $preserv['view'] = $preserv['view'] || $event['id'] && !$this->bo->check_perms(Acl::EDIT,$event);
+		$view = $preserv['view'] = $preserv['view'] || $event['id'] && !$this->bo->check_perms(Acl::EDIT, $event);
 		//echo "view=$view, event="; _debug_array($event);
 		// shared locking of entries to edit
 		if (!$view && ($locktime = $GLOBALS['egw_info']['server']['Lock_Time_Calender']) && $event['id'])
 		{
-			$lock_path = Vfs::app_entry_lock_path('calendar',$event['id']);
+			$lock_path = Vfs::app_entry_lock_path('calendar', $event['id']);
 			$lock_owner = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
 
 			if (($preserv['lock_token'] = $event['lock_token']))		// already locked --> refresh the lock
 			{
-				Vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',true,false);
+				Vfs::lock($lock_path, $preserv['lock_token'], $locktime, $lock_owner, $scope = 'shared', $type = 'write', true, false);
 			}
 			if (($lock = Vfs::checkLock($lock_path)) && $lock['owner'] != $lock_owner)
 			{
 				$msg .= ' '.lang('This entry is currently opened by %1!',
-					(($lock_uid = $GLOBALS['egw']->accounts->name2id(substr($lock['owner'],7),'account_email')) ?
+					(($lock_uid = $GLOBALS['egw']->accounts->name2id(substr($lock['owner'], 7), 'account_email')) ?
 					Api\Accounts::username($lock_uid) : $lock['owner']));
 			}
-			elseif($lock)
+			elseif ($lock)
 			{
 				$preserv['lock_token'] = $lock['token'];
 			}
-			elseif(Vfs::lock($lock_path,$preserv['lock_token'],$locktime,$lock_owner,$scope='shared',$type='write',false,false))
+			elseif (Vfs::lock($lock_path, $preserv['lock_token'], $locktime, $lock_owner, $scope = 'shared', $type = 'write', false, false))
 			{
 				//We handle AJAX_REQUEST in client-side for unlocking the locked entry, in case of closing the entry by X button or close button
 			}
 			else
 			{
-				$msg .= ' '.lang("Can't aquire lock!");		// eg. an exclusive lock via CalDAV ...
+				$msg .= ' '.lang("Can't aquire lock!"); // eg. an exclusive lock via CalDAV ...
 				$view = true;
 			}
 		}
-		$content = array_merge($event,array(
+		$content = array_merge($event, array(
 			'link_to' => array(
 				'to_id'  => $link_to_id,
 				'to_app' => 'calendar',
 			),
-			'edit_single' => $preserv['edit_single'],	// need to be in content too, as it is used in the template
+			'edit_single' => $preserv['edit_single'], // need to be in content too, as it is used in the template
 			'tabs'   => $preserv['tabs'],
 			'view' => $view,
 			'query_delete_exceptions' => (int)($event['recur_type'] && $event['recur_exception']),
@@ -1602,11 +1600,11 @@ 
 		$row = 3;
 		$readonlys = $content['participants'] = $preserv['participants'] = array();
 		// preserve some ui elements, if set eg. under error-conditions
-		foreach(array('quantity','resource','role') as $n)
+		foreach (array('quantity', 'resource', 'role') as $n)
 		{
 			if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n];
 		}
-		foreach($event['participant_types'] as $type => $participants)
+		foreach ($event['participant_types'] as $type => $participants)
 		{
 			$name = 'accounts';
 			if (isset($this->bo->resources[$type]))
@@ -1615,17 +1613,17 @@ 
 			}
 			// sort participants (in there group/app) by title
 			uksort($participants, array($this, 'uid_title_cmp'));
-			foreach($participants as $id => $status)
+			foreach ($participants as $id => $status)
 			{
 				$uid = $type == 'u' ? $id : $type.$id;
 				$quantity = $role = null;
-				calendar_so::split_status($status,$quantity,$role);
+				calendar_so::split_status($status, $quantity, $role);
 				$preserv['participants'][$row] = $content['participants'][$row] = array(
 					'app'      => $name == 'accounts' ? ($GLOBALS['egw']->accounts->get_type($id) == 'g' ? 'Group' : 'User') : $name,
 					'uid'      => $uid,
 					'status'   => $status,
 					'old_status' => $status,
-					'quantity' => $quantity > 1 || $uid[0] == 'r' ? $quantity : '',	// only display quantity for resources or if > 1
+					'quantity' => $quantity > 1 || $uid[0] == 'r' ? $quantity : '', // only display quantity for resources or if > 1
 					'role'     => $role,
 				);
 				// replace iCal roles with a nicer label and remove regular REQ-PARTICIPANT
@@ -1634,33 +1632,33 @@ 
 					$content['participants'][$row]['role_label'] = lang($this->bo->roles[$role]);
 				}
 				// allow third party apps to use categories for roles
-				elseif(substr($role,0,6) == 'X-CAT-')
+				elseif (substr($role, 0, 6) == 'X-CAT-')
 				{
-					$content['participants'][$row]['role_label'] = $GLOBALS['egw']->categories->id2name(substr($role,6));
+					$content['participants'][$row]['role_label'] = $GLOBALS['egw']->categories->id2name(substr($role, 6));
 				}
 				else
 				{
-					$content['participants'][$row]['role_label'] = lang(str_replace('X-','',$role));
+					$content['participants'][$row]['role_label'] = lang(str_replace('X-', '', $role));
 				}
-				$content['participants'][$row]['delete_id'] = strpbrk($uid,'"\'<>') !== false ? md5($uid) : $uid;
+				$content['participants'][$row]['delete_id'] = strpbrk($uid, '"\'<>') !== false ? md5($uid) : $uid;
 				//echo "<p>$uid ($quantity): $role --> {$content['participants'][$row]['role']}</p>\n";
 
-				if (($no_status = !$this->bo->check_status_perms($uid,$event)) || $view)
+				if (($no_status = !$this->bo->check_status_perms($uid, $event)) || $view)
 					$readonlys['participants'][$row]['status'] = $no_status;
-				if ($preserv['hide_delete'] || !$this->bo->check_perms(Acl::EDIT,$event))
+				if ($preserv['hide_delete'] || !$this->bo->check_perms(Acl::EDIT, $event))
 					$readonlys['participants']['delete'][$uid] = true;
 				// todo: make the participants available as links with email as title
 				$content['participants'][$row++]['title'] = $this->get_title($uid);
 				// enumerate group-invitations, so people can accept/reject them
 				if ($name == 'accounts' && $GLOBALS['egw']->accounts->get_type($id) == 'g' &&
-					($members = $GLOBALS['egw']->accounts->members($id,true)))
+					($members = $GLOBALS['egw']->accounts->members($id, true)))
 				{
 					$sel_options['status']['G'] = lang('Select one');
 					// sort members by title
 					usort($members, array($this, 'uid_title_cmp'));
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
-						if (!isset($participants[$member]) && $this->bo->check_perms(Acl::READ,0,$member))
+						if (!isset($participants[$member]) && $this->bo->check_perms(Acl::READ, 0, $member))
 						{
 							$preserv['participants'][$row] = $content['participants'][$row] = array(
 								'app'      => 'Group invitation',
@@ -1669,7 +1667,7 @@ 
 							);
 							$readonlys['participants'][$row]['quantity'] = $readonlys['participants']['delete'][$member] = true;
 							// read access is enough to invite participants, but you need edit rights to change status
-							$readonlys['participants'][$row]['status'] = !$this->bo->check_perms(Acl::EDIT,0,$member);
+							$readonlys['participants'][$row]['status'] = !$this->bo->check_perms(Acl::EDIT, 0, $member);
 							$content['participants'][$row++]['title'] = Api\Accounts::username($member);
 						}
 					}
@@ -1677,43 +1675,43 @@ 
 			}
 			// resouces / apps we shedule, atm. resources and addressbook
 			$content['participants']['cal_resources'] = '';
-			foreach($this->bo->resources as $data)
+			foreach ($this->bo->resources as $data)
 			{
-				if ($data['app'] == 'email') continue;	// make no sense, as we cant search for email
+				if ($data['app'] == 'email') continue; // make no sense, as we cant search for email
 				$content['participants']['cal_resources'] .= ','.$data['app'];
 			}
 		}
 		$content['participants']['status_date'] = $preserv['actual_date'];
-		$preserved = array_merge($preserv,$content);
+		$preserved = array_merge($preserv, $content);
 		$event['new_alarm']['options'] = $content['new_alarm']['options'];
 		if ($event['alarm'])
 		{
 			// makes keys of the alarm-array starting with 1
 			$content['alarm'] = array(false);
-			foreach(array_values($event['alarm']) as $id => $alarm)
+			foreach (array_values($event['alarm']) as $id => $alarm)
 			{
-				if (!$alarm['all'] && !$this->bo->check_perms(Acl::READ,0,$alarm['owner']))
+				if (!$alarm['all'] && !$this->bo->check_perms(Acl::READ, 0, $alarm['owner']))
 				{
-					continue;	// no read rights to the calendar of the alarm-owner, dont show the alarm
+					continue; // no read rights to the calendar of the alarm-owner, dont show the alarm
 				}
-				$alarm['all'] = (int) $alarm['all'];
+				$alarm['all'] = (int)$alarm['all'];
 				$after = false;
-				if($alarm['offset'] < 0)
+				if ($alarm['offset'] < 0)
 				{
 					$after = true;
 					$alarm['offset'] = -1 * $alarm['offset'];
 				}
-				$days = (int) ($alarm['offset'] / DAY_s);
-				$hours = (int) (($alarm['offset'] % DAY_s) / HOUR_s);
-				$minutes = (int) (($alarm['offset'] % HOUR_s) / 60);
+				$days = (int)($alarm['offset'] / DAY_s);
+				$hours = (int)(($alarm['offset'] % DAY_s) / HOUR_s);
+				$minutes = (int)(($alarm['offset'] % HOUR_s) / 60);
 				$label = array();
 				if ($days) $label[] = $days.' '.lang('days');
 				if ($hours) $label[] = $hours.' '.lang('hours');
 				if ($minutes) $label[] = $minutes.' '.lang('Minutes');
-				$alarm['offset'] = implode(', ',$label) . ' ' . ($after ? lang('after') : lang('before'));
+				$alarm['offset'] = implode(', ', $label).' '.($after ? lang('after') : lang('before'));
 				$content['alarm'][] = $alarm;
 
-				$readonlys['alarm[delete_alarm]['.$alarm['id'].']'] = !$this->bo->check_perms(Acl::EDIT,$alarm['all'] ? $event : 0,$alarm['owner']);
+				$readonlys['alarm[delete_alarm]['.$alarm['id'].']'] = !$this->bo->check_perms(Acl::EDIT, $alarm['all'] ? $event : 0, $alarm['owner']);
 			}
 			if (count($content['alarm']) == 1)
 			{
@@ -1728,20 +1726,20 @@ 
 
 		if ($view)
 		{
-			$readonlys['__ALL__'] = true;	// making everything readonly, but widgets set explicitly to false
+			$readonlys['__ALL__'] = true; // making everything readonly, but widgets set explicitly to false
 			$readonlys['button[cancel]'] = $readonlys['action'] =
 				$readonlys['before_after'] = $readonlys['button[add_alarm]'] = $readonlys['new_alarm[owner]'] =
 				$readonlys['new_alarm[options]'] = $readonlys['new_alarm[date]'] = false;
 
 			$content['participants']['no_add'] = true;
 
-			if(!$event['whole_day'])
+			if (!$event['whole_day'])
 			{
 				$etpl->setElementAttribute('whole_day', 'disabled', true);
 			}
 
 			// respect category permissions
-			if(!empty($event['category']))
+			if (!empty($event['category']))
 			{
 				$content['category'] = $this->categories->check_list(Acl::READ, $event['category']);
 			}
@@ -1752,7 +1750,7 @@ 
 
 			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
-				$readonlys['recur_exception'] = !count($content['recur_exception']);	// otherwise we get a delete button
+				$readonlys['recur_exception'] = !count($content['recur_exception']); // otherwise we get a delete button
 				//$onclick =& $etpl->get_cell_attribute('button[delete]','onclick');
 				//$onclick = str_replace('Delete this event','Delete this series of recuring events',$onclick);
 			}
@@ -1762,9 +1760,9 @@ 
 				$readonlys['recur_interval'] = $readonlys['recur_data'] = true;
 			}
 		}
-		if($content['category'] && !is_array($content['category']))
+		if ($content['category'] && !is_array($content['category']))
 		{
-			$content['category'] = explode(',',$event['category']);
+			$content['category'] = explode(',', $event['category']);
 		}
 		// disabling the custom fields tab, if there are none
 		$readonlys['tabs'] = array(
@@ -1781,13 +1779,13 @@ 
 		{
 			$readonlys['action'] = true;
 		}
-		if (!($readonlys['button[exception]'] = !$this->bo->check_perms(Acl::EDIT,$event) || $event['recur_type'] == MCAL_RECUR_NONE || ($event['recur_enddate'] &&$event['start'] > $event['recur_enddate'])))
+		if (!($readonlys['button[exception]'] = !$this->bo->check_perms(Acl::EDIT, $event) || $event['recur_type'] == MCAL_RECUR_NONE || ($event['recur_enddate'] && $event['start'] > $event['recur_enddate'])))
 		{
 			$content['exception_label'] = $this->bo->long_date(max($preserved['actual_date'], $event['start']));
 		}
-		$readonlys['button[delete]'] = !$event['id'] || $preserved['hide_delete'] || !$this->bo->check_perms(Acl::DELETE,$event);
+		$readonlys['button[delete]'] = !$event['id'] || $preserved['hide_delete'] || !$this->bo->check_perms(Acl::DELETE, $event);
 
-		if (!$event['id'] || $this->bo->check_perms(Acl::EDIT,$event))	// new event or edit rights to the event ==> allow to add alarm for all users
+		if (!$event['id'] || $this->bo->check_perms(Acl::EDIT, $event))	// new event or edit rights to the event ==> allow to add alarm for all users
 		{
 			$sel_options['owner'][0] = lang('All participants');
 		}
@@ -1795,25 +1793,25 @@ 
 		{
 			$sel_options['owner'][$this->user] = $this->bo->participant_name($this->user);
 		}
-		foreach((array) $event['participant_types']['u'] as $uid => $status)
+		foreach ((array)$event['participant_types']['u'] as $uid => $status)
 		{
-			if ($uid != $this->user && $status != 'R' && $this->bo->check_perms(Acl::EDIT,0,$uid))
+			if ($uid != $this->user && $status != 'R' && $this->bo->check_perms(Acl::EDIT, 0, $uid))
 			{
 				$sel_options['owner'][$uid] = $this->bo->participant_name($uid);
 			}
 		}
-		$content['no_add_alarm'] = !count($sel_options['owner']);	// no rights to set any alarm
+		$content['no_add_alarm'] = !count($sel_options['owner']); // no rights to set any alarm
 		if (!$event['id'])
 		{
-			$etpl->set_cell_attribute('button[new_alarm]','type','checkbox');
+			$etpl->set_cell_attribute('button[new_alarm]', 'type', 'checkbox');
 		}
 		if ($preserved['no_popup'])
 		{
-			$etpl->set_cell_attribute('button[cancel]','onclick','');
+			$etpl->set_cell_attribute('button[cancel]', 'onclick', '');
 		}
 
 		// Allow admins to restore deleted events
-		if($GLOBALS['egw_info']['server']['calendar_delete_history'] && $event['deleted'] )
+		if ($GLOBALS['egw_info']['server']['calendar_delete_history'] && $event['deleted'])
 		{
 			$content['deleted'] = $preserved['deleted'] = null;
 			$etpl->set_cell_attribute('button[save]', 'label', 'Recover');
@@ -1825,7 +1823,7 @@ 
 		// Setup history tab
 		$this->setup_history($content, $sel_options);
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - '
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '
 			. (!$event['id'] ? lang('Add')
 				: ($view ? ($content['edit_single'] ? lang('View exception') : ($content['recur_type'] ? lang('View series') : lang('View')))
 					: ($content['edit_single'] ? lang('Create exception') : ($content['recur_type'] ? lang('Edit series') : lang('Edit')))));
@@ -1835,15 +1833,15 @@ 
 		if (!empty($preserved['lock_token'])) $content['lock_token'] = $preserved['lock_token'];
 
 		// non_interactive==true from $_GET calls immediate save action without displaying the edit form
-		if(isset($_GET['non_interactive']) && (bool)$_GET['non_interactive'] === true)
+		if (isset($_GET['non_interactive']) && (bool)$_GET['non_interactive'] === true)
 		{
-			unset($_GET['non_interactive']);	// prevent process_exec <--> edit loops
+			unset($_GET['non_interactive']); // prevent process_exec <--> edit loops
 			$content['button']['save'] = true;
-			$this->process_edit(array_merge($content,$preserved));
+			$this->process_edit(array_merge($content, $preserved));
 		}
 		else
 		{
-			$etpl->exec('calendar.calendar_uiforms.process_edit',$content,$sel_options,$readonlys,$preserved,$preserved['no_popup'] ? 0 : 2);
+			$etpl->exec('calendar.calendar_uiforms.process_edit', $content, $sel_options, $readonlys, $preserved, $preserved['no_popup'] ? 0 : 2);
 		}
 	}
 
@@ -1853,14 +1851,14 @@ 
 	 * @param int $id
 	 * @param string $token
 	 */
-	function ajax_unlock($id,$token)
+	function ajax_unlock($id, $token)
 	{
-		$lock_path = Vfs::app_entry_lock_path('calendar',$id);
+		$lock_path = Vfs::app_entry_lock_path('calendar', $id);
 		$lock_owner = 'mailto:'.$GLOBALS['egw_info']['user']['account_email'];
 
 		if (($lock = Vfs::checkLock($lock_path)) && $lock['owner'] == $lock_owner || $lock['token'] == $token)
 		{
-			Vfs::unlock($lock_path,$token,false);
+			Vfs::unlock($lock_path, $token, false);
 		}
 	}
 
@@ -1872,17 +1870,17 @@ 
 	 * 		are called by new mail-app; and we intend to use the stuff passed on by session
 	 * @param string $msg = null
 	 */
-	function meeting(array $event=null, $msg=null)
+	function meeting(array $event = null, $msg = null)
 	{
 		$user = $GLOBALS['egw_info']['user']['account_id'];
 		$readonlys['button[apply]'] = true;
-		$_usesession=!is_array($event);
+		$_usesession = !is_array($event);
 		//special usage if $event is array('event'=>null,'msg'=>'','useSession'=>true) we
 		//are called by new mail-app; and we intend to use the stuff passed on by session
-		if ($event == array('event'=>null,'msg'=>'','useSession'=>true))
+		if ($event == array('event'=>null, 'msg'=>'', 'useSession'=>true))
 		{
-			$event=null; // set to null
-			$_usesession=true; // trigger session read
+			$event = null; // set to null
+			$_usesession = true; // trigger session read
 		}
 		if (!is_array($event))
 		{
@@ -1911,7 +1909,7 @@ 
 
 			if (($existing_event = $this->bo->read($event['uid'])) && !$existing_event['deleted'])
 			{
-				switch(strtolower($ical_method))
+				switch (strtolower($ical_method))
 				{
 					case 'reply':
 						// first participant is the one replying (our iCal parser adds owner first!)
@@ -1965,19 +1963,19 @@ 
 			}
 			else	// event not in calendar
 			{
-				$readonlys['button[cancel]'] = true;	// no way to remove a canceled event not in calendar
+				$readonlys['button[cancel]'] = true; // no way to remove a canceled event not in calendar
 			}
 			$event['participant_types'] = array();
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				$user_type = $user_id = null;
 				calendar_so::split_user($uid, $user_type, $user_id);
 				$event['participants'][$uid] = $event['participant_types'][$user_type][$user_id] =
-					$status && $status !== 'X' ? $status : 'U';	// X --> no status given --> U = unknown
+					$status && $status !== 'X' ? $status : 'U'; // X --> no status given --> U = unknown
 			}
 			//error_log(__METHOD__."(...) parsed as ".array2string($event));
 			$event['recure'] = $this->bo->recure2string($event);
-			$event['all_participants'] = implode(",\n",$this->bo->participants($event, true));
+			$event['all_participants'] = implode(",\n", $this->bo->participants($event, true));
 
 			// ignore events in the past (for recurring events check enddate!)
 			if ($this->bo->date2ts($event['start']) < $this->bo->now_su &&
@@ -1997,23 +1995,23 @@ 
 			// clear notification errors
 			notifications::errors(true);
 
-			switch($button)
+			switch ($button)
 			{
 				case 'reject':
 					if (!$event['id'])
 					{
 						// send reply to organizer
-						$this->bo->send_update(MSG_REJECTED,array('e'.$event['organizer'] => 'DCHAIR'),$event);
-						break;	// no need to store rejected event
+						$this->bo->send_update(MSG_REJECTED, array('e'.$event['organizer'] => 'DCHAIR'), $event);
+						break; // no need to store rejected event
 					}
 					// fall-through
 				case 'accept':
 				case 'tentativ':
-					$status = strtoupper($button[0]);	// A, R or T
+					$status = strtoupper($button[0]); // A, R or T
 					if (!$event['id'])
 					{
 						// if organizer is a EGroupware user, but we have no rights to organizers calendar
-						if (isset($event['owner']) && !$this->bo->check_perms(Acl::ADD,0,$event['owner']))
+						if (isset($event['owner']) && !$this->bo->check_perms(Acl::ADD, 0, $event['owner']))
 						{
 							// --> make organize a participant with role chair and current user the owner
 							$event['participant_types']['u'] = $event['participants'][$event['owner']] =
@@ -2021,7 +2019,7 @@ 
 							$event['owner'] = $this->user;
 						}
 						// store event without notifications!
-						if (($event['id'] = $this->bo->update($event, $ignore_conflicts=true, true, false, true, $msg, true)))
+						if (($event['id'] = $this->bo->update($event, $ignore_conflicts = true, true, false, true, $msg, true)))
 						{
 							$msg[] = lang('Event saved');
 						}
@@ -2059,7 +2057,7 @@ 
 		Framework::message(implode("\n", (array)$msg));
 		$readonlys['button[edit]'] = !$event['id'];
 		$event['ics_method'] = $readonlys['ics_method'] = strtolower($ical_method);
-		switch(strtolower($ical_method))
+		switch (strtolower($ical_method))
 		{
 			case 'reply':
 				$event['ics_method_label'] = lang('Reply to meeting request');
@@ -2083,37 +2081,37 @@ 
 	 * @param array $conflicts array with conflicting events, the events are not garantied to be readable by the user!
 	 * @param array $preserv data to preserv
 	 */
-	function conflicts($event,$conflicts,$preserv)
+	function conflicts($event, $conflicts, $preserv)
 	{
 		$etpl = new Etemplate('calendar.conflicts');
 		$allConflicts = array();
 
-		foreach($conflicts as $k => $conflict)
+		foreach ($conflicts as $k => $conflict)
 		{
-			$is_readable = $this->bo->check_perms(Acl::READ,$conflict);
+			$is_readable = $this->bo->check_perms(Acl::READ, $conflict);
 
 			$conflicts[$k] += array(
 				'icon_participants' => $is_readable ? (count($conflict['participants']) > 1 ? 'users' : 'single') : 'private',
-				'tooltip_participants' => $is_readable ? implode(', ',$this->bo->participants($conflict)) : '',
-				'time' => $this->bo->long_date($conflict['start'],$conflict['end'],true),
-				'conflicting_participants' => implode(",\n",$this->bo->participants(array(
-					'participants' => array_intersect_key((array)$conflict['participants'],$event['participants']),
-				),true,true)),	// show group invitations too
+				'tooltip_participants' => $is_readable ? implode(', ', $this->bo->participants($conflict)) : '',
+				'time' => $this->bo->long_date($conflict['start'], $conflict['end'], true),
+				'conflicting_participants' => implode(",\n", $this->bo->participants(array(
+					'participants' => array_intersect_key((array)$conflict['participants'], $event['participants']),
+				), true, true)), // show group invitations too
 				'icon_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? 'recur' : '',
 				'text_recur' => $conflict['recur_type'] != MCAL_RECUR_NONE ? lang('Recurring event') : ' ',
 			);
-				$allConflicts += array_intersect_key((array)$conflict['participants'],$event['participants']);
+				$allConflicts += array_intersect_key((array)$conflict['participants'], $event['participants']);
 			}
 		$content = $event + array(
-			'conflicts' => array_values($conflicts),	// conflicts have id-start as key
+			'conflicts' => array_values($conflicts), // conflicts have id-start as key
 		);
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('Scheduling conflict');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('Scheduling conflict');
 		$resources_config = Api\Config::read('resources');
 		$readonlys = array();
 
 		foreach (array_keys($allConflicts) as $pId)
 		{
-			if(substr($pId,0,1) == 'r' && $resources_config ) // resources Allow ignore conflicts
+			if (substr($pId, 0, 1) == 'r' && $resources_config) // resources Allow ignore conflicts
 			{
 
 				switch ($resources_config['ignoreconflicts'])
@@ -2133,7 +2131,7 @@ 
 				}
 			}
 		}
-		$etpl->exec('calendar.calendar_uiforms.process_edit',$content,array(),$readonlys,array_merge($event,$preserv),$preserv['no_popup'] ? 0 : 2);
+		$etpl->exec('calendar.calendar_uiforms.process_edit', $content, array(), $readonlys, array_merge($event, $preserv), $preserv['no_popup'] ? 0 : 2);
 	}
 
 	/**
@@ -2151,7 +2149,7 @@ 
 		//$response->addAlert(__METHOD__.'('.array2string($edit_content).')');
 
 		// convert start/end date-time values to timestamps
-		foreach(array('start', 'end') as $name)
+		foreach (array('start', 'end') as $name)
 		{
 			if (!empty($edit_content[$name]))
 			{
@@ -2181,7 +2179,7 @@ 
 			'recur_type'   => $edit_content['recur_type'],
 			'participants' => array(),
 		);
-		foreach($edit_content['participants'] as $key => $data)
+		foreach ($edit_content['participants'] as $key => $data)
 		{
 			if (is_numeric($key) && !$edit_content['participants']['delete'][$data['uid']] &&
 				!$edit_content['participants']['delete'][md5($data['uid'])])
@@ -2196,21 +2194,21 @@ 
 		// default search parameters
 		$content['start_time'] = $edit_content['whole_day'] ? 0 : $this->cal_prefs['workdaystarts'];
 		$content['end_time'] = $this->cal_prefs['workdayends'];
-		if ($this->cal_prefs['workdayends']*HOUR_s < $this->cal_prefs['workdaystarts']*HOUR_s+$content['duration'])
+		if ($this->cal_prefs['workdayends'] * HOUR_s < $this->cal_prefs['workdaystarts'] * HOUR_s + $content['duration'])
 		{
-			$content['end_time'] = 0;	// no end-time limit, as duration would never fit
+			$content['end_time'] = 0; // no end-time limit, as duration would never fit
 		}
 		$content['weekdays'] = MCAL_M_WEEKDAYS;
 
 		$content['search_window'] = 7 * DAY_s;
 
 		// store content in session
-		Api\Cache::setSession('calendar','freetimesearch_args_'.(int)$edit_content['id'],$content);
+		Api\Cache::setSession('calendar', 'freetimesearch_args_'.(int)$edit_content['id'], $content);
 
 		//menuaction=calendar.calendar_uiforms.freetimesearch&values2url('start,end,duration,participants,recur_type,whole_day'),ft_search,700,500
-		$link = 'calendar.calendar_uiforms.freetimesearch&cal_id='. $edit_content['id'];
+		$link = 'calendar.calendar_uiforms.freetimesearch&cal_id='.$edit_content['id'];
 
-		$response->call('app.calendar.freetime_search_popup',$link);
+		$response->call('app.calendar.freetime_search_popup', $link);
 
 		//$response->addScriptCall('egw_openWindowCentered2',$link,'ft_search',700,500);
 
@@ -2233,26 +2231,26 @@ 
 	{
 		$etpl = new Etemplate('calendar.freetimesearch');
 		$sel_options['search_window'] = array(
-			7*DAY_s		=> lang('one week'),
-			14*DAY_s	=> lang('two weeks'),
-			31*DAY_s	=> lang('one month'),
-			92*DAY_s	=> lang('three month'),
-			365*DAY_s	=> lang('one year'),
+			7 * DAY_s		=> lang('one week'),
+			14 * DAY_s	=> lang('two weeks'),
+			31 * DAY_s	=> lang('one month'),
+			92 * DAY_s	=> lang('three month'),
+			365 * DAY_s	=> lang('one year'),
 		);
 		if (!is_array($content))
 		{
 			// get content from session (and delete it immediatly)
-			$content = Api\Cache::getSession('calendar','freetimesearch_args_'.(int)$_GET['cal_id']);
-			Api\Cache::unsetSession('calendar','freetimesearch_args_'.(int)$_GET['cal_id']);
+			$content = Api\Cache::getSession('calendar', 'freetimesearch_args_'.(int)$_GET['cal_id']);
+			Api\Cache::unsetSession('calendar', 'freetimesearch_args_'.(int)$_GET['cal_id']);
 			//Since the start_time and end_time from calendar_user_preferences are numbers, not timestamp, in order to show them on date-timeonly
 			//widget we need to convert them from numbers to timestamps, only for the first time when we have template without content
 			$sTime = $content['start_time'];
 			$eTime = $content['end_time'];
-			$content['start_time'] = strtotime(((strlen($content['start_time'])<2)?("0".$content['start_time']):$content['start_time']).":00");
-			$content['end_time'] = strtotime(((strlen($content['end_time'])<2)?("0".$content['end_time']):$content['end_time']).":00");
+			$content['start_time'] = strtotime(((strlen($content['start_time']) < 2) ? ("0".$content['start_time']) : $content['start_time']).":00");
+			$content['end_time'] = strtotime(((strlen($content['end_time']) < 2) ? ("0".$content['end_time']) : $content['end_time']).":00");
 
 			// pick a searchwindow fitting the duration (search for a 10 day slot in a one week window never succeeds)
-			foreach(array_keys($sel_options['search_window']) as $window)
+			foreach (array_keys($sel_options['search_window']) as $window)
 			{
 				if ($window > $content['duration'])
 				{
@@ -2279,19 +2277,19 @@ 
 		{
 			$content['msg'] .= lang('Only the initial date of that recuring event is checked!');
 		}
-		$content['freetime'] = $this->freetime($content['participants'],$content['start'],$content['start']+$content['search_window'],$content['duration'],$content['cal_id']);
-		$content['freetime'] = $this->split_freetime_daywise($content['freetime'],$content['duration'],(is_array($content['weekdays'])?$weekds:$content['weekdays']),$sTime,$eTime,$sel_options);
+		$content['freetime'] = $this->freetime($content['participants'], $content['start'], $content['start'] + $content['search_window'], $content['duration'], $content['cal_id']);
+		$content['freetime'] = $this->split_freetime_daywise($content['freetime'], $content['duration'], (is_array($content['weekdays']) ? $weekds : $content['weekdays']), $sTime, $eTime, $sel_options);
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('freetime search');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('freetime search');
 
 		$sel_options['duration'] = $this->durations;
 		if ($content['duration'] && isset($sel_options['duration'][$content['duration']])) $content['end'] = '';
 
-		$etpl->exec('calendar.calendar_uiforms.freetimesearch',$content,$sel_options,NULL,array(
+		$etpl->exec('calendar.calendar_uiforms.freetimesearch', $content, $sel_options, NULL, array(
 				'participants'	=> $content['participants'],
 				'cal_id'		=> $content['cal_id'],
 				'recur_type'	=> $content['recur_type'],
-			),2);
+			), 2);
 	}
 
 	/**
@@ -2304,15 +2302,15 @@ 
 	 * @param int $cal_id own id for existing events, to exclude them from being busy-time, default 0
 	 * @return array of free time-slots: array with start and end values
 	 */
-	function freetime($participants,$start,$end,$duration=1,$cal_id=0)
+	function freetime($participants, $start, $end, $duration = 1, $cal_id = 0)
 	{
-		if ($this->debug > 2) $this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)',true,$participants,$start,$end,$duration,$cal_id);
+		if ($this->debug > 2) $this->bo->debug_message(__METHOD__.'(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5)', true, $participants, $start, $end, $duration, $cal_id);
 
 		$busy = $this->bo->search(array(
 			'start' => $start,
 			'end'	=> $end,
 			'users'	=> $participants,
-			'ignore_acl' => true,	// otherwise we get only events readable by the user
+			'ignore_acl' => true, // otherwise we get only events readable by the user
 		));
 		$busy[] = array(	// add end-of-search-date as event, to cope with empty search and get freetime til that date
 			'start'	=> $end,
@@ -2321,15 +2319,15 @@ 
 		$ft_start = $start;
 		$freetime = array();
 		$n = 0;
-		foreach($busy as $event)
+		foreach ($busy as $event)
 		{
-			if ((int)$cal_id && $event['id'] == (int)$cal_id) continue;	// ignore our own event
+			if ((int)$cal_id && $event['id'] == (int)$cal_id) continue; // ignore our own event
 
  			if ($event['non_blocking']) continue; // ignore non_blocking events
 
 			// check if from all wanted participants at least one has a not rejected status in found event
 			$non_rejected_found = false;
-			foreach($participants as $uid)
+			foreach ($participants as $uid)
 			{
 				if ($event['participants'][$uid] == 'R') continue;
 
@@ -2345,10 +2343,10 @@ 
 
 			if ($this->debug)
 			{
-				echo "<p>ft_start=".date('D d.m.Y H:i',$ft_start)."<br>\n";
+				echo "<p>ft_start=".date('D d.m.Y H:i', $ft_start)."<br>\n";
 				echo "event[title]=$event[title]<br>\n";
-				echo "event[start]=".date('D d.m.Y H:i',$event['start'])."<br>\n";
-				echo "event[end]=".date('D d.m.Y H:i',$event['end'])."<br>\n";
+				echo "event[start]=".date('D d.m.Y H:i', $event['start'])."<br>\n";
+				echo "event[end]=".date('D d.m.Y H:i', $event['end'])."<br>\n";
 			}
 			// $events ends before our actual position ==> ignore it
 			if ($event['end'] < $ft_start)
@@ -2372,11 +2370,11 @@ 
 					'start'	=> $ft_start,
 					'end'	=> $ft_end,
 				);
-				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i',$ft_start)." - ".date('D d.m.Y H:i',$ft_end)."</p>\n";
+				if ($this->debug > 1) echo "<p>freetime: ".date('D d.m.Y H:i', $ft_start)." - ".date('D d.m.Y H:i', $ft_end)."</p>\n";
 			}
 			$ft_start = $event['end'];
 		}
-		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6',true,$participants,$start,$end,$duration,$cal_id,$freetime);
+		if ($this->debug > 0) $this->bo->debug_message('uiforms::freetime(participants=%1, start=%2, end=%3, duration=%4, cal_id=%5) freetime=%6', true, $participants, $start, $end, $duration, $cal_id, $freetime);
 
 		return $freetime;
 	}
@@ -2396,46 +2394,46 @@ 
 	 */
 	function split_freetime_daywise($freetime, $duration, $weekdays, $_start_time, $_end_time, &$sel_options)
 	{
-		if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)',true,$freetime,$duration,$_start_time,$_end_time);
+		if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(freetime=%1, duration=%2, start_time=%3, end_time=%4)', true, $freetime, $duration, $_start_time, $_end_time);
 
 		$freetime_daywise = array();
 		if (!is_array($sel_options)) $sel_options = array();
 		$time_format = $this->common_prefs['timeformat'] == 12 ? 'h:i a' : 'H:i';
 
-		$start_time = (int) $_start_time;	// ignore leading zeros
-		$end_time   = (int) $_end_time;
+		$start_time = (int)$_start_time; // ignore leading zeros
+		$end_time   = (int)$_end_time;
 
 		// ignore the end_time, if duration would never fit
-		if (($end_time - $start_time)*HOUR_s < $duration)
+		if (($end_time - $start_time) * HOUR_s < $duration)
 		{
 			$end_time = 0;
-			if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise',true,$duration,$start_time);
+			if ($this->debug > 1) $this->bo->debug_message('uiforms::split_freetime_daywise(, duration=%2, start_time=%3,..) end_time set to 0, it never fits durationn otherwise', true, $duration, $start_time);
 		}
 		$n = 0;
-		foreach($freetime as $ft)
+		foreach ($freetime as $ft)
 		{
 			$adaybegin = $this->bo->date2array($ft['start']);
 			$adaybegin['hour'] = $adaybegin['minute'] = $adaybegin['second'] = 0;
 			unset($adaybegin['raw']);
 			$daybegin = $this->bo->date2ts($adaybegin);
 
-			for($t = $daybegin; $t < $ft['end']; $t += DAY_s,$daybegin += DAY_s)
+			for ($t = $daybegin; $t < $ft['end']; $t += DAY_s, $daybegin += DAY_s)
 			{
-				$dow = date('w',$daybegin+DAY_s/2);	// 0=Sun, .., 6=Sat
-				$mcal_dow = pow(2,$dow);
-				if (!($weekdays & $mcal_dow))
+				$dow = date('w', $daybegin + DAY_s / 2); // 0=Sun, .., 6=Sat
+				$mcal_dow = pow(2, $dow);
+				if (!($weekdays&$mcal_dow))
 				{
 					//echo "wrong day of week $dow<br>\n";
-					continue;	// wrong day of week
+					continue; // wrong day of week
 				}
 				$start = $t < $ft['start'] ? $ft['start'] : $t;
 
-				if ($start-$daybegin < $start_time*HOUR_s)	// start earlier then start_time
+				if ($start - $daybegin < $start_time * HOUR_s)	// start earlier then start_time
 				{
-					$start = $daybegin + $start_time*HOUR_s;
+					$start = $daybegin + $start_time * HOUR_s;
 				}
 				// if end_time given use it, else the original slot's end
-				$end = $end_time ? $daybegin + $end_time*HOUR_s : $ft['end'];
+				$end = $end_time ? $daybegin + $end_time * HOUR_s : $ft['end'];
 				if ($end > $ft['end']) $end = $ft['end'];
 
 				// slot to small for duration
@@ -2449,11 +2447,11 @@ 
 					'end'	=> $end,
 				);
 				$times = array();
-				for ($s = $start; $s+$duration <= $end && $s < $daybegin+DAY_s; $s += 60*$this->cal_prefs['interval'])
+				for ($s = $start; $s + $duration <= $end && $s < $daybegin + DAY_s; $s += 60 * $this->cal_prefs['interval'])
 				{
 					$e = $s + $duration;
-					$end_date = $e-$daybegin > DAY_s ? lang(date('l',$e)).' '.date($this->common_prefs['dateformat'],$e).' ' : '';
-					$times[$s] = date($time_format,$s).' - '.$end_date.date($time_format,$e);
+					$end_date = $e - $daybegin > DAY_s ? lang(date('l', $e)).' '.date($this->common_prefs['dateformat'], $e).' ' : '';
+					$times[$s] = date($time_format, $s).' - '.$end_date.date($time_format, $e);
 				}
 				$sel_options[$n.'start'] = $times;
 			}
@@ -2468,13 +2466,13 @@ 
      * @param boolean $return_error should an error-msg be returned or a regular page with it generated (default)
      * @return string error-msg if $return_error
      */
-    function export($content=0,$return_error=false)
+    function export($content = 0, $return_error = false)
     {
 		$boical = new calendar_ical();
 		#error_log(__METHOD__.print_r($content,true));
 		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
 		{
-			if (!($ical =& $boical->exportVCal(array($cal_id),'2.0','PUBLISH',false)))
+			if (!($ical = & $boical->exportVCal(array($cal_id), '2.0', 'PUBLISH', false)))
 			{
 				$msg = lang('Permission denied');
 
@@ -2482,20 +2480,20 @@ 
 			}
 			else
 			{
-				html::content_header('event.ics','text/calendar',bytes($ical));
+				html::content_header('event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				common::egw_exit();
 			}
 		}
 		if (is_array($content))
 		{
-			$events =& $this->bo->search(array(
+			$events = & $this->bo->search(array(
 				'start' => $content['start'],
 				'end'   => $content['end'],
 				'enum_recuring' => false,
 				'daywise'       => false,
 				'owner'         => $this->owner,
-				'date_format'   => 'server',    // timestamp in server time for boical class
+				'date_format'   => 'server', // timestamp in server time for boical class
 			));
 			if (!$events)
 			{
@@ -2503,8 +2501,8 @@ 
 			}
 			else
 			{
-				$ical =& $boical->exportVCal($events,'2.0','PUBLISH',false);
-				html::content_header($content['file'] ? $content['file'] : 'event.ics','text/calendar',bytes($ical));
+				$ical = & $boical->exportVCal($events, '2.0', 'PUBLISH', false);
+				html::content_header($content['file'] ? $content['file'] : 'event.ics', 'text/calendar', bytes($ical));
 				echo $ical;
 				common::egw_exit();
 			}
@@ -2520,9 +2518,9 @@ 
 		}
 		$content['msg'] = $msg;
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export');
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar').' - '.lang('iCal Export');
 		$etpl = new etemplate_new('calendar.export');
-		$etpl->exec('calendar.calendar_uiforms.export',$content);
+		$etpl->exec('calendar.calendar_uiforms.export', $content);
     }
 
 	/**
@@ -2530,7 +2528,7 @@ 
 	 *
 	 * @param array $_content
 	 */
-	function cat_acl(array $_content=null)
+	function cat_acl(array $_content = null)
 	{
 		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
@@ -2542,15 +2540,15 @@ 
 			unset($_content['button']);
 			if ($button != 'cancel')	// store changed Acl
 			{
-				foreach($_content as $data)
+				foreach ($_content as $data)
 				{
 					if (!($cat_id = $data['cat_id'])) continue;
-					foreach(array_merge((array)$data['add'],(array)$data['status'],array_keys((array)$data['old'])) as $account_id)
+					foreach (array_merge((array)$data['add'], (array)$data['status'], array_keys((array)$data['old'])) as $account_id)
 					{
 						$rights = 0;
-						if (in_array($account_id,(array)$data['add'])) $rights |= calendar_boupdate::CAT_ACL_ADD;
-						if (in_array($account_id,(array)$data['status'])) $rights |= calendar_boupdate::CAT_ACL_STATUS;
-						if ($account_id) $this->bo->set_cat_rights($cat_id,$account_id,$rights);
+						if (in_array($account_id, (array)$data['add'])) $rights |= calendar_boupdate::CAT_ACL_ADD;
+						if (in_array($account_id, (array)$data['status'])) $rights |= calendar_boupdate::CAT_ACL_STATUS;
+						if ($account_id) $this->bo->set_cat_rights($cat_id, $account_id, $rights);
 					}
 				}
 			}
@@ -2562,20 +2560,20 @@ 
 				), 'admin');
 			}
 		}
-		$content= $preserv = array();
+		$content = $preserv = array();
 		$n = 1;
-		foreach($this->bo->get_cat_rights() as $Lcat_id => $data)
+		foreach ($this->bo->get_cat_rights() as $Lcat_id => $data)
 		{
-			$cat_id = substr($Lcat_id,1);
+			$cat_id = substr($Lcat_id, 1);
 			$row = array(
 				'cat_id' => $cat_id,
 				'add' => array(),
 				'status' => array(),
 			);
-			foreach($data as $account_id => $rights)
+			foreach ($data as $account_id => $rights)
 			{
-				if ($rights & calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
-				if ($rights & calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
+				if ($rights&calendar_boupdate::CAT_ACL_ADD) $row['add'][] = $account_id;
+				if ($rights&calendar_boupdate::CAT_ACL_STATUS) $row['status'][] = $account_id;
 			}
 			$content[$n] = $row;
 			$preserv[$n] = array(
@@ -2591,7 +2589,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Calendar').' - '.lang('Category ACL');
 		$tmp = new Etemplate('calendar.cat_acl');
 		$GLOBALS['egw_info']['flags']['nonavbar'] = 1;
-		$tmp->exec('calendar.calendar_uiforms.cat_acl',$content,null,$readonlys,$preserv);
+		$tmp->exec('calendar.calendar_uiforms.cat_acl', $content, null, $readonlys, $preserv);
 	}
 
 	/**
@@ -2641,18 +2639,18 @@ 
 
 
 		// Get participants for only this one, if it's recurring.  The date is on the end of the value.
-		if($content['recur_type'] || $content['recurrence'])
+		if ($content['recur_type'] || $content['recurrence'])
 		{
 			$content['history']['filter'] = array(
 				'(history_status NOT LIKE \'participants%\' OR (history_status LIKE \'participants%\' AND (
-					history_new_value LIKE \'%' . Api\Storage\Tracking::ONE2N_SEPERATOR . $content['recurrence'] . '\' OR
-					history_old_value LIKE \'%' . Api\Storage\Tracking::ONE2N_SEPERATOR . $content['recurrence'] . '\')))'
+					history_new_value LIKE \'%' . Api\Storage\Tracking::ONE2N_SEPERATOR.$content['recurrence'].'\' OR
+					history_old_value LIKE \'%' . Api\Storage\Tracking::ONE2N_SEPERATOR.$content['recurrence'].'\')))'
 			);
 		}
 
 		// Translate labels
 		$tracking = new calendar_tracking();
-		foreach($tracking->field2label as $field => $label)
+		foreach ($tracking->field2label as $field => $label)
 		{
 			$sel_options[$status][$field] = lang($label);
 		}
@@ -2671,44 +2669,44 @@ 
 	 *	which particular instance was dragged
 	 * @return string XML response if no error occurs
 	 */
-	function ajax_moveEvent($_eventId,$calendarOwner,$targetDateTime,$targetOwner,$durationT=null,$seriesInstance=null)
+	function ajax_moveEvent($_eventId, $calendarOwner, $targetDateTime, $targetOwner, $durationT = null, $seriesInstance = null)
 	{
-		list($eventId, $date) = explode(':', $_eventId,2);
+		list($eventId, $date) = explode(':', $_eventId, 2);
 		$ignore_conflicts = false;
 
 		// we do not allow dragging into another users calendar ATM
-		if($targetOwner < 0)
+		if ($targetOwner < 0)
 		{
 			$targetOwner = array($targetOwner);
 		}
-		if($targetOwner == 0 || is_array($targetOwner) && $targetOwner[0] == 0)
+		if ($targetOwner == 0 || is_array($targetOwner) && $targetOwner[0] == 0)
 		{
 			$targetOwner = $calendarOwner;
 		}
 		// But you may be viewing multiple users, or a group calendar and
 		// dragging your event - dragging across calendars does not change owner
-		if(is_array($targetOwner) && !in_array($calendarOwner, $targetOwner))
+		if (is_array($targetOwner) && !in_array($calendarOwner, $targetOwner))
 		{
 			$return = true;
-			foreach($targetOwner as $owner)
+			foreach ($targetOwner as $owner)
 			{
-				if($owner < 0 && in_array($calendarOwner, $GLOBALS['egw']->accounts->members($owner,true)))
+				if ($owner < 0 && in_array($calendarOwner, $GLOBALS['egw']->accounts->members($owner, true)))
 				{
 					$return = false;
 					break;
 				}
-				else if ($owner > 0 && $this->bo->check_perms(Acl::EDIT, $eventId,0,'ts',$date))
+				else if ($owner > 0 && $this->bo->check_perms(Acl::EDIT, $eventId, 0, 'ts', $date))
 				{
 					$return = false;
 					break;
 				}
 			}
-			if($return) return;
+			if ($return) return;
 		}
-		$old_event=$event=$this->bo->read($eventId);
+		$old_event = $event = $this->bo->read($eventId);
 		if (!$durationT)
 		{
-			$duration=$event['end']-$event['start'];
+			$duration = $event['end'] - $event['start'];
 		}
 		// Drag a normal event to whole day non-blocking
 		else if ($durationT == 'whole_day')
@@ -2716,7 +2714,7 @@ 
 			$event['whole_day'] = true;
 			$event['non_blocking'] = true;
 			// Make duration whole days, less 1 second
-			$duration = round(($event['end']-$event['start'])/DAY_s) * DAY_s - 1;
+			$duration = round(($event['end'] - $event['start']) / DAY_s) * DAY_s - 1;
 		}
 		else
 		{
@@ -2729,18 +2727,18 @@ 
 			$d = new Api\DateTime($date, Api\DateTime::$user_timezone);
 			if (!empty($event['whole_day']))
 			{
-				$d =& $this->bo->so->startOfDay($d);
+				$d = & $this->bo->so->startOfDay($d);
 				$d->setUser();
 			}
 			$event = $this->bo->read($eventId, $d, true);
 
 			// For DnD, create an exception if they gave the date
 			$preserv = null;
-			$this->_create_exception($event,$preserv);
+			$this->_create_exception($event, $preserv);
 			unset($event['id']);
 
 			$messages = null;
-			$conflicts = $this->bo->update($event,false,true,false,true,$messages);
+			$conflicts = $this->bo->update($event, false, true, false, true, $messages);
 			if (!is_array($conflicts) && $conflicts)
 			{
 				// now we need to add the original start as recur-execption to the series
@@ -2748,28 +2746,28 @@ 
 				$recur_event['recur_exception'][] = $d->format('ts');
 				// check if we need to move the alarms, because they are next on that exception
 				$this->bo->check_move_alarms($recur_event, null, $d);
-				unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-				unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-				$this->bo->update($recur_event,true);	// no conflict check here
+				unset($recur_event['start']); unset($recur_event['end']); // no update necessary
+				unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start!
+				$this->bo->update($recur_event, true); // no conflict check here
 
 				// Sending null will trigger a removal of the original for that date
 				Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$_eventId, 'data' => null));
 
 				unset($recur_event);
-				unset($event['edit_single']);			// if we further edit it, it's just a single event
+				unset($event['edit_single']); // if we further edit it, it's just a single event
 				unset($preserv['edit_single']);
 			}
 		}
 
 		$d = new Api\DateTime($targetDateTime, Api\DateTime::$user_timezone);
 		$event['start'] = $d->format('ts');
-		$event['end'] = $event['start']+$duration;
+		$event['end'] = $event['start'] + $duration;
 
 		if ($event['recur_type'] != MCAL_RECUR_NONE && !$date && $seriesInstance)
 		{
 			// calculate offset against clicked recurrance,
 			// depending on which is smaller
-			$offset = Api\DateTime::to($targetDateTime,'ts') - Api\DateTime::to($seriesInstance,'ts');
+			$offset = Api\DateTime::to($targetDateTime, 'ts') - Api\DateTime::to($seriesInstance, 'ts');
 			$event['start'] = $old_event['start'] + $offset;
 			$event['duration'] = $duration;
 
@@ -2780,31 +2778,31 @@ 
 			// Can't handle conflict.  Just ignore it.
 			$ignore_conflicts = true;
 		}
-		if(!$event['recur_type'])
+		if (!$event['recur_type'])
 		{
 			$this->bo->check_move_alarms($event, $old_event);
 		}
 
 		// Drag a whole day to a time
-		if($durationT && $durationT != 'whole_day')
+		if ($durationT && $durationT != 'whole_day')
 		{
 			$event['whole_day'] = ($duration == DAY_s);
 			$event['non_blocking'] = false;
 			// If there's a conflict, it won't save the change and the conflict popup will be blank
 			// so save the change now, and then let the conflict check happen.
 			$message = null;
-			$this->bo->update($event,true, true, false, true, $message,true);
+			$this->bo->update($event, true, true, false, true, $message, true);
 
 			// Whole day non blocking with DAY_s would add a day
-			if($duration==DAY_s) $duration=0;
+			if ($duration == DAY_s) $duration = 0;
 		}
 
 		$status_reset_to_unknown = false;
 		$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-		foreach((array)$event['participants'] as $uid => $status)
+		foreach ((array)$event['participants'] as $uid => $status)
 		{
 			$q = $r = null;
-			calendar_so::split_status($status,$q,$r);
+			calendar_so::split_status($status, $q, $r);
 			if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
 			{
 				$preferences = new Api\Preferences($uid);
@@ -2817,23 +2815,23 @@ 
 						if ($sameday) break;
 					default:
 						$status_reset_to_unknown = true;
-						$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
+						$event['participants'][$uid] = calendar_so::combine_status('U', $q, $r);
 						// todo: report reset status to user
 				}
 			}
 		}
 
 		$message = false;
-		$conflicts=$this->bo->update($event,$ignore_conflicts, true, false, true, $message);
+		$conflicts = $this->bo->update($event, $ignore_conflicts, true, false, true, $message);
 
-		$this->update_client($event['id'],$d);
+		$this->update_client($event['id'], $d);
 		$response = Api\Json\Response::get();
-		if(!is_array($conflicts) && $conflicts)
+		if (!is_array($conflicts) && $conflicts)
 		{
-			if(is_int($conflicts))
+			if (is_int($conflicts))
 			{
 				$event['id'] = $conflicts;
-				$response->call('egw.refresh', '','calendar',$event['id'],'edit');
+				$response->call('egw.refresh', '', 'calendar', $event['id'], 'edit');
 			}
 		}
 		else if ($conflicts)
@@ -2846,21 +2844,21 @@ 
 					.'&end='.$event['end']
 					.'&non_interactive=true'
 					.'&cancel_needs_refresh=true',
-				'',750,410);
+				'', 750, 410);
 		}
 		else if ($message)
 		{
-			$response->call('egw.message',  implode('<br />', $message));
+			$response->call('egw.message', implode('<br />', $message));
 		}
-		if($event['id'] != $eventId ) $this->update_client($_eventId);
+		if ($event['id'] != $eventId) $this->update_client($_eventId);
 		if ($status_reset_to_unknown)
 		{
-			foreach((array)$event['participants'] as $uid => $status)
+			foreach ((array)$event['participants'] as $uid => $status)
 			{
 				if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user)
 				{
-					calendar_so::split_status($status,$q,$r);
-					$status = calendar_so::combine_status('U',$q,$r);
+					calendar_so::split_status($status, $q, $r);
+					$status = calendar_so::combine_status('U', $q, $r);
 					$this->bo->set_status($event['id'], $uid, $status, 0, true);
 				}
 			}
@@ -2877,7 +2875,7 @@ 
 	{
 		list($eventId, $date) = explode(':', $_eventId);
 		$event = $this->bo->read($eventId);
-		if($date)
+		if ($date)
 		{
 			$d = new Api\DateTime($date, Api\DateTime::$user_timezone);
 		}
@@ -2887,29 +2885,29 @@ 
 		{
 			if (!empty($event['whole_day']))
 			{
-				$d =& $this->bo->so->startOfDay($date);
+				$d = & $this->bo->so->startOfDay($date);
 				$d->setUser();
 			}
 			$event = $this->bo->read($eventId, $d, true);
 			$date = $d->format('ts');
 		}
-		if($event['participants'][$uid])
+		if ($event['participants'][$uid])
 		{
 			$q = $r = null;
-			calendar_so::split_status($event['participants'][$uid],$q,$r);
-			$event['participants'][$uid] = $status = calendar_so::combine_status($status,$q,$r);
-			$this->bo->set_status($event['id'],$uid,$status,$date,true);
+			calendar_so::split_status($event['participants'][$uid], $q, $r);
+			$event['participants'][$uid] = $status = calendar_so::combine_status($status, $q, $r);
+			$this->bo->set_status($event['id'], $uid, $status, $date, true);
 		}
 		else
 		{
 			// Group membership
-			foreach($event['participants'] as $id => $status)
+			foreach ($event['participants'] as $id => $status)
 			{
-				if($GLOBALS['egw']->accounts->get_type($id) == 'g' && in_array($uid,$GLOBALS['egw']->accounts->members($id,true)))
+				if ($GLOBALS['egw']->accounts->get_type($id) == 'g' && in_array($uid, $GLOBALS['egw']->accounts->members($id, true)))
 				{
-					calendar_so::split_status($event['participants'][$uid],$q,$r);
-					$event['participants'][$uid] = $status = calendar_so::combine_status($status,$q,$r);
-					$this->bo->set_status($event['id'],$uid,$status,$date,true);
+					calendar_so::split_status($event['participants'][$uid], $q, $r);
+					$event['participants'][$uid] = $status = calendar_so::combine_status($status, $q, $r);
+					$this->bo->set_status($event['id'], $uid, $status, $date, true);
 					break;
 				}
 			}
@@ -2917,7 +2915,7 @@ 
 
 		// Directly update stored data.  If event is still visible, it will
 		// be notified & update itself.
-		$this->update_client($eventId,$d);
+		$this->update_client($eventId, $d);
 	}
 
 	/**
@@ -2925,8 +2923,8 @@ 
 	 */
 	public function ajax_delete($eventId)
 	{
-		list($id, $date) = explode(':',$eventId);
-		$event=$this->bo->read($id);
+		list($id, $date) = explode(':', $eventId);
+		$event = $this->bo->read($id);
 		$response = Api\Json\Response::get();
 
 		if ($this->bo->delete($event['id'], (int)$date))
@@ -2939,11 +2937,11 @@ 
 			{
 				$msg = lang('Event deleted');
 			}
-			$response->apply('egw.refresh', Array($msg,'calendar',$eventId,'delete'));
+			$response->apply('egw.refresh', Array($msg, 'calendar', $eventId, 'delete'));
 		}
 		else
 		{
-			$response->apply('egw.message', Array(lang('Error')),'error');
+			$response->apply('egw.message', Array(lang('Error')), 'error');
 		}
 	}
 
@@ -2956,10 +2954,10 @@ 
 	 */
 	public function ajax_invite($_eventId, $invite = array(), $remove = array())
 	{
-		list($eventId, $date) = explode(':', $_eventId,2);
+		list($eventId, $date) = explode(':', $_eventId, 2);
 
 		$event = $this->bo->read($eventId);
-		if($date)
+		if ($date)
 		{
 			$d = new Api\DateTime($date, Api\DateTime::$user_timezone);
 		}
@@ -2969,17 +2967,17 @@ 
 		{
 			if (!empty($event['whole_day']))
 			{
-				$d =& $this->bo->so->startOfDay($date);
+				$d = & $this->bo->so->startOfDay($date);
 				$d->setUser();
 			}
 			$event = $this->bo->read($eventId, $d, true);
 			// For DnD, create an exception if they gave the date
 			$preserv = null;
-			$this->_create_exception($event,$preserv);
+			$this->_create_exception($event, $preserv);
 			unset($event['id']);
 
 			$messages = null;
-			$conflicts = $this->bo->update($event,true,true,false,true,$messages);
+			$conflicts = $this->bo->update($event, true, true, false, true, $messages);
 			if (!is_array($conflicts) && $conflicts)
 			{
 				// now we need to add the original start as recur-execption to the series
@@ -2987,28 +2985,28 @@ 
 				$recur_event['recur_exception'][] = $d->format('ts');
 				// check if we need to move the alarms, because they are next on that exception
 				$this->bo->check_move_alarms($recur_event, null, $d);
-				unset($recur_event['start']); unset($recur_event['end']);	// no update necessary
-				unset($recur_event['alarm']);	// unsetting alarms too, as they cant be updated without start!
-				$this->bo->update($recur_event,true);	// no conflict check here
+				unset($recur_event['start']); unset($recur_event['end']); // no update necessary
+				unset($recur_event['alarm']); // unsetting alarms too, as they cant be updated without start!
+				$this->bo->update($recur_event, true); // no conflict check here
 
 				// Sending null will trigger a removal of the original for that date
 				Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$_eventId, 'data' => null));
 
 				unset($recur_event);
-				unset($event['edit_single']);			// if we further edit it, it's just a single event
+				unset($event['edit_single']); // if we further edit it, it's just a single event
 				unset($preserv['edit_single']);
 			}
 		}
-		foreach($remove as $participant)
+		foreach ($remove as $participant)
 		{
 			unset($event['participants'][$participant]);
 		}
-		foreach($invite as $participant)
+		foreach ($invite as $participant)
 		{
 			$event['participants'][$participant] = 'U';
 		}
 		$message = null;
-		$conflicts=$this->bo->update($event,false, true, false, true, $message);
+		$conflicts = $this->bo->update($event, false, true, false, true, $message);
 
 		$response = Api\Json\Response::get();
 
@@ -3016,8 +3014,8 @@ 
 		{
 			// Save it anyway, was done with explicit user interaction,
 			// and if we don't we lose the invite
-			$this->bo->update($event,true);	// no conflict check here
-			$this->update_client($event['id'],$d);
+			$this->bo->update($event, true); // no conflict check here
+			$this->update_client($event['id'], $d);
 			$response->call(
 				'egw_openWindowCentered2',
 				$GLOBALS['egw_info']['server']['webserver_url'].'/index.php?menuaction=calendar.calendar_uiforms.edit
@@ -3026,22 +3024,22 @@ 
 					.'&end='.$event['end']
 					.'&non_interactive=true'
 					.'&cancel_needs_refresh=true',
-				'',750,410);
+				'', 750, 410);
 		}
 		else if ($message)
 		{
-			$response->call('egw.message',  implode('<br />', $message));
+			$response->call('egw.message', implode('<br />', $message));
 		}
-		if($conflicts)
+		if ($conflicts)
 		{
-			$this->update_client($event['id'],$d);
-			if(is_int($conflicts))
+			$this->update_client($event['id'], $d);
+			if (is_int($conflicts))
 			{
 				$event['id'] = $conflicts;
 			}
-			if($event['id'])
+			if ($event['id'])
 			{
-				$response->call('egw.refresh', '','calendar',$event['id'],'edit');
+				$response->call('egw.refresh', '', 'calendar', $event['id'], 'edit');
 			}
 		}
 	}
@@ -3052,13 +3050,13 @@ 
 	 * @param array $mailContent = null mail content
 	 * @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 raw mail data
-			Link::get_data ($_GET['egw_data']);
+			Link::get_data($_GET['egw_data']);
 			return false;
 		}
 
@@ -3068,7 +3066,7 @@ 
 			$AB = new Api\Contacts();
 			$accounts = array(0 => $GLOBALS['egw_info']['user']['account_id']);
 
-			$participants[0] = array (
+			$participants[0] = array(
 				'uid' => $GLOBALS['egw_info']['user']['account_id'],
 				'delete_id' => $GLOBALS['egw_info']['user']['account_id'],
 				'status' => 'A',
@@ -3076,23 +3074,23 @@ 
 				'app' => 'User',
 				'role' => 'REQ-PARTICIPANT'
 			);
-			foreach($mailContent['addresses'] as $address)
+			foreach ($mailContent['addresses'] as $address)
 			{
 				// Get available contacts from the email
 				$contacts = $AB->search(array(
 						'email' => $address['email'],
 						'email_home' => $address['email']
-					),'contact_id,contact_email,contact_email_home,egw_addressbook.account_id as account_id','','','',false,'OR',false,array('owner' => 0),'',false);
+					), 'contact_id,contact_email,contact_email_home,egw_addressbook.account_id as account_id', '', '', '', false, 'OR', false, array('owner' => 0), '', false);
 				if (is_array($contacts))
 				{
-					foreach($contacts as $account)
+					foreach ($contacts as $account)
 					{
 						$accounts[] = $account['account_id'];
 					}
 				}
 				else
 				{
-					$participants []= array (
+					$participants [] = array(
 						'app' => 'email',
 						'uid' => 'e'.$address['email'],
 						'status' => 'U',
@@ -3100,7 +3098,7 @@ 
 					);
 				}
 			}
-			$participants = array_merge($participants , array(
+			$participants = array_merge($participants, array(
 				"participant" => $accounts,
 				"role" => "REQ-PARTICIPANT",
 				"add" => "pressed"
@@ -3124,14 +3122,14 @@ 
 			{
 				foreach ($mailContent['attachments'] as $attachment)
 				{
-					if($attachment['egw_data'])
+					if ($attachment['egw_data'])
 					{
-						Link::link('calendar',$event['link_to']['to_id'],Link::DATA_APPNAME,  $attachment);
+						Link::link('calendar', $event['link_to']['to_id'], Link::DATA_APPNAME, $attachment);
 					}
-					else if(is_readable($attachment['tmp_name']) ||
+					else if (is_readable($attachment['tmp_name']) ||
 						(Vfs::is_readable($attachment['tmp_name']) && parse_url($attachment['tmp_name'], PHP_URL_SCHEME) === 'vfs'))
 					{
-						Link::link('calendar',$event['link_to']['to_id'],'file',  $attachment);
+						Link::link('calendar', $event['link_to']['to_id'], 'file', $attachment);
 					}
 				}
 			}

api/src/Contacts.php

Spacing +264 added lines, -265 removed lines

@@ -16,7 +16,7 @@ 
 
 namespace EGroupware\Api;
 
-use calendar_bo;	// to_do: do NOT require it, just use if there
+use calendar_bo; // to_do: do NOT require it, just use if there
 
 /**
  * Business object for contacts
@@ -38,7 +38,7 @@ 
 	/**
 	 * @var array $timestamps timestamps
 	 */
-	var $timestamps = array('modified','created');
+	var $timestamps = array('modified', 'created');
 
 	/**
 	 * @var array $fileas_types
@@ -173,28 +173,28 @@ 
 	 * @param string $contact_app ='addressbook' used for acl->get_grants()
 	 * @param Db $db =null
 	 */
-	function __construct($contact_app='addressbook',Db $db=null)
+	function __construct($contact_app = 'addressbook', Db $db = null)
 	{
-		parent::__construct($contact_app,$db);
+		parent::__construct($contact_app, $db);
 		if ($this->log)
 		{
 			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir'].'/log-addressbook_bo';
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3 ,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($contact_app)\n", 3, $this->logfile);
 		}
 
-		$this->now_su = DateTime::to('now','ts');
+		$this->now_su = DateTime::to('now', 'ts');
 
-		$this->prefs =& $GLOBALS['egw_info']['user']['preferences']['addressbook'];
+		$this->prefs = & $GLOBALS['egw_info']['user']['preferences']['addressbook'];
 		// get the default addressbook from the users prefs
 		$this->default_addressbook = $GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] ?
 			(int)$GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'] : $this->user;
-		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'],-1) == 'p';
+		$this->default_private = substr($GLOBALS['egw_info']['user']['preferences']['addressbook']['add_default'], -1) == 'p';
 		if ($this->default_addressbook > 0 && $this->default_addressbook != $this->user &&
 			($this->default_private ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->forced['addressbook']['add_default'] ||
 			$this->default_addressbook == (int)$GLOBALS['egw']->preferences->default['addressbook']['add_default']))
 		{
-			$this->default_addressbook = $this->user;	// admin set a default or forced pref for personal addressbook
+			$this->default_addressbook = $this->user; // admin set a default or forced pref for personal addressbook
 		}
 		$this->private_addressbook = self::private_addressbook($this->contact_repository == 'sql', $this->prefs);
 
@@ -299,27 +299,27 @@ 
 		$this->own_account_acl = $GLOBALS['egw_info']['server']['own_account_acl'];
 		if (!is_array($this->own_account_acl)) $this->own_account_acl = json_php_unserialize($this->own_account_acl, true);
 		// we have only one acl (n_fn) for the whole name, as not all backends store every part in an own field
-		if ($this->own_account_acl && in_array('n_fn',$this->own_account_acl))
+		if ($this->own_account_acl && in_array('n_fn', $this->own_account_acl))
 		{
-			$this->own_account_acl = array_merge($this->own_account_acl,array('n_prefix','n_given','n_middle','n_family','n_suffix'));
+			$this->own_account_acl = array_merge($this->own_account_acl, array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix'));
 		}
 		if ($GLOBALS['egw_info']['server']['org_fileds_to_update'])
 		{
-			$this->org_fields =  $GLOBALS['egw_info']['server']['org_fileds_to_update'];
+			$this->org_fields = $GLOBALS['egw_info']['server']['org_fileds_to_update'];
 			if (!is_array($this->org_fields)) $this->org_fields = unserialize($this->org_fields);
 
 			// Set country code if country name is selected
-			$supported_fields = $this->get_fields('supported',null,0);
-			if(in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname',$this->org_fields))
+			$supported_fields = $this->get_fields('supported', null, 0);
+			if (in_array('adr_one_countrycode', $supported_fields) && in_array('adr_one_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_one_countrycode';
 			}
-			if(in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname',$this->org_fields))
+			if (in_array('adr_two_countrycode', $supported_fields) && in_array('adr_two_countryname', $this->org_fields))
 			{
 				$this->org_fields[] = 'adr_two_countrycode';
 			}
 		}
-		$this->categories = new Categories($this->user,'addressbook');
+		$this->categories = new Categories($this->user, 'addressbook');
 
 		$this->delete_history = $GLOBALS['egw_info']['server']['history'];
 	}
@@ -333,7 +333,7 @@ 
 	 * @param array $prefs addressbook preferences
 	 * @return boolean
 	 */
-	public static function private_addressbook($contact_repository, array $prefs=null)
+	public static function private_addressbook($contact_repository, array $prefs = null)
 	{
 		return $contact_repository == 'sql' && $prefs['private_addressbook'];
 	}
@@ -347,7 +347,7 @@ 
 	 * @param int $user =null account_id or null for current user
 	 * @return array with owner => label pairs
 	 */
-	function get_addressbooks($required=Acl::READ,$extra_label=null,$user=null)
+	function get_addressbooks($required = Acl::READ, $extra_label = null, $user = null)
 	{
 		if (is_null($user))
 		{
@@ -366,11 +366,11 @@ 
 		if ($extra_label) $addressbooks[''] = $extra_label;
 		$addressbooks[$user] = lang('Personal');
 		// add all group addressbooks the user has the necessary rights too
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if (($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
+			if (($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'g')
 			{
-				$to_sort[$uid] = lang('Group %1',$GLOBALS['egw']->accounts->id2name($uid));
+				$to_sort[$uid] = lang('Group %1', $GLOBALS['egw']->accounts->id2name($uid));
 			}
 		}
 		if ($to_sort)
@@ -378,19 +378,19 @@ 
 			asort($to_sort);
 			$addressbooks += $to_sort;
 		}
-		if ($required != Acl::ADD &&	// do NOT allow to set accounts as default addressbook (AB can add accounts)
+		if ($required != Acl::ADD && // do NOT allow to set accounts as default addressbook (AB can add accounts)
 			!$preferences['addressbook']['hide_accounts'] && (
-				($grants[0] & $required) == $required ||
+				($grants[0]&$required) == $required ||
 				$preferences['common']['account_selection'] == 'groupmembers' &&
-				$this->account_repository != 'ldap' && ($required & Acl::READ)))
+				$this->account_repository != 'ldap' && ($required&Acl::READ)))
 		{
 			$addressbooks[0] = lang('Accounts');
 		}
 		// add all other user addressbooks the user has the necessary rights too
 		$to_sort = array();
-		foreach($grants as $uid => $rights)
+		foreach ($grants as $uid => $rights)
 		{
-			if ($uid != $user && ($rights & $required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
+			if ($uid != $user && ($rights&$required) == $required && $GLOBALS['egw']->accounts->get_type($uid) == 'u')
 			{
 				$to_sort[$uid] = Accounts::username($uid);
 			}
@@ -415,22 +415,22 @@ 
 	 * @param boolean $isUpdate =false If true, reads the old record for any not set fields
 	 * @return string
 	 */
-	function fileas($contact,$type=null, $isUpdate=false)
+	function fileas($contact, $type = null, $isUpdate = false)
 	{
 		if (is_null($type)) $type = $contact['fileas_type'];
 		if (!$type) $type = $this->prefs['fileas_default'] ? $this->prefs['fileas_default'] : $this->fileas_types[0];
 
-		if (strpos($type,'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
+		if (strpos($type, 'n_fn') !== false) $contact['n_fn'] = $this->fullname($contact);
 
-		if($isUpdate)
+		if ($isUpdate)
 		{
-			$fileas_fields = array('n_prefix','n_given','n_middle','n_family','n_suffix','n_fn','org_name','org_unit','adr_one_locality','bday');
+			$fileas_fields = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix', 'n_fn', 'org_name', 'org_unit', 'adr_one_locality', 'bday');
 			$old = null;
-			foreach($fileas_fields as $field)
+			foreach ($fileas_fields as $field)
 			{
-				if(!isset($contact[$field]))
+				if (!isset($contact[$field]))
 				{
-					if(is_null($old)) $old = $this->read($contact['id']);
+					if (is_null($old)) $old = $this->read($contact['id']);
 					$contact[$field] = $old[$field];
 				}
 			}
@@ -438,8 +438,8 @@ 
 		}
 
 		// removing empty delimiters, caused by empty contact fields
-		$fileas = str_replace(array(', , : ',', : ',': , ',', , ',': : ',' ()'),
-			array(': ',': ',': ',', ',': ',''),
+		$fileas = str_replace(array(', , : ', ', : ', ': , ', ', , ', ': : ', ' ()'),
+			array(': ', ': ', ': ', ', ', ': ', ''),
 			strtr($type, array(
 				'n_prefix' => $contact['n_prefix'],
 				'n_given'  => $contact['n_given'],
@@ -453,13 +453,13 @@ 
 				'bday'     => (int)$contact['bday'] ? DateTime::to($contact['bday'], true) : $contact['bday'],
 			)));
 
-		while ($fileas[0] == ':' ||  $fileas[0] == ',')
+		while ($fileas[0] == ':' || $fileas[0] == ',')
 		{
-			$fileas = substr($fileas,2);
+			$fileas = substr($fileas, 2);
 		}
-		while (substr($fileas,-2) == ': ' || substr($fileas,-2) == ', ')
+		while (substr($fileas, -2) == ': ' || substr($fileas, -2) == ', ')
 		{
-			$fileas = substr($fileas,0,-2);
+			$fileas = substr($fileas, 0, -2);
 		}
 		return $fileas;
 	}
@@ -471,15 +471,15 @@ 
 	 * @param string $file_as =null file_as type, default null to read it from the contact, unknown/not set type default to the first one
 	 * @return string
 	 */
-	function fileas_type($contact,$file_as=null)
+	function fileas_type($contact, $file_as = null)
 	{
 		if (is_null($file_as)) $file_as = $contact['n_fileas'];
 
 		if ($file_as)
 		{
-			foreach($this->fileas_types as $type)
+			foreach ($this->fileas_types as $type)
 			{
-				if ($this->fileas($contact,$type) == $file_as)
+				if ($this->fileas($contact, $type) == $file_as)
 				{
 					return $type;
 				}
@@ -496,10 +496,10 @@ 
 	 */
 	public static function cf_options()
 	{
-		$cf_fields = Storage\Customfields::get('addressbook',TRUE);
-		foreach ($cf_fields as $key => $value )
+		$cf_fields = Storage\Customfields::get('addressbook', TRUE);
+		foreach ($cf_fields as $key => $value)
 		{
-			$options[$key]= $value['label'];
+			$options[$key] = $value['label'];
 		}
 		return $options;
 	}
@@ -510,7 +510,7 @@ 
 	 * @param array $contact =null real content to use, default none
 	 * @return array with options: fileas type => label pairs
 	 */
-	function fileas_options($contact=null)
+	function fileas_options($contact = null)
 	{
 		$labels = array(
 			'n_prefix' => lang('prefix'),
@@ -524,13 +524,13 @@ 
 			'adr_one_locality' => lang('city'),
 			'bday'     => lang('Birthday'),
 		);
-		foreach(array_keys($labels) as $name)
+		foreach (array_keys($labels) as $name)
 		{
 			if ($contact[$name]) $labels[$name] = $contact[$name];
 		}
-		foreach($this->fileas_types as $fileas_type)
+		foreach ($this->fileas_types as $fileas_type)
 		{
-			$options[$fileas_type] = $this->fileas($labels,$fileas_type);
+			$options[$fileas_type] = $this->fileas($labels, $fileas_type);
 		}
 		return $options;
 	}
@@ -545,7 +545,7 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated, false for wrong fileas type
 	 */
-	function set_all_fileas($fileas_type,$all=false,&$errors=null,$ignore_acl=false)
+	function set_all_fileas($fileas_type, $all = false, &$errors = null, $ignore_acl = false)
 	{
 		if ($fileas_type != '' && !in_array($fileas_type, $this->fileas_types))
 		{
@@ -553,17 +553,17 @@ 
 		}
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
+		for ($n = $updated = $errors = 0; ($contacts = parent::search($all ? array() : array(
 			'n_fileas IS NULL',
 			"n_fileas=''",
 			'n_fn IS NULL',
 			"n_fn=''",
-		),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$old_fn     = $contact['n_fn'];
 				$old_fileas = $contact['n_fileas'];
@@ -571,19 +571,19 @@ 
 				// only update fileas if type is given AND (all should be updated or n_fileas is empty)
 				if ($fileas_type && ($all || empty($contact['n_fileas'])))
 				{
-					$contact['n_fileas'] = $this->fileas($contact,$fileas_type);
+					$contact['n_fileas'] = $this->fileas($contact, $fileas_type);
 				}
 				if ($old_fileas != $contact['n_fileas'] || $old_fn != $contact['n_fn'])
 				{
 					// only specify/write updated fields plus "keys"
-					$contact = array_intersect_key($contact,array(
+					$contact = array_intersect_key($contact, array(
 						'id' => true,
 						'owner' => true,
 						'private' => true,
 						'account_id' => true,
 						'uid' => true,
-					)+($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array())+($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
-					if ($this->save($contact,$ignore_acl))
+					) + ($old_fileas != $contact['n_fileas'] ? array('n_fileas' => true) : array()) + ($old_fn != $contact['n_fn'] ? array('n_fn' => true) : array()));
+					if ($this->save($contact, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -606,11 +606,11 @@ 
 	 * @param int &$errors=null on return number of errors
 	 * @return int|boolean number of contacts updated
 	 */
-	function set_all_cleanup(&$errors=null,$ignore_acl=false)
+	function set_all_cleanup(&$errors = null, $ignore_acl = false)
 	{
 		if ($ignore_acl)
 		{
-			unset($this->somain->grants);	// to NOT limit search to contacts readable by current user
+			unset($this->somain->grants); // to NOT limit search to contacts readable by current user
 		}
 
 		// fields that must not be touched
@@ -632,14 +632,14 @@ 
 		);
 
 		// to be able to work on huge contact repositories we read the contacts in chunks of 100
-		for($n = $updated = $errors = 0; ($contacts = parent::search(array(),false,'','','',false,'OR',array($n*100,100))); ++$n)
+		for ($n = $updated = $errors = 0; ($contacts = parent::search(array(), false, '', '', '', false, 'OR', array($n * 100, 100))); ++$n)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$fields_to_update = array();
-				foreach($contact as $field_name => $field_value)
+				foreach ($contact as $field_name => $field_value)
 				{
-					if($fields_exclude[$field_name] === true) continue; // dont touch specified field
+					if ($fields_exclude[$field_name] === true) continue; // dont touch specified field
 
 					if (is_string($field_value) && $field_name != 'pubkey' && $field_name != 'jpegphoto')
 					{
@@ -649,9 +649,9 @@ 
 							$fields_to_update[$field_name] = $field_value = trim($field_value);
 						}
 						// check if field contains a carriage return - exclude notes
-						if ($field_name != 'note' && strpos($field_value,"\x0D\x0A") !== false)
+						if ($field_name != 'note' && strpos($field_value, "\x0D\x0A") !== false)
 						{
-							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A"," ",$field_value);
+							$fields_to_update[$field_name] = $field_value = str_replace("\x0D\x0A", " ", $field_value);
 						}
 					}
 					// check if a field contains an empty string
@@ -661,13 +661,13 @@ 
 					}
 					// check for valid birthday date
 					if ($field_name == 'bday' && $field_value != null &&
-						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/',$field_value))
+						!preg_match('/^(18|19|20|21|22)\d{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/', $field_value))
 					{
 						$fields_to_update[$field_name] = $field_value = null;
 					}
 				}
 
-				if(count($fields_to_update) > 0)
+				if (count($fields_to_update) > 0)
 				{
 					$contact_to_save = array(
 						'id' => $contact['id'],
@@ -676,7 +676,7 @@ 
 						'account_id' => $contact['account_id'],
 						'uid' => $contact['uid']) + $fields_to_update;
 
-					if ($this->save($contact_to_save,$ignore_acl))
+					if ($this->save($contact_to_save, $ignore_acl))
 					{
 						$updated++;
 					}
@@ -701,14 +701,14 @@ 
 		if (empty($contact['n_family']) && empty($contact['n_given'])) {
 			$cpart = array('org_name');
 		} else {
-			$cpart = array('n_prefix','n_given','n_middle','n_family','n_suffix');
+			$cpart = array('n_prefix', 'n_given', 'n_middle', 'n_family', 'n_suffix');
 		}
 		$parts = array();
-		foreach($cpart as $n)
+		foreach ($cpart as $n)
 		{
 			if ($contact[$n]) $parts[] = $contact[$n];
 		}
-		return implode(' ',$parts);
+		return implode(' ', $parts);
 	}
 
 	/**
@@ -722,7 +722,7 @@ 
 	 *
 	 * @return array updated data
 	 */
-	function db2data($data, $date_format='ts')
+	function db2data($data, $date_format = 'ts')
 	{
 		static $fb_url = false;
 
@@ -734,7 +734,7 @@ 
 				$data[$name] = DateTime::server2user($data[$name], $date_format);
 			}
 		}
-		$data['photo'] = $this->photo_src($data['id'],$data['jpegphoto'],'',$data['etag']);
+		$data['photo'] = $this->photo_src($data['id'], $data['jpegphoto'], '', $data['etag']);
 
 		// set freebusy_uri for accounts
 		if (!$data['freebusy_uri'] && !$data['owner'] && $data['account_id'] && !is_object($GLOBALS['egw_setup']))
@@ -757,13 +757,13 @@ 
 	 * @param string $etag =null etag to set in url to allow caching with Expires header
 	 * @return string/array
 	 */
-	function photo_src($id,$jpeg,$default='',$etag=null)
+	function photo_src($id, $jpeg, $default = '', $etag = null)
 	{
 		//error_log(__METHOD__."($id, ..., etag=$etag) ".  function_backtrace());
 		return $jpeg ? array(
 			'menuaction' => 'addressbook.addressbook_ui.photo',
 			'contact_id' => $id,
-		)+(isset($etag) ? array(
+		) + (isset($etag) ? array(
 			'etag'       => $etag,
 		) : array()) : $default;
 	}
@@ -779,7 +779,7 @@ 
 	 *
 	 * @return array upated data
 	 */
-	function data2db($data, $date_format='ts')
+	function data2db($data, $date_format = 'ts')
 	{
 		// convert timestamps from user-time to server-time in the db
 		foreach ($this->timestamps as $name)
@@ -800,7 +800,7 @@ 
 	* @param int $check_etag =null
 	* @return boolean|int true on success or false on failiure, 0 if etag does not match
 	*/
-	function delete($contact,$deny_account_delete=true,$check_etag=null)
+	function delete($contact, $deny_account_delete = true, $check_etag = null)
 	{
 		if (is_array($contact) && isset($contact['id']))
 		{
@@ -810,12 +810,12 @@ 
 		{
 			$contact = array($contact);
 		}
-		foreach($contact as $c)
+		foreach ($contact as $c)
 		{
 			$id = is_array($c) ? $c['id'] : $c;
 
 			$ok = false;
-			if ($this->check_perms(Acl::DELETE,$c,$deny_account_delete))
+			if ($this->check_perms(Acl::DELETE, $c, $deny_account_delete))
 			{
 				if (!($old = $this->read($id))) return false;
 				// check if we only mark contacts as deleted, or really delete them
@@ -826,12 +826,12 @@ 
 					$delete = $old;
 					$delete['tid'] = self::DELETED_TYPE;
 					if ($check_etag) $delete['etag'] = $check_etag;
-					if (($ok = $this->save($delete))) $ok = true;	// we have to return true or false
-					Link::unlink(0,'addressbook',$id,'','','',true);
+					if (($ok = $this->save($delete))) $ok = true; // we have to return true or false
+					Link::unlink(0, 'addressbook', $id, '', '', '', true);
 				}
-				elseif (($ok = parent::delete($id,$check_etag)))
+				elseif (($ok = parent::delete($id, $check_etag)))
 				{
-					Link::unlink(0,'addressbook',$id);
+					Link::unlink(0, 'addressbook', $id);
 				}
 
 				// Don't notify of final purge
@@ -858,7 +858,7 @@ 
 	* @param boolean $touch_modified =true should modified/r be updated
 	* @return int/string/boolean id on success, false on failure, the error-message is in $this->error
 	*/
-	function save(&$contact, $ignore_acl=false, $touch_modified=true)
+	function save(&$contact, $ignore_acl = false, $touch_modified = true)
 	{
 		// remember if we add or update a entry
 		if (($isUpdate = $contact['id']))
@@ -867,11 +867,11 @@ 
 			{
 				if (($old = $this->read($contact['id'])))	// --> try reading the old entry and set it from there
 				{
-					if(!isset($contact['owner']))
+					if (!isset($contact['owner']))
 					{
 						$contact['owner'] = $old['owner'];
 					}
-					if(!isset($contact['private']))
+					if (!isset($contact['private']))
 					{
 						$contact['private'] = $old['private'];
 					}
@@ -903,7 +903,7 @@ 
 		{
 			$contact['private'] = 0;
 		}
-		if(!$ignore_acl && !$this->check_perms($isUpdate ? Acl::EDIT : Acl::ADD,$contact))
+		if (!$ignore_acl && !$this->check_perms($isUpdate ? Acl::EDIT : Acl::ADD, $contact))
 		{
 			$this->error = 'access denied';
 			return false;
@@ -916,15 +916,15 @@ 
 		// convert categories
 		if (is_array($contact['cat_id']))
 		{
-			$contact['cat_id'] = implode(',',$contact['cat_id']);
+			$contact['cat_id'] = implode(',', $contact['cat_id']);
 		}
 
 		// Update country codes
-		foreach(array('adr_one_', 'adr_two_') as $c_prefix) {
-			if($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
+		foreach (array('adr_one_', 'adr_two_') as $c_prefix) {
+			if ($contact[$c_prefix.'countryname'] && !$contact[$c_prefix.'countrycode'] &&
 				$code = Country::country_code($contact[$c_prefix.'countryname']))
 			{
-				if(strlen($code) == 2)
+				if (strlen($code) == 2)
 				{
 					$contact[$c_prefix.'countrycode'] = $code;
 				}
@@ -933,7 +933,7 @@ 
 					$contact[$c_prefix.'countrycode'] = null;
 				}
 			}
-			if($contact[$c_prefix.'countrycode'] != null)
+			if ($contact[$c_prefix.'countrycode'] != null)
 			{
 				$contact[$c_prefix.'countryname'] = null;
 			}
@@ -961,9 +961,9 @@ 
 		// (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
 		if (!$ignore_acl && !$contact['owner'] && !($this->is_admin($contact) || $this->allow_account_edit()))
 		{
-			foreach(array_keys($contact) as $field)
+			foreach (array_keys($contact) as $field)
 			{
-				if (!in_array($field,$this->own_account_acl) && !in_array($field,array('id','owner','account_id','modified','modifier')))
+				if (!in_array($field, $this->own_account_acl) && !in_array($field, array('id', 'owner', 'account_id', 'modified', 'modifier')))
 				{
 					// user is not allowed to change that
 					if ($old)
@@ -984,12 +984,12 @@ 
 		{
 			if (isset($to_write['owner']) && !empty($to_write['owner']))
 			{
-				error_log(__METHOD__.__LINE__." Trying to change account to owner:". $to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
+				error_log(__METHOD__.__LINE__." Trying to change account to owner:".$to_write['owner'].' Account affected:'.array2string($old).' Data send:'.array2string($to_write));
 				unset($to_write['owner']);
 			}
 		}
 
-		if(!($this->error = parent::save($to_write)))
+		if (!($this->error = parent::save($to_write)))
 		{
 			$contact['id'] = $to_write['id'];
 			$contact['uid'] = $to_write['uid'];
@@ -1003,27 +1003,27 @@ 
 				$GLOBALS['egw']->accounts->cache_invalidate($contact['account_id']);
 				// call edit-accout hook, to let other apps know about changed account (names or email)
 				$GLOBALS['hook_values'] = $GLOBALS['egw']->accounts->read($contact['account_id']);
-				Hooks::process($GLOBALS['hook_values']+array(
+				Hooks::process($GLOBALS['hook_values'] + array(
 					'location' => 'editaccount',
-				),False,True);	// called for every app now, not only enabled ones)
+				), False, True); // called for every app now, not only enabled ones)
 			}
 			// notify interested apps about changes in the account-contact data
 			if (!$to_write['owner'] && $to_write['account_id'] && $isUpdate)
 			{
 				$to_write['location'] = 'editaccountcontact';
-				Hooks::process($to_write,False,True);	// called for every app now, not only enabled ones));
+				Hooks::process($to_write, False, True); // called for every app now, not only enabled ones));
 			}
 			// Notify linked apps about changes in the contact data
-			Link::notify_update('addressbook',  $contact['id'], $contact);
+			Link::notify_update('addressbook', $contact['id'], $contact);
 
 			// Check for restore of deleted contact, restore held links
-			if($old && $old['tid'] == self::DELETED_TYPE && $contact['tid'] != self::DELETED_TYPE)
+			if ($old && $old['tid'] == self::DELETED_TYPE && $contact['tid'] != self::DELETED_TYPE)
 			{
 				Link::restore('addressbook', $contact['id']);
 			}
 
 			// Record change history for sql - doesn't work for LDAP accounts
-			if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
+			if (!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
 			{
 				$deleted = ($old['tid'] == self::DELETED_TYPE || $contact['tid'] == self::DELETED_TYPE);
 				if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
@@ -1031,12 +1031,12 @@ 
 			}
 
 			// Expire birthday cache for this year and next if birthday changed
-			if($isUpdate && $old['bday'] !== $to_write['bday'] || !$isUpdate && $to_write['bday'])
+			if ($isUpdate && $old['bday'] !== $to_write['bday'] || !$isUpdate && $to_write['bday'])
 			{
-				$year = (int) date('Y',time());
-				Cache::unsetInstance(__CLASS__,"birthday-$year-{$to_write['owner']}");
+				$year = (int)date('Y', time());
+				Cache::unsetInstance(__CLASS__, "birthday-$year-{$to_write['owner']}");
 				$year++;
-				Cache::unsetInstance(__CLASS__,"birthday-$year-{$to_write['owner']}");
+				Cache::unsetInstance(__CLASS__, "birthday-$year-{$to_write['owner']}");
 			}
 		}
 
@@ -1050,7 +1050,7 @@ 
 	 * @param int $dst_w =240 max width to resize to
 	 * @return string with resized jpeg photo, null on error
 	 */
-	public static function resize_photo($photo,$dst_w=240)
+	public static function resize_photo($photo, $dst_w = 240)
 	{
 		if (is_resource($photo))
 		{
@@ -1066,15 +1066,15 @@ 
 		//error_log(__METHOD__."() got image $src_w * $src_h, is_jpeg=".array2string(substr($photo,0,2) === "\377\330"));
 
 		// if $photo is to width or not a jpeg image --> resize it
-		if ($src_w > $dst_w || cut_bytes($photo,0,2) !== "\377\330")
+		if ($src_w > $dst_w || cut_bytes($photo, 0, 2) !== "\377\330")
 		{
 			//error_log(__METHOD__."(,dst_w=$dst_w) src_w=$src_w, cut_bytes(photo,0,2)=".array2string(cut_bytes($photo,0,2)).' --> resizing');
 			// scale the image to a width of 60 and a height according to the proportion of the source image
-			$resized = imagecreatetruecolor($dst_w,$dst_h = round($src_h * $dst_w / $src_w));
-			imagecopyresized($resized,$image,0,0,0,0,$dst_w,$dst_h,$src_w,$src_h);
+			$resized = imagecreatetruecolor($dst_w, $dst_h = round($src_h * $dst_w / $src_w));
+			imagecopyresized($resized, $image, 0, 0, 0, 0, $dst_w, $dst_h, $src_w, $src_h);
 
 			ob_start();
-			imagejpeg($resized,null,90);
+			imagejpeg($resized, null, 90);
 			$photo = ob_get_contents();
 			ob_end_clean();
 
@@ -1095,7 +1095,7 @@ 
 	* @param boolean $ignore_acl =false true: no acl check
 	* @return array|boolean array with contact data, null if not found or false on no view perms
 	*/
-	function read($contact_id, $ignore_acl=false)
+	function read($contact_id, $ignore_acl = false)
 	{
 		// get so_sql_cf to read private customfields too, if we ignore acl
 		if ($ignore_acl && is_a($this->somain, __CLASS__.'\\Sql'))
@@ -1105,11 +1105,11 @@ 
 		}
 		if (!($data = parent::read($contact_id)))
 		{
-			$data = null;	// not found
+			$data = null; // not found
 		}
-		elseif (!$ignore_acl && !$this->check_perms(Acl::READ,$data))
+		elseif (!$ignore_acl && !$this->check_perms(Acl::READ, $data))
 		{
-			$data = false;	// no view perms
+			$data = false; // no view perms
 		}
 		else
 		{
@@ -1117,10 +1117,10 @@ 
 			$data['fileas_type'] = $this->fileas_type($data);
 
 			// Update country name from code
-			if($data['adr_one_countrycode'] != null) {
+			if ($data['adr_one_countrycode'] != null) {
 				$data['adr_one_countryname'] = Country::get_full_name($data['adr_one_countrycode'], true);
 			}
-			if($data['adr_two_countrycode'] != null) {
+			if ($data['adr_two_countrycode'] != null) {
 				$data['adr_two_countryname'] = Country::get_full_name($data['adr_two_countrycode'], true);
 			}
 		}
@@ -1144,7 +1144,7 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true permission granted, false for permission denied, null for contact does not exist
 	 */
-	function check_perms($needed,$contact,$deny_account_delete=false,$user=null)
+	function check_perms($needed, $contact, $deny_account_delete = false, $user = null)
 	{
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -1155,7 +1155,7 @@ 
 		else
 		{
 			$grants = $this->get_grants($user);
-			$memberships =  $GLOBALS['egw']->accounts->memberships($user,true);
+			$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 		}
 
 		if ((!is_array($contact) || !isset($contact['owner'])) &&
@@ -1181,12 +1181,12 @@ 
 			$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']))
 		{
-			$access = !!array_intersect($memberships,$GLOBALS['egw']->accounts->memberships($contact['account_id'],true));
+			$access = !!array_intersect($memberships, $GLOBALS['egw']->accounts->memberships($contact['account_id'], true));
 		}
 		else
 		{
-			$access = ($grants[$owner] & $needed) &&
-				(!$contact['private'] || ($grants[$owner] & Acl::PRIVAT) || in_array($owner,$memberships));
+			$access = ($grants[$owner]&$needed) &&
+				(!$contact['private'] || ($grants[$owner]&Acl::PRIVAT) || in_array($owner, $memberships));
 		}
 		//error_log(__METHOD__."($needed,$contact[id],$deny_account_delete,$user) returning ".array2string($access));
 		return $access;
@@ -1201,11 +1201,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_perms($check,$id,false,$user);
+		return $this->check_perms($check, $id, false, $user);
 	}
 
 	/**
@@ -1217,18 +1217,18 @@ 
 	function read_org($org_id)
 	{
 		if (!$org_id) return false;
-		if (strpos($org_id,'*AND*')!== false) $org_id = str_replace('*AND*','&',$org_id);
+		if (strpos($org_id, '*AND*') !== false) $org_id = str_replace('*AND*', '&', $org_id);
 		$org = array();
-		foreach(explode('|||',$org_id) as $part)
+		foreach (explode('|||', $org_id) as $part)
 		{
-			list($name,$value) = explode(':',$part,2);
+			list($name, $value) = explode(':', $part, 2);
 			$org[$name] = $value;
 		}
-		$csvs = array('cat_id');	// fields with comma-separated-values
+		$csvs = array('cat_id'); // fields with comma-separated-values
 
 		// split regular fields and custom fields
 		$custom_fields = $regular_fields = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if ($name[0] != '#')
 			{
@@ -1236,9 +1236,9 @@ 
 			}
 			else
 			{
-				$custom_fields[] = $name = substr($name,1);
+				$custom_fields[] = $name = substr($name, 1);
 				$regular_fields['id'] = 'id';
-				if (substr($this->customfields[$name]['type'],0,6)=='select' && $this->customfields[$name]['rows'] ||	// multiselection
+				if (substr($this->customfields[$name]['type'], 0, 6) == 'select' && $this->customfields[$name]['rows'] || // multiselection
 					$this->customfields[$name]['type'] == 'radio')
 				{
 					$csvs[] = '#'.$name;
@@ -1246,24 +1246,24 @@ 
 			}
 		}
 		// read the regular fields
-		$contacts = parent::search('',$regular_fields,'','','',false,'AND',false,$org);
+		$contacts = parent::search('', $regular_fields, '', '', '', false, 'AND', false, $org);
 		if (!$contacts) return false;
 
 		// if we have custom fields, read and merge them in
 		if ($custom_fields)
 		{
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
-			if (($cfs = $this->read_customfields($ids,$custom_fields)))
+			if (($cfs = $this->read_customfields($ids, $custom_fields)))
 			{
 				foreach ($contacts as &$contact)
 				{
 					$id = $contact['id'];
 					if (isset($cfs[$id]))
 					{
-						foreach($cfs[$id] as $name => $value)
+						foreach ($cfs[$id] as $name => $value)
 						{
 							$contact['#'.$name] = $value;
 						}
@@ -1275,33 +1275,33 @@ 
 
 		// create a statistic about the commonness of each fields values
 		$fields = array();
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$fields[$name][$value]++;
 				}
 				else
 				{
 					// for comma separated fields, we have to use each single value
-					foreach(explode(',',$value) as $val)
+					foreach (explode(',', $value) as $val)
 					{
 						$fields[$name][$val]++;
 					}
 				}
 			}
 		}
-		foreach($fields as $name => $values)
+		foreach ($fields as $name => $values)
 		{
-			if (!in_array($name,$this->org_fields)) continue;
+			if (!in_array($name, $this->org_fields)) continue;
 
-			arsort($values,SORT_NUMERIC);
-			list($value,$num) = each($values);
-			if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+			arsort($values, SORT_NUMERIC);
+			list($value, $num) = each($values);
+			if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 			{
-				if (!in_array($name,$csvs))
+				if (!in_array($name, $csvs))
 				{
 					$org[$name] = $value;
 				}
@@ -1310,12 +1310,12 @@ 
 					$org[$name] = array();
 					foreach ($values as $value => $num)
 					{
-						if ($value && $num / (double) count($contacts) >= $this->org_common_factor)
+						if ($value && $num / (double)count($contacts) >= $this->org_common_factor)
 						{
 							$org[$name][] = $value;
 						}
 					}
-					$org[$name] = implode(',',$org[$name]);
+					$org[$name] = implode(',', $org[$name]);
 				}
 			}
 		}
@@ -1329,10 +1329,10 @@ 
 	 * @param array $fields field-name => value pairs
 	 * @return array with contacts
 	 */
-	function org_similar($org_name,$fields)
+	function org_similar($org_name, $fields)
 	{
 		$criteria = array();
-		foreach($this->org_fields as $name)
+		foreach ($this->org_fields as $name)
 		{
 			if (isset($fields[$name]))
 			{
@@ -1346,7 +1346,7 @@ 
 				}
 			}
 		}
-		return parent::search($criteria,false,'n_family,n_given','','',false,'OR',false,array('org_name'=>$org_name));
+		return parent::search($criteria, false, 'n_family,n_given', '', '', false, 'OR', false, array('org_name'=>$org_name));
 	}
 
 	/**
@@ -1357,10 +1357,10 @@ 
 	 * @param boolean $only_org_fields =true check and return only org_fields, default true
 	 * @return array with field-name => value from $from
 	 */
-	function changed_fields($from,$to,$only_org_fields=true)
+	function changed_fields($from, $to, $only_org_fields = true)
 	{
 		// we only care about countryname, if contrycode is empty
-		foreach(array(
+		foreach (array(
 			'adr_one_countryname' => 'adr_one_countrycode',
 			'adr_two_countryname' => 'adr_one_countrycode',
 		) as $name => $code)
@@ -1369,13 +1369,13 @@ 
 			if (!empty($to[$code])) $to[$name] = '';
 		}
 		$changed = array();
-		foreach($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
+		foreach ($only_org_fields ? $this->org_fields : array_keys($this->contact_fields) as $name)
 		{
-			if (in_array($name,array('modified','modifier')))	// never count these
+			if (in_array($name, array('modified', 'modifier')))	// never count these
 			{
 				continue;
 			}
-			if ((string) $from[$name] != (string) $to[$name])
+			if ((string)$from[$name] != (string)$to[$name])
 			{
 				$changed[$name] = $from[$name];
 			}
@@ -1392,35 +1392,35 @@ 
 	 * @param array $members =null org-members to change, default null --> function queries them itself
 	 * @return array/boolean (changed-members,changed-fields,failed-members) or false if no org_fields changed or no (other) members matching that fields
 	 */
-	function change_org($org_name,$from,$to,$members=null)
+	function change_org($org_name, $from, $to, $members = null)
 	{
-		if (!($changed = $this->changed_fields($from,$to,true))) return false;
+		if (!($changed = $this->changed_fields($from, $to, true))) return false;
 
 		if (is_null($members) || !is_array($members))
 		{
-			$members = $this->org_similar($org_name,$changed);
+			$members = $this->org_similar($org_name, $changed);
 		}
 		if (!$members) return false;
 
 		$ids = array();
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			$ids[] = $member['id'];
 		}
 		$customfields = $this->read_customfields($ids);
 
 		$changed_members = $changed_fields = $failed_members = 0;
-		foreach($members as $member)
+		foreach ($members as $member)
 		{
 			if (isset($customfields[$member['id']]))
 			{
-				foreach(array_keys($this->customfields) as $name)
+				foreach (array_keys($this->customfields) as $name)
 				{
 					$member['#'.$name] = $customfields[$member['id']][$name];
 				}
 			}
 			$fields = 0;
-			foreach($changed as $name => $value)
+			foreach ($changed as $name => $value)
 			{
 				if ((string)$value == (string)$member[$name])
 				{
@@ -1430,7 +1430,7 @@ 
 			}
 			if ($fields)
 			{
-				if (!$this->check_perms(Acl::EDIT,$member) || !$this->save($member))
+				if (!$this->check_perms(Acl::EDIT, $member) || !$this->save($member))
 				{
 					++$failed_members;
 				}
@@ -1441,7 +1441,7 @@ 
 				}
 			}
 		}
-		return array($changed_members,$changed_fields,$failed_members);
+		return array($changed_members, $changed_fields, $failed_members);
 	}
 
 	/**
@@ -1468,12 +1468,12 @@ 
 			if ($contact['n_fileas']) return $contact['n_fileas'];
 			$type = null;
 		}
-		$title =  $this->fileas($contact,$type);
+		$title = $this->fileas($contact, $type);
 		if ($this->prefs['link_title_cf'] && $contact['#'.$this->prefs['link_title_cf']])
 		{
-			$title .= ' ' . $contact['#'.$this->prefs['link_title_cf']];
+			$title .= ' '.$contact['#'.$this->prefs['link_title_cf']];
 		}
-		return $title ;
+		return $title;
 	}
 
 	/**
@@ -1487,21 +1487,21 @@ 
 	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($contacts =& $this->search(array('contact_id' => $ids),false)))
+		if (($contacts = & $this->search(array('contact_id' => $ids), false)))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-			   	$titles[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+			   	$titles[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 			}
 		}
 		// we assume all not returned contacts are not readable for the user (as we report all deleted contacts to egw_link)
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -1528,23 +1528,23 @@ 
 		{
 			$criteria = is_array($pattern) ? $pattern['search'] : $pattern;
 		}
-		if($options['start'] || $options['num_rows'])
+		if ($options['start'] || $options['num_rows'])
 		{
 			$limit = array($options['start'], $options['num_rows']);
 		}
 		$filter = (array)$options['filter'];
 		if ($GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts']) $filter['account_id'] = null;
-		if (($contacts =& parent::search($criteria,false,'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR', $limit, $filter)))
+		if (($contacts = & parent::search($criteria, false, 'org_name,n_family,n_given,cat_id,contact_email', '', '%', false, 'OR', $limit, $filter)))
 		{
 			$ids = array();
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
 				$ids[] = $contact['id'];
 			}
 			$cfs = $this->read_customfields($ids);
-			foreach($contacts as $contact)
+			foreach ($contacts as $contact)
 			{
-				$result[$contact['id']] = $this->link_title($contact+(array)$cfs[$contact['id']]);
+				$result[$contact['id']] = $this->link_title($contact + (array)$cfs[$contact['id']]);
 				// make sure to return a correctly quoted rfc822 address, if requested
 				if ($options['type'] === 'email')
 				{
@@ -1585,7 +1585,7 @@ 
 		// let link query know, to append email to list
 		$options['type'] = 'email';
 
-		return $this->link_query($pattern,$options);
+		return $this->link_query($pattern, $options);
 	}
 
 	/**
@@ -1599,7 +1599,7 @@ 
 		if (!$ids) return null;
 
 		$data = array();
-		foreach(!is_array($ids) ? array($ids) : $ids as $id)
+		foreach (!is_array($ids) ? array($ids) : $ids as $id)
 		{
 			if (!($contact = $this->read($id))) continue;
 
@@ -1621,7 +1621,7 @@ 
 	 * @param boolean $extra_title =true if true, use a short date only title and put the full title as extra_title (tooltip)
 	 * @return array
 	 */
-	function read_calendar($uids,$extra_title=true)
+	function read_calendar($uids, $extra_title = true)
 	{
 		if (!$GLOBALS['egw_info']['user']['apps']['calendar']) return array();
 
@@ -1636,9 +1636,9 @@ 
 
 		//_debug_array($events);
 		$calendars = array();
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				if ($status == 'R' && !$GLOBALS['egw_info']['user']['preferences']['calendar']['show_rejected'])
 				{
@@ -1655,13 +1655,13 @@ 
 							'app' => 'calendar',
 							'title' => $bocal->link_title($event),
 							'extra_args' => array(
-								'date' => date('Ymd',$event['start']),
+								'date' => date('Ymd', $event['start']),
 							),
 						);
 						if ($extra_title)
 						{
 							$link['extra_title'] = $link['title'];
-							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],$event['start']);
+							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $event['start']);
 						}
 						$calendars[$uid]['last_link'] = $link;
 					}
@@ -1676,13 +1676,13 @@ 
 							'app' => 'calendar',
 							'title' => $bocal->link_title($event),
 							'extra_args' => array(
-								'date' => date('Ymd',$event['start']),
+								'date' => date('Ymd', $event['start']),
 							),
 						);
 						if ($extra_title)
 						{
 							$link['extra_title'] = $link['title'];
-							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],$event['start']);
+							$link['title'] = date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], $event['start']);
 						}
 						$calendars[$uid]['next_link'] = $link;
 					}
@@ -1701,8 +1701,8 @@ 
 	 */
 	public function read_birthdays($addressbook, $year)
 	{
-		$birthdays = Cache::getInstance(__CLASS__,"birthday-$year-$addressbook");
-		if($birthdays !== null)
+		$birthdays = Cache::getInstance(__CLASS__, "birthday-$year-$addressbook");
+		if ($birthdays !== null)
 		{
 			return $birthdays;
 		}
@@ -1713,44 +1713,43 @@ 
 			'n_family' => "!''",
 			'bday' => "!''",
 		);
-		$bdays =& $this->search('',array('id','n_family','n_given','n_prefix','n_middle','bday'),
-			'contact_bday ASC',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter);
+		$bdays = & $this->search('', array('id', 'n_family', 'n_given', 'n_prefix', 'n_middle', 'bday'),
+			'contact_bday ASC', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter);
 
 		if ($bdays)
 		{
 			// sort by month and day only
 			usort($bdays, function($a, $b)
 			{
-				return (int) $a['bday'] == (int) $b['bday'] ?
-					strcmp($a['bday'], $b['bday']) :
-					(int) $a['bday'] - (int) $b['bday'];
+				return (int)$a['bday'] == (int)$b['bday'] ?
+					strcmp($a['bday'], $b['bday']) : (int)$a['bday'] - (int)$b['bday'];
 			});
-			foreach($bdays as $pers)
+			foreach ($bdays as $pers)
 			{
-				if (empty($pers['bday']) || $pers['bday']=='0000-00-00 0' || $pers['bday']=='0000-00-00' || $pers['bday']=='0.0.00')
+				if (empty($pers['bday']) || $pers['bday'] == '0000-00-00 0' || $pers['bday'] == '0000-00-00' || $pers['bday'] == '0.0.00')
 				{
 					//error_log(__METHOD__.__LINE__.' Skipping entry for invalid birthday:'.array2string($pers));
 					continue;
 				}
-				list($y,$m,$d) = explode('-',$pers['bday']);
+				list($y, $m, $d) = explode('-', $pers['bday']);
 				if ($y > $year)
 				{
 					// not yet born
 					continue;
 				}
-				$birthdays[sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
+				$birthdays[sprintf('%04d%02d%02d', $year, $m, $d)][] = array(
 					'day'       => $d,
 					'month'     => $m,
 					'occurence' => 0,
 					'name'      => lang('Birthday').' '.($pers['n_given'] ? $pers['n_given'] : $pers['n_prefix']).' '.$pers['n_middle'].' '.
 						$pers['n_family'].
-						($GLOBALS['egw_info']['server']['hide_birthdays'] == 'age' ? ' '.($year - $y): '').
-						($y && in_array($GLOBALS['egw_info']['server']['hide_birthdays'], array('','age')) ? ' ('.$y.')' : ''),
-					'birthyear' => $y,	// this can be used to identify birthdays from holidays
+						($GLOBALS['egw_info']['server']['hide_birthdays'] == 'age' ? ' '.($year - $y) : '').
+						($y && in_array($GLOBALS['egw_info']['server']['hide_birthdays'], array('', 'age')) ? ' ('.$y.')' : ''),
+					'birthyear' => $y, // this can be used to identify birthdays from holidays
 				);
 			}
 		}
-		Cache::setInstance(__CLASS__,"birthday-$year-$addressbook", $birthdays, self::BIRTHDAY_CACHE_TIME);
+		Cache::setInstance(__CLASS__, "birthday-$year-$addressbook", $birthdays, self::BIRTHDAY_CACHE_TIME);
 		return $birthdays;
 	}
 
@@ -1773,7 +1772,7 @@ 
 	{
 		// get all cats if you want to drop sub cats
 		$drop_subs = ($data['drop_subs'] && !$data['modify_subs']);
-		if($drop_subs)
+		if ($drop_subs)
 		{
 			$cats = new Categories('', 'addressbook');
 			$cat_ids = $cats->return_all_children($data['cat_id']);
@@ -1784,14 +1783,14 @@ 
 		}
 
 		// Get addresses that use the category
-		@set_time_limit( 0 );
-		foreach($cat_ids as $cat_id)
+		@set_time_limit(0);
+		foreach ($cat_ids as $cat_id)
 		{
 			if (($ids = $this->search(array('cat_id' => $cat_id), false)))
 			{
-				foreach($ids as &$info)
+				foreach ($ids as &$info)
 				{
-					$info['cat_id'] = implode(',',array_diff(explode(',',$info['cat_id']), $cat_ids));
+					$info['cat_id'] = implode(',', array_diff(explode(',', $info['cat_id']), $cat_ids));
 					$this->save($info);
 				}
 			}
@@ -1813,14 +1812,14 @@ 
 		$account = null;
 		$custom_fields = Storage\Customfields::get('addressbook', true);
 		$custom_field_list = $this->read_customfields($ids);
-		foreach(parent::search(array('id'=>$ids),false) as $contact)	// $this->search calls the extended search from ui!
+		foreach (parent::search(array('id'=>$ids), false) as $contact)	// $this->search calls the extended search from ui!
 		{
 			if ($contact['account_id'])
 			{
 				if (!is_null($account))
 				{
 					echo $this->error = 'Can not merge more then one account!';
-					return false;	// we dont deal with two accounts!
+					return false; // we dont deal with two accounts!
 				}
 				$account = $contact;
 				continue;
@@ -1828,7 +1827,7 @@ 
 			// Add in custom fields
 			if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
 
-			$pos = array_search($contact['id'],$ids);
+			$pos = array_search($contact['id'], $ids);
 			$contacts[$pos] = $contact;
 		}
 		if (!is_null($account))	// we found an account, so we merge the contacts into it
@@ -1841,38 +1840,38 @@ 
 			$target = $contacts[0];
 			unset($contacts[0]);
 		}
-		if (!$this->check_perms(Acl::EDIT,$target))
+		if (!$this->check_perms(Acl::EDIT, $target))
 		{
 			echo $this->error = 'No edit permission for the target contact!';
 			return 0;
 		}
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			foreach($contact as $name => $value)
+			foreach ($contact as $name => $value)
 			{
 				if (!$value) continue;
 
-				switch($name)
+				switch ($name)
 				{
 					case 'id':
 					case 'tid':
 					case 'owner':
 					case 'private':
 					case 'etag';
-						break;	// ignored
+						break; // ignored
 
 					case 'cat_id':	// cats are all merged together
-						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',',$target['cat_id']) : array();
-						$target['cat_id'] = array_unique(array_merge($target['cat_id'],is_array($value)?$value:explode(',',$value)));
+						if (!is_array($target['cat_id'])) $target['cat_id'] = $target['cat_id'] ? explode(',', $target['cat_id']) : array();
+						$target['cat_id'] = array_unique(array_merge($target['cat_id'], is_array($value) ? $value : explode(',', $value)));
 						break;
 
 					default:
 						// Multi-select custom fields can also be merged
-						if($name[0] == '#') {
+						if ($name[0] == '#') {
 							$c_name = substr($name, 1);
-							if($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
-								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',',$target[$name]) : array();
-								$target[$name] = implode(',',array_unique(array_merge($target[$name],is_array($value)?$value:explode(',',$value))));
+							if ($custom_fields[$c_name]['type'] == 'select' && $custom_fields[$c_name]['rows'] > 1) {
+								if (!is_array($target[$name])) $target[$name] = $target[$name] ? explode(',', $target[$name]) : array();
+								$target[$name] = implode(',', array_unique(array_merge($target[$name], is_array($value) ? $value : explode(',', $value))));
 							}
 						}
 						if (!$target[$name]) $target[$name] = $value;
@@ -1883,29 +1882,29 @@ 
 		if (!$this->save($target)) return 0;
 
 		$success = 1;
-		foreach($contacts as $contact)
+		foreach ($contacts as $contact)
 		{
-			if (!$this->check_perms(Acl::DELETE,$contact))
+			if (!$this->check_perms(Acl::DELETE, $contact))
 			{
 				continue;
 			}
-			foreach(Link::get_links('addressbook',$contact['id']) as $data)
+			foreach (Link::get_links('addressbook', $contact['id']) as $data)
 			{
 				//_debug_array(array('function'=>__METHOD__,'line'=>__LINE__,'app'=>'addressbook','id'=>$contact['id'],'data:'=>$data,'target'=>$target['id']));
 				// info_from and info_link_id (main link)
-				$newlinkID = Link::link('addressbook',$target['id'],$data['app'],$data['id'],$data['remark'],$target['owner']);
+				$newlinkID = Link::link('addressbook', $target['id'], $data['app'], $data['id'], $data['remark'], $target['owner']);
 				//_debug_array(array('newLinkID'=>$newlinkID));
 				if ($newlinkID)
 				{
 					// update egw_infolog set info_link_id=$newlinkID where info_id=$data['id'] and info_link_id=$data['link_id']
-					if ($data['app']=='infolog')
+					if ($data['app'] == 'infolog')
 					{
-						$this->db->update('egw_infolog',array(
+						$this->db->update('egw_infolog', array(
 								'info_link_id' => $newlinkID
-							),array(
+							), array(
 								'info_id' => $data['id'],
 								'info_link_id' => $data['link_id']
-							),__LINE__,__FILE__,'infolog');
+							), __LINE__, __FILE__, 'infolog');
 					}
 					unset($newlinkID);
 				}
@@ -1930,14 +1929,14 @@ 
 	 * @param int $owner =null
 	 * @return boolean
 	 */
-	function check_list($list,$required,$owner=null)
+	function check_list($list, $required, $owner = null)
 	{
 		if ($list && ($list_data = $this->read_list($list)))
 		{
 			$owner = $list_data['list_owner'];
 		}
 		//error_log(__METHOD__."($list, $required, $owner) grants[$owner]=".$this->grants[$owner]." returning ".array2string(!!($this->grants[$owner] & $required)));
-		return !!($this->grants[$owner] & $required);
+		return !!($this->grants[$owner]&$required);
 	}
 
 	/**
@@ -1949,17 +1948,17 @@ 
 	 * @param array &$data=array() values for keys 'list_uid', 'list_carddav_name', 'list_name'
 	 * @return int|boolean integer list_id or false on error
 	 */
-	function add_list($keys,$owner,$contacts=array(),array &$data=array())
+	function add_list($keys, $owner, $contacts = array(), array &$data = array())
 	{
-		if (!$this->check_list(null,Acl::ADD|Acl::EDIT,$owner)) return false;
+		if (!$this->check_list(null, Acl::ADD|Acl::EDIT, $owner)) return false;
 
 		try {
-			$ret = parent::add_list($keys,$owner,$contacts,$data);
+			$ret = parent::add_list($keys, $owner, $contacts, $data);
 			if ($ret) unset(self::$list_cache[$ret]);
 		}
 		// catch sql error, as creating same name&owner list gives a sql error doublicate key
-		catch(Api\Db\Exception\InvalidSql $e) {
-			unset($e);	// not used
+		catch (Api\Db\Exception\InvalidSql $e) {
+			unset($e); // not used
 			return false;
 		}
 		return $ret;
@@ -1973,13 +1972,13 @@ 
 	 * @param array $existing =null array of existing contact-id(s) of list, to not reread it, eg. array()
 	 * @return false on error
 	 */
-	function add2list($contact,$list,array $existing=null)
+	function add2list($contact, $list, array $existing = null)
 	{
-		if (!$this->check_list($list,Acl::EDIT)) return false;
+		if (!$this->check_list($list, Acl::EDIT)) return false;
 
 		unset(self::$list_cache[$list]);
 
-		return parent::add2list($contact,$list,$existing);
+		return parent::add2list($contact, $list, $existing);
 	}
 
 	/**
@@ -1989,9 +1988,9 @@ 
 	 * @param int $list list-id
 	 * @return false on error
 	 */
-	function remove_from_list($contact,$list=null)
+	function remove_from_list($contact, $list = null)
 	{
-		if ($list && !$this->check_list($list,Acl::EDIT)) return false;
+		if ($list && !$this->check_list($list, Acl::EDIT)) return false;
 
 		if ($list)
 		{
@@ -2002,7 +2001,7 @@ 
 			self::$list_cache = array();
 		}
 
-		return parent::remove_from_list($contact,$list);
+		return parent::remove_from_list($contact, $list);
 	}
 
 	/**
@@ -2013,9 +2012,9 @@ 
 	 */
 	function delete_list($list)
 	{
-		if (!$this->check_list($list,Acl::DELETE)) return false;
+		if (!$this->check_list($list, Acl::DELETE)) return false;
 
-		foreach((array)$list as $l)
+		foreach ((array)$list as $l)
 		{
 			unset(self::$list_cache[$l]);
 		}
@@ -2051,7 +2050,7 @@ 
 	{
 		$code = Country::country_code($country);
 
-		switch($code)
+		switch ($code)
 		{
 			case 'AU':
 			case 'CA':
@@ -2115,12 +2114,12 @@ 
 	 *  by the ones the user normally does not see due to category permissions - used to preserve categories
 	 * @return array category ids (found, added and preserved categories)
 	 */
-	function find_or_add_categories($catname_list, $contact_id=null)
+	function find_or_add_categories($catname_list, $contact_id = null)
 	{
 		if ($contact_id && $contact_id > 0 && ($old_contact = $this->read($contact_id)))
 		{
 			// preserve categories without users read access
-			$old_categories = explode(',',$old_contact['cat_id']);
+			$old_categories = explode(',', $old_contact['cat_id']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
@@ -2174,15 +2173,15 @@ 
 	{
 		if (!is_object($this->categories))
 		{
-			$this->categories = new Categories($this->user,'addressbook');
+			$this->categories = new Categories($this->user, 'addressbook');
 		}
 
 		if (!is_array($cat_id_list))
 		{
-			$cat_id_list = explode(',',$cat_id_list);
+			$cat_id_list = explode(',', $cat_id_list);
 		}
 		$cat_list = array();
-		foreach($cat_id_list as $cat_id)
+		foreach ($cat_id_list as $cat_id)
 		{
 			if ($cat_id && $this->categories->check_perms(Acl::READ, $cat_id) &&
 					($cat_name = $this->categories->id2name($cat_id)) && $cat_name != '--')
@@ -2214,14 +2213,14 @@ 
 	 * @param boolean $relax =false if asked to relax, we only match against some key fields
 	 * @return array od matching contact_ids
 	 */
-	function find_contact($contact, $relax=false)
+	function find_contact($contact, $relax = false)
 	{
 		$empty_addr_one = $empty_addr_two = true;
 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '('. ($relax ? 'RELAX': 'EXACT') . ')[ContactData]:'
+				. '('.($relax ? 'RELAX' : 'EXACT').')[ContactData]:'
 				. array2string($contact)
 				. "\n", 3, $this->logfile);
 		}
@@ -2232,7 +2231,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactID]: ' . $contact['id']
+					. '()[ContactID]: '.$contact['id']
 					. "\n", 3, $this->logfile);
 			}
 			// We only do a simple consistency check
@@ -2250,11 +2249,11 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. '()[ContactUID]: ' . $contact['uid']
+					. '()[ContactUID]: '.$contact['uid']
 					. "\n", 3, $this->logfile);
 			}
 			// Try the given UID first
-			$criteria = array ('contact_uid' => $contact['uid']);
+			$criteria = array('contact_uid' => $contact['uid']);
 			if (($foundContacts = parent::search($criteria)))
 			{
 				foreach ($foundContacts as $egwContact)
@@ -2337,7 +2336,7 @@ 
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 				. '()[Addressbook FIND Step 1]: '
-				. 'CRITERIA = ' . array2string($criteria)
+				. 'CRITERIA = '.array2string($criteria)
 				. "\n", 3, $this->logfile);
 		}
 
@@ -2366,7 +2365,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 2]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 
@@ -2390,7 +2389,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. '()[Addressbook FIND Step 3]: '
-						. 'CRITERIA = ' . array2string($criteria)
+						. 'CRITERIA = '.array2string($criteria)
 						. "\n", 3, $this->logfile);
 				}
 
@@ -2416,7 +2415,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					. '()[Addressbook FIND Step 4]: '
-					. 'CRITERIA = ' . array2string($criteria)
+					. 'CRITERIA = '.array2string($criteria)
 					. "\n", 3, $this->logfile);
 			}
 			if (($foundContacts = parent::search($criteria, true, '', '', '', true)))
@@ -2430,7 +2429,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-				. '()[FOUND]: ' . array2string($matchingContacts)
+				. '()[FOUND]: '.array2string($matchingContacts)
 				. "\n", 3, $this->logfile);
 		}
 		return $matchingContacts;
@@ -2447,9 +2446,9 @@ 
 	 * @param int|array $owner =null 0=accounts, null=all addressbooks or integer account_id of user or group
 	 * @return string
 	 */
-	public function get_ctag($owner=null)
+	public function get_ctag($owner = null)
 	{
-		$filter = array('tid' => null);	// tid=null --> use all entries incl. deleted (tid='D')
+		$filter = array('tid' => null); // tid=null --> use all entries incl. deleted (tid='D')
 		// show addressbook of a single user?
 		if (!is_null($owner)) $filter['owner'] = $owner;
 
@@ -2458,11 +2457,11 @@ 
 		{
 			$filter['account_id'] = null;
 		}
-		$result = $this->search(array(),'contact_modified','contact_modified DESC','','',false,'AND',array(0,1),$filter);
+		$result = $this->search(array(), 'contact_modified', 'contact_modified DESC', '', '', false, 'AND', array(0, 1), $filter);
 
 		if (!$result || !isset($result[0]['modified']))
 		{
-			$ctag = 'empty';	// ctag for empty addressbook
+			$ctag = 'empty'; // ctag for empty addressbook
 		}
 		else
 		{