EGroupware / egroupware

api/src/WebDAV/Tools/_parse_proppatch.php

Doc Comments +1 added lines

@@ -95,6 +95,7 @@
      *
      * @param  string  path of input stream
      * @param boolean $store_request =false if true whole request data will be made available in $this->request
+     * @param string $path
      * @access public
      */
     function __construct($path, $store_request=false)

Indentation +192 added lines, -192 removed lines

@@ -43,198 +43,198 @@
  */
 class _parse_proppatch
 {
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $success;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $props;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $depth;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $mode;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $current;
-
-    /**
-     * On return whole request, if $store_request == true was specified in constructor
-     *
-     * @var string
-     */
-    var $request;
-
-    /**
-     * constructor
-     *
-     * @param  string  path of input stream
-     * @param boolean $store_request =false if true whole request data will be made available in $this->request
-     * @access public
-     */
-    function __construct($path, $store_request=false)
-    {
-        $this->success = true;
-
-        $this->depth = 0;
-        $this->props = array();
-        $had_input = false;
-
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
-
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
-
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
-
-        xml_set_character_data_handler($xml_parser,
-                                       array(&$this, "_data"));
-
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
-
-        while($this->success && !feof($f_in)) {
-            $line = fgets($f_in);
-            if ($store_request) $this->request .= $line;
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($xml_parser, $line, false);
-            }
-        }
-
-        if($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
-
-        xml_parser_free($xml_parser);
-
-        fclose($f_in);
-    }
-
-    /**
-     * tag start handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @param  array     tag attributes
-     * @return void
-     * @access private
-     */
-    function _startElement($parser, $name, $attrs)
-    {
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-            if ($ns == "")
-                $this->success = false;
-        } else {
-            $ns = "";
-            $tag = $name;
-        }
-
-        if ($this->depth == 1) {
-            $this->mode = $tag;
-        }
-
-        if ($this->depth == 3) {
-            $prop = array("name" => $tag);
-            $this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
-            if ($this->mode == "set") {
-                $this->current["val"] = "";     // default set val
-            }
-        }
-
-        if ($this->depth >= 4) {
-            $this->current["val"] .= "<$tag";
-            if (isset($attr)) {
-                foreach ($attr as $key => $val) {
-                    $this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
-                }
-            }
-            $this->current["val"] .= ">";
-        }
-
-
-
-        $this->depth++;
-    }
-
-    /**
-     * tag end handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @return void
-     * @access private
-     */
-    function _endElement($parser, $name)
-    {
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-            if ($ns == "")
-                $this->success = false;
-        } else {
-            $ns = "";
-            $tag = $name;
-        }
-
-        $this->depth--;
-
-        if ($this->depth >= 4) {
-            $this->current["val"] .= "</$tag>";
-        }
-
-        if ($this->depth == 3) {
-            if (isset($this->current)) {
-                $this->props[] = $this->current;
-                unset($this->current);
-            }
-        }
-    }
-
-    /**
-     * input data handler
-     *
-     * @param  resource  parser
-     * @param  string    data
-     * @return void
-     * @access private
-     */
-    function _data($parser, $data)
-    {
-        if (isset($this->current)) {
-            $this->current["val"] .= $data;
-        }
-    }
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $success;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $props;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $depth;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $mode;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $current;
+
+	/**
+	 * On return whole request, if $store_request == true was specified in constructor
+	 *
+	 * @var string
+	 */
+	var $request;
+
+	/**
+	 * constructor
+	 *
+	 * @param  string  path of input stream
+	 * @param boolean $store_request =false if true whole request data will be made available in $this->request
+	 * @access public
+	 */
+	function __construct($path, $store_request=false)
+	{
+		$this->success = true;
+
+		$this->depth = 0;
+		$this->props = array();
+		$had_input = false;
+
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
+
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
+
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
+
+		xml_set_character_data_handler($xml_parser,
+									   array(&$this, "_data"));
+
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
+
+		while($this->success && !feof($f_in)) {
+			$line = fgets($f_in);
+			if ($store_request) $this->request .= $line;
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($xml_parser, $line, false);
+			}
+		}
+
+		if($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
+
+		xml_parser_free($xml_parser);
+
+		fclose($f_in);
+	}
+
+	/**
+	 * tag start handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @param  array     tag attributes
+	 * @return void
+	 * @access private
+	 */
+	function _startElement($parser, $name, $attrs)
+	{
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+			if ($ns == "")
+				$this->success = false;
+		} else {
+			$ns = "";
+			$tag = $name;
+		}
+
+		if ($this->depth == 1) {
+			$this->mode = $tag;
+		}
+
+		if ($this->depth == 3) {
+			$prop = array("name" => $tag);
+			$this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
+			if ($this->mode == "set") {
+				$this->current["val"] = "";     // default set val
+			}
+		}
+
+		if ($this->depth >= 4) {
+			$this->current["val"] .= "<$tag";
+			if (isset($attr)) {
+				foreach ($attr as $key => $val) {
+					$this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
+				}
+			}
+			$this->current["val"] .= ">";
+		}
+
+
+
+		$this->depth++;
+	}
+
+	/**
+	 * tag end handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @return void
+	 * @access private
+	 */
+	function _endElement($parser, $name)
+	{
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+			if ($ns == "")
+				$this->success = false;
+		} else {
+			$ns = "";
+			$tag = $name;
+		}
+
+		$this->depth--;
+
+		if ($this->depth >= 4) {
+			$this->current["val"] .= "</$tag>";
+		}
+
+		if ($this->depth == 3) {
+			if (isset($this->current)) {
+				$this->props[] = $this->current;
+				unset($this->current);
+			}
+		}
+	}
+
+	/**
+	 * input data handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    data
+	 * @return void
+	 * @access private
+	 */
+	function _data($parser, $data)
+	{
+		if (isset($this->current)) {
+			$this->current["val"] .= $data;
+		}
+	}
 }
 
 /*

Spacing +5 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
      * @param boolean $store_request =false if true whole request data will be made available in $this->request
      * @access public
      */
-    function __construct($path, $store_request=false)
+    function __construct($path, $store_request = false)
     {
         $this->success = true;
 
@@ -123,7 +123,7 @@ 
         xml_parser_set_option($xml_parser,
                               XML_OPTION_CASE_FOLDING, false);
 
-        while($this->success && !feof($f_in)) {
+        while ($this->success && !feof($f_in)) {
             $line = fgets($f_in);
             if ($store_request) $this->request .= $line;
             if (is_string($line)) {
@@ -132,7 +132,7 @@ 
             }
         }
 
-        if($had_input) {
+        if ($had_input) {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -169,7 +169,7 @@ 
             $prop = array("name" => $tag);
             $this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
             if ($this->mode == "set") {
-                $this->current["val"] = "";     // default set val
+                $this->current["val"] = ""; // default set val
             }
         }
 
@@ -177,7 +177,7 @@ 
             $this->current["val"] .= "<$tag";
             if (isset($attr)) {
                 foreach ($attr as $key => $val) {
-                    $this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
+                    $this->current["val"] .= ' '.$key.'="'.str_replace('"', '&quot;', $val).'"';
                 }
             }
             $this->current["val"] .= ">";

Braces +48 added lines, -21 removed lines

@@ -106,7 +106,8 @@ 
         $had_input = false;
 
         $f_in = fopen($path, "r");
-        if (!$f_in) {
+        if (!$f_in)
+        {
             $this->success = false;
             return;
         }
@@ -123,16 +124,22 @@ 
         xml_parser_set_option($xml_parser,
                               XML_OPTION_CASE_FOLDING, false);
 
-        while($this->success && !feof($f_in)) {
+        while($this->success && !feof($f_in))
+        {
             $line = fgets($f_in);
-            if ($store_request) $this->request .= $line;
-            if (is_string($line)) {
+            if ($store_request)
+            {
+            	$this->request .= $line;
+            }
+            if (is_string($line))
+            {
                 $had_input = true;
                 $this->success &= xml_parse($xml_parser, $line, false);
             }
         }
 
-        if($had_input) {
+        if($had_input)
+        {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -152,31 +159,42 @@ 
      */
     function _startElement($parser, $name, $attrs)
     {
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
             if ($ns == "")
-                $this->success = false;
-        } else {
+            {
+                            $this->success = false;
+            }
+        }
+        else
+        {
             $ns = "";
             $tag = $name;
         }
 
-        if ($this->depth == 1) {
+        if ($this->depth == 1)
+        {
             $this->mode = $tag;
         }
 
-        if ($this->depth == 3) {
+        if ($this->depth == 3)
+        {
             $prop = array("name" => $tag);
             $this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
-            if ($this->mode == "set") {
+            if ($this->mode == "set")
+            {
                 $this->current["val"] = "";     // default set val
             }
         }
 
-        if ($this->depth >= 4) {
+        if ($this->depth >= 4)
+        {
             $this->current["val"] .= "<$tag";
-            if (isset($attr)) {
-                foreach ($attr as $key => $val) {
+            if (isset($attr))
+            {
+                foreach ($attr as $key => $val)
+                {
                     $this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
                 }
             }
@@ -198,23 +216,31 @@ 
      */
     function _endElement($parser, $name)
     {
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
             if ($ns == "")
-                $this->success = false;
-        } else {
+            {
+                            $this->success = false;
+            }
+        }
+        else
+        {
             $ns = "";
             $tag = $name;
         }
 
         $this->depth--;
 
-        if ($this->depth >= 4) {
+        if ($this->depth >= 4)
+        {
             $this->current["val"] .= "</$tag>";
         }
 
-        if ($this->depth == 3) {
-            if (isset($this->current)) {
+        if ($this->depth == 3)
+        {
+            if (isset($this->current))
+            {
                 $this->props[] = $this->current;
                 unset($this->current);
             }
@@ -231,7 +257,8 @@ 
      */
     function _data($parser, $data)
     {
-        if (isset($this->current)) {
+        if (isset($this->current))
+        {
             $this->current["val"] .= $data;
         }
     }

api/thumbnail.php

Doc Comments +1 added lines

@@ -80,6 +80,7 @@
 
 /**
  * Returns the maximum width/height of a thumbnail
+ * @return integer|null
  */
 function get_maxsize()
 {

Spacing +25 added lines, -26 removed lines

@@ -70,9 +70,9 @@ 
 		}
 	}
 
-	if (!preg_match('/^[a-z0-9_-]+$/i',$app))
+	if (!preg_match('/^[a-z0-9_-]+$/i', $app))
 	{
-		die('Stop');	// just to prevent someone doing nasty things
+		die('Stop'); // just to prevent someone doing nasty things
 	}
 
 	return $app;
@@ -83,8 +83,7 @@ 
  */
 function get_maxsize()
 {
-	$preset = !($GLOBALS['egw_info']['server']['link_list_thumbnail'] > 0) ? 64 :
-		$GLOBALS['egw_info']['server']['link_list_thumbnail'];
+	$preset = !($GLOBALS['egw_info']['server']['link_list_thumbnail'] > 0) ? 64 : $GLOBALS['egw_info']['server']['link_list_thumbnail'];
 
 	// Another maximum size may be passed if thumbnails are turned on
 	if ($preset != 0 && isset($_GET['thsize']) && is_numeric($_GET['thsize']))
@@ -150,7 +149,7 @@ 
 	}
 	$dst = gen_dstfile($stat && !empty($stat['url']) ? $stat['url'] : $src, $maxsize, $height, $width, $minsize);
 	$dst_dir = dirname($dst);
-	if(file_exists($dst_dir))
+	if (file_exists($dst_dir))
 	{
 		// Check whether the destination file already exists and is newer than
 		// the source file. Assume the file doesn't exist if thumbnailing is turned off.
@@ -190,7 +189,7 @@ 
 		{
 			// Allow client to cache these, makes scrolling in filemanager much nicer
 			// setting maximum allow caching time of one year, if url contains (non-empty) moditication time
-			Api\Session::cache_control(empty($_GET['mtime']) ? 300 : 31536000, true);	// true = private / browser only caching
+			Api\Session::cache_control(empty($_GET['mtime']) ? 300 : 31536000, true); // true = private / browser only caching
 			header('Content-Type: '.$output_mime);
 			readfile($dst);
 			return true;
@@ -212,7 +211,7 @@ 
  * @param int $minsize =null
  * @return string
  */
-function gen_dstfile($src, $maxsize, $height=null, $width=null, $minsize=null)
+function gen_dstfile($src, $maxsize, $height = null, $width = null, $minsize = null)
 {
 	// Use the egroupware file cache to store the thumbnails on a per instance basis
 	$cachefile = new Api\Cache\Files(array());
@@ -238,7 +237,7 @@ 
  * TODO: As this is a general purpose function, it might probably be moved
  *   to some other php file or an "image utils" class.
  */
-function get_scaled_image_size($w, $h, $maxw, $maxh, $minw=0, $minh=0)
+function get_scaled_image_size($w, $h, $maxw, $maxh, $minw = 0, $minh = 0)
 {
 	//Scale will contain the factor by which the image has to be scaled down
 	$scale = 1.0;
@@ -299,7 +298,7 @@ 
  * @param int $maxh the maximum height of the thumbnail
  * @returns boolean|resource false or a gd_image
  */
-function gd_image_load($file,$maxw,$maxh)
+function gd_image_load($file, $maxw, $maxh)
 {
 	// Get mime type
 	list($type, $image_type) = explode('/', $mime = Vfs::mime_content_type($file));
@@ -307,9 +306,9 @@ 
 	if (!$type) list($type, $image_type) = explode('/', $mime = Api\MimeMagic::filename2mime($file));
 
 	// Call the according gd constructor depending on the file type
-	if($type == 'image')
+	if ($type == 'image')
 	{
-		if (in_array($image_type, array('tiff','jpeg')) && ($image = exif_thumbnail_load($file)))
+		if (in_array($image_type, array('tiff', 'jpeg')) && ($image = exif_thumbnail_load($file)))
 		{
 			return $image;
 		}
@@ -332,12 +331,12 @@ 
 	else if ($type == 'application')
 	{
 		$thumb = false;
-		if(strpos($image_type,'vnd.oasis.opendocument.') === 0)
+		if (strpos($image_type, 'vnd.oasis.opendocument.') === 0)
 		{
 			// OpenDocuments have thumbnails inside already
 			$thumb = get_opendocument_thumbnail($file);
 		}
-		else if($image_type == 'pdf')
+		else if ($image_type == 'pdf')
 		{
 			$thumb = get_pdf_thumbnail($file);
 		}
@@ -347,7 +346,7 @@ 
 			//$thumb = get_msoffice_thumbnail($file);
 		}
 		// Mark it with mime type icon
-		if($thumb)
+		if ($thumb)
 		{
 			// Need to scale first, or the mark will be wrong size
 			$scaled = get_scaled_image_size(imagesx($thumb), imagesy($thumb), $maxw, $maxh);
@@ -387,8 +386,8 @@ 
 
 	// Image is already there, but we can't access them directly through VFS
 	$ext = $mimetype == 'application/vnd.oasis.opendocument.text' ? '.odt' : '.ods';
-	$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($file,$ext).'-');
-	copy($file,$archive);
+	$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($file, $ext).'-');
+	copy($file, $archive);
 
 	$thumbnail_url = 'zip://'.$archive.'#Thumbnails/thumbnail.png';
 	$image = imagecreatefromstring(file_get_contents($thumbnail_url));
@@ -442,7 +441,7 @@ 
  */
 function get_pdf_thumbnail($file)
 {
-	if(!pdf_thumbnails_available()) return false;
+	if (!pdf_thumbnails_available()) return false;
 
 	// switch off max_excution_time, as some thumbnails take longer and
 	// will be startet over and over again, if they dont finish
@@ -471,7 +470,7 @@ 
 	$target_height = imagesy($target_image);
 
 	// Find mime image, if no tag image set
-	if(!$tag_image && $mime)
+	if (!$tag_image && $mime)
 	{
 		list($app, $icon) = explode('/', Vfs::mime_icon($mime), 2);
 		list(, $path) = explode($GLOBALS['egw_info']['server']['webserver_url'],
@@ -482,16 +481,16 @@ 
 
 	// Find correct size - max 1/3 target
 	$tag_size = get_scaled_image_size(imagesx($tag_image), imagesy($tag_image), $target_width / 3, $target_height / 3);
-	if(!$tag_size) return;
-	list($tag_width,$tag_height) = $tag_size;
+	if (!$tag_size) return;
+	list($tag_width, $tag_height) = $tag_size;
 
 	// Put it in
-	if($mime)
+	if ($mime)
 	{
-		imagecopyresampled($target_image,$tag_image,
+		imagecopyresampled($target_image, $tag_image,
 			$target_width - $tag_width,
 			$target_height - $tag_height,
-			0,0,
+			0, 0,
 			$tag_width,
 			$tag_height,
 			imagesx($tag_image),
@@ -545,7 +544,7 @@ 
 function gd_image_thumbnail($file, $maxw, $maxh, $minw, $minh)
 {
 	//Load the image
-	if (($img_src = gd_image_load($file,$maxw,$maxh)) !== false)
+	if (($img_src = gd_image_load($file, $maxw, $maxh)) !== false)
 	{
 		//Get the constraints of the image
 		$w = imagesx($img_src);
@@ -575,14 +574,14 @@ 
 */
 function gdVersion($user_ver = 0)
 {
-	if (! extension_loaded('gd')) { return; }
+	if (!extension_loaded('gd')) { return; }
 	static $gd_ver = 0;
 
 	// Just accept the specified setting if it's 1.
 	if ($user_ver == 1) { $gd_ver = 1; return 1; }
 
 	// Use the static variable if function was called previously.
-	if ($user_ver !=2 && $gd_ver > 0 ) { return $gd_ver; }
+	if ($user_ver != 2 && $gd_ver > 0) { return $gd_ver; }
 
 	// Use the gd_info() function if possible.
 	if (function_exists('gd_info')) {

Braces +38 added lines, -12 removed lines

@@ -244,10 +244,13 @@ 
 	$scale = 1.0;
 
 	//Select the constraining dimension
-	if ($w > $h) // landscape image: constraining factor $minh or $maxw
+	if ($w > $h)
+	{
+		// landscape image: constraining factor $minh or $maxw
 	{
 		$scale = $minh ? $minh / $h : $maxw / $w;
 	}
+	}
 	else // portrail image: constraining factor $minw or $maxh
 	{
 		$scale = $minw ? $minw / $w : $maxh / $h;
@@ -304,7 +307,10 @@ 
 	// Get mime type
 	list($type, $image_type) = explode('/', $mime = Vfs::mime_content_type($file));
 	// if $file is not from vfs, use Api\MimeMagic::filename2mime to get mime-type from extension
-	if (!$type) list($type, $image_type) = explode('/', $mime = Api\MimeMagic::filename2mime($file));
+	if (!$type)
+	{
+		list($type, $image_type) = explode('/', $mime = Api\MimeMagic::filename2mime($file));
+	}
 
 	// Call the according gd constructor depending on the file type
 	if($type == 'image')
@@ -442,7 +448,10 @@ 
  */
 function get_pdf_thumbnail($file)
 {
-	if(!pdf_thumbnails_available()) return false;
+	if(!pdf_thumbnails_available())
+	{
+		return false;
+	}
 
 	// switch off max_excution_time, as some thumbnails take longer and
 	// will be startet over and over again, if they dont finish
@@ -482,7 +491,10 @@ 
 
 	// Find correct size - max 1/3 target
 	$tag_size = get_scaled_image_size(imagesx($tag_image), imagesy($tag_image), $target_width / 3, $target_height / 3);
-	if(!$tag_size) return;
+	if(!$tag_size)
+	{
+		return;
+	}
 	list($tag_width,$tag_height) = $tag_size;
 
 	// Put it in
@@ -575,17 +587,24 @@ 
 */
 function gdVersion($user_ver = 0)
 {
-	if (! extension_loaded('gd')) { return; }
+	if (! extension_loaded('gd'))
+	{
+return; }
 	static $gd_ver = 0;
 
 	// Just accept the specified setting if it's 1.
-	if ($user_ver == 1) { $gd_ver = 1; return 1; }
+	if ($user_ver == 1)
+	{
+$gd_ver = 1; return 1; }
 
 	// Use the static variable if function was called previously.
-	if ($user_ver !=2 && $gd_ver > 0 ) { return $gd_ver; }
+	if ($user_ver !=2 && $gd_ver > 0 )
+	{
+return $gd_ver; }
 
 	// Use the gd_info() function if possible.
-	if (function_exists('gd_info')) {
+	if (function_exists('gd_info'))
+	{
 		$ver_info = gd_info();
 		$match = null;
 		preg_match('/\d/', $ver_info['GD Version'], $match);
@@ -594,11 +613,15 @@ 
 	}
 
 	// If phpinfo() is disabled use a specified / fail-safe choice...
-	if (preg_match('/phpinfo/', ini_get('disable_functions'))) {
-		if ($user_ver == 2) {
+	if (preg_match('/phpinfo/', ini_get('disable_functions')))
+	{
+		if ($user_ver == 2)
+		{
 			$gd_ver = 2;
 			return 2;
-		} else {
+		}
+		else
+		{
 			$gd_ver = 1;
 			return 1;
 		}
@@ -607,6 +630,9 @@ 
 	ob_start();
 	phpinfo(8);
 	$info = stristr(ob_get_clean(), 'gd version');
-	if (preg_match('/\d/', $info, $match)) $gd_ver = $match[0];
+	if (preg_match('/\d/', $info, $match))
+	{
+		$gd_ver = $match[0];
+	}
 	return $match[0];
 }

calendar/importexport/class.import_events_csv.inc.php

Doc Comments -1 removed lines

@@ -94,7 +94,6 @@
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
 	 * @param definition $_definition
 	 */
 	public function import( $_stream, definition $_definition ) {

Indentation +19 added lines, -19 removed lines

@@ -82,9 +82,9 @@ 
 	private $user = null;
 
 	/**
-         * List of import errors
-         */
-        protected $errors = array();
+	 * List of import errors
+	 */
+		protected $errors = array();
 
 	/**
 	 * List of actions, and how many times that action was taken
@@ -305,26 +305,26 @@ 
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
 		return $this->results;
 	}
 } // end of iface_export_plugin

Braces +94 added lines, -38 removed lines

@@ -17,7 +17,8 @@ 
 /**
  * class import_csv for addressbook
  */
-class import_events_csv implements iface_import_plugin  {
+class import_events_csv implements iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 			// char
@@ -97,7 +98,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, definition $_definition ) {
+	public function import( $_stream, definition $_definition )
+	{
 		$import_csv = new import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -122,7 +124,8 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) ) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) )
+		{
 			$import_csv->skip_records( $_definition->plugin_options['num_header_lines'] );
 		}
 
@@ -131,12 +134,16 @@ 
 			$_definition->plugin_options['events_owner'] : $this->user;
 
 		// trash_users_records ?
-		if ( $_definition->plugin_options['trash_users_records'] === true ) {
-			if ( !$_definition->plugin_options['dry_run'] ) {
+		if ( $_definition->plugin_options['trash_users_records'] === true )
+		{
+			if ( !$_definition->plugin_options['dry_run'] )
+			{
 				$socal = new calendar_socal();
 				$this->bocalupdate->so->deleteaccount( $_definition->plugin_options['events_owner']);
 				unset( $socal );
-			} else {
+			}
+			else
+			{
 				$lid = $GLOBALS['egw']->accounts->id2name( $_definition->plugin_options['events_owner'] );
 				echo "Attension: All Events of '$lid' would be deleted!\n";
 			}
@@ -145,38 +152,63 @@ 
 		$this->errors = array();
 		$this->results = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 
 			// don't import empty events
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
-			if ( $_definition->plugin_options['events_owner'] != -1 ) {
+			if ( $_definition->plugin_options['events_owner'] != -1 )
+			{
 				$record['owner'] = $_definition->plugin_options['events_owner'];
-			} else unset( $record['owner'] );
+			}
+			else {
+				unset( $record['owner'] );
+			}
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ( $_definition->plugin_options['conditions'] )
+			{
+				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				{
+					switch ( $condition['type'] )
+					{
 						// exists
 						case 'exists' :
 
-							if ( is_array( $event = $this->bocalupdate->read( $record['uid'], null, $this->is_admin ) ) ) {
+							if ( is_array( $event = $this->bocalupdate->read( $record['uid'], null, $this->is_admin ) ) )
+							{
 								// apply action to event matching this exists condition
 								$record['id'] = $event['id'];
 
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $event['cat_id'] ) ) $event['cat_id'] = explode( ',', $event['cat_id'] );
-									if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
+								if ( $_definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $event['cat_id'] ) )
+									{
+										$event['cat_id'] = explode( ',', $event['cat_id'] );
+									}
+									if ( !is_array( $record['cat_id'] ) )
+									{
+										$record['cat_id'] = explode( ',', $record['cat_id'] );
+									}
 									$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $event['cat_id'] ) ) );
 								}
 
 								// check if entry is modiefied
 								$event = array_intersect_key( $event, $record );
 								$diff = array_diff( $event, $record );
-								if( !empty( $diff ) ) $record['modified'] = time();
+								if( !empty( $diff ) )
+								{
+									$record['modified'] = time();
+								}
 
 								$action = $condition['true'];
-							} else $action = $condition['false'];
+							}
+							else {
+								$action = $condition['false'];
+							}
 
 							$this->action( $action['action'], $record );
 							break;
@@ -190,9 +222,14 @@ 
 							throw new Exception('condition not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// unconditional insert
 				$this->action( 'insert', $record );
 			}
@@ -206,8 +243,10 @@ 
 	 * @param array $_data event data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data ) {
-		switch ( $_action ) {
+	private function action ( $_action, $_data )
+	{
+		switch ( $_action )
+		{
 			case 'none' :
 				return true;
 
@@ -217,32 +256,42 @@ 
 				// paticipants handling
 				$participants = $_data['participants'] ? split( '[,;]', $_data['participants'] ) : array();
 				$_data['participants'] = array();
-				if ( $this->definition->plugin_options['owner_joins_event'] && $this->definition->plugin_options['events_owner'] > 0 ) {
+				if ( $this->definition->plugin_options['owner_joins_event'] && $this->definition->plugin_options['events_owner'] > 0 )
+				{
 					$_data['participants'][$this->definition->plugin_options['events_owner']] = 'A';
 				}
-				foreach( $participants as $participant ) {
+				foreach( $participants as $participant )
+				{
 					list( $participant, $status ) = explode( '=', $participant );
 					$valid_staties = array('U'=>'U','u'=>'U','A'=>'A','a'=>'A','R'=>'R','r'=>'R','T'=>'T','t'=>'T');
 					$status = isset( $valid_staties[$status] ) ? $valid_staties[$status] : 'U';
-					if ( $participant && is_numeric($participant ) ) {
+					if ( $participant && is_numeric($participant ) )
+					{
 						$_data['participants'][$participant] = $status;
 					}
 				}
 				// no valid participants so far --> add the importing user/owner
-				if ( empty( $_data['participants'] ) ) {
+				if ( empty( $_data['participants'] ) )
+				{
 					$_data['participants'][$this->user] = 'A';
 				}
 
 				// are we serious?
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					print_r($_data);
 					$this->results[$_action]++;
-				} else {
+				}
+				else
+				{
 					$messages = array();
 					$result = $this->bocalupdate->update( $_data, true, !$_data['modified'], $this->is_admin, true, $messages);
-					if(!$result) {
+					if(!$result)
+					{
 						$this->errors = implode(',', $messages);
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 					}
 					return $result;
@@ -257,7 +306,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar CSV export');
 	}
 
@@ -266,7 +316,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports events into your Calendar from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -275,7 +326,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -291,7 +343,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -300,7 +353,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -312,7 +366,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -324,7 +379,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
 		return $this->results;
 	}
 } // end of iface_export_plugin

Spacing +58 added lines, -58 removed lines

@@ -10,28 +10,28 @@ 
  * @version $Id: $
  */
 
-require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.iface_import_plugin.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.iface_import_plugin.inc.php');
 require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.import_csv.inc.php');
 
 
 /**
  * class import_csv for addressbook
  */
-class import_events_csv implements iface_import_plugin  {
+class import_events_csv implements iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 			// char
-		'charset', 				// string
-		'event_owner', 			// int account_id or -1 for leave untuched
-		'owner_joins_event',	// bool
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'event_owner', // int account_id or -1 for leave untuched
+		'owner_joins_event', // bool
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
-		'num_header_lines',		// int number of header lines
-		'trash_users_records',	// trashes all events of events owner before import
-		'field_conversion', 	// array( $csv_col_num => conversion)
-		'field_mapping',		// array( $csv_col_num => adb_filed)
-		'conditions',			/* => array containing condition arrays:
+		'num_header_lines', // int number of header lines
+		'trash_users_records', // trashes all events of events owner before import
+		'field_conversion', // array( $csv_col_num => conversion)
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // record['uid'] exists
 				'true' => array(
 					'action' => update,
@@ -47,14 +47,14 @@ 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	private static $actions = array( 'none', 'update', 'insert', 'delete', );
+	private static $actions = array('none', 'update', 'insert', 'delete',);
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	private static $conditions = array( 'exists', 'empty', );
+	private static $conditions = array('exists', 'empty',);
 
 	/**
 	 * @var definition
@@ -97,8 +97,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, definition $_definition ) {
-		$import_csv = new import_csv( $_stream, array(
+	public function import($_stream, definition $_definition) {
+		$import_csv = new import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -106,11 +106,11 @@ 
 		$this->definition = $_definition;
 
 		// user, is admin ?
-		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
+		$this->is_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// fetch the calendar bo
 		$this->bocalupdate = new calendar_boupdate();
@@ -122,24 +122,24 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) ) {
-			$import_csv->skip_records( $_definition->plugin_options['num_header_lines'] );
+		if (isset($_definition->plugin_options['num_header_lines'])) {
+			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
 		}
 
 		// set eventOwner
 		$plugin_options = $_definition->plugin_options;
-		$plugin_options['events_owner'] = isset( $_definition->plugin_options['events_owner'] ) ?
+		$plugin_options['events_owner'] = isset($_definition->plugin_options['events_owner']) ?
 			$_definition->plugin_options['events_owner'] : $this->user;
 		$_definition->plugin_options = $plugin_options;
 
 		// trash_users_records ?
-		if ( $_definition->plugin_options['trash_users_records'] === true ) {
-			if ( !$_definition->plugin_options['dry_run'] ) {
+		if ($_definition->plugin_options['trash_users_records'] === true) {
+			if (!$_definition->plugin_options['dry_run']) {
 				$socal = new calendar_socal();
-				$this->bocalupdate->so->deleteaccount( $_definition->plugin_options['events_owner']);
-				unset( $socal );
+				$this->bocalupdate->so->deleteaccount($_definition->plugin_options['events_owner']);
+				unset($socal);
 			} else {
-				$lid = $GLOBALS['egw']->accounts->id2name( $_definition->plugin_options['events_owner'] );
+				$lid = $GLOBALS['egw']->accounts->id2name($_definition->plugin_options['events_owner']);
 				echo "Attension: All Events of '$lid' would be deleted!\n";
 			}
 		}
@@ -147,44 +147,44 @@ 
 		$this->errors = array();
 		$this->results = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 
 			// don't import empty events
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
-			if ( $_definition->plugin_options['events_owner'] != -1 ) {
+			if ($_definition->plugin_options['events_owner'] != -1) {
 				$record['owner'] = $_definition->plugin_options['events_owner'];
-			} else unset( $record['owner'] );
+			} else unset($record['owner']);
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ($_definition->plugin_options['conditions']) {
+				foreach ($_definition->plugin_options['conditions'] as $condition) {
+					switch ($condition['type']) {
 						// exists
 						case 'exists' :
 
-							if ( is_array( $event = $this->bocalupdate->read( $record['uid'], null, $this->is_admin ) ) ) {
+							if (is_array($event = $this->bocalupdate->read($record['uid'], null, $this->is_admin))) {
 								// apply action to event matching this exists condition
 								$record['id'] = $event['id'];
 
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $event['cat_id'] ) ) $event['cat_id'] = explode( ',', $event['cat_id'] );
-									if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
-									$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $event['cat_id'] ) ) );
+								if ($_definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($event['cat_id'])) $event['cat_id'] = explode(',', $event['cat_id']);
+									if (!is_array($record['cat_id'])) $record['cat_id'] = explode(',', $record['cat_id']);
+									$record['cat_id'] = implode(',', array_unique(array_merge($record['cat_id'], $event['cat_id'])));
 								}
 
 								// check if entry is modiefied
-								$event = array_intersect_key( $event, $record );
-								$diff = array_diff( $event, $record );
-								if( !empty( $diff ) ) $record['modified'] = time();
+								$event = array_intersect_key($event, $record);
+								$diff = array_diff($event, $record);
+								if (!empty($diff)) $record['modified'] = time();
 
 								$action = $condition['true'];
 							} else $action = $condition['false'];
 
-							$this->action( $action['action'], $record );
+							$this->action($action['action'], $record);
 							break;
 						case 'empty' :
-							$action = empty( $record[$condition['string']] ) ? $condition['true'] : $condition['false'];
-							$this->action( $action['action'], $record );
+							$action = empty($record[$condition['string']]) ? $condition['true'] : $condition['false'];
+							$this->action($action['action'], $record);
 							break;
 
 						// not supported action
@@ -196,7 +196,7 @@ 
 				}
 			} else {
 				// unconditional insert
-				$this->action( 'insert', $record );
+				$this->action('insert', $record);
 			}
 		}
 	}
@@ -208,8 +208,8 @@ 
 	 * @param array $_data event data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data ) {
-		switch ( $_action ) {
+	private function action($_action, $_data) {
+		switch ($_action) {
 			case 'none' :
 				return true;
 
@@ -217,32 +217,32 @@ 
 			case 'insert' :
 
 				// paticipants handling
-				$participants = $_data['participants'] ? split( '[,;]', $_data['participants'] ) : array();
+				$participants = $_data['participants'] ? split('[,;]', $_data['participants']) : array();
 				$_data['participants'] = array();
-				if ( $this->definition->plugin_options['owner_joins_event'] && $this->definition->plugin_options['events_owner'] > 0 ) {
+				if ($this->definition->plugin_options['owner_joins_event'] && $this->definition->plugin_options['events_owner'] > 0) {
 					$_data['participants'][$this->definition->plugin_options['events_owner']] = 'A';
 				}
-				foreach( $participants as $participant ) {
-					list( $participant, $status ) = explode( '=', $participant );
-					$valid_staties = array('U'=>'U','u'=>'U','A'=>'A','a'=>'A','R'=>'R','r'=>'R','T'=>'T','t'=>'T');
-					$status = isset( $valid_staties[$status] ) ? $valid_staties[$status] : 'U';
-					if ( $participant && is_numeric($participant ) ) {
+				foreach ($participants as $participant) {
+					list($participant, $status) = explode('=', $participant);
+					$valid_staties = array('U'=>'U', 'u'=>'U', 'A'=>'A', 'a'=>'A', 'R'=>'R', 'r'=>'R', 'T'=>'T', 't'=>'T');
+					$status = isset($valid_staties[$status]) ? $valid_staties[$status] : 'U';
+					if ($participant && is_numeric($participant)) {
 						$_data['participants'][$participant] = $status;
 					}
 				}
 				// no valid participants so far --> add the importing user/owner
-				if ( empty( $_data['participants'] ) ) {
+				if (empty($_data['participants'])) {
 					$_data['participants'][$this->user] = 'A';
 				}
 
 				// are we serious?
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					print_r($_data);
 					$this->results[$_action]++;
 				} else {
 					$messages = array();
-					$result = $this->bocalupdate->update( $_data, true, !$_data['modified'], $this->is_admin, true, $messages);
-					if(!$result) {
+					$result = $this->bocalupdate->update($_data, true, !$_data['modified'], $this->is_admin, true, $messages);
+					if (!$result) {
 						$this->errors = implode(',', $messages);
 					} else {
 						$this->results[$_action]++;

calendar/inc/class.calendar_boupdate.inc.php

Doc Comments +11 added lines, -6 removed lines

@@ -519,6 +519,7 @@ 
 	 * @param array $new_event Event after the change
 	 * @param string $role we treat CHAIR like event owners
 	 * @param string $status of current user
+	 * @param integer $msg_type
 	 * @return boolean true = update requested, false otherwise
 	 */
 	public static function update_requested($userid, $part_prefs, &$msg_type, $old_event ,$new_event, $role, $status=null)
@@ -594,7 +595,7 @@ 
 	/**
 	 * Check calendar prefs, if a given user (integer account_id) or email (user or externals) should get notified
 	 *
-	 * @param int|string $user_or_email
+	 * @param string $user_or_email
 	 * @param string $ical_method ='REQUEST'
 	 * @param string $role ='REQ-PARTICIPANT'
 	 * @return boolean true if user requested to be notified, false if not
@@ -645,8 +646,7 @@ 
 	 * Get iCal/iMip method from internal nummeric msg-type plus optional notification message and verbose name
 	 *
 	 * @param int $msg_type see MSG_* defines
-	 * @param string& $action=null on return verbose name
-	 * @param string& $msg=null on return notification message
+	 * @param string& $action on return verbose name
 	 */
 	function msg_type2ical_method($msg_type, &$action=null, &$msg=null)
 	{
@@ -1011,6 +1011,9 @@ 
 		return true;
 	}
 
+	/**
+	 * @param integer $added
+	 */
 	function get_update_message($event,$added)
 	{
 		$nul = null;
@@ -1300,8 +1303,8 @@ 
 	 *
 	 * @param int $right self::CAT_ACL_{ADD|STATUS}
 	 * @param int|array $event
-	 * @return boolean true if use has the right, false if not
-	 * @return boolean false=access denied because of cat acl, true access granted because of cat acl,
+	 * @return null|boolean true if use has the right, false if not
+	 * @return null|boolean false=access denied because of cat acl, true access granted because of cat acl,
 	 * 	null = cat has no acl
 	 */
 	function check_cat_acl($right,$event)
@@ -1386,6 +1389,8 @@ 
 	 * Check if current user has a given right on a category (if it's restricted!)
 	 *
 	 * @param int $cat_id
+	 * @param integer $right
+	 * @param integer $user
 	 * @return boolean false=access denied because of cat acl, true access granted because of cat acl,
 	 * 	null = cat has no acl
 	 */
@@ -1647,7 +1652,7 @@ 
 	 * @param string $action
 	 * @param array $event_arr
 	 * @param array $disinvited
-	 * @return array
+	 * @return string
 	 */
 	function _get_event_details($event,$action,&$event_arr,$disinvited=array())
 	{

Indentation +39 added lines, -39 removed lines

@@ -1504,22 +1504,22 @@ 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
   		{
-            if (!isset($new_event['participants'][$userid])){
-            	// Attendee will be deleted this way
-            	$new_event['participants'][$userid] = 'G';
-            }
-            elseif ($new_event['participants'][$userid] == $status)
-            {
-            	// Same status -- nothing to do.
-            	unset($new_event['participants'][$userid]);
-            }
+			if (!isset($new_event['participants'][$userid])){
+				// Attendee will be deleted this way
+				$new_event['participants'][$userid] = 'G';
+			}
+			elseif ($new_event['participants'][$userid] == $status)
+			{
+				// Same status -- nothing to do.
+				unset($new_event['participants'][$userid]);
+			}
 		}
 		// write the changes
 		foreach ($new_event['participants'] as $userid => $status)
 		{
 			$this->set_status($old_event, $userid, $status, $recur_date, true, false,$skip_notification);
 		}
-    }
+	}
 
 	/**
 	 * deletes an event
@@ -2493,24 +2493,24 @@ 
 	/**
 	 * classifies an incoming event from the eGW point-of-view
 	 *
-     * exceptions: unlike other calendar apps eGW does not create an event exception
-     * if just the participant state changes - therefore we have to distinguish between
-     * real exceptions and status only exceptions
-     *
-     * @param array $event the event to check
-     *
-     * @return array
-     * 	type =>
-     * 		SINGLE a single event
-     * 		SERIES-MASTER the series master
-     * 		SERIES-EXCEPTION event is a real exception
-	  * 		SERIES-PSEUDO-EXCEPTION event is a status only exception
-	  * 		SERIES-EXCEPTION-PROPAGATE event was a status only exception in the past and is now a real exception
-	  * 	stored_event => if event already exists in the database array with event data or false
-	  * 	master_event => for event type SERIES-EXCEPTION, SERIES-PSEUDO-EXCEPTION or SERIES-EXCEPTION-PROPAGATE
-	  * 		the corresponding series master event array
-	  * 		NOTE: this param is false if event is of type SERIES-MASTER
-     */
+	 * exceptions: unlike other calendar apps eGW does not create an event exception
+	 * if just the participant state changes - therefore we have to distinguish between
+	 * real exceptions and status only exceptions
+	 *
+	 * @param array $event the event to check
+	 *
+	 * @return array
+	 * 	type =>
+	 * 		SINGLE a single event
+	 * 		SERIES-MASTER the series master
+	 * 		SERIES-EXCEPTION event is a real exception
+	 * 		SERIES-PSEUDO-EXCEPTION event is a status only exception
+	 * 		SERIES-EXCEPTION-PROPAGATE event was a status only exception in the past and is now a real exception
+	 * 	stored_event => if event already exists in the database array with event data or false
+	 * 	master_event => for event type SERIES-EXCEPTION, SERIES-PSEUDO-EXCEPTION or SERIES-EXCEPTION-PROPAGATE
+	 * 		the corresponding series master event array
+	 * 		NOTE: this param is false if event is of type SERIES-MASTER
+	 */
 	function get_event_info($event)
 	{
 		$type = 'SINGLE'; // default
@@ -2681,16 +2681,16 @@ 
 			'stored_event' => $stored_event,
 			'master_event' => $master_event,
 		);
-    }
-
-    /**
-     * Translates all timestamps for a given event from server-time to user-time.
-     * The update() and save() methods expect timestamps in user-time.
-     * @param &$event	the event we are working on
-     *
-     */
-    function server2usertime (&$event)
-    {
+	}
+
+	/**
+	 * Translates all timestamps for a given event from server-time to user-time.
+	 * The update() and save() methods expect timestamps in user-time.
+	 * @param &$event	the event we are working on
+	 *
+	 */
+	function server2usertime (&$event)
+	{
 		// we run all dates through date2usertime, to adjust to user-time
 		foreach(array('start','end','recur_enddate','recurrence') as $ts)
 		{
@@ -2713,7 +2713,7 @@ 
 				$event['alarm'][$id]['time'] = $this->date2usertime($alarm['time']);
 			}
 		}
-    }
+	}
 	/**
 	 * Delete events that are more than $age years old
 	 *

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

@@ -1708,12 +1708,12 @@ 
 	 */
 	function event2array($event)
 	{
-		$var['title'] = Array(
+		$var['title'] = array(
 			'field'		=> lang('Title'),
 			'data'		=> $event['title']
 		);
 
-		$var['description'] = Array(
+		$var['description'] = array(
 			'field'	=> lang('Description'),
 			'data'	=> $event['description']
 		);
@@ -1722,48 +1722,48 @@ 
 		{
 			$cat_string[] = stripslashes(Api\Categories::id2name($cat_id));
 		}
-		$var['category'] = Array(
+		$var['category'] = array(
 			'field'	=> lang('Category'),
 			'data'	=> implode(', ',$cat_string)
 		);
 
-		$var['location'] = Array(
+		$var['location'] = array(
 			'field'	=> lang('Location'),
 			'data'	=> $event['location']
 		);
 
-		$var['startdate'] = Array(
+		$var['startdate'] = array(
 			'field'	=> lang('Start Date/Time'),
 			'data'	=> $this->format_date($event['start']),
 		);
 
-		$var['enddate'] = Array(
+		$var['enddate'] = array(
 			'field'	=> lang('End Date/Time'),
 			'data'	=> $this->format_date($event['end']),
 		);
 
-		$pri = Array(
+		$pri = array(
 			0   => lang('None'),
 			1	=> lang('Low'),
 			2	=> lang('Normal'),
 			3	=> lang('High')
 		);
-		$var['priority'] = Array(
+		$var['priority'] = array(
 			'field'	=> lang('Priority'),
 			'data'	=> $pri[$event['priority']]
 		);
 
-		$var['owner'] = Array(
+		$var['owner'] = array(
 			'field'	=> lang('Owner'),
 			'data'	=> Api\Accounts::username($event['owner'])
 		);
 
-		$var['updated'] = Array(
+		$var['updated'] = array(
 			'field'	=> lang('Updated'),
 			'data'	=> $this->format_date($event['modtime']).', '.Api\Accounts::username($event['modifier'])
 		);
 
-		$var['access'] = Array(
+		$var['access'] = array(
 			'field'	=> lang('Access'),
 			'data'	=> $event['public'] ? lang('Public') : lang('Private')
 		);
@@ -1772,13 +1772,13 @@ 
 		{
 			$participants = $this->participants($event,true);
 		}
-		$var['participants'] = Array(
+		$var['participants'] = array(
 			'field'	=> lang('Participants'),
 			'data'	=> $participants
 		);
 
 		// Repeated Events
-		$var['recur_type'] = Array(
+		$var['recur_type'] = array(
 			'field'	=> lang('Repetition'),
 			'data'	=> ($event['recur_type'] != MCAL_RECUR_NONE) ? $this->recure2string($event) : '',
 		);
@@ -1828,7 +1828,7 @@ 
 	 * @param Api\DateTime $instance_date For recurring events, this is the date we
 	 *	are dealing with
 	 */
-	function check_move_alarms(Array &$event, Array $old_event = null, Api\DateTime $instance_date = null)
+	function check_move_alarms(array &$event, array $old_event = null, Api\DateTime $instance_date = null)
 	{
 		if ($old_event !== null && $event['start'] == $old_event['start']) return;
 

Braces +216 added lines, -55 removed lines

@@ -85,11 +85,17 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_boupdate::__construct() started',True);
+		}
 
 		parent::__construct();	// calling the parent constructor
 
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_boupdate::__construct() finished',True);
+		}
 	}
 
 	/**
@@ -119,7 +125,10 @@ 
 	function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false,$updateTS=true,&$messages=null, $skip_notification=false)
 	{
 		//error_log(__METHOD__."(".array2string($event).",$ignore_conflicts,$touch_modified,$ignore_acl)");
-		if (!is_array($messages)) $messages = $messages ? (array)$messages : array();
+		if (!is_array($messages))
+		{
+			$messages = $messages ? (array)$messages : array();
+		}
 
 		if ($this->debug > 1 || $this->debug == 'update')
 		{
@@ -139,10 +148,13 @@ 
 
 		$status_reset_to_unknown = false;
 
-		if (($new_event = !$event['id']))	// some defaults for new entries
+		if (($new_event = !$event['id']))
+		{
+			// some defaults for new entries
 		{
 			// if no owner given, set user to owner
 			if (!$event['owner']) $event['owner'] = $this->user;
+		}
 			// set owner as participant if none is given
 			if (!is_array($event['participants']) || !count($event['participants']))
 			{
@@ -182,7 +194,10 @@ 
 		// check category based ACL
 		if ($event['category'])
 		{
-			if (!is_array($event['category'])) $event['category'] = explode(',',$event['category']);
+			if (!is_array($event['category']))
+			{
+				$event['category'] = explode(',',$event['category']);
+			}
 			if (!$old_event || !isset($old_event['category']))
 			{
 				$old_event['category'] = array();
@@ -234,13 +249,16 @@ 
 		if (!$ignore_conflicts && !$event['non_blocking'] && isset($event['start']) && isset($event['end']) &&
 			(($conflicts = $this->conflicts($event, $checked_excluding)) || $checked_excluding))
 		{
-			if ($checked_excluding)	// warn user if not all recurrences have been checked
+			if ($checked_excluding)
+			{
+				// warn user if not all recurrences have been checked
 			{
 				$conflicts['warning'] = array(
 					'start' => $checked_excluding,
 					'title' => lang('Only recurrences until %1 (excluding) have been checked!', $checked_excluding->format(true)),
 				);
 			}
+			}
 			return $conflicts;
 		}
 
@@ -304,7 +322,10 @@ 
 		$types_with_quantity = array();
 		foreach($this->resources as $type => $data)
 		{
-			if ($data['max_quantity']) $types_with_quantity[] = $type;
+			if ($data['max_quantity'])
+			{
+				$types_with_quantity[] = $type;
+			}
 		}
 		// get all NOT rejected participants and evtl. their quantity
 		$quantity = $users = array();
@@ -312,12 +333,19 @@ 
 		{
 			$q = $r = null;
 			calendar_so::split_status($status,$q,$r);
-			if ($status[0] == 'R') continue;	// ignore rejected participants
+			if ($status[0] == 'R')
+			{
+				continue;
+			}
+			// ignore rejected participants
 
-			if ($uid < 0)	// group, check it's members too
+			if ($uid < 0)
+			{
+				// group, check it's members too
 			{
 				$users = array_unique(array_merge($users, (array)$GLOBALS['egw']->accounts->members($uid,true)));
 			}
+			}
 			$users[] = $uid;
 			if (in_array($uid[0],$types_with_quantity))
 			{
@@ -348,18 +376,24 @@ 
 			$startts = $date->format('ts');
 
 			// skip past events or recurrences
-			if ($startts+$duration < $this->now_su) continue;
+			if ($startts+$duration < $this->now_su)
+			{
+				continue;
+			}
 
 			// abort check if configured limits are exceeded
 			if ($event['recur_type'] &&
 				(++$checked > $max_checked && $max_checked > 0 || // maximum number of checked recurrences exceeded
 				microtime(true) > $start+$max_check_time ||	// max check time exceeded
-				$startts > $this->config['horizont']))	// we are behind horizon for which recurrences are rendered
+				$startts > $this->config['horizont']))
+			{
+				// we are behind horizon for which recurrences are rendered
 			{
 				if ($this->debug > 2 || $this->debug == 'conflicts')
 				{
 					$this->debug_message(__METHOD__.'() conflict check limited to %1 recurrences, %2 seconds, until (excluding) %3',
 						$checked, microtime(true)-$start, $date);
+			}
 				}
 				$checked_excluding = $date;
 				break;
@@ -383,10 +417,13 @@ 
 			{
 				if ($overlap['id'] == $event['id'] ||	// that's the event itself
 					$overlap['id'] == $event['reference'] ||	// event is an exception of overlap
-					$overlap['non_blocking'])			// that's a non_blocking event
+					$overlap['non_blocking'])
+				{
+					// that's a non_blocking event
 				{
 					continue;
 				}
+				}
 				if ($this->debug > 3 || $this->debug == 'conflicts')
 				{
 					$this->debug_message(__METHOD__.'() checking overlapping event %1',false,$overlap);
@@ -506,7 +543,11 @@ 
 	 */
 	public function check_acl_invite($uid)
 	{
-		if (!is_numeric($uid)) return true;	// nothing implemented for resources so far
+		if (!is_numeric($uid))
+		{
+			return true;
+		}
+		// nothing implemented for resources so far
 
 		if (!$this->require_acl_invite)
 		{
@@ -847,14 +888,20 @@ 
 		$startdate = new Api\DateTime($event['start']);
 		$enddate = new Api\DateTime($event['end']);
 		$modified = new Api\DateTime($event['modified']);
-		if ($old_event) $olddate = new Api\DateTime($old_event['start']);
+		if ($old_event)
+		{
+			$olddate = new Api\DateTime($old_event['start']);
+		}
 		//error_log(__METHOD__."() date_default_timezone_get()=".date_default_timezone_get().", user-timezone=".Api\DateTime::$user_timezone->getName().", startdate=".$startdate->format().", enddate=".$enddate->format().", updated=".$modified->format().", olddate=".($olddate ? $olddate->format() : ''));
 		$owner_prefs = $ics = null;
 		foreach($to_notify as $userid => $statusid)
 		{
 			$res_info = $quantity = $role = null;
 			calendar_so::split_status($statusid, $quantity, $role);
-			if ($this->debug > 0) error_log(__METHOD__." trying to notify $userid, with $statusid ($role)");
+			if ($this->debug > 0)
+			{
+				error_log(__METHOD__." trying to notify $userid, with $statusid ($role)");
+			}
 
 			if (!is_numeric($userid))
 			{
@@ -873,7 +920,11 @@ 
 
 				if (!isset($userid))
 				{
-					if (empty($res_info['email'])) continue;	// no way to notify
+					if (empty($res_info['email']))
+					{
+						continue;
+					}
+					// no way to notify
 					// check if event-owner wants non-EGroupware users notified
 					if (is_null($owner_prefs))
 					{
@@ -943,7 +994,10 @@ 
 				$details['to-lastname'] = isset($tln)? $tln: '';
 
 				// event is in user-time of current user, now we need to calculate the tz-difference to the notified user and take it into account
-				if (!isset($part_prefs['common']['tz'])) $part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
+				if (!isset($part_prefs['common']['tz']))
+				{
+					$part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
+				}
 				$timezone = new DateTimeZone($part_prefs['common']['tz']);
 				$timeformat = $part_prefs['common']['timeformat'];
 				switch($timeformat)
@@ -978,9 +1032,12 @@ 
 				switch($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
 				{
 					case 'ical':
-						if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
+						if (is_null($ics) || $m_type != $msg_type)
+						{
+							// need different ical for organizer notification
 						{
 							$calendar_ical = new calendar_ical();
+						}
 							$calendar_ical->setSupportedFields('full');	// full iCal fields+event TZ
 							// we need to pass $event[id] so iCal class reads event again,
 							// as event is in user TZ, but iCal class expects server TZ!
@@ -994,7 +1051,10 @@ 
 							'encoding' => '8bit',
 							'type' => 'text/calendar; method='.$method,
 						);
-						if ($m_type != $msg_type) unset($ics);
+						if ($m_type != $msg_type)
+						{
+							unset($ics);
+						}
 						$subject = isset($cleared_event) ? $cleared_event['title'] : $event['title'];
 						// fall through
 					case 'extended':
@@ -1045,7 +1105,9 @@ 
 						$notification->set_popupmessage($notify_body."\n\n".$details['description']."\n\n".$details_body);
 						$notification->set_popuplinks(array($details['link_arr']));
 
-						if(is_array($attachment)) { $notification->set_attachments(array($attachment)); }
+						if(is_array($attachment))
+						{
+$notification->set_attachments(array($attachment)); }
 						$notification->send();
 					}
 					catch (Exception $exception) {
@@ -1077,7 +1139,10 @@ 
 			Api\Translation::init();
 		}
 		// restore timezone, in case we had to reset it to server-timezone
-		if ($restore_tz) date_default_timezone_set($restore_tz);
+		if ($restore_tz)
+		{
+			date_default_timezone_set($restore_tz);
+		}
 
 		return true;
 	}
@@ -1112,10 +1177,13 @@ 
 		{
 			$to_notify = $event['participants'];
 		}
-		elseif ($this->check_perms(Acl::READ,$event))	// checks agains $this->owner set to $alarm[owner]
+		elseif ($this->check_perms(Acl::READ,$event))
+		{
+			// checks agains $this->owner set to $alarm[owner]
 		{
 			$to_notify[$alarm['owner']] = 'A';
 		}
+		}
 		else
 		{
 			return False;	// no rights
@@ -1165,7 +1233,10 @@ 
 		if ($event['id'])
 		{
 			// invalidate the read-cache if it contains the event we store now
-			if ($event['id'] == self::$cached_event['id']) self::$cached_event = array();
+			if ($event['id'] == self::$cached_event['id'])
+			{
+				self::$cached_event = array();
+			}
 			$old_event = $this->read($event['id'], $event['recurrence'], false, 'server');
 		}
 		else
@@ -1173,7 +1244,10 @@ 
 			$old_event = null;
 		}
 
-		if (!isset($event['whole_day'])) $event['whole_day'] = $this->isWholeDay($event);
+		if (!isset($event['whole_day']))
+		{
+			$event['whole_day'] = $this->isWholeDay($event);
+		}
 		$save_event = $event;
 		if ($event['whole_day'])
 		{
@@ -1214,7 +1288,10 @@ 
 		foreach($timestamps as $ts)
 		{
 			// we convert here from user-time to timestamps in server-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			if (isset($event[$ts]))
+			{
+				$event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			}
 		}
 		// convert tzid name to integer tz_id, of set user default
 		if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid'])))
@@ -1264,7 +1341,10 @@ 
 				if (!isset($event['alarm'][$id]))
 				{
 					$alarm['time'] = $event['start'] - $alarm['offset'];
-					if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
+					if ($alarm['time'] < time())
+					{
+						calendar_so::shift_alarm($event, $alarm);
+					}
 						// remove (not store) alarms belonging to not longer existing or rejected participants
 					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] :
 						$old_event['participants'][$alarm['owner']];
@@ -1317,7 +1397,10 @@ 
 
 		// Update history
 		$tracking = new calendar_tracking($this);
-		if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
+		if (empty($event['id']) && !empty($cal_id))
+		{
+			$event['id']=$cal_id;
+		}
 		$tracking->track($event, $old_event);
 
 		return $cal_id;
@@ -1334,9 +1417,12 @@ 
 	 */
 	function check_status_perms($uid,$event)
 	{
-		if ($uid[0] == 'c' || $uid[0] == 'e')	// for contact we use the owner of the event
+		if ($uid[0] == 'c' || $uid[0] == 'e')
+		{
+			// for contact we use the owner of the event
 		{
 			if (!is_array($event) && !($event = $this->read($event))) return false;
+		}
 
 			return $this->check_perms(Acl::EDIT,0,$event['owner']);
 		}
@@ -1347,13 +1433,19 @@ 
 			return $access;
 		}
 		// no access or denied access because of category acl --> regular check
-		if (!is_numeric($uid))	// this is eg. for resources (r123)
+		if (!is_numeric($uid))
+		{
+			// this is eg. for resources (r123)
 		{
 			$resource = $this->resource_info($uid);
+		}
 
 			return Acl::EDIT & $resource['rights'];
 		}
-		if (!is_array($event) && !($event = $this->read($event))) return false;
+		if (!is_array($event) && !($event = $this->read($event)))
+		{
+			return false;
+		}
 
 		// regular user and groups (need to check memberships too)
 		if (!isset($event['participants'][$uid]))
@@ -1377,7 +1469,10 @@ 
 	 */
 	function check_cat_acl($right,$event)
 	{
-		if (!is_array($event)) $event = $this->read($event);
+		if (!is_array($event))
+		{
+			$event = $this->read($event);
+		}
 
 		$ret = null;
 		if ($event['category'])
@@ -1434,7 +1529,10 @@ 
 	public static function set_cat_rights($cat_id,$user,$rights)
 	{
 		//echo "<p>".__METHOD__."($cat_id,$user,$rights)</p>\n";
-		if (!isset(self::$cat_rights_cache)) self::get_cat_rights($cat_id);
+		if (!isset(self::$cat_rights_cache))
+		{
+			self::get_cat_rights($cat_id);
+		}
 
 		if ((int)$rights != (int)self::$cat_rights_cache['L'.$cat_id][$user])
 		{
@@ -1446,7 +1544,10 @@ 
 			else
 			{
 				unset(self::$cat_rights_cache['L'.$cat_id][$user]);
-				if (!self::$cat_rights_cache['L'.$cat_id]) unset(self::$cat_rights_cache['L'.$cat_id]);
+				if (!self::$cat_rights_cache['L'.$cat_id])
+				{
+					unset(self::$cat_rights_cache['L'.$cat_id]);
+				}
 				$GLOBALS['egw']->acl->delete_repository('calendar','L'.$cat_id,$user);
 			}
 			Api\Cache::setSession('calendar','cat_rights',self::$cat_rights_cache);
@@ -1479,7 +1580,10 @@ 
 				foreach($cat_rights as $uid => $value)
 				{
 					$all |= $value;
-					if (in_array($uid,$memberships)) $own |= $value;
+					if (in_array($uid,$memberships))
+					{
+						$own |= $value;
+					}
 				}
 			}
 			foreach(array(self::CAT_ACL_ADD,self::CAT_ACL_STATUS) as $mask)
@@ -1526,13 +1630,16 @@ 
 				is_numeric($uid)?$uid:substr($uid,1),$status,
 				$recur_date?$this->date2ts($recur_date,true):0,$role)))
 		{
-			if ($status == 'R')	// remove alarms belonging to rejected participants
+			if ($status == 'R')
+			{
+				// remove alarms belonging to rejected participants
 			{
 				foreach(isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
 				{
 					if ((string)$alarm['owner'] === (string)$uid)
 					{
 						$this->so->delete_alarm($id);
+			}
 						//error_log(__LINE__.': '.__METHOD__."(".array2string($event).", '$uid', '$status', ...) deleting alarm=".array2string($alarm).", $status=".array2string($alarm));
 					}
 				}
@@ -1546,8 +1653,15 @@ 
 			);
 			if (isset($status2msg[$status]) && !$skip_notification)
 			{
-				if (!is_array($event)) $event = $this->read($cal_id);
-				if (isset($recur_date)) $event = $this->read($event['id'],$recur_date); //re-read the actually edited recurring event
+				if (!is_array($event))
+				{
+					$event = $this->read($cal_id);
+				}
+				if (isset($recur_date))
+				{
+					$event = $this->read($event['id'],$recur_date);
+				}
+				//re-read the actually edited recurring event
 				$this->send_update($status2msg[$status],$event['participants'],$event);
 			}
 
@@ -1570,12 +1684,16 @@ 
 	 */
 	function update_status($new_event, $old_event , $recur_date=0, $skip_notification=false)
 	{
-		if (!isset($new_event['participants'])) return;
+		if (!isset($new_event['participants']))
+		{
+			return;
+		}
 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
-  		{
-            if (!isset($new_event['participants'][$userid])){
+		{
+            if (!isset($new_event['participants'][$userid]))
+            {
             	// Attendee will be deleted this way
             	$new_event['participants'][$userid] = 'G';
             }
@@ -1658,7 +1776,10 @@ 
 					}
 					else
 					{
-						if (!($exception = $this->read($id))) continue;
+						if (!($exception = $this->read($id)))
+						{
+							continue;
+						}
 						$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 						$exception['reference'] = $exception['recurrence'] = 0;
 						$this->update($exception, true, true, false, true, $msg=null, true);
@@ -1729,7 +1850,10 @@ 
 		$event_arr = $this->event2array($event);
 		foreach($event_arr as $key => $val)
 		{
-			if ($key == 'recur_type') $key = 'repetition';
+			if ($key == 'recur_type')
+			{
+				$key = 'repetition';
+			}
 			$details[$key] = $val['data'];
 		}
 		$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
@@ -1901,7 +2025,10 @@ 
 	 */
 	function check_move_alarms(Array &$event, Array $old_event = null, Api\DateTime $instance_date = null)
 	{
-		if ($old_event !== null && $event['start'] == $old_event['start']) return;
+		if ($old_event !== null && $event['start'] == $old_event['start'])
+		{
+			return;
+		}
 
 		$time = new Api\DateTime($event['start']);
 		if(!is_array($event['alarm']))
@@ -1975,7 +2102,10 @@ 
 		if (is_array($old_event) || $old_event > 0)
 		{
 			// preserve categories without users read access
-			if (!is_array($old_event)) $old_event = $this->read($old_event);
+			if (!is_array($old_event))
+			{
+				$old_event = $this->read($old_event);
+			}
 			$old_categories = explode(',',$old_event['category']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
@@ -2066,7 +2196,10 @@ 
 				"($filter)[EVENT]:" . array2string($event)."\n",3,$this->logfile);
 		}
 
-		if (!isset($event['recurrence'])) $event['recurrence'] = 0;
+		if (!isset($event['recurrence']))
+		{
+			$event['recurrence'] = 0;
+		}
 
 		if ($filter == 'master')
 		{
@@ -2120,19 +2253,26 @@ 
 							$matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence'];
 						}
 					}
-				} elseif ($filter != 'master' && ($filter == 'exact' ||
+				}
+				elseif ($filter != 'master' && ($filter == 'exact' ||
 							$event['recur_type'] == $egwEvent['recur_type'] &&
 							strpos($egwEvent['title'], $event['title']) === 0))
 				{
 					$matchingEvents[] = $egwEvent['id']; // we found the event
 				}
 			}
-			if (!empty($matchingEvents) || $filter == 'exact') return $matchingEvents;
+			if (!empty($matchingEvents) || $filter == 'exact')
+			{
+				return $matchingEvents;
+			}
 		}
 		unset($event['id']);
 
 		// No chance to find a master without [U]ID
-		if ($filter == 'master' && empty($event['uid'])) return $matchingEvents;
+		if ($filter == 'master' && empty($event['uid']))
+		{
+			return $matchingEvents;
+		}
 
 		// only query calendars of users, we have READ-grants from
 		$users = array();
@@ -2141,17 +2281,23 @@ 
 			$user = trim($user);
 			if ($this->check_perms(Acl::READ|self::ACL_READ_FOR_PARTICIPANTS|self::ACL_FREEBUSY,0,$user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user,$users))
+				{
+					// already added?
 				{
 					$users[] = $user;
 				}
+				}
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
 				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
-			if (!is_numeric($user)) continue;
+			if (!is_numeric($user))
+			{
+				continue;
+			}
 
 			// for groups we have to include the members
 			if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
@@ -2231,7 +2377,10 @@ 
 			}
 			foreach ($matchFields as $key)
 			{
-				if (isset($event[$key])) $query['cal_'.$key] = $event[$key];
+				if (isset($event[$key]))
+				{
+					$query['cal_'.$key] = $event[$key];
+				}
 			}
 		}
 
@@ -2271,7 +2420,10 @@ 
 					'[FOUND]: ' . array2string($egwEvent)."\n",3,$this->logfile);
 			}
 
-			if (in_array($egwEvent['id'], $matchingEvents)) continue;
+			if (in_array($egwEvent['id'], $matchingEvents))
+			{
+				continue;
+			}
 
 			// convert timezone id of event to tzid (iCal id like 'Europe/Berlin')
 			if (!$egwEvent['tz_id'] || !($egwEvent['tzid'] = calendar_timezones::id2tz($egwEvent['tz_id'])))
@@ -2438,13 +2590,16 @@ 
 					foreach ($event['participants'] as $attendee => $status)
 					{
 						if (!isset($egwEvent['participants'][$attendee]) &&
-								$attendee != $egwEvent['owner']) // ||
+								$attendee != $egwEvent['owner'])
+						{
+							// ||
 							//(!$relax && $egw_event['participants'][$attendee] != $status))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								"() additional event['participants']: $attendee\n",3,$this->logfile);
+						}
 							}
 							continue 2;
 						}
@@ -2766,7 +2921,10 @@ 
 		foreach(array('start','end','recur_enddate','recurrence') as $ts)
 		{
 			// we convert here from server-time to timestamps in user-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
+			if (isset($event[$ts]))
+			{
+				$event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
+			}
 		}
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
@@ -2794,9 +2952,12 @@ 
 	 */
 	function purge($age)
 	{
-		if (is_numeric($age) && $age > 0)	// just make sure bogus values dont delete everything
+		if (is_numeric($age) && $age > 0)
+		{
+			// just make sure bogus values dont delete everything
 		{
 			$this->so->purge(time() - 365*24*3600*(float)$age);
 		}
+		}
 	}
 }

Spacing +306 added lines, -308 removed lines

@@ -16,15 +16,15 @@ 
 use EGroupware\Api\Acl;
 
 // types of messsages send by calendar_boupdate::send_update
-define('MSG_DELETED',0);
-define('MSG_MODIFIED',1);
-define('MSG_ADDED',2);
-define('MSG_REJECTED',3);
-define('MSG_TENTATIVE',4);
-define('MSG_ACCEPTED',5);
-define('MSG_ALARM',6);
-define('MSG_DISINVITE',7);
-define('MSG_DELEGATED',8);
+define('MSG_DELETED', 0);
+define('MSG_MODIFIED', 1);
+define('MSG_ADDED', 2);
+define('MSG_REJECTED', 3);
+define('MSG_TENTATIVE', 4);
+define('MSG_ACCEPTED', 5);
+define('MSG_ALARM', 6);
+define('MSG_DISINVITE', 7);
+define('MSG_DELEGATED', 8);
 
 /**
  * Class to access AND manipulate all calendar data (business object)
@@ -85,11 +85,11 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True);
+		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started', True);
 
-		parent::__construct();	// calling the parent constructor
+		parent::__construct(); // calling the parent constructor
 
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True);
+		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished', True);
 	}
 
 	/**
@@ -116,7 +116,7 @@ 
 	 * +      + +  C   +	which is clearly wrong for everything with a maximum quantity > 1
 	 * ++++++++ ++++++++
 	 */
-	function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false,$updateTS=true,&$messages=null, $skip_notification=false)
+	function update(&$event, $ignore_conflicts = false, $touch_modified = true, $ignore_acl = false, $updateTS = true, &$messages = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__."(".array2string($event).",$ignore_conflicts,$touch_modified,$ignore_acl)");
 		if (!is_array($messages)) $messages = $messages ? (array)$messages : array();
@@ -124,7 +124,7 @@ 
 		if ($this->debug > 1 || $this->debug == 'update')
 		{
 			$this->debug_message('calendar_boupdate::update(%1,ignore_conflict=%2,touch_modified=%3,ignore_acl=%4)',
-				false,$event,$ignore_conflicts,$touch_modified,$ignore_acl);
+				false, $event, $ignore_conflicts, $touch_modified, $ignore_acl);
 		}
 		// check some minimum requirements:
 		// - new events need start, end and title
@@ -152,11 +152,11 @@ 
 		}
 
 		// check if user has the permission to update / create the event
-		if (!$ignore_acl && (!$new_event && !$this->check_perms(Acl::EDIT,$event['id']) ||
-			$new_event && !$this->check_perms(Acl::EDIT,0,$event['owner'])) &&
-			!$this->check_perms(Acl::ADD,0,$event['owner']))
+		if (!$ignore_acl && (!$new_event && !$this->check_perms(Acl::EDIT, $event['id']) ||
+			$new_event && !$this->check_perms(Acl::EDIT, 0, $event['owner'])) &&
+			!$this->check_perms(Acl::ADD, 0, $event['owner']))
 		{
-			$messages[] = lang('Access to calendar of %1 denied!',Api\Accounts::username($event['owner']));
+			$messages[] = lang('Access to calendar of %1 denied!', Api\Accounts::username($event['owner']));
 			return false;
 		}
 		if ($new_event)
@@ -165,24 +165,24 @@ 
 		}
 		else
 		{
-			$old_event = $this->read((int)$event['id'],null,$ignore_acl);
+			$old_event = $this->read((int)$event['id'], null, $ignore_acl);
 		}
 
 		// do we need to check, if user is allowed to invite the invited participants
-		if ($this->require_acl_invite && ($removed = $this->remove_no_acl_invite($event,$old_event)))
+		if ($this->require_acl_invite && ($removed = $this->remove_no_acl_invite($event, $old_event)))
 		{
 			// report removed participants back to user
-			foreach($removed as $key => $account_id)
+			foreach ($removed as $key => $account_id)
 			{
 				$removed[$key] = $this->participant_name($account_id);
 			}
-			$messages[] = lang('%1 participants removed because of missing invite grants',count($removed)).
-				': '.implode(', ',$removed);
+			$messages[] = lang('%1 participants removed because of missing invite grants', count($removed)).
+				': '.implode(', ', $removed);
 		}
 		// check category based ACL
 		if ($event['category'])
 		{
-			if (!is_array($event['category'])) $event['category'] = explode(',',$event['category']);
+			if (!is_array($event['category'])) $event['category'] = explode(',', $event['category']);
 			if (!$old_event || !isset($old_event['category']))
 			{
 				$old_event['category'] = array();
@@ -191,38 +191,38 @@ 
 			{
 				$old_event['category'] = explode(',', $old_event['category']);
 			}
-			foreach($event['category'] as $key => $cat_id)
+			foreach ($event['category'] as $key => $cat_id)
 			{
 				// check if user is allowed to update event categories
-				if ((!$old_event || !in_array($cat_id,$old_event['category'])) &&
-					self::has_cat_right(self::CAT_ACL_ADD,$cat_id,$this->user) === false)
+				if ((!$old_event || !in_array($cat_id, $old_event['category'])) &&
+					self::has_cat_right(self::CAT_ACL_ADD, $cat_id, $this->user) === false)
 				{
 					unset($event['category'][$key]);
 					// report removed category to user
 					$removed_cats[$cat_id] = $this->categories->id2name($cat_id);
-					continue;	// no further check, as cat was removed
+					continue; // no further check, as cat was removed
 				}
 				// for new or moved events check status of participants, if no category status right --> set all status to 'U' = unknown
 				if (!$status_reset_to_unknown &&
-					self::has_cat_right(self::CAT_ACL_STATUS,$cat_id,$this->user) === false &&
+					self::has_cat_right(self::CAT_ACL_STATUS, $cat_id, $this->user) === false &&
 					(!$old_event || $old_event['start'] != $event['start'] || $old_event['end'] != $event['end']))
 				{
-					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 ($status != 'U')
 						{
-							$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
 						}
 					}
-					$status_reset_to_unknown = true;	// once is enough
+					$status_reset_to_unknown = true; // once is enough
 				}
 			}
 			if ($removed_cats)
 			{
-				$messages[] = lang('Category %1 removed because of missing rights',implode(', ',$removed_cats));
+				$messages[] = lang('Category %1 removed because of missing rights', implode(', ', $removed_cats));
 			}
 			if ($status_reset_to_unknown)
 			{
@@ -258,30 +258,30 @@ 
 		$event = $this->read($cal_id, null, $ignore_acl, 'ts', $new_event && !$event['public'] ? $this->user : null);
 		//error_log("new $cal_id=". array2string($event));
 
-		if($old_event['deleted'] && $event['deleted'] == null)
+		if ($old_event['deleted'] && $event['deleted'] == null)
 		{
 			// Restored, bring back links
 			Link::restore('calendar', $cal_id);
 		}
 		if ($this->log_file)
 		{
-			$this->log2file($event2save,$event,$old_event);
+			$this->log2file($event2save, $event, $old_event);
 		}
 		// send notifications
-		if(!$skip_notification)
+		if (!$skip_notification)
 		{
 			if ($new_event)
 			{
-				$this->send_update(MSG_ADDED,$event['participants'],'',$event);
+				$this->send_update(MSG_ADDED, $event['participants'], '', $event);
 			}
 			else // update existing event
 			{
-				$this->check4update($event,$old_event);
+				$this->check4update($event, $old_event);
 			}
 		}
 
 		// notify the link-class about the update, as other apps may be subscribt to it
-		Link::notify_update('calendar',$cal_id,$event);
+		Link::notify_update('calendar', $cal_id, $event);
 
 		return $cal_id;
 	}
@@ -299,27 +299,27 @@ 
 	 * @param Api\DateTime& $checked_excluding =null time until which (excluding) recurrences have been checked
 	 * @return array or events
 	 */
-	function conflicts(array $event, &$checked_excluding=null)
+	function conflicts(array $event, &$checked_excluding = null)
 	{
 		$types_with_quantity = array();
-		foreach($this->resources as $type => $data)
+		foreach ($this->resources as $type => $data)
 		{
 			if ($data['max_quantity']) $types_with_quantity[] = $type;
 		}
 		// get all NOT rejected participants and evtl. their quantity
 		$quantity = $users = array();
-		foreach($event['participants'] as $uid => $status)
+		foreach ($event['participants'] as $uid => $status)
 		{
 			$q = $r = null;
-			calendar_so::split_status($status,$q,$r);
-			if ($status[0] == 'R') continue;	// ignore rejected participants
+			calendar_so::split_status($status, $q, $r);
+			if ($status[0] == 'R') continue; // ignore rejected participants
 
 			if ($uid < 0)	// group, check it's members too
 			{
-				$users = array_unique(array_merge($users, (array)$GLOBALS['egw']->accounts->members($uid,true)));
+				$users = array_unique(array_merge($users, (array)$GLOBALS['egw']->accounts->members($uid, true)));
 			}
 			$users[] = $uid;
-			if (in_array($uid[0],$types_with_quantity))
+			if (in_array($uid[0], $types_with_quantity))
 			{
 				$quantity[$uid] = $q;
 			}
@@ -342,58 +342,58 @@ 
 		}
 		$checked = 0;
 		$start = microtime(true);
-		$duration = $event['end']-$event['start'];
-		foreach($recurences as $date)
+		$duration = $event['end'] - $event['start'];
+		foreach ($recurences as $date)
 		{
 			$startts = $date->format('ts');
 
 			// skip past events or recurrences
-			if ($startts+$duration < $this->now_su) continue;
+			if ($startts + $duration < $this->now_su) continue;
 
 			// abort check if configured limits are exceeded
 			if ($event['recur_type'] &&
 				(++$checked > $max_checked && $max_checked > 0 || // maximum number of checked recurrences exceeded
-				microtime(true) > $start+$max_check_time ||	// max check time exceeded
+				microtime(true) > $start + $max_check_time || // max check time exceeded
 				$startts > $this->config['horizont']))	// we are behind horizon for which recurrences are rendered
 			{
 				if ($this->debug > 2 || $this->debug == 'conflicts')
 				{
 					$this->debug_message(__METHOD__.'() conflict check limited to %1 recurrences, %2 seconds, until (excluding) %3',
-						$checked, microtime(true)-$start, $date);
+						$checked, microtime(true) - $start, $date);
 				}
 				$checked_excluding = $date;
 				break;
 			}
-			$overlapping_events =& $this->search(array(
+			$overlapping_events = & $this->search(array(
 				'start' => $startts,
-				'end'   => $startts+$duration,
+				'end'   => $startts + $duration,
 				'users' => $users,
-				'ignore_acl' => true,	// otherwise we get only events readable by the user
-				'enum_groups' => true,	// otherwise group-events would not block time
+				'ignore_acl' => true, // otherwise we get only events readable by the user
+				'enum_groups' => true, // otherwise group-events would not block time
 				'query' => array(
 					'cal_non_blocking' => 0,
 				),
-				'no_integration' => true,	// do NOT use integration of other apps
+				'no_integration' => true, // do NOT use integration of other apps
 			));
 			if ($this->debug > 2 || $this->debug == 'conflicts')
 			{
-				$this->debug_message(__METHOD__.'() checking for potential overlapping events for users %1 from %2 to %3',false,$users,$startts,$startts+$duration);
+				$this->debug_message(__METHOD__.'() checking for potential overlapping events for users %1 from %2 to %3', false, $users, $startts, $startts + $duration);
 			}
-			foreach((array) $overlapping_events as $k => $overlap)
+			foreach ((array)$overlapping_events as $k => $overlap)
 			{
-				if ($overlap['id'] == $event['id'] ||	// that's the event itself
-					$overlap['id'] == $event['reference'] ||	// event is an exception of overlap
+				if ($overlap['id'] == $event['id'] || // that's the event itself
+					$overlap['id'] == $event['reference'] || // event is an exception of overlap
 					$overlap['non_blocking'])			// that's a non_blocking event
 				{
 					continue;
 				}
 				if ($this->debug > 3 || $this->debug == 'conflicts')
 				{
-					$this->debug_message(__METHOD__.'() checking overlapping event %1',false,$overlap);
+					$this->debug_message(__METHOD__.'() checking overlapping event %1', false, $overlap);
 				}
 				// check if the overlap is with a rejected participant or within the allowed quantity
-				$common_parts = array_intersect($users,array_keys($overlap['participants']));
-				foreach($common_parts as $n => $uid)
+				$common_parts = array_intersect($users, array_keys($overlap['participants']));
+				foreach ($common_parts as $n => $uid)
 				{
 					$status = $overlap['participants'][$uid];
 					calendar_so::split_status($status, $q, $r);
@@ -402,9 +402,9 @@ 
 						unset($common_parts[$n]);
 						continue;
 					}
-					if (is_numeric($uid) || !in_array($uid[0],$types_with_quantity))
+					if (is_numeric($uid) || !in_array($uid[0], $types_with_quantity))
 					{
-						continue;	// no quantity check: quantity allways 1 ==> conflict
+						continue; // no quantity check: quantity allways 1 ==> conflict
 					}
 					if (!isset($max_quantity[$uid]))
 					{
@@ -414,7 +414,7 @@ 
 					$quantity[$uid] += $q;
 					if ($quantity[$uid] <= $max_quantity[$uid])
 					{
-						$possible_quantity_conflicts[$uid][] =& $overlapping_events[$k];	// an other event can give the conflict
+						$possible_quantity_conflicts[$uid][] = & $overlapping_events[$k]; // an other event can give the conflict
 						unset($common_parts[$n]);
 						continue;
 					}
@@ -424,22 +424,22 @@ 
 				{
 					if ($this->debug > 3 || $this->debug == 'conflicts')
 					{
-						$this->debug_message(__METHOD__.'() conflicts with the following participants found %1',false,$common_parts);
+						$this->debug_message(__METHOD__.'() conflicts with the following participants found %1', false, $common_parts);
 					}
-					$conflicts[$overlap['id'].'-'.$this->date2ts($overlap['start'])] =& $overlapping_events[$k];
+					$conflicts[$overlap['id'].'-'.$this->date2ts($overlap['start'])] = & $overlapping_events[$k];
 				}
 			}
 		}
 		//error_log(__METHOD__."() conflict check took ".number_format(microtime(true)-$start, 3).'s');
 		// check if we are withing the allowed quantity and if not add all events using that resource
 		// seems this function is doing very strange things, it gives empty conflicts
-		foreach($max_quantity as $uid => $max)
+		foreach ($max_quantity as $uid => $max)
 		{
 			if ($quantity[$uid] > $max)
 			{
-				foreach((array)$possible_quantity_conflicts[$uid] as $conflict)
+				foreach ((array)$possible_quantity_conflicts[$uid] as $conflict)
 				{
-					$conflicts[$conflict['id'].'-'.$this->date2ts($conflict['start'])] =& $possible_quantity_conflicts[$k];
+					$conflicts[$conflict['id'].'-'.$this->date2ts($conflict['start'])] = & $possible_quantity_conflicts[$k];
 				}
 			}
 		}
@@ -447,10 +447,10 @@ 
 
 		if (count($conflicts))
 		{
-			foreach($conflicts as $key => $conflict)
+			foreach ($conflicts as $key => $conflict)
 			{
-					$conflict['participants'] = array_intersect_key((array)$conflict['participants'],$event['participants']);
-				if (!$this->check_perms(Acl::READ,$conflict))
+					$conflict['participants'] = array_intersect_key((array)$conflict['participants'], $event['participants']);
+				if (!$this->check_perms(Acl::READ, $conflict))
 				{
 					$conflicts[$key] = array(
 						'id'    => $conflict['id'],
@@ -463,7 +463,7 @@ 
 			}
 			if ($this->debug > 2 || $this->debug == 'conflicts')
 			{
-				$this->debug_message(__METHOD__.'() %1 conflicts found %2',false,count($conflicts),$conflicts);
+				$this->debug_message(__METHOD__.'() %1 conflicts found %2', false, count($conflicts), $conflicts);
 			}
 		}
 		return $conflicts;
@@ -475,22 +475,22 @@ 
 	 * @param array $old_event =null old event with already invited participants
 	 * @return array removed participants because of missing invite grants
 	 */
-	public function remove_no_acl_invite(array &$event,array $old_event=null)
+	public function remove_no_acl_invite(array &$event, array $old_event = null)
 	{
 		if (!$this->require_acl_invite)
 		{
-			return array();	// nothing to check, everyone can invite everyone else
+			return array(); // nothing to check, everyone can invite everyone else
 		}
 		if ($event['id'] && is_null($old_event))
 		{
 			$old_event = $this->read($event['id']);
 		}
 		$removed = array();
-		foreach(array_keys((array)$event['participants']) as $uid)
+		foreach (array_keys((array)$event['participants']) as $uid)
 		{
 			if ((is_null($old_event) || !isset($old_event['participants'][$uid])) && !$this->check_acl_invite($uid))
 			{
-				unset($event['participants'][$uid]);	// remove participant
+				unset($event['participants'][$uid]); // remove participant
 				$removed[] = $uid;
 			}
 		}
@@ -506,19 +506,19 @@ 
 	 */
 	public function check_acl_invite($uid)
 	{
-		if (!is_numeric($uid)) return true;	// nothing implemented for resources so far
+		if (!is_numeric($uid)) return true; // nothing implemented for resources so far
 
 		if (!$this->require_acl_invite)
 		{
-			$ret = true;	// no grant required
+			$ret = true; // no grant required
 		}
 		elseif ($this->require_acl_invite == 'groups' && $GLOBALS['egw']->accounts->get_type($uid) != 'g')
 		{
-			$ret = true;	// grant only required for groups
+			$ret = true; // grant only required for groups
 		}
 		else
 		{
-			$ret = $this->check_perms(self::ACL_INVITE,0,$uid);
+			$ret = $this->check_perms(self::ACL_INVITE, 0, $uid);
 		}
 		//error_log(__METHOD__."($uid) = ".array2string($ret));
 		//echo "<p>".__METHOD__."($uid) require_acl_invite=$this->require_acl_invite returning ".array2string($ret)."</p>\n";
@@ -532,7 +532,7 @@ 
 	 * @param array $old_event the event before the update
 	 * @todo check if there is a real change, not assume every save is a change
 	 */
-	function check4update($new_event,$old_event)
+	function check4update($new_event, $old_event)
 	{
 		//error_log(__METHOD__."($new_event[title])");
 		$modified = $added = $deleted = array();
@@ -540,9 +540,9 @@ 
 		//echo "<p>calendar_boupdate::check4update() new participants = ".print_r($new_event['participants'],true).", old participants =".print_r($old_event['participants'],true)."</p>\n";
 
 		// Find modified and deleted participants ...
-		foreach($old_event['participants'] as $old_userid => $old_status)
+		foreach ($old_event['participants'] as $old_userid => $old_status)
 		{
-			if(isset($new_event['participants'][$old_userid]))
+			if (isset($new_event['participants'][$old_userid]))
 			{
 				$modified[$old_userid] = $new_event['participants'][$old_userid];
 			}
@@ -552,27 +552,27 @@ 
 			}
 		}
 		// Find new participants ...
-		foreach(array_keys((array)$new_event['participants']) as $new_userid)
+		foreach (array_keys((array)$new_event['participants']) as $new_userid)
 		{
-			if(!isset($old_event['participants'][$new_userid]))
+			if (!isset($old_event['participants'][$new_userid]))
 			{
 				$added[$new_userid] = 'U';
 			}
 		}
 		//echo "<p>calendar_boupdate::check4update() added=".print_r($added,true).", modified=".print_r($modified,true).", deleted=".print_r($deleted,true)."</p>\n";
-		if(count($added) || count($modified) || count($deleted))
+		if (count($added) || count($modified) || count($deleted))
 		{
-			if(count($added))
+			if (count($added))
 			{
-				$this->send_update(MSG_ADDED,$added,$old_event,$new_event);
+				$this->send_update(MSG_ADDED, $added, $old_event, $new_event);
 			}
-			if(count($modified))
+			if (count($modified))
 			{
-				$this->send_update(MSG_MODIFIED,$modified,$old_event,$new_event);
+				$this->send_update(MSG_MODIFIED, $modified, $old_event, $new_event);
 			}
-			if(count($deleted))
+			if (count($deleted))
 			{
-				$this->send_update(MSG_DISINVITE,$deleted,$new_event);
+				$this->send_update(MSG_DISINVITE, $deleted, $new_event);
 			}
 		}
 	}
@@ -589,11 +589,11 @@ 
 	 * @param string $status of current user
 	 * @return boolean true = update requested, false otherwise
 	 */
-	public static function update_requested($userid, $part_prefs, &$msg_type, $old_event ,$new_event, $role, $status=null)
+	public static function update_requested($userid, $part_prefs, &$msg_type, $old_event, $new_event, $role, $status = null)
 	{
 		if ($msg_type == MSG_ALARM)
 		{
-			return True;	// always True for now
+			return True; // always True for now
 		}
 		$want_update = 0;
 
@@ -601,7 +601,7 @@ 
 		//
 		$msg_is_response = $msg_type == MSG_REJECTED || $msg_type == MSG_ACCEPTED || $msg_type == MSG_TENTATIVE || $msg_type == MSG_DELEGATED;
 
-		switch($ru = $part_prefs['calendar']['receive_updates'])
+		switch ($ru = $part_prefs['calendar']['receive_updates'])
 		{
 			case 'responses':
 				++$want_update;
@@ -615,8 +615,8 @@ 
 			default:
 				if (is_array($new_event) && is_array($old_event))
 				{
-					$diff = max(abs(self::date2ts($old_event['start'])-self::date2ts($new_event['start'])),
-						abs(self::date2ts($old_event['end'])-self::date2ts($new_event['end'])));
+					$diff = max(abs(self::date2ts($old_event['start']) - self::date2ts($new_event['start'])),
+						abs(self::date2ts($old_event['end']) - self::date2ts($new_event['end'])));
 					$check = $ru == 'time_change_4h' ? 4 * 60 * 60 - 1 : 0;
 					if ($msg_type == MSG_MODIFIED && $diff > $check)
 					{
@@ -636,13 +636,13 @@ 
 				if (!is_numeric($userid) && $role == 'CHAIR' &&
 					($msg_is_response || in_array($msg_type, array(MSG_ADDED, MSG_DELETED))))
 				{
-					switch($msg_type)
+					switch ($msg_type)
 					{
 						case MSG_DELETED:	// treat deleting event as rejection to organizer
 							$msg_type = MSG_REJECTED;
 							break;
 						case MSG_ADDED:		// new events use added, but organizer needs status
-							switch($status[0])
+							switch ($status[0])
 							{
 								case 'A': $msg_type = MSG_ACCEPTED; break;
 								case 'R': $msg_type = MSG_REJECTED; break;
@@ -667,7 +667,7 @@ 
 	 * @param string $role ='REQ-PARTICIPANT'
 	 * @return boolean true if user requested to be notified, false if not
 	 */
-	static public function email_update_requested($user_or_email, $ical_method='REQUEST', $role='REQ-PARTICIPANT')
+	static public function email_update_requested($user_or_email, $ical_method = 'REQUEST', $role = 'REQ-PARTICIPANT')
 	{
 		// check if email is from a user
 		if (is_numeric($user_or_email))
@@ -691,7 +691,7 @@ 
 				)
 			);
 		}
-		switch($ical_method)
+		switch ($ical_method)
 		{
 			default:
 			case 'REQUEST':
@@ -716,9 +716,9 @@ 
 	 * @param string& $action=null on return verbose name
 	 * @param string& $msg=null on return notification message
 	 */
-	function msg_type2ical_method($msg_type, &$action=null, &$msg=null)
+	function msg_type2ical_method($msg_type, &$action = null, &$msg = null)
 	{
-		switch($msg_type)
+		switch ($msg_type)
 		{
 			case MSG_DELETED:
 				$action = 'Canceled';
@@ -770,7 +770,7 @@ 
 		$msg = $this->cal_prefs['notify'.$pref];
 		if (empty($msg))
 		{
-			$msg = $this->cal_prefs['notifyAdded'];	// use a default
+			$msg = $this->cal_prefs['notifyAdded']; // use a default
 		}
 		//error_log(__METHOD__."($msg_type) action='$action', $msg='$msg' returning '$method'");
 		return $method;
@@ -786,7 +786,7 @@ 
 	 * @param int $user =0 User who started the notify, default current user
 	 * @return bool true/false
 	 */
-	function send_update($msg_type,$to_notify,$old_event,$new_event=null,$user=0)
+	function send_update($msg_type, $to_notify, $old_event, $new_event = null, $user = 0)
 	{
 		//error_log(__METHOD__."($msg_type,".array2string($to_notify).",...) ".array2string($new_event));
 		if (!is_array($to_notify))
@@ -798,11 +798,11 @@ 
 		$owner = $old_event ? $old_event['owner'] : $new_event['owner'];
 		if ($owner && !isset($to_notify[$owner]) && $msg_type != MSG_ALARM)
 		{
-			$to_notify[$owner] = 'OCHAIR';	// always include the event-owner
+			$to_notify[$owner] = 'OCHAIR'; // always include the event-owner
 		}
 
 		// ignore events in the past (give a tolerance of 10 seconds for the script)
-		if($old_event && $this->date2ts($old_event['start']) < ($this->now_su - 10))
+		if ($old_event && $this->date2ts($old_event['start']) < ($this->now_su - 10))
 		{
 			return False;
 		}
@@ -812,7 +812,7 @@ 
 			$restore_tz = $tz;
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 		}
-		$temp_user = $GLOBALS['egw_info']['user'];	// save user-date of the enviroment to restore it after
+		$temp_user = $GLOBALS['egw_info']['user']; // save user-date of the enviroment to restore it after
 
 		if (!$user)
 		{
@@ -828,16 +828,16 @@ 
 		$event = $msg_type == MSG_ADDED || $msg_type == MSG_MODIFIED ? $new_event : $old_event;
 
 		// add all group-members to the notification, unless they are already participants
-		foreach($to_notify as $userid => $statusid)
+		foreach ($to_notify as $userid => $statusid)
 		{
 			if (is_numeric($userid) && $GLOBALS['egw']->accounts->get_type($userid) == 'g' &&
 				($members = $GLOBALS['egw']->accounts->members($userid, true)))
 			{
-				foreach($members as $member)
+				foreach ($members as $member)
 				{
 					if (!isset($to_notify[$member]))
 					{
-						$to_notify[$member] = 'G';	// Group-invitation
+						$to_notify[$member] = 'G'; // Group-invitation
 					}
 				}
 			}
@@ -849,7 +849,7 @@ 
 		if ($old_event) $olddate = new Api\DateTime($old_event['start']);
 		//error_log(__METHOD__."() date_default_timezone_get()=".date_default_timezone_get().", user-timezone=".Api\DateTime::$user_timezone->getName().", startdate=".$startdate->format().", enddate=".$enddate->format().", updated=".$modified->format().", olddate=".($olddate ? $olddate->format() : ''));
 		$owner_prefs = $ics = null;
-		foreach($to_notify as $userid => $statusid)
+		foreach ($to_notify as $userid => $statusid)
 		{
 			$res_info = $quantity = $role = null;
 			calendar_so::split_status($statusid, $quantity, $role);
@@ -872,14 +872,14 @@ 
 
 				if (!isset($userid))
 				{
-					if (empty($res_info['email'])) continue;	// no way to notify
+					if (empty($res_info['email'])) continue; // no way to notify
 					// check if event-owner wants non-EGroupware users notified
 					if (is_null($owner_prefs))
 					{
 						$preferences = new Api\Preferences($owner);
 						$owner_prefs = $preferences->read_repository();
 					}
-					if ($role != 'CHAIR' &&		// always notify externals CHAIRs
+					if ($role != 'CHAIR' && // always notify externals CHAIRs
 						(empty($owner_prefs['calendar']['notify_externals']) ||
 						$owner_prefs['calendar']['notify_externals'] == 'no'))
 					{
@@ -891,12 +891,12 @@ 
 
 			if ($statusid == 'R' || $GLOBALS['egw']->accounts->get_type($userid) == 'g')
 			{
-				continue;	// dont notify rejected participants or groups
+				continue; // dont notify rejected participants or groups
 			}
 
-			if($userid != $GLOBALS['egw_info']['user']['account_id'] ||
+			if ($userid != $GLOBALS['egw_info']['user']['account_id'] ||
 				($userid == $GLOBALS['egw_info']['user']['account_id'] &&
-					$user_prefs['calendar']['receive_own_updates']==1) ||
+					$user_prefs['calendar']['receive_own_updates'] == 1) ||
 				$msg_type == MSG_ALARM)
 			{
 				$tfn = $tln = $lid = null; //cleanup of lastname and fullname (in case they are set in a previous loop)
@@ -905,8 +905,8 @@ 
 					$preferences = new Api\Preferences($userid);
 					$GLOBALS['egw_info']['user']['preferences'] = $part_prefs = $preferences->read_repository();
 					$fullname = Api\Accounts::username($userid);
-					$tfn = Api\Accounts::id2name($userid,'account_firstname');
-					$tln = Api\Accounts::id2name($userid,'account_lastname');
+					$tfn = Api\Accounts::id2name($userid, 'account_firstname');
+					$tln = Api\Accounts::id2name($userid, 'account_lastname');
 				}
 				else	// external email address: use Api\Preferences of event-owner, plus some hardcoded settings (eg. ical notification)
 				{
@@ -917,7 +917,7 @@ 
 					}
 					$part_prefs = $owner_prefs;
 					$part_prefs['calendar']['receive_updates'] = $owner_prefs['calendar']['notify_externals'];
-					$part_prefs['calendar']['update_format'] = 'ical';	// use ical format
+					$part_prefs['calendar']['update_format'] = 'ical'; // use ical format
 					$fullname = $res_info && !empty($res_info['name']) ? $res_info['name'] : $userid;
 				}
 				$m_type = $msg_type;
@@ -938,14 +938,14 @@ 
 				$details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event,
 					$action, $event_arr, $disinvited);
 				$details['to-fullname'] = $fullname;
-				$details['to-firstname'] = isset($tfn)? $tfn: '';
-				$details['to-lastname'] = isset($tln)? $tln: '';
+				$details['to-firstname'] = isset($tfn) ? $tfn : '';
+				$details['to-lastname'] = isset($tln) ? $tln : '';
 
 				// event is in user-time of current user, now we need to calculate the tz-difference to the notified user and take it into account
 				if (!isset($part_prefs['common']['tz'])) $part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
 				$timezone = new DateTimeZone($part_prefs['common']['tz']);
 				$timeformat = $part_prefs['common']['timeformat'];
-				switch($timeformat)
+				switch ($timeformat)
 				{
 			  		case '24':
 						$timeformat = 'H:i';
@@ -954,7 +954,7 @@ 
 						$timeformat = 'h:i a';
 						break;
 				}
-				$timeformat = $part_prefs['common']['dateformat'] . ', ' . $timeformat;
+				$timeformat = $part_prefs['common']['dateformat'].', '.$timeformat;
 
 				$startdate->setTimezone($timezone);
 				$details['startdate'] = $startdate->format($timeformat);
@@ -963,7 +963,7 @@ 
 				$details['enddate'] = $enddate->format($timeformat);
 
 				$modified->setTimezone($timezone);
-				$details['updated'] = $modified->format($timeformat) . ', ' . Api\Accounts::username($event['modifier']);
+				$details['updated'] = $modified->format($timeformat).', '.Api\Accounts::username($event['modifier']);
 
 				if ($old_event != False)
 				{
@@ -972,15 +972,14 @@ 
 				}
 				//error_log(__METHOD__."() userid=$userid, timezone=".$timezone->getName().", startdate=$details[startdate], enddate=$details[enddate], updated=$details[updated], olddate=$details[olddate]");
 
-				list($subject,$notify_body) = explode("\n",$GLOBALS['egw']->preferences->parse_notify($notify_msg,$details),2);
+				list($subject, $notify_body) = explode("\n", $GLOBALS['egw']->preferences->parse_notify($notify_msg, $details), 2);
 				// alarm is NOT an iCal method, therefore we have to use extened (no iCal)
-				switch($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
+				switch ($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
 				{
-					case 'ical':
-						if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
+					case 'ical' : if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
 						{
 							$calendar_ical = new calendar_ical();
-							$calendar_ical->setSupportedFields('full');	// full iCal fields+event TZ
+							$calendar_ical->setSupportedFields('full'); // full iCal fields+event TZ
 							// 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 = $calendar_ical->exportVCal(array(isset($cleared_event) ? $cleared_event : $event['id']),
@@ -999,11 +998,11 @@ 
 					case 'extended':
 
 						$details_body = lang('Event Details follow').":\n";
-						foreach($event_arr as $key => $val)
+						foreach ($event_arr as $key => $val)
 						{
-							if(!empty($details[$key]))
+							if (!empty($details[$key]))
 							{
-								switch($key)
+								switch ($key)
 								{
 							 		case 'access':
 									case 'priority':
@@ -1012,7 +1011,7 @@ 
 									case 'title':
 										break;
 									default:
-										$details_body .= sprintf("%-20s %s\n",$val['field'].':',$details[$key]);
+										$details_body .= sprintf("%-20s %s\n", $val['field'].':', $details[$key]);
 										break;
 							 	}
 							}
@@ -1020,7 +1019,7 @@ 
 						break;
 				}
 				// send via notification_app
-				if($GLOBALS['egw_info']['apps']['notifications']['enabled'])
+				if ($GLOBALS['egw_info']['apps']['notifications']['enabled'])
 				{
 					try {
 						//error_log(__METHOD__."() notifying $userid from $senderid: $subject");
@@ -1044,9 +1043,9 @@ 
 						$notification->set_popupmessage($notify_body."\n\n".$details['description']."\n\n".$details_body);
 						$notification->set_popuplinks(array($details['link_arr']));
 
-						if(is_array($attachment)) { $notification->set_attachments(array($attachment)); }
+						if (is_array($attachment)) { $notification->set_attachments(array($attachment)); }
 						$notification->send();
-						foreach(notifications::errors(true) as $error)
+						foreach (notifications::errors(true) as $error)
 						{
 							error_log(__METHOD__."() Error notifying $userid from $senderid: $subject: $error");
 						}
@@ -1085,14 +1084,14 @@ 
 		return true;
 	}
 
-	function get_update_message($event,$added)
+	function get_update_message($event, $added)
 	{
 		$nul = null;
-		$details = $this->_get_event_details($event,$added ? lang('Added') : lang('Modified'),$nul);
+		$details = $this->_get_event_details($event, $added ? lang('Added') : lang('Modified'), $nul);
 
 		$notify_msg = $this->cal_prefs[$added || empty($this->cal_prefs['notifyModified']) ? 'notifyAdded' : 'notifyModified'];
 
-		return explode("\n",$GLOBALS['egw']->preferences->parse_notify($notify_msg,$details),2);
+		return explode("\n", $GLOBALS['egw']->preferences->parse_notify($notify_msg, $details), 2);
 	}
 
 	/**
@@ -1106,37 +1105,37 @@ 
 		//echo "<p>bocalendar::send_alarm("; print_r($alarm); echo ")</p>\n";
 		$GLOBALS['egw_info']['user']['account_id'] = $this->owner = $alarm['owner'];
 
-		$event_time_user = Api\DateTime::server2user($alarm['time'] + $alarm['offset']);	// alarm[time] is in server-time, read requires user-time
-		if (!$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->read($alarm['cal_id'],$event_time_user)))
+		$event_time_user = Api\DateTime::server2user($alarm['time'] + $alarm['offset']); // alarm[time] is in server-time, read requires user-time
+		if (!$alarm['owner'] || !$alarm['cal_id'] || !($event = $this->read($alarm['cal_id'], $event_time_user)))
 		{
-			return False;	// event not found
+			return False; // event not found
 		}
 		if ($alarm['all'])
 		{
 			$to_notify = $event['participants'];
 		}
-		elseif ($this->check_perms(Acl::READ,$event))	// checks agains $this->owner set to $alarm[owner]
+		elseif ($this->check_perms(Acl::READ, $event))	// checks agains $this->owner set to $alarm[owner]
 		{
 			$to_notify[$alarm['owner']] = 'A';
 		}
 		else
 		{
-			return False;	// no rights
+			return False; // no rights
 		}
 		// need to load calendar translations and set currentapp, so calendar can reload a different lang
 		Api\Translation::add_app('calendar');
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
 
-		$ret = $this->send_update(MSG_ALARM,$to_notify,$event,False,$alarm['owner']);
+		$ret = $this->send_update(MSG_ALARM, $to_notify, $event, False, $alarm['owner']);
 
 		// create a new alarm for recuring events for the next event, if one exists
-		if ($event['recur_type'] != MCAL_RECUR_NONE && ($event = $this->read($alarm['cal_id'],$event_time_user+1)))
+		if ($event['recur_type'] != MCAL_RECUR_NONE && ($event = $this->read($alarm['cal_id'], $event_time_user + 1)))
 		{
 			$alarm['time'] = $this->date2ts($event['start']) - $alarm['offset'];
 			unset($alarm['times']);
 			unset($alarm['next']);
 			//error_log(__METHOD__."() moving alarm to next recurrence ".array2string($alarm));
-			$this->save_alarm($alarm['cal_id'], $alarm, false);	// false = do NOT update timestamp, as nothing changed for iCal clients
+			$this->save_alarm($alarm['cal_id'], $alarm, false); // false = do NOT update timestamp, as nothing changed for iCal clients
 		}
 		return $ret;
 	}
@@ -1152,15 +1151,15 @@ 
 	 * DEPRECATED: we allways (have to) update timestamp, as they are required for sync!
 	 * @return int|boolean $cal_id > 0 or false on error (eg. permission denied)
 	 */
-	function save($event,$ignore_acl=false,$updateTS=true)
+	function save($event, $ignore_acl = false, $updateTS = true)
 	{
 		unset($updateTS);
 		//error_log(__METHOD__.'('.array2string($event).", $ignore_acl, $updateTS)");
 
 		// check if user has the permission to update / create the event
-		if (!$ignore_acl && ($event['id'] && !$this->check_perms(Acl::EDIT,$event['id']) ||
-			!$event['id'] && !$this->check_perms(Acl::EDIT,0,$event['owner']) &&
-			!$this->check_perms(Acl::ADD,0,$event['owner'])))
+		if (!$ignore_acl && ($event['id'] && !$this->check_perms(Acl::EDIT, $event['id']) ||
+			!$event['id'] && !$this->check_perms(Acl::EDIT, 0, $event['owner']) &&
+			!$this->check_perms(Acl::ADD, 0, $event['owner'])))
 		{
 			return false;
 		}
@@ -1205,19 +1204,19 @@ 
 				$time->setUser();
 				$save_event['recur_enddate'] = Api\DateTime::to($time, 'ts');
 			}
-			$timestamps = array('modified','created');
+			$timestamps = array('modified', 'created');
 			// all-day events are handled in server time
 			$event['tzid'] = $save_event['tzid'] = Api\DateTime::$server_timezone->getName();
 		}
 		else
 		{
-			$timestamps = array('start','end','modified','created','recur_enddate','recurrence');
+			$timestamps = array('start', 'end', 'modified', 'created', 'recur_enddate', 'recurrence');
 		}
 		// we run all dates through date2ts, to adjust to server-time and the possible date-formats
-		foreach($timestamps as $ts)
+		foreach ($timestamps as $ts)
 		{
 			// we convert here from user-time to timestamps in server-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts], true) : 0;
 		}
 		// convert tzid name to integer tz_id, of set user default
 		if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid'])))
@@ -1227,7 +1226,7 @@ 
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as &$date)
+			foreach ($event['recur_exception'] as &$date)
 			{
 				if ($event['whole_day'])
 				{
@@ -1236,7 +1235,7 @@ 
 				}
 				else
 				{
-					$date = $this->date2ts($date,true);
+					$date = $this->date2ts($date, true);
 				}
 			}
 			unset($date);
@@ -1244,7 +1243,7 @@ 
 		// same with the alarms
 		if (isset($event['alarm']) && is_array($event['alarm']) && isset($event['start']))
 		{
-			foreach($event['alarm'] as $id => &$alarm)
+			foreach ($event['alarm'] as $id => &$alarm)
 			{
 				// remove alarms belonging to not longer existing or rejected participants
 				if ($alarm['owner'] && isset($event['participants']))
@@ -1262,15 +1261,14 @@ 
 		// update all existing alarm times, in case alarm got moved and alarms are not include in $event
 		if ($old_event && is_array($old_event['alarm']) && isset($event['start']))
 		{
-			foreach($old_event['alarm'] as $id => &$alarm)
+			foreach ($old_event['alarm'] as $id => &$alarm)
 			{
 				if (!isset($event['alarm'][$id]))
 				{
 					$alarm['time'] = $event['start'] - $alarm['offset'];
 					if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
 						// remove (not store) alarms belonging to not longer existing or rejected participants
-					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] :
-						$old_event['participants'][$alarm['owner']];
+					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] : $old_event['participants'][$alarm['owner']];
 					if (!$alarm['owner'] || isset($status) && calendar_so::split_status($status) !== 'R')
 					{
 						$this->so->save_alarm($event['id'], $alarm);
@@ -1296,7 +1294,7 @@ 
 		}
 		$set_recurrences = $old_event ? $event['recur_enddate'] != $old_event['recur_enddate'] : false;
 		$set_recurrences_start = 0;
-		if (($cal_id = $this->so->save($event,$set_recurrences,$set_recurrences_start,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
+		if (($cal_id = $this->so->save($event, $set_recurrences, $set_recurrences_start, 0, $event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
 		{
 			$save_event['id'] = $cal_id;
 			// unset participants to enforce the default stati for all added recurrences
@@ -1307,7 +1305,7 @@ 
 		// create links for new participants from addressbook, if configured
 		if ($cal_id && $GLOBALS['egw_info']['server']['link_contacts'] && $event['participants'])
 		{
-			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);
@@ -1320,7 +1318,7 @@ 
 
 		// Update history
 		$tracking = new calendar_tracking($this);
-		if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
+		if (empty($event['id']) && !empty($cal_id)) $event['id'] = $cal_id;
 		$tracking->track($event, $old_event);
 
 		return $cal_id;
@@ -1335,16 +1333,16 @@ 
 	 * @param array|int $event event array or id of the event
 	 * @return boolean
 	 */
-	function check_status_perms($uid,$event)
+	function check_status_perms($uid, $event)
 	{
 		if ($uid[0] == 'c' || $uid[0] == 'e')	// for contact we use the owner of the event
 		{
 			if (!is_array($event) && !($event = $this->read($event))) return false;
 
-			return $this->check_perms(Acl::EDIT,0,$event['owner']);
+			return $this->check_perms(Acl::EDIT, 0, $event['owner']);
 		}
 		// check if we have a category Acl for the event or not (null)
-		$access = $this->check_cat_acl(self::CAT_ACL_STATUS,$event);
+		$access = $this->check_cat_acl(self::CAT_ACL_STATUS, $event);
 		if (!is_null($access))
 		{
 			return $access;
@@ -1354,17 +1352,17 @@ 
 		{
 			$resource = $this->resource_info($uid);
 
-			return Acl::EDIT & $resource['rights'];
+			return Acl::EDIT&$resource['rights'];
 		}
 		if (!is_array($event) && !($event = $this->read($event))) return false;
 
 		// regular user and groups (need to check memberships too)
 		if (!isset($event['participants'][$uid]))
 		{
-			$memberships = $GLOBALS['egw']->accounts->memberships($uid,true);
+			$memberships = $GLOBALS['egw']->accounts->memberships($uid, true);
 		}
 		$memberships[] = $uid;
-		return array_intersect($memberships, array_keys($event['participants'])) && $this->check_perms(Acl::EDIT,0,$uid);
+		return array_intersect($memberships, array_keys($event['participants'])) && $this->check_perms(Acl::EDIT, 0, $uid);
 	}
 
 	/**
@@ -1378,16 +1376,16 @@ 
 	 * @return boolean false=access denied because of cat acl, true access granted because of cat acl,
 	 * 	null = cat has no acl
 	 */
-	function check_cat_acl($right,$event)
+	function check_cat_acl($right, $event)
 	{
 		if (!is_array($event)) $event = $this->read($event);
 
 		$ret = null;
 		if ($event['category'])
 		{
-			foreach(is_array($event['category']) ? $event['category'] : explode(',',$event['category']) as $cat_id)
+			foreach (is_array($event['category']) ? $event['category'] : explode(',', $event['category']) as $cat_id)
 			{
-				$access = self::has_cat_right($right,$cat_id,$this->user);
+				$access = self::has_cat_right($right, $cat_id, $this->user);
 				if ($access === true)
 				{
 					$ret = true;
@@ -1395,7 +1393,7 @@ 
 				}
 				if ($access === false)
 				{
-					$ret = false;	// cat denies access --> check further cats
+					$ret = false; // cat denies access --> check further cats
 				}
 			}
 		}
@@ -1416,12 +1414,12 @@ 
 	 * @param int $cat_id =null null to return array with all cats
 	 * @return array with account_id => right pairs
 	 */
-	public static function get_cat_rights($cat_id=null)
+	public static function get_cat_rights($cat_id = null)
 	{
 		if (!isset(self::$cat_rights_cache))
 		{
-			self::$cat_rights_cache = Api\Cache::getSession('calendar','cat_rights',
-				array($GLOBALS['egw']->acl,'get_location_grants'),array('L%','calendar'));
+			self::$cat_rights_cache = Api\Cache::getSession('calendar', 'cat_rights',
+				array($GLOBALS['egw']->acl, 'get_location_grants'), array('L%', 'calendar'));
 		}
 		//echo "<p>".__METHOD__."($cat_id) = ".array2string($cat_id ? self::$cat_rights_cache['L'.$cat_id] : self::$cat_rights_cache)."</p>\n";
 		return $cat_id ? self::$cat_rights_cache['L'.$cat_id] : self::$cat_rights_cache;
@@ -1434,7 +1432,7 @@ 
 	 * @param int $user
 	 * @param int $rights self::CAT_ACL_{ADD|STATUS} or'ed together
 	 */
-	public static function set_cat_rights($cat_id,$user,$rights)
+	public static function set_cat_rights($cat_id, $user, $rights)
 	{
 		//echo "<p>".__METHOD__."($cat_id,$user,$rights)</p>\n";
 		if (!isset(self::$cat_rights_cache)) self::get_cat_rights($cat_id);
@@ -1444,15 +1442,15 @@ 
 			if ($rights)
 			{
 				self::$cat_rights_cache['L'.$cat_id][$user] = $rights;
-				$GLOBALS['egw']->acl->add_repository('calendar','L'.$cat_id,$user,$rights);
+				$GLOBALS['egw']->acl->add_repository('calendar', 'L'.$cat_id, $user, $rights);
 			}
 			else
 			{
 				unset(self::$cat_rights_cache['L'.$cat_id][$user]);
 				if (!self::$cat_rights_cache['L'.$cat_id]) unset(self::$cat_rights_cache['L'.$cat_id]);
-				$GLOBALS['egw']->acl->delete_repository('calendar','L'.$cat_id,$user);
+				$GLOBALS['egw']->acl->delete_repository('calendar', 'L'.$cat_id, $user);
 			}
-			Api\Cache::setSession('calendar','cat_rights',self::$cat_rights_cache);
+			Api\Cache::setSession('calendar', 'cat_rights', self::$cat_rights_cache);
 		}
 	}
 
@@ -1463,9 +1461,9 @@ 
 	 * @return boolean false=access denied because of cat acl, true access granted because of cat acl,
 	 * 	null = cat has no acl
 	 */
-	public static function has_cat_right($right,$cat_id,$user)
+	public static function has_cat_right($right, $cat_id, $user)
 	{
-		static $cache=null;
+		static $cache = null;
 
 		if (!isset($cache[$cat_id]))
 		{
@@ -1473,21 +1471,21 @@ 
 			$cat_rights = self::get_cat_rights($cat_id);
 			if (!is_null($cat_rights))
 			{
-				static $memberships=null;
+				static $memberships = null;
 				if (is_null($memberships))
 				{
-					$memberships = $GLOBALS['egw']->accounts->memberships($user,true);
+					$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 					$memberships[] = $user;
 				}
-				foreach($cat_rights as $uid => $value)
+				foreach ($cat_rights as $uid => $value)
 				{
 					$all |= $value;
-					if (in_array($uid,$memberships)) $own |= $value;
+					if (in_array($uid, $memberships)) $own |= $value;
 				}
 			}
-			foreach(array(self::CAT_ACL_ADD,self::CAT_ACL_STATUS) as $mask)
+			foreach (array(self::CAT_ACL_ADD, self::CAT_ACL_STATUS) as $mask)
 			{
-				$cache[$cat_id][$mask] = !($all & $mask) ? null : !!($own & $mask);
+				$cache[$cat_id][$mask] = !($all&$mask) ? null : !!($own&$mask);
 			}
 		}
 		//echo "<p>".__METHOD__."($right,$cat_id) all=$all, own=$own returning ".array2string($cache[$cat_id][$right])."</p>\n";
@@ -1507,13 +1505,13 @@ 
 	 * @param boolean $skip_notification =false true: do not send notification messages
 	 * @return int number of changed recurrences
 	 */
-	function set_status($event,$uid,$status,$recur_date=0,$ignore_acl=false,$updateTS=true,$skip_notification=false)
+	function set_status($event, $uid, $status, $recur_date = 0, $ignore_acl = false, $updateTS = true, $skip_notification = false)
 	{
 		unset($updateTS);
 
 		$cal_id = is_array($event) ? $event['id'] : $event;
 		//echo "<p>calendar_boupdate::set_status($cal_id,$uid,$status,$recur_date)</p>\n";
-		if (!$cal_id || (!$ignore_acl && !$this->check_status_perms($uid,$event)))
+		if (!$cal_id || (!$ignore_acl && !$this->check_status_perms($uid, $event)))
 		{
 			return false;
 		}
@@ -1522,16 +1520,16 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				"($cal_id, $uid, $status, $recur_date)\n",3,$this->logfile);
+				"($cal_id, $uid, $status, $recur_date)\n", 3, $this->logfile);
 		}
 		$old_event = $this->read($cal_id, $recur_date, false, 'server');
-		if (($Ok = $this->so->set_status($cal_id,is_numeric($uid)?'u':$uid[0],
-				is_numeric($uid)?$uid:substr($uid,1),$status,
-				$recur_date?$this->date2ts($recur_date,true):0,$role)))
+		if (($Ok = $this->so->set_status($cal_id, is_numeric($uid) ? 'u' : $uid[0],
+				is_numeric($uid) ? $uid : substr($uid, 1), $status,
+				$recur_date ? $this->date2ts($recur_date, true) : 0, $role)))
 		{
 			if ($status == 'R')	// remove alarms belonging to rejected participants
 			{
-				foreach(isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
+				foreach (isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
 				{
 					if ((string)$alarm['owner'] === (string)$uid)
 					{
@@ -1550,8 +1548,8 @@ 
 			if (isset($status2msg[$status]) && !$skip_notification)
 			{
 				if (!is_array($event)) $event = $this->read($cal_id);
-				if (isset($recur_date)) $event = $this->read($event['id'],$recur_date); //re-read the actually edited recurring event
-				$this->send_update($status2msg[$status],$event['participants'],$event);
+				if (isset($recur_date)) $event = $this->read($event['id'], $recur_date); //re-read the actually edited recurring event
+				$this->send_update($status2msg[$status], $event['participants'], $event);
 			}
 
 			// Update history
@@ -1571,14 +1569,14 @@ 
 	 * @param int $recur_date =0 date to change, or 0 = all since now
 	 * @param boolean $skip_notification Do not send notifications.  Parameter passed on to set_status().
 	 */
-	function update_status($new_event, $old_event , $recur_date=0, $skip_notification=false)
+	function update_status($new_event, $old_event, $recur_date = 0, $skip_notification = false)
 	{
 		if (!isset($new_event['participants'])) return;
 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
   		{
-            if (!isset($new_event['participants'][$userid])){
+            if (!isset($new_event['participants'][$userid])) {
             	// Attendee will be deleted this way
             	$new_event['participants'][$userid] = 'G';
             }
@@ -1591,7 +1589,7 @@ 
 		// write the changes
 		foreach ($new_event['participants'] as $userid => $status)
 		{
-			$this->set_status($old_event, $userid, $status, $recur_date, true, false,$skip_notification);
+			$this->set_status($old_event, $userid, $status, $recur_date, true, false, $skip_notification);
 		}
     }
 
@@ -1606,43 +1604,43 @@ 
 	 * @param int &$exceptions_kept=null on return number of kept exceptions
 	 * @return boolean true on success, false on error (usually permission denied)
 	 */
-	function delete($cal_id, $recur_date=0, $ignore_acl=false, $skip_notification=false,
-		$delete_exceptions=true, &$exceptions_kept=null)
+	function delete($cal_id, $recur_date = 0, $ignore_acl = false, $skip_notification = false,
+		$delete_exceptions = true, &$exceptions_kept = null)
 	{
 		//error_log(__METHOD__."(cal_id=$cal_id, recur_date=$recur_date, ignore_acl=$ignore_acl, skip_notifications=$skip_notification)");
-		if (!($event = $this->read($cal_id,$recur_date)) ||
-			!$ignore_acl && !$this->check_perms(Acl::DELETE,$event))
+		if (!($event = $this->read($cal_id, $recur_date)) ||
+			!$ignore_acl && !$this->check_perms(Acl::DELETE, $event))
 		{
 			return false;
 		}
 
 		// Don't send notification if the event has already been deleted
-		if(!$event['deleted'] && !$skip_notification)
+		if (!$event['deleted'] && !$skip_notification)
 		{
-			$this->send_update(MSG_DELETED,$event['participants'],$event);
+			$this->send_update(MSG_DELETED, $event['participants'], $event);
 		}
 
 		if (!$recur_date || $event['recur_type'] == MCAL_RECUR_NONE)
 		{
 			$config = Api\Config::read('phpgwapi');
-			if(!$config['calendar_delete_history'] || $event['deleted'])
+			if (!$config['calendar_delete_history'] || $event['deleted'])
 			{
 				$this->so->delete($cal_id);
 
 				// delete all links to the event
-				Link::unlink(0,'calendar',$cal_id);
+				Link::unlink(0, 'calendar', $cal_id);
 			}
 			elseif ($config['calendar_delete_history'])
 			{
 				// mark all links to the event as deleted, but keep them
-				Link::unlink(0,'calendar',$cal_id,'','','',true);
+				Link::unlink(0, 'calendar', $cal_id, '', '', '', true);
 
 				$event['deleted'] = $this->now;
 				$this->save($event, $ignore_acl);
 				// Actually delete alarms
 				if (isset($event['alarm']) && is_array($event['alarm']))
 				{
-					foreach($event['alarm'] as $id => $alarm)
+					foreach ($event['alarm'] as $id => $alarm)
 					{
 						$this->delete_alarm($id);
 					}
@@ -1664,7 +1662,7 @@ 
 						if (!($exception = $this->read($id))) continue;
 						$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 						$exception['reference'] = $exception['recurrence'] = 0;
-						$this->update($exception, true, true, false, true, $msg=null, true);
+						$this->update($exception, true, true, false, true, $msg = null, true);
 						++$exceptions_kept;
 					}
 				}
@@ -1676,9 +1674,9 @@ 
 			if ($event['alarm'])
 			{
 				$next_recurrance = null;
-				foreach($event['alarm'] as &$alarm)
+				foreach ($event['alarm'] as &$alarm)
 				{
-					if (($alarm['time'] == $recur_date) || ($alarm['time']+$alarm['offset'] == $recur_date))
+					if (($alarm['time'] == $recur_date) || ($alarm['time'] + $alarm['offset'] == $recur_date))
 					{
 						//error_log(__METHOD__.__LINE__.'->'.array2string($recur_date));
 						//error_log(__METHOD__.__LINE__.array2string($event));
@@ -1686,12 +1684,12 @@ 
 						{
 							$checkdate = $recur_date;
 							//if ($alarm['time']+$alarm['offset'] == $recur_date) $checkdate = $recur_date + $alarm['offset'];
-							if (($e = $this->read($cal_id,$checkdate+1)))
+							if (($e = $this->read($cal_id, $checkdate + 1)))
 							{
 								$next_recurrance = $this->date2ts($e['start']);
 							}
 						}
-						$alarm['time'] = $this->date2ts($next_recurrance, true);	// user to server-time
+						$alarm['time'] = $this->date2ts($next_recurrance, true); // user to server-time
 						$alarm['cal_id'] = $cal_id;
 						unset($alarm['times']);
 						unset($alarm['next']);
@@ -1705,7 +1703,7 @@ 
 			$event = $this->read($cal_id);
 			//if (isset($alarmbuffer)) $event['alarm'] = $alarmbuffer;
 			$event['recur_exception'][] = $recur_date;
-			$this->save($event);// updates the content-history
+			$this->save($event); // updates the content-history
 		}
 		if ($event['reference'])
 		{
@@ -1723,19 +1721,19 @@ 
 	 * @param array $disinvited
 	 * @return array
 	 */
-	function _get_event_details($event,$action,&$event_arr,$disinvited=array())
+	function _get_event_details($event, $action, &$event_arr, $disinvited = array())
 	{
 		$details = array(			// event-details for the notify-msg
 			'id'          => $event['id'],
 			'action'      => lang($action),
 		);
 		$event_arr = $this->event2array($event);
-		foreach($event_arr as $key => $val)
+		foreach ($event_arr as $key => $val)
 		{
 			if ($key == 'recur_type') $key = 'repetition';
 			$details[$key] = $val['data'];
 		}
-		$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
+		$details['participants'] = $details['participants'] ? implode("\n", $details['participants']) : '';
 
 		$event_arr['link']['field'] = lang('URL');
 		$eventStart_arr = $this->date2array($event['start']); // give this as 'date' to the link to pick the right recurrence for the participants state
@@ -1756,7 +1754,7 @@ 
 		 */
 		$link_arr = array();
 		$link_arr['text'] = $event['title'];
-		$link_arr['view'] = array(	'menuaction' => 'calendar.calendar_uiforms.edit',
+		$link_arr['view'] = array('menuaction' => 'calendar.calendar_uiforms.edit',
 									'cal_id' => $event['id'],
 									'date' => $eventStart_arr['full'],
 									);
@@ -1764,11 +1762,11 @@ 
 		$details['link_arr'] = $link_arr;
 
 		$dis = array();
-		foreach($disinvited as $uid)
+		foreach ($disinvited as $uid)
 		{
 			$dis[] = $this->participant_name($uid);
 		}
-		$details['disinvited'] = implode(', ',$dis);
+		$details['disinvited'] = implode(', ', $dis);
 		return $details;
 	}
 
@@ -1792,13 +1790,13 @@ 
 			'data'	=> $event['description']
 		);
 
-		foreach(explode(',',$event['category']) as $cat_id)
+		foreach (explode(',', $event['category']) as $cat_id)
 		{
 			$cat_string[] = stripslashes(Api\Categories::id2name($cat_id));
 		}
 		$var['category'] = Array(
 			'field'	=> lang('Category'),
-			'data'	=> implode(', ',$cat_string)
+			'data'	=> implode(', ', $cat_string)
 		);
 
 		$var['location'] = Array(
@@ -1844,7 +1842,7 @@ 
 
 		if (isset($event['participants']) && is_array($event['participants']) && !empty($event['participants']))
 		{
-			$participants = $this->participants($event,true);
+			$participants = $this->participants($event, true);
 		}
 		$var['participants'] = Array(
 			'field'	=> lang('Participants'),
@@ -1867,26 +1865,26 @@ 
 	 * @param array $old_event =null event-data in the DB before calling save
 	 * @param string $type ='update'
 	 */
-	function log2file($event2save,$event_saved,$old_event=null,$type='update')
+	function log2file($event2save, $event_saved, $old_event = null, $type = 'update')
 	{
-		if (!($f = fopen($this->log_file,'a')))
+		if (!($f = fopen($this->log_file, 'a')))
 		{
 			echo "<p>error opening '$this->log_file' !!!</p>\n";
 			return false;
 		}
-		fwrite($f,$type.': '.Api\Accounts::username($this->user).': '.date('r')."\n");
-		fwrite($f,"Time: time to save / saved time read back / old time before save\n");
-		foreach(array('start','end') as $name)
+		fwrite($f, $type.': '.Api\Accounts::username($this->user).': '.date('r')."\n");
+		fwrite($f, "Time: time to save / saved time read back / old time before save\n");
+		foreach (array('start', 'end') as $name)
 		{
-			fwrite($f,$name.': '.(isset($event2save[$name]) ? $this->format_date($event2save[$name]) : 'not set').' / '.
-				$this->format_date($event_saved[$name]) .' / '.
+			fwrite($f, $name.': '.(isset($event2save[$name]) ? $this->format_date($event2save[$name]) : 'not set').' / '.
+				$this->format_date($event_saved[$name]).' / '.
 				(is_null($old_event) ? 'no old event' : $this->format_date($old_event[$name]))."\n");
 		}
-		foreach(array('event2save','event_saved','old_event') as $name)
+		foreach (array('event2save', 'event_saved', 'old_event') as $name)
 		{
-			fwrite($f,$name.' = '.print_r($$name,true));
+			fwrite($f, $name.' = '.print_r($$name, true));
 		}
-		fwrite($f,"\n");
+		fwrite($f, "\n");
 		fclose($f);
 
 		return true;
@@ -1907,14 +1905,14 @@ 
 		if ($old_event !== null && $event['start'] == $old_event['start']) return;
 
 		$time = new Api\DateTime($event['start']);
-		if(!is_array($event['alarm']))
+		if (!is_array($event['alarm']))
 		{
 			$event['alarm'] = $this->so->read_alarms($event['id']);
 		}
 
-		foreach($event['alarm'] as &$alarm)
+		foreach ($event['alarm'] as &$alarm)
 		{
-			if($event['recur_type'] != MCAL_RECUR_NONE)
+			if ($event['recur_type'] != MCAL_RECUR_NONE)
 			{
 				calendar_so::shift_alarm($event, $alarm, $instance_date->format('ts'));
 			}
@@ -1934,14 +1932,14 @@ 
 	 * @param boolean $update_modified =true call update modified, default true
 	 * @return string id of the alarm, or false on error (eg. no perms)
 	 */
-	function save_alarm($cal_id, $alarm, $update_modified=true)
+	function save_alarm($cal_id, $alarm, $update_modified = true)
 	{
-		if (!$cal_id || !$this->check_perms(Acl::EDIT,$alarm['all'] ? $cal_id : 0,!$alarm['all'] ? $alarm['owner'] : 0))
+		if (!$cal_id || !$this->check_perms(Acl::EDIT, $alarm['all'] ? $cal_id : 0, !$alarm['all'] ? $alarm['owner'] : 0))
 		{
 			//echo "<p>no rights to save the alarm=".print_r($alarm,true)." to event($cal_id)</p>";
-			return false;	// no rights to add the alarm
+			return false; // no rights to add the alarm
 		}
-		$alarm['time'] = $this->date2ts($alarm['time'],true);	// user to server-time
+		$alarm['time'] = $this->date2ts($alarm['time'], true); // user to server-time
 
 		return $this->so->save_alarm($cal_id, $alarm, $update_modified);
 	}
@@ -1954,11 +1952,11 @@ 
 	 */
 	function delete_alarm($id)
 	{
-		list(,$cal_id) = explode(':',$id);
+		list(,$cal_id) = explode(':', $id);
 
-		if (!($alarm = $this->so->read_alarm($id)) || !$cal_id || !$this->check_perms(Acl::EDIT,$alarm['all'] ? $cal_id : 0,!$alarm['all'] ? $alarm['owner'] : 0))
+		if (!($alarm = $this->so->read_alarm($id)) || !$cal_id || !$this->check_perms(Acl::EDIT, $alarm['all'] ? $cal_id : 0, !$alarm['all'] ? $alarm['owner'] : 0))
 		{
-			return false;	// no rights to delete the alarm
+			return false; // no rights to delete the alarm
 		}
 
 		return $this->so->delete_alarm($id);
@@ -1973,13 +1971,13 @@ 
 	 *  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, $old_event=null)
+	function find_or_add_categories($catname_list, $old_event = null)
 	{
 		if (is_array($old_event) || $old_event > 0)
 		{
 			// preserve categories without users read access
 			if (!is_array($old_event)) $old_event = $this->read($old_event);
-			$old_categories = explode(',',$old_event['category']);
+			$old_categories = explode(',', $old_event['category']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
 			{
@@ -2033,7 +2031,7 @@ 
 	{
 		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)
@@ -2058,7 +2056,7 @@ 
 	 *                              master	-> try to find a releated series master
 	 * @return array calendar_ids of matching entries
 	 */
-	function find_event($event, $filter='exact')
+	function find_event($event, $filter = 'exact')
 	{
 		$matchingEvents = array();
 		$query = array();
@@ -2066,14 +2064,14 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				"($filter)[EVENT]:" . array2string($event)."\n",3,$this->logfile);
+				"($filter)[EVENT]:".array2string($event)."\n", 3, $this->logfile);
 		}
 
 		if (!isset($event['recurrence'])) $event['recurrence'] = 0;
 
 		if ($filter == 'master')
 		{
-			$query[] = 'recur_type!='. MCAL_RECUR_NONE;
+			$query[] = 'recur_type!='.MCAL_RECUR_NONE;
 			$query['cal_recurrence'] = 0;
 		}
 		elseif ($filter == 'exact')
@@ -2094,14 +2092,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['id'] . ")[EventID]\n",3,$this->logfile);
+					'('.$event['id'].")[EventID]\n", 3, $this->logfile);
 			}
 			if (($egwEvent = $this->read($event['id'], 0, false, 'server')))
 			{
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-						'()[FOUND]:' . array2string($egwEvent)."\n",3,$this->logfile);
+						'()[FOUND]:'.array2string($egwEvent)."\n", 3, $this->logfile);
 				}
 				if ($egwEvent['recur_type'] != MCAL_RECUR_NONE &&
 					(empty($event['uid']) || $event['uid'] == $egwEvent['uid']))
@@ -2120,7 +2118,7 @@ 
 						$exceptions = $this->so->get_recurrence_exceptions($egwEvent, $event['tzid']);
 						if (in_array($event['recurrence'], $exceptions))
 						{
-							$matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence'];
+							$matchingEvents[] = $egwEvent['id'].':'.(int)$event['recurrence'];
 						}
 					}
 				} elseif ($filter != 'master' && ($filter == 'exact' ||
@@ -2139,19 +2137,19 @@ 
 
 		// only query calendars of users, we have READ-grants from
 		$users = array();
-		foreach(array_keys($this->grants) as $user)
+		foreach (array_keys($this->grants) as $user)
 		{
 			$user = trim($user);
-			if ($this->check_perms(Acl::READ|self::ACL_READ_FOR_PARTICIPANTS|self::ACL_FREEBUSY,0,$user))
+			if ($this->check_perms(Acl::READ|self::ACL_READ_FOR_PARTICIPANTS|self::ACL_FREEBUSY, 0, $user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user, $users))	// already added?
 				{
 					$users[] = $user;
 				}
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
-				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
+				continue; // for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
 			if (!is_numeric($user)) continue;
@@ -2162,7 +2160,7 @@ 
 				$members = $GLOBALS['egw']->accounts->members($user, true);
 				if (is_array($members))
 				{
-					foreach($members as $member)
+					foreach ($members as $member)
 					{
 						// use only members which gave the user a read-grant
 						if (!in_array($member, $users) &&
@@ -2178,7 +2176,7 @@ 
 				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 				if (is_array($memberships))
 				{
-					foreach($memberships as $group)
+					foreach ($memberships as $group)
 					{
 						if (!in_array($group, $users))
 						{
@@ -2204,24 +2202,24 @@ 
 
 				// check length with some tolerance
 				$length = $event['end'] - $event['start'] - $delta;
-				$query[] = ('(cal_end-cal_start)>' . $length);
+				$query[] = ('(cal_end-cal_start)>'.$length);
 				$length += 2 * $delta;
-				$query[] = ('(cal_end-cal_start)<' . $length);
-				$query[] = ('cal_start>' . ($event['start'] - 86400));
-				$query[] = ('cal_start<' . ($event['start'] + 86400));
+				$query[] = ('(cal_end-cal_start)<'.$length);
+				$query[] = ('cal_start>'.($event['start'] - 86400));
+				$query[] = ('cal_start<'.($event['start'] + 86400));
 			}
 			elseif (isset($event['start']))
 			{
 				if ($filter == 'relax')
 				{
-					$query[] = ('cal_start>' . ($event['start'] - 3600));
-					$query[] = ('cal_start<' . ($event['start'] + 3600));
+					$query[] = ('cal_start>'.($event['start'] - 3600));
+					$query[] = ('cal_start<'.($event['start'] + 3600));
 				}
 				else
 				{
 					// we accept a tiny tolerance
-					$query[] = ('cal_start>' . ($event['start'] - 2));
-					$query[] = ('cal_start<' . ($event['start'] + 2));
+					$query[] = ('cal_start>'.($event['start'] - 2));
+					$query[] = ('cal_start<'.($event['start'] + 2));
 				}
 			}
 			if ($filter == 'relax')
@@ -2244,14 +2242,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['uid'] . ")[EventUID]\n",3,$this->logfile);
+					'('.$event['uid'].")[EventUID]\n", 3, $this->logfile);
 			}
 		}
 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'[QUERY]: ' . array2string($query)."\n",3,$this->logfile);
+				'[QUERY]: '.array2string($query)."\n", 3, $this->logfile);
 		}
 		if (!count($users) || !($foundEvents =
 			$this->so->search(null, null, $users, 0, 'owner', false, 0, array('query' => $query))))
@@ -2259,19 +2257,19 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				"[NO MATCH]\n",3,$this->logfile);
+				"[NO MATCH]\n", 3, $this->logfile);
 			}
 			return $matchingEvents;
 		}
 
 		$pseudos = array();
 
-		foreach($foundEvents as $egwEvent)
+		foreach ($foundEvents as $egwEvent)
 		{
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'[FOUND]: ' . array2string($egwEvent)."\n",3,$this->logfile);
+					'[FOUND]: '.array2string($egwEvent)."\n", 3, $this->logfile);
 			}
 
 			if (in_array($egwEvent['id'], $matchingEvents)) continue;
@@ -2345,7 +2343,7 @@ 
 						if (in_array($event['recurrence'], $exceptions))
 						{
 							// We found a pseudo exception
-							$matchingEvents = array($egwEvent['id'] . ':' . (int)$event['recurrence']);
+							$matchingEvents = array($egwEvent['id'].':'.(int)$event['recurrence']);
 							break;
 						}
 					}
@@ -2363,7 +2361,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() egwEvent length does not match!\n",3,$this->logfile);
+							"() egwEvent length does not match!\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2375,7 +2373,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() egwEvent is not a whole-day event!\n",3,$this->logfile);
+							"() egwEvent is not a whole-day event!\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2396,8 +2394,8 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() event[$key] differ: '" . $event[$key] .
-							"' <> '" . $egwEvent[$key] . "'\n",3,$this->logfile);
+							"() event[$key] differ: '".$event[$key].
+							"' <> '".$egwEvent[$key]."'\n", 3, $this->logfile);
 					}
 					continue 2; // next foundEvent
 				}
@@ -2415,7 +2413,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() egwEvent category $cat_id is missing!\n",3,$this->logfile);
+							"() egwEvent category $cat_id is missing!\n", 3, $this->logfile);
 						}
 						continue 2;
 					}
@@ -2427,7 +2425,7 @@ 
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 							'() event has additional categories:'
-							. array2string($newCategories)."\n",3,$this->logfile);
+							. array2string($newCategories)."\n", 3, $this->logfile);
 					}
 					continue;
 				}
@@ -2447,7 +2445,7 @@ 
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								"() additional event['participants']: $attendee\n",3,$this->logfile);
+								"() additional event['participants']: $attendee\n", 3, $this->logfile);
 							}
 							continue 2;
 						}
@@ -2470,8 +2468,8 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() missing event[participants]: ' .
-								array2string($egwEvent['participants'])."\n",3,$this->logfile);
+								'() missing event[participants]: '.
+								array2string($egwEvent['participants'])."\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2483,7 +2481,7 @@ 
 				if ($egwEvent['recur_type'] != MCAL_RECUR_NONE)
 				{
 					// We found a pseudo Exception
-					$pseudos[] = $egwEvent['id'] . ':' . $event['start'];
+					$pseudos[] = $egwEvent['id'].':'.$event['start'];
 					continue;
 				}
 			}
@@ -2505,7 +2503,7 @@ 
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								"() additional event['recur_exception']: $day\n",3,$this->logfile);
+								"() additional event['recur_exception']: $day\n", 3, $this->logfile);
 							}
 							continue 2;
 						}
@@ -2515,8 +2513,8 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() missing event[recur_exception]: ' .
-								array2string($event['recur_exception'])."\n",3,$this->logfile);
+								'() missing event[recur_exception]: '.
+								array2string($event['recur_exception'])."\n", 3, $this->logfile);
 						}
 						continue;
 					}
@@ -2531,8 +2529,8 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								"() events[$key] differ: " . $event[$key] .
-								' <> ' . $egwEvent[$key]."\n",3,$this->logfile);
+								"() events[$key] differ: ".$event[$key].
+								' <> '.$egwEvent[$key]."\n", 3, $this->logfile);
 						}
 						continue 2;
 					}
@@ -2548,7 +2546,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"() new exception for series found.\n",3,$this->logfile);
+					"() new exception for series found.\n", 3, $this->logfile);
 			}
 			$matchingEvents = array();
 		}
@@ -2559,7 +2557,7 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'[MATCHES]:' . array2string($matches)."\n",3,$this->logfile);
+				'[MATCHES]:'.array2string($matches)."\n", 3, $this->logfile);
 		}
 		return $matches;
 	}
@@ -2632,7 +2630,7 @@ 
 				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"()[MASTER]: $eventID\n",3,$this->logfile);
+					"()[MASTER]: $eventID\n", 3, $this->logfile);
 				}
 				$type = 'SERIES-EXCEPTION';
 				if (($master_event = $this->read($eventID, 0, false, 'server')))
@@ -2653,7 +2651,7 @@ 
 					}
 					elseif (in_array($event['start'], $master_event['recur_exception']))
 					{
-						$type='SERIES-PSEUDO-EXCEPTION'; // new pseudo exception?
+						$type = 'SERIES-PSEUDO-EXCEPTION'; // new pseudo exception?
 						$recurrence_event = $master_event;
 						$recurrence_event['start'] = $event['start'];
 						$recurrence_event['end'] -= $master_event['start'] - $event['start'];
@@ -2670,8 +2668,8 @@ 
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-									'() try occurrence ' . $egw_rrule->current()
-									. " ($occurrence)\n",3,$this->logfile);
+									'() try occurrence '.$egw_rrule->current()
+									. " ($occurrence)\n", 3, $this->logfile);
 							}
 							if ($event['start'] == $occurrence)
 							{
@@ -2704,8 +2702,8 @@ 
 			// default if we cannot find a proof for a fundamental change
 			// the recurrence_event is the master event with start and end adjusted to the recurrence
 			// check for changed data
-			foreach (array('start','end','uid','title','location','description',
-				'priority','public','special','non_blocking') as $key)
+			foreach (array('start', 'end', 'uid', 'title', 'location', 'description',
+				'priority', 'public', 'special', 'non_blocking') as $key)
 			{
 				if (!empty($event[$key]) && $recurrence_event[$key] != $event[$key])
 				{
@@ -2763,10 +2761,10 @@ 
      * @param &$event	the event we are working on
      *
      */
-    function server2usertime (&$event)
+    function server2usertime(&$event)
     {
 		// we run all dates through date2usertime, to adjust to user-time
-		foreach(array('start','end','recur_enddate','recurrence') as $ts)
+		foreach (array('start', 'end', 'recur_enddate', 'recurrence') as $ts)
 		{
 			// we convert here from server-time to timestamps in user-time!
 			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
@@ -2774,7 +2772,7 @@ 
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as $n => $date)
+			foreach ($event['recur_exception'] as $n => $date)
 			{
 				$event['recur_exception'][$n] = $this->date2usertime($date);
 			}
@@ -2782,7 +2780,7 @@ 
 		// same with the alarms
 		if (isset($event['alarm']) && is_array($event['alarm']))
 		{
-			foreach($event['alarm'] as $id => $alarm)
+			foreach ($event['alarm'] as $id => $alarm)
 			{
 				$event['alarm'][$id]['time'] = $this->date2usertime($alarm['time']);
 			}
@@ -2799,7 +2797,7 @@ 
 	{
 		if (is_numeric($age) && $age > 0)	// just make sure bogus values dont delete everything
 		{
-			$this->so->purge(time() - 365*24*3600*(float)$age);
+			$this->so->purge(time() - 365 * 24 * 3600 * (float)$age);
 		}
 	}
 }

calendar/inc/class.calendar_holidays.inc.php

Doc Comments +3 added lines

@@ -135,6 +135,9 @@
 		return $until_year ? $years : $years[$year];
 	}
 
+	/**
+	 * @param string $url
+	 */
 	protected static function is_url($url)
 	{
 		return $url[0] == '/' || strpos($url, '://') !== false;

Braces +32 added lines, -8 removed lines

@@ -41,7 +41,10 @@ 
 	 */
 	public static function read($country, $year=null)
 	{
-		if (!$year) $year = (int)Api\DateTime::to('now', 'Y');
+		if (!$year)
+		{
+			$year = (int)Api\DateTime::to('now', 'Y');
+		}
 		$level = self::is_url($country) ? Api\Cache::INSTANCE : Api\Cache::TREE;
 
 		$holidays = Api\Cache::getCache($level, __CLASS__, $country.':'.$year);
@@ -68,7 +71,10 @@ 
 	 */
 	public static function render($country, $year=null, $until_year=null)
 	{
-		if (!$year) $year = (int)Api\DateTime::to('now', 'Y');
+		if (!$year)
+		{
+			$year = (int)Api\DateTime::to('now', 'Y');
+		}
 		$end_year = $until_year && $year < $until_year ? $until_year : $year;
 
 		$starttime = microtime(true);
@@ -81,22 +87,40 @@ 
 		{
 			$start = new Api\DateTime($event['start']);
 			$end = new Api\DateTime($event['end']);
-			if ($start->format('Y') > $end_year) continue;
-			if ($end->format('Y') < $year && !$event['recur_type']) continue;
+			if ($start->format('Y') > $end_year)
+			{
+				continue;
+			}
+			if ($end->format('Y') < $year && !$event['recur_type'])
+			{
+				continue;
+			}
 
 			// recuring events
 			if ($event['recur_type'])
 			{
 				// calendar_rrule limits no enddate, to 5 years
-				if (!$event['recur_enddate']) $event['recur_enddate'] = (1+$end_year).'0101';
+				if (!$event['recur_enddate'])
+				{
+					$event['recur_enddate'] = (1+$end_year).'0101';
+				}
 
 				$rrule = calendar_rrule::event2rrule($event);
-				if ($rrule->enddate && $rrule->enddate->format('Y') < $year) continue;
+				if ($rrule->enddate && $rrule->enddate->format('Y') < $year)
+				{
+					continue;
+				}
 
 				foreach($rrule as $rtime)
 				{
-					if (($y = (int)$rtime->format('Y')) < $year) continue;
-					if ($y > $end_year) break;
+					if (($y = (int)$rtime->format('Y')) < $year)
+					{
+						continue;
+					}
+					if ($y > $end_year)
+					{
+						break;
+					}
 
 					$ymd = (int)$rtime->format('Ymd');
 					$years[$y][(string)$ymd][] = array(

Spacing +11 added lines, -11 removed lines

@@ -44,7 +44,7 @@ 
 	 * @param int $year =null default current year
 	 * @return array of Ymd => array of array with values for keys 'occurence','month','day','name', (commented out) 'title'
 	 */
-	public static function read($country, $year=null)
+	public static function read($country, $year = null)
 	{
 		if (!$year) $year = (int)Api\DateTime::to('now', 'Y');
 		$level = self::is_url($country) ? Api\Cache::INSTANCE : Api\Cache::TREE;
@@ -52,9 +52,9 @@ 
 		$holidays = Api\Cache::getCache($level, __CLASS__, $country.':'.$year);
 
 		// if we dont find holidays in cache, we render from previous year until next 5 years
-		if (!isset($holidays) && ($years = self::render($country, $year-1, $year+5)))
+		if (!isset($holidays) && ($years = self::render($country, $year - 1, $year + 5)))
 		{
-			foreach($years as $y => $data)
+			foreach ($years as $y => $data)
 			{
 				Api\Cache::setCache($level, __CLASS__, $country.':'.$y, $data, self::HOLIDAY_CACHE_TIME);
 			}
@@ -71,7 +71,7 @@ 
 	 * @param int $until_year =null default, fetch only one year, if given result is indexed additional by year
 	 * @return array of Ymd => array of array with values for keys 'occurence','month','day','name', (commented out) 'title'
 	 */
-	public static function render($country, $year=null, $until_year=null)
+	public static function render($country, $year = null, $until_year = null)
 	{
 		if (!$year) $year = (int)Api\DateTime::to('now', 'Y');
 		$end_year = $until_year && $year < $until_year ? $until_year : $year;
@@ -82,7 +82,7 @@ 
 			return array();
 		}
 		$years = array();
-		foreach($holidays as $event)
+		foreach ($holidays as $event)
 		{
 			$start = new Api\DateTime($event['start']);
 			$end = new Api\DateTime($event['end']);
@@ -93,12 +93,12 @@ 
 			if ($event['recur_type'])
 			{
 				// calendar_rrule limits no enddate, to 5 years
-				if (!$event['recur_enddate']) $event['recur_enddate'] = (1+$end_year).'0101';
+				if (!$event['recur_enddate']) $event['recur_enddate'] = (1 + $end_year).'0101';
 
 				$rrule = calendar_rrule::event2rrule($event);
 				if ($rrule->enddate && $rrule->enddate->format('Y') < $year) continue;
 
-				foreach($rrule as $rtime)
+				foreach ($rrule as $rtime)
 				{
 					if (($y = (int)$rtime->format('Y')) < $year) continue;
 					if ($y > $end_year) break;
@@ -116,7 +116,7 @@ 
 			else
 			{
 				$end_ymd = (int)$end->format('Ymd');
-				while(($ymd = (int)$start->format('Ymd')) <= $end_ymd)
+				while (($ymd = (int)$start->format('Ymd')) <= $end_ymd)
 				{
 					$y = (int)$start->format('Y');
 					$years[$y][(string)$ymd][] = array(
@@ -130,11 +130,11 @@ 
 				}
 			}
 		}
-		foreach($years as $y => &$data)
+		foreach ($years as $y => &$data)
 		{
 			ksort($data);
 		}
-		error_log(__METHOD__."('$country', $year, $end_year) took ".  number_format(microtime(true)-$starttime, 3).'s to fetch '.count(call_user_func_array('array_merge', $years)).' events');
+		error_log(__METHOD__."('$country', $year, $end_year) took ".number_format(microtime(true) - $starttime, 3).'s to fetch '.count(call_user_func_array('array_merge', $years)).' events');
 		unset($starttime);
 
 		return $until_year ? $years : $years[$year];
@@ -165,7 +165,7 @@ 
 		}
 		// php does not automatic gzip decode, but it does not accept that in request headers
 		// iCloud eg. always gzip compresses: https://p16-calendars.icloud.com/holidays/au_en-au.ics
-		foreach($http_response_header as $h)
+		foreach ($http_response_header as $h)
 		{
 			if (preg_match('/^content-encoding:.*gzip/i', $h))
 			{

calendar/inc/class.calendar_ical.inc.php

Doc Comments +11 added lines, -7 removed lines

@@ -194,7 +194,7 @@ 
 	 *                          default 0 => export whole series (or events, if not recurring)
 	 * @param string $principalURL ='' Used for CalDAV exports
 	 * @param string $charset ='UTF-8' encoding of the vcalendar, default UTF-8
-	 * @param int|string $current_user =0 uid of current user to only export that one as participant for method=REPLY
+	 * @param integer $current_user =0 uid of current user to only export that one as participant for method=REPLY
 	 * @return string|boolean string with iCal or false on error (e.g. no permission to read the event)
 	 */
 	function &exportVCal($events, $version='1.0', $method='PUBLISH', $recur_date=0, $principalURL='', $charset='UTF-8', $current_user=0)
@@ -1094,16 +1094,15 @@ 
 	 * Import an iCal
 	 *
 	 * @param string|resource $_vcalData
-	 * @param int $cal_id=-1 must be -1 for new entries!
-	 * @param string $etag=null if an etag is given, it has to match the current etag or the import will fail
-	 * @param boolean $merge=false	merge data with existing entry
-	 * @param int $recur_date=0 if set, import the recurrence at this timestamp,
+	 * @param int $cal_id must be -1 for new entries!
+	 * @param int $recur_date if set, import the recurrence at this timestamp,
 	 *                          default 0 => import whole series (or events, if not recurring)
 	 * @param string $principalURL='' Used for CalDAV imports
-	 * @param int $user=null account_id of owner, default null
 	 * @param string $charset  The encoding charset for $text. Defaults to
 	 *                         utf-8 for new format, iso-8859-1 for old format.
-	 * @param string $caldav_name=null name from CalDAV client or null (to use default)
+	 * @param string $caldav_name name from CalDAV client or null (to use default)
+	 * @param integer $etag
+	 * @param integer $user
 	 * @return int|boolean|null cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied or null for "403 Forbidden"
 	 */
 	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null, $caldav_name=null,$skip_notification=false)
@@ -3182,6 +3181,10 @@ 
 		return $event;
 	}
 
+	/**
+	 * @param integer $contentID
+	 * @param string $charset
+	 */
 	function search($_vcalData, $contentID=null, $relax=false, $charset=null)
 	{
 		if (($events = $this->icaltoegw($_vcalData, $charset)))
@@ -3221,6 +3224,7 @@ 
 	 * @param string $method ='PUBLISH' or eg. 'REPLY'
 	 * @param array $extra =null extra attributes to add
 	 * 	X-CALENDARSERVER-MASK-UID can be used to not include an event specified by this uid as busy
+	 * @return string|null
 	 */
 	function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null)
 	{

Indentation +49 added lines, -49 removed lines

@@ -483,15 +483,15 @@ 
 									{
 										$user = $this->resource_info($this->user);
 										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
-			    						$parameters['ATTENDEE'][] = array(
-			    							'CN'		=>	$user['name'],
-			    							'ROLE'		=> 'REQ-PARTICIPANT',
+										$parameters['ATTENDEE'][] = array(
+											'CN'		=>	$user['name'],
+											'ROLE'		=> 'REQ-PARTICIPANT',
 											'PARTSTAT'	=> 'NEEDS-ACTION',
 											'CUTYPE'	=> 'INDIVIDUAL',
 											'RSVP'		=> 'TRUE',
 											'X-EGROUPWARE-UID'	=> (string)$this->user,
-			    						);
-			    						$event['participants'][$this->user] = true;
+										);
+										$event['participants'][$this->user] = true;
 									}
 									break;
 								case 'r':
@@ -543,24 +543,24 @@ 
 						}
 						break;
 
-    				case 'ORGANIZER':
-	    				if (!$organizerURL)
-	    				{
-	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
-			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
-			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
-			    			if ($version == '1.0')
-			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
-			    			}
-			    			else
-			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
-			    			}
-			    			$organizerUID = $event['owner'];
-		    				if (!isset($event['participants'][$event['owner']]))
-		    				{
-			    				$options = array(
+					case 'ORGANIZER':
+						if (!$organizerURL)
+						{
+							$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
+								. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
+							$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+							if ($version == '1.0')
+							{
+								$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+							}
+							else
+							{
+								$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+							}
+							$organizerUID = $event['owner'];
+							if (!isset($event['participants'][$event['owner']]))
+							{
+								$options = array(
 									'ROLE'     => 'CHAIR',
 									'PARTSTAT' => 'DELEGATED',
 									'CUTYPE'   => 'INDIVIDUAL',
@@ -570,20 +570,20 @@ 
 								if (!empty($organizerEMail)) $options['EMAIL'] = $organizerEMail;
 								if (!empty($event['owner'])) $options['X-EGROUPWARE-UID'] = $event['owner'];
 								$attributes['ATTENDEE'][] = $organizerURL;
-			    				$parameters['ATTENDEE'][] = $options;
-		    				}
-	    				}
-    					// do NOT use ORGANIZER for events without further participants or a different organizer
-	    				if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
-	    				{
-		    				$attributes['ORGANIZER'] = $organizerURL;
-		    				$parameters['ORGANIZER']['CN'] = $organizerCN;
-		    				if (!empty($organizerUID))
-		    				{
-			    				$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
-		    				}
-	    				}
-	    				break;
+								$parameters['ATTENDEE'][] = $options;
+							}
+						}
+						// do NOT use ORGANIZER for events without further participants or a different organizer
+						if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
+						{
+							$attributes['ORGANIZER'] = $organizerURL;
+							$parameters['ORGANIZER']['CN'] = $organizerCN;
+							if (!empty($organizerUID))
+							{
+								$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
+							}
+						}
+						break;
 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
@@ -992,12 +992,12 @@ 
 				foreach (is_array($value) && $parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
 				{
 					$valueData = Api\Translation::convert($valueData,Api\Translation::charset(),$charset);
-                    $paramData = (array) Api\Translation::convert(is_array($value) ?
-                    		$parameters[$key][$valueID] : $parameters[$key],
-                            Api\Translation::charset(),$charset);
-                    $valuesData = (array) Api\Translation::convert($values[$key],
-                    		Api\Translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+					$paramData = (array) Api\Translation::convert(is_array($value) ?
+							$parameters[$key][$valueID] : $parameters[$key],
+							Api\Translation::charset(),$charset);
+					$valuesData = (array) Api\Translation::convert($values[$key],
+							Api\Translation::charset(),$charset);
+					$content = $valueData . implode(';', $valuesData);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -2233,7 +2233,7 @@ 
 	 * @param string|resource $_vcalData
 	 * @param string $principalURL ='' Used for CalDAV imports
 	 * @param string $charset  The encoding charset for $text. Defaults to
-     *                         utf-8 for new format, iso-8859-1 for old format.
+	 *                         utf-8 for new format, iso-8859-1 for old format.
 	 * @return Iterator|array|boolean Iterator if resource given or array of events on success, false on failure
 	 */
 	function icaltoegw($_vcalData, $principalURL='', $charset=null)
@@ -2784,10 +2784,10 @@ 
 					// fall throught
 				case 'ATTENDEE':
 					if (isset($attributes['params']['PARTSTAT']))
-				    {
-				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
-				    }
-				    if (isset($attributes['params']['STATUS']))
+					{
+						$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
+					}
+					if (isset($attributes['params']['STATUS']))
 					{
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
 						if (empty($status)) $status = 'X';
@@ -3178,7 +3178,7 @@ 
 				array2string($event)."\n",3,$this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
-        //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
+		//    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 

Braces +317 added lines, -81 removed lines

@@ -177,7 +177,10 @@ 
 	function __construct(&$_clientProperties = array())
 	{
 		parent::__construct();
-		if ($this->log) $this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal";
+		if ($this->log)
+		{
+			$this->logfile = $GLOBALS['egw_info']['server']['temp_dir']."/log-vcal";
+		}
 		$this->clientProperties = $_clientProperties;
 		$this->vCalendar = new Horde_Icalendar;
 		$this->addressbook = new Api\Contacts;
@@ -226,10 +229,14 @@ 
 			'ATTACH'        => 'attachments',
 		);
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		if ($this->productManufacturer == '' )
-		{	// syncevolution is broken
+		{
+// syncevolution is broken
 			$version = '2.0';
 		}
 
@@ -237,10 +244,16 @@ 
 		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION', $version);
-		if ($method) $vcal->setAttribute('METHOD', $method);
+		if ($method)
+		{
+			$vcal->setAttribute('METHOD', $method);
+		}
 		$events_exported = false;
 
-		if (!is_array($events)) $events = array($events);
+		if (!is_array($events))
+		{
+			$events = array($events);
+		}
 
 		$vtimezones_added = array();
 		foreach ($events as $event)
@@ -306,7 +319,10 @@ 
 				self::$tz_cache[$event['tzid']] = calendar_timezones::DateTimeZone($event['tzid']);
 			}
 
-			if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+			if ($this->so->isWholeDay($event))
+			{
+				$event['whole_day'] = true;
+			}
 
 			if ($this->log)
 			{
@@ -317,7 +333,10 @@ 
 
 			if ($recurrence)
 			{
-				if (!($master = $this->read($event['id'], 0, true, 'server'))) continue;
+				if (!($master = $this->read($event['id'], 0, true, 'server')))
+				{
+					continue;
+				}
 
 				if (!isset($this->supportedFields['participants']))
 				{
@@ -374,7 +393,8 @@ 
 			if ($this->productManufacturer != 'file' && $this->uidExtension)
 			{
 				// Append UID to DESCRIPTION
-				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
+				if (!preg_match('/\[UID:.+\]/m', $event['description']))
+				{
 					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
 				}
 			}
@@ -434,11 +454,21 @@ 
 							$quantity = $role = null;
 							calendar_so::split_status($status, $quantity, $role);
 							// do not include event owner/ORGANIZER as participant in his own calendar, if he is only participant
-							if (count($event['participants']) == 1 && $event['owner'] == $uid) continue;
+							if (count($event['participants']) == 1 && $event['owner'] == $uid)
+							{
+								continue;
+							}
 
-							if (!($info = $this->resource_info($uid))) continue;
+							if (!($info = $this->resource_info($uid)))
+							{
+								continue;
+							}
 
-							if (in_array($status, array('X','E'))) continue;	// dont include deleted participants
+							if (in_array($status, array('X','E')))
+							{
+								continue;
+							}
+							// dont include deleted participants
 
 							if ($this->log)
 							{
@@ -517,24 +547,49 @@ 
 							}
 							// ROLE={CHAIR|REQ-PARTICIPANT|OPT-PARTICIPANT|NON-PARTICIPANT|X-*}
 							$options = array();
-							if (!empty($participantCN)) $options['CN'] = $participantCN;
-							if (!empty($role)) $options['ROLE'] = $role;
-							if (!empty($status)) $options['PARTSTAT'] = $status;
-							if (!empty($cutype)) $options['CUTYPE'] = $cutype;
-							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
+							if (!empty($participantCN))
+							{
+								$options['CN'] = $participantCN;
+							}
+							if (!empty($role))
+							{
+								$options['ROLE'] = $role;
+							}
+							if (!empty($status))
+							{
+								$options['PARTSTAT'] = $status;
+							}
+							if (!empty($cutype))
+							{
+								$options['CUTYPE'] = $cutype;
+							}
+							if (!empty($rsvp))
+							{
+								$options['RSVP'] = $rsvp;
+							}
 							if (!empty($info['email']) && $participantURL != 'mailto:'.$info['email'])
 							{
 								$options['EMAIL'] = $info['email'];	// only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
 							}
-							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
-							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
+							if ($info['type'] != 'e')
+							{
+								$options['X-EGROUPWARE-UID'] = (string)$uid;
+							}
+							if ($quantity > 1)
+							{
+								$options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
+							}
 							$attributes['ATTENDEE'][] = $participantURL;
 							$parameters['ATTENDEE'][] = $options;
 						}
 						break;
 
 					case 'CLASS':
-						if ($event['public']) continue;	// public is default, no need to export, fails CalDAVTester if added as default
+						if ($event['public'])
+						{
+							continue;
+						}
+						// public is default, no need to export, fails CalDAVTester if added as default
 						$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
 						// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
 						if (!$event['public'] && $this->productManufacturer == 'groupdav')
@@ -566,9 +621,18 @@ 
 									'CUTYPE'   => 'INDIVIDUAL',
 									//'RSVP'     => 'FALSE',
 									);
-								if (!empty($organizerCN)) $options['CN'] = $organizerCN;
-								if (!empty($organizerEMail)) $options['EMAIL'] = $organizerEMail;
-								if (!empty($event['owner'])) $options['X-EGROUPWARE-UID'] = $event['owner'];
+								if (!empty($organizerCN))
+								{
+									$options['CN'] = $organizerCN;
+								}
+								if (!empty($organizerEMail))
+								{
+									$options['EMAIL'] = $organizerEMail;
+								}
+								if (!empty($event['owner']))
+								{
+									$options['X-EGROUPWARE-UID'] = $event['owner'];
+								}
 								$attributes['ATTENDEE'][] = $organizerURL;
 			    				$parameters['ATTENDEE'][] = $options;
 		    				}
@@ -597,9 +661,12 @@ 
 						{
 							// Hack for CalDAVTester to export duration instead of endtime
 							if ($tzid == 'UTC' && $event['end'] - $event['start'] <= 86400)
-								$attributes['duration'] = $event['end'] - $event['start'];
-							else
-							$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							{
+															$attributes['duration'] = $event['end'] - $event['start'];
+							}
+							else {
+														$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							}
 						}
 						else
 						{
@@ -619,7 +686,11 @@ 
 						break;
 
 					case 'RRULE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+						if ($event['recur_type'] == MCAL_RECUR_NONE)
+						{
+							break;
+						}
+						// no recuring event
 						$rriter = calendar_rrule::event2rrule($event, false, $tzid);
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
@@ -653,7 +724,10 @@ 
 						break;
 
 					case 'EXDATE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;
+						if ($event['recur_type'] == MCAL_RECUR_NONE)
+						{
+							break;
+						}
 						if (!empty($event['recur_exception']))
 						{
 							if (empty($event['whole_day']))
@@ -680,14 +754,21 @@ 
 									);
 								}
 								$event['recur_exception'] = $days;
-								if ($version != '1.0') $parameters['EXDATE']['VALUE'] = 'DATE';
+								if ($version != '1.0')
+								{
+									$parameters['EXDATE']['VALUE'] = 'DATE';
+								}
 							}
 							$vevent->setAttribute('EXDATE', $event['recur_exception'], $parameters['EXDATE']);
 						}
 						break;
 
 					case 'PRIORITY':
-						if (!$event['priority']) continue;	// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
+						if (!$event['priority'])
+						{
+							continue;
+						}
+						// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
 						if ($this->productManufacturer == 'funambol' &&
 							(strpos($this->productName, 'outlook') !== false
 								|| strpos($this->productName, 'pocket pc') !== false))
@@ -701,7 +782,11 @@ 
 						break;
 
 					case 'TRANSP':
-						if (!$event['non_blocking']) continue;	// OPAQUE is default, no need to export, fails CalDAVTester if added as default
+						if (!$event['non_blocking'])
+						{
+							continue;
+						}
+						// OPAQUE is default, no need to export, fails CalDAVTester if added as default
 						if ($version == '1.0')
 						{
 							$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
@@ -758,7 +843,11 @@ 
 						elseif ($event['recurrence'] && $event['reference'])
 						{
 							// $event['reference'] is a calendar_id, not a timestamp
-							if (!($revent = $this->read($event['reference']))) break;	// referenced event does not exist
+							if (!($revent = $this->read($event['reference'])))
+							{
+								break;
+							}
+							// referenced event does not exist
 
 							if (empty($revent['whole_day']))
 							{
@@ -884,7 +973,10 @@ 
 			foreach ((array)$event['alarm'] as $alarmData)
 			{
 				// skip over alarms that don't have the minimum required info
-				if (!isset($alarmData['offset']) && !isset($alarmData['time'])) continue;
+				if (!isset($alarmData['offset']) && !isset($alarmData['time']))
+				{
+					continue;
+				}
 
 				// skip alarms not being set for all users and alarms owned by other users
 				if ($alarmData['all'] != true && $alarmData['owner'] != $this->user)
@@ -901,7 +993,10 @@ 
 
 				if ($version == '1.0')
 				{
-					if ($event['title']) $description = $event['title'];
+					if ($event['title'])
+					{
+						$description = $event['title'];
+					}
 					if ($description)
 					{
 						$values['DALARM']['snooze_time'] = '';
@@ -921,7 +1016,10 @@ 
 					// VCalendar 2.0 / RFC 2445
 
 					// RFC requires DESCRIPTION for DISPLAY
-					if (!$event['title'] && !$description) $description = 'Alarm';
+					if (!$event['title'] && !$description)
+					{
+						$description = 'Alarm';
+					}
 
 					/* Disabling for now
 					// Lightning infinitly pops up alarms for recuring events, if the only use an offset
@@ -1112,13 +1210,20 @@ 
 		$this->events_imported = 0;
 		$replace = $delete_exceptions= false;
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		if (!($events = $this->icaltoegw($_vcalData, $principalURL, $charset)))
 		{
 			return false;
 		}
-		if (!is_array($events)) $cal_id = -1;	// just to be sure, as iterator does NOT allow array access (eg. $events[0])
+		if (!is_array($events))
+		{
+			$cal_id = -1;
+		}
+		// just to be sure, as iterator does NOT allow array access (eg. $events[0])
 
 		if ($cal_id > 0)
 		{
@@ -1126,8 +1231,14 @@ 
 			{
 				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
-				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
-				if ($recur_date) $events[0]['recurrence'] = $recur_date;
+				if (!is_null($etag))
+				{
+					$events[0]['etag'] = (int) $etag;
+				}
+				if ($recur_date)
+				{
+					$events[0]['recurrence'] = $recur_date;
+				}
 			}
 			elseif (($foundEvent = $this->find_event(array('id' => $cal_id), 'exact')) &&
 					($eventId = array_shift($foundEvent)) &&
@@ -1135,7 +1246,10 @@ 
 			{
 				foreach ($events as $k => $event)
 				{
-					if (!isset($event['uid'])) $events[$k]['uid'] = $egwEvent['uid'];
+					if (!isset($event['uid']))
+					{
+						$events[$k]['uid'] = $egwEvent['uid'];
+					}
 				}
 			}
 		}
@@ -1165,10 +1279,17 @@ 
 		$msg = null;
 		foreach ($events as $event)
 		{
-			if (!is_array($event)) continue; // the iterator may return false
+			if (!is_array($event))
+			{
+				continue;
+			}
+			// the iterator may return false
 			++$this->events_imported;
 
-			if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+			if ($this->so->isWholeDay($event))
+			{
+				$event['whole_day'] = true;
+			}
 			if (is_array($event['category']))
 			{
 				$event['category'] = $this->find_or_add_categories($event['category'],
@@ -1205,7 +1326,10 @@ 
 						}
 						else
 						{
-							if (!($exception = $this->read($id))) continue;
+							if (!($exception = $this->read($id)))
+							{
+								continue;
+							}
 							$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 							$exception['reference'] = $exception['recurrence'] = 0;
 							$this->update($exception, true,true,false,true,$msg,$skip_notification);
@@ -1294,7 +1418,10 @@ 
 								break;
 
 							default:
-								if (!empty($value)) $event[$key] = $value;
+								if (!empty($value))
+								{
+									$event[$key] = $value;
+								}
 						}
 					}
 				}
@@ -1392,7 +1519,10 @@ 
 			else // common adjustments for new events
 			{
 				unset($event['id']);
-				if ($caldav_name) $event['caldav_name'] = $caldav_name;
+				if ($caldav_name)
+				{
+					$event['caldav_name'] = $caldav_name;
+				}
 				// set non blocking all day depending on the user setting
 				if (!empty($event['whole_day']) && $this->nonBlockingAllday)
 				{
@@ -1440,7 +1570,10 @@ 
 					|| !isset($event['participants'][$event['owner']]))
 				{
 					$status = calendar_so::combine_status($event['owner'] == $this->user ? 'A' : 'U', 1, 'CHAIR');
-					if (!is_array($event['participants'])) $event['participants'] = array();
+					if (!is_array($event['participants']))
+					{
+						$event['participants'] = array();
+					}
 					$event['participants'][$event['owner']] = $status;
 				}
 				else
@@ -1593,7 +1726,10 @@ 
 								$occurence = $exception = false;
 								foreach ($event_info['master_event']['recur_exception'] as $exception)
 								{
-									if ($exception > $event['start']) break;
+									if ($exception > $event['start'])
+									{
+										break;
+									}
 									$occurence = $exception;
 								}
 								if (!$occurence)
@@ -1683,12 +1819,15 @@ 
 					case 'SERIES-MASTER':
 					case 'SERIES-EXCEPTION':
 					case 'SERIES-EXCEPTION-PROPAGATE':
-						if (is_array($event_info['stored_event'])) // status update requires a stored event
+						if (is_array($event_info['stored_event']))
+						{
+							// status update requires a stored event
 						{
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
 								$this->update_status($event, $event_info['stored_event'],0,$skip_notification);
+						}
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
 							{
@@ -1700,9 +1839,12 @@ 
 						break;
 
 					case 'SERIES-PSEUDO-EXCEPTION':
-						if (is_array($event_info['master_event'])) // status update requires a stored master event
+						if (is_array($event_info['master_event']))
+						{
+							// status update requires a stored master event
 						{
 							$recurrence = $this->date2usertime($event['recurrence']);
+						}
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
@@ -1775,7 +1917,10 @@ 
 	 */
 	public function sync_alarms(array &$event, array $old_alarms, $user)
 	{
-		if ($this->debug) error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
+		}
 		$modified = 0;
 		foreach($event['alarm'] as &$alarm)
 		{
@@ -1799,19 +1944,40 @@ 
 			if ($alarm['offset'] != $old_alarm['offset'] || $old_alarm['owner'] != $user && !$alarm['all'])
 			{
 				$alarm['owner'] = $user;
-				if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
-				if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
-				if ($this->debug) error_log(__METHOD__."() adding new alarm from client ".array2string($alarm));
-				if ($event['id']) $alarm['id'] = $this->save_alarm($event['id'], $alarm);
+				if (!isset($alarm['time']))
+				{
+					$alarm['time'] = $event['start'] - $alarm['offset'];
+				}
+				if ($alarm['time'] < time())
+				{
+					calendar_so::shift_alarm($event, $alarm);
+				}
+				if ($this->debug)
+				{
+					error_log(__METHOD__."() adding new alarm from client ".array2string($alarm));
+				}
+				if ($event['id'])
+				{
+					$alarm['id'] = $this->save_alarm($event['id'], $alarm);
+				}
 				++$modified;
 			}
 			// existing alarm --> update it
 			elseif ($alarm['offset'] == $old_alarm['offset'] && ($old_alarm['owner'] == $user || $old_alarm['all']))
 			{
-				if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
-				if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
+				if (!isset($alarm['time']))
+				{
+					$alarm['time'] = $event['start'] - $alarm['offset'];
+				}
+				if ($alarm['time'] < time())
+				{
+					calendar_so::shift_alarm($event, $alarm);
+				}
 				$alarm = array_merge($old_alarm, $alarm);
-				if ($this->debug) error_log(__METHOD__."() updating existing alarm from client ".array2string($alarm));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."() updating existing alarm from client ".array2string($alarm));
+				}
 				$alarm['id'] = $this->save_alarm($event['id'], $alarm);
 				++$modified;
 			}
@@ -1825,7 +1991,10 @@ 
 				unset($old_alarm[$id]);
 				continue;
 			}
-			if ($this->debug) error_log(__METHOD__."() deleting alarm '$id' deleted on client ".array2string($old_alarm));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() deleting alarm '$id' deleted on client ".array2string($old_alarm));
+			}
 			$this->delete_alarm($id);
 			++$modified;
 		}
@@ -2244,7 +2413,10 @@ 
 				array2string($_vcalData)."\n",3,$this->logfile);
 		}
 
-		if (!is_array($this->supportedFields)) $this->setSupportedFields();
+		if (!is_array($this->supportedFields))
+		{
+			$this->setSupportedFields();
+		}
 
 		// we use Api\CalDAV\IcalIterator only on resources, as calling importVCal() accesses single events like an array (eg. $events[0])
 		if (is_resource($_vcalData))
@@ -2589,19 +2761,27 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime(trim($recurenceMatches[2]));
 							}
-							else break;
+							else {
+								break;
+							}
 							// fall-through
 						case 'DAILY':	// 2.0
 							$vcardData['recur_type'] = MCAL_RECUR_DAILY;
-							if (stripos($recurence, 'BYDAY') === false) break;
+							if (stripos($recurence, 'BYDAY') === false)
+							{
+								break;
+							}
 							// hack to handle TYPE=DAILY;BYDAY= as WEEKLY, which is true as long as there's no interval
 							// fall-through
 						case 'W':
 						case 'WEEKLY':
 							$days = array();
-							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))		// 1.0
+							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))
+							{
+								// 1.0
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
+							}
 								if (empty($recurenceMatches[2]))
 								{
 									$days[0] = strtoupper(substr(date('D', $vcardData['start']),0,2));
@@ -2614,7 +2794,10 @@ 
 								$repeatMatches = null;
 								if (preg_match('/#(\d+)/',$recurenceMatches[4],$repeatMatches))
 								{
-									if ($repeatMatches[1]) $vcardData['recur_count'] = $repeatMatches[1];
+									if ($repeatMatches[1])
+									{
+										$vcardData['recur_count'] = $repeatMatches[1];
+									}
 								}
 								else
 								{
@@ -2623,9 +2806,12 @@ 
 
 								$recur_days = $this->recur_days_1_0;
 							}
-							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))
+							{
+								// 2.0
 							{
 								$days = explode(',',$recurenceMatches[1]);
+							}
 								$recur_days = $this->recur_days;
 							}
 							else	// no day given, use the day of dtstart
@@ -2684,7 +2870,10 @@ 
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
-							} else break;
+							}
+							else {
+								break;
+							}
 							// fall-through
 						case 'YEARLY':	// 2.0
 							if (strpos($recurence, 'BYDAY') === false)
@@ -2704,7 +2893,10 @@ 
 					}
 					break;
 				case 'EXDATE':
-					if (!$attributes['value']) break;
+					if (!$attributes['value'])
+					{
+						break;
+					}
 					if ((isset($attributes['params']['VALUE'])
 							&& $attributes['params']['VALUE'] == 'DATE') ||
 						(!isset($attributes['params']['VALUE']) && $isDate))
@@ -2784,13 +2976,16 @@ 
 					// fall throught
 				case 'ATTENDEE':
 					if (isset($attributes['params']['PARTSTAT']))
-				    {
+					{
 				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
 				    }
 				    if (isset($attributes['params']['STATUS']))
-					{
+				    {
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
-						if (empty($status)) $status = 'X';
+						if (empty($status))
+						{
+							$status = 'X';
+						}
 					}
 					else
 					{
@@ -2850,7 +3045,10 @@ 
 							$uid = $this->user;
 					}
 					// check principal url from CalDAV here after X-EGROUPWARE-UID and to get optional X-EGROUPWARE-QUANTITY
-					if (!$uid) $uid = Api\CalDAV\Principals::url2uid($attributes['value'], null, $cn);
+					if (!$uid)
+					{
+						$uid = Api\CalDAV\Principals::url2uid($attributes['value'], null, $cn);
+					}
 
 					// try to find an email address
 					if (!$uid && $email && ($uid = $GLOBALS['egw']->accounts->name2id($email, 'account_email')))
@@ -2918,7 +3116,10 @@ 
 								}
 								$status = 'U'; // keep the group
 							}
-							else continue; // can't find this group
+							else {
+								continue;
+							}
+							// can't find this group
 						}
 						elseif (empty($searcharray))
 						{
@@ -2977,7 +3178,9 @@ 
 
 								try {
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
-										$component->getAttribute('ORGANIZER');
+									{
+																			$component->getAttribute('ORGANIZER');
+									}
 								}
 								catch(Horde_Icalendar_Exception $e)
 								{
@@ -3014,7 +3217,10 @@ 
 					}
 					break;
 				case 'CREATED':		// will be written direct to the event
-					if ($event['modified']) break;
+					if ($event['modified'])
+					{
+						break;
+					}
 					// fall through
 				case 'LAST-MODIFIED':	// will be written direct to the event
 					$event['modified'] = $attributes['value'];
@@ -3035,7 +3241,11 @@ 
 					break;
 
 				case 'ATTACH':
-					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break;	// handeled by managed attachment code
+					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE']))
+					{
+						break;
+					}
+					// handeled by managed attachment code
 					// fall throught to store external attachment url
 				default:	// X- attribute or other by EGroupware unsupported property
 					//error_log(__METHOD__."() $attributes[name] = ".array2string($attributes));
@@ -3166,7 +3376,10 @@ 
 			$event['end'] = $event['start'] + 60 * $this->cal_prefs['defaultlength'];
 		}
 
-		if ($this->calendarOwner) $event['owner'] = $this->calendarOwner;
+		if ($this->calendarOwner)
+		{
+			$event['owner'] = $this->calendarOwner;
+		}
 
 		// parsing ATTACH attributes for managed attachments
 		$event['attach-delete-by-put'] = $component->getAttributeDefault('X-EGROUPWARE-ATTACH-INCLUDED', null) === 'TRUE';
@@ -3192,7 +3405,10 @@ 
 				$filter = $relax ? 'relax' : 'check';
 				$event = array_shift($events);
 				$eventId = -1;
-				if ($this->so->isWholeDay($event)) $event['whole_day'] = true;
+				if ($this->so->isWholeDay($event))
+				{
+					$event['whole_day'] = true;
+				}
 				if ($contentID)
 				{
 					$parts = preg_split('/:/', $contentID);
@@ -3224,8 +3440,16 @@ 
 	 */
 	function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null)
 	{
-		if (!$start) $start = time();	// default now
-		if (!$end) $end = time() + 100*DAY_s;	// default next 100 days
+		if (!$start)
+		{
+			$start = time();
+		}
+		// default now
+		if (!$end)
+		{
+			$end = time() + 100*DAY_s;
+		}
+		// default next 100 days
 
 		$vcal = new Horde_Icalendar;
 		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
@@ -3247,10 +3471,13 @@ 
 				$attributes[$attr] = date('Ymd\THis', $value);
 			}
 		}
-		if (is_null($extra)) $extra = array(
+		if (is_null($extra))
+		{
+			$extra = array(
 			'URL' => $this->freebusy_url($user),
 			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user,'account_email'),
 		);
+		}
 		foreach($attributes+$extra as $attr => $value)
 		{
 			$vfreebusy->setAttribute($attr, $value);
@@ -3266,9 +3493,18 @@ 
 		{
 			foreach ($fbdata as $event)
 			{
-				if ($event['non_blocking']) continue;
-				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID']) continue;
-				if ($event['participants'][$user] == 'R') continue;
+				if ($event['non_blocking'])
+				{
+					continue;
+				}
+				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID'])
+				{
+					continue;
+				}
+				if ($event['participants'][$user] == 'R')
+				{
+					continue;
+				}
 
 				$fbtype = $event['participants'][$user] == 'T' ? 'BUSY-TENTATIVE' : 'BUSY';
 

Spacing +268 added lines, -269 removed lines

@@ -64,39 +64,39 @@ 
 	 * @var array $priority_egw2ical conversion of the priority egw => ical
 	 */
 	var $priority_egw2ical = array(
-		0 => 0,		// undefined
-		1 => 9,		// low
-		2 => 5,		// normal
-		3 => 1,		// high
+		0 => 0, // undefined
+		1 => 9, // low
+		2 => 5, // normal
+		3 => 1, // high
 	);
 
 	/**
 	 * @var array $priority_ical2egw conversion of the priority ical => egw
 	 */
 	var $priority_ical2egw = array(
-		0 => 0,		// undefined
-		9 => 1,	8 => 1, 7 => 1, 6 => 1,	// low
-		5 => 2,		// normal
-		4 => 3, 3 => 3, 2 => 3, 1 => 3,	// high
+		0 => 0, // undefined
+		9 => 1, 8 => 1, 7 => 1, 6 => 1, // low
+		5 => 2, // normal
+		4 => 3, 3 => 3, 2 => 3, 1 => 3, // high
 	);
 
 	/**
 	 * @var array $priority_egw2funambol conversion of the priority egw => funambol
 	 */
 	var $priority_egw2funambol = array(
-		0 => 1,		// undefined (mapped to normal since undefined does not exist)
-		1 => 0,		// low
-		2 => 1,		// normal
-		3 => 2,		// high
+		0 => 1, // undefined (mapped to normal since undefined does not exist)
+		1 => 0, // low
+		2 => 1, // normal
+		3 => 2, // high
 	);
 
 	/**
 	 * @var array $priority_funambol2egw conversion of the priority funambol => egw
 	 */
 	var $priority_funambol2egw = array(
-		0 => 1,		// low
-		1 => 2,		// normal
-		2 => 3,		// high
+		0 => 1, // low
+		1 => 2, // normal
+		2 => 3, // high
 	);
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * @var boolean
 	 */
 	var $log = false;
-	var $logfile="/tmp/log-vcal";
+	var $logfile = "/tmp/log-vcal";
 
 	/**
 	 * Conflict callback
@@ -203,7 +203,7 @@ 
 	 * @param int|string $current_user =0 uid of current user to only export that one as participant for method=REPLY
 	 * @return string|boolean string with iCal or false on error (e.g. no permission to read the event)
 	 */
-	function &exportVCal($events, $version='1.0', $method='PUBLISH', $recur_date=0, $principalURL='', $charset='UTF-8', $current_user=0)
+	function &exportVCal($events, $version = '1.0', $method = 'PUBLISH', $recur_date = 0, $principalURL = '', $charset = 'UTF-8', $current_user = 0)
 	{
 		if ($this->log)
 		{
@@ -234,13 +234,13 @@ 
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
-		if ($this->productManufacturer == '' )
+		if ($this->productManufacturer == '')
 		{	// syncevolution is broken
 			$version = '2.0';
 		}
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 		$vcal->setAttribute('VERSION', $version);
 		if ($method) $vcal->setAttribute('METHOD', $method);
@@ -270,15 +270,15 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-								'() User does not have the permission to read event ' . $event['id']. "\n",
-								3,$this->logfile);
+								'() User does not have the permission to read event '.$event['id']."\n",
+								3, $this->logfile);
 						}
 						return -1; // Permission denied
 					}
 				}
 				else
 				{
-					$retval = false;  // Entry does not exist
+					$retval = false; // Entry does not exist
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
@@ -292,7 +292,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'() export event UID: ' . $event['uid'] . ".\n",
+					'() export event UID: '.$event['uid'].".\n",
 					3, $this->logfile);
 			}
 
@@ -317,8 +317,8 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					'(' . $event['id']. ',' . $recurrence . ")\n" .
-					array2string($event)."\n",3,$this->logfile);
+					'('.$event['id'].','.$recurrence.")\n".
+					array2string($event)."\n", 3, $this->logfile);
 			}
 
 			if ($recurrence)
@@ -339,7 +339,7 @@ 
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								"(, $recurrence) Gratuitous pseudo exception, skipped ...\n",
-								3,$this->logfile);
+								3, $this->logfile);
 						}
 						continue; // unsupported status only exception
 					}
@@ -349,13 +349,13 @@ 
 					$days = $this->so->get_recurrence_exceptions($master, $tzid, 0, 0, 'rrule');
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-							array2string($days)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+							array2string($days)."\n", 3, $this->logfile);
 					}
 					$recurrence = $days[$recurrence]; // use remote representation
 				}
 				// force single event
-				foreach (array('recur_enddate','recur_interval','recur_exception','recur_data','recur_date','id','etag') as $name)
+				foreach (array('recur_enddate', 'recur_interval', 'recur_exception', 'recur_data', 'recur_date', 'id', 'etag') as $name)
 				{
 					unset($event[$name]);
 				}
@@ -363,7 +363,7 @@ 
 			}
 
 			// check if tzid of event (not only recuring ones) is already added to export
-			if ($tzid && $tzid != 'UTC' && !in_array($tzid,$vtimezones_added))
+			if ($tzid && $tzid != 'UTC' && !in_array($tzid, $vtimezones_added))
 			{
 				// check if we have vtimezone component data for tzid of event, if not default to user timezone (default to server tz)
 				if (calendar_timezones::add_vtimezone($vcal, $tzid) ||
@@ -381,7 +381,7 @@ 
 			{
 				// Append UID to DESCRIPTION
 				if (!preg_match('/\[UID:.+\]/m', $event['description'])) {
-					$event['description'] .= "\n[UID:" . $event['uid'] . "]";
+					$event['description'] .= "\n[UID:".$event['uid']."]";
 				}
 			}
 
@@ -402,14 +402,14 @@ 
 				$exceptions = array();
 
 				// dont use "virtual" exceptions created by participant status for GroupDAV or file export
-				if (!in_array($this->productManufacturer,array('file','groupdav')))
+				if (!in_array($this->productManufacturer, array('file', 'groupdav')))
 				{
 					$filter = isset($this->supportedFields['participants']) ? 'rrule' : 'tz_rrule';
 					$exceptions = $this->so->get_recurrence_exceptions($event, $tzid, 0, 0, $filter);
 					if ($this->log)
 					{
-						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n" .
-							array2string($exceptions)."\n",3,$this->logfile);
+						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS)\n".
+							array2string($exceptions)."\n", 3, $this->logfile);
 					}
 				}
 				elseif (is_array($event['recur_exception']))
@@ -426,8 +426,8 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							'(' . $event['id'] . ") [$icalFieldName] not supported\n",
-							3,$this->logfile);
+							'('.$event['id'].") [$icalFieldName] not supported\n",
+							3, $this->logfile);
 					}
 					continue;
 				}
@@ -444,23 +444,23 @@ 
 
 							if (!($info = $this->resource_info($uid))) continue;
 
-							if (in_array($status, array('X','E'))) continue;	// dont include deleted participants
+							if (in_array($status, array('X', 'E'))) continue; // dont include deleted participants
 
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									'()attendee:' . array2string($info) ."\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									'()attendee:'.array2string($info)."\n", 3, $this->logfile);
 							}
 							$participantCN = str_replace(array('\\', ',', ';', ':'),
 												array('\\\\', '\\,', '\\;', '\\:'),
 												trim(empty($info['cn']) ? $info['name'] : $info['cn']));
 							if ($version == '1.0')
 							{
-								$participantURL = trim('"' . $participantCN . '"' . (empty($info['email']) ? '' : ' <' . $info['email'] .'>'));
+								$participantURL = trim('"'.$participantCN.'"'.(empty($info['email']) ? '' : ' <'.$info['email'].'>'));
 							}
 							else
 							{
-								$participantURL = empty($info['email']) ? '' : 'mailto:' . $info['email'];
+								$participantURL = empty($info['email']) ? '' : 'mailto:'.$info['email'];
 							}
 							// RSVP={TRUE|FALSE}	// resonse expected, not set in eGW => status=U
 							$rsvp = $status == 'U' ? 'TRUE' : 'FALSE';
@@ -488,7 +488,7 @@ 
 										($members = $GLOBALS['egw']->accounts->members($uid, true)) && in_array($this->user, $members))
 									{
 										$user = $this->resource_info($this->user);
-										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
+										$attributes['ATTENDEE'][] = 'mailto:'.$user['email'];
 			    						$parameters['ATTENDEE'][] = array(
 			    							'CN'		=>	$user['name'],
 			    							'ROLE'		=> 'REQ-PARTICIPANT',
@@ -530,7 +530,7 @@ 
 							if (!empty($rsvp)) $options['RSVP'] = $rsvp;
 							if (!empty($info['email']) && $participantURL != 'mailto:'.$info['email'])
 							{
-								$options['EMAIL'] = $info['email'];	// only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
+								$options['EMAIL'] = $info['email']; // only add EMAIL attribute, if not already URL, as eg. Akonadi is reported to have problems with it
 							}
 							if ($info['type'] != 'e') $options['X-EGROUPWARE-UID'] = (string)$uid;
 							if ($quantity > 1) $options['X-EGROUPWARE-QUANTITY'] = (string)$quantity;
@@ -540,7 +540,7 @@ 
 						break;
 
 					case 'CLASS':
-						if ($event['public']) continue;	// public is default, no need to export, fails CalDAVTester if added as default
+						if ($event['public']) continue; // public is default, no need to export, fails CalDAVTester if added as default
 						$attributes['CLASS'] = $event['public'] ? 'PUBLIC' : 'PRIVATE';
 						// Apple iCal on OS X uses X-CALENDARSERVER-ACCESS: CONFIDENTIAL on VCALANDAR (not VEVENT!)
 						if (!$event['public'] && $this->productManufacturer == 'groupdav')
@@ -552,16 +552,16 @@ 
     				case 'ORGANIZER':
 	    				if (!$organizerURL)
 	    				{
-	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
-			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
-			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
+	    					$organizerCN = '"'.trim($GLOBALS['egw']->accounts->id2name($event['owner'], 'account_firstname')
+			    				. ' '.$GLOBALS['egw']->accounts->id2name($event['owner'], 'account_lastname')).'"';
+			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'], 'account_email');
 			    			if ($version == '1.0')
 			    			{
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
+		    					$organizerURL = trim($organizerCN.(empty($organizerURL) ? '' : ' <'.$organizerURL.'>'));
 			    			}
 			    			else
 			    			{
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
+		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:'.$organizerEMail;
 			    			}
 			    			$organizerUID = $event['owner'];
 		    				if (!isset($event['participants'][$event['owner']]))
@@ -594,7 +594,7 @@ 
 					case 'DTSTART':
 						if (empty($event['whole_day']))
 						{
-							$attributes['DTSTART'] = self::getDateTime($event['start'],$tzid,$parameters['DTSTART']);
+							$attributes['DTSTART'] = self::getDateTime($event['start'], $tzid, $parameters['DTSTART']);
 						}
 						break;
 
@@ -605,27 +605,27 @@ 
 							if ($tzid == 'UTC' && $event['end'] - $event['start'] <= 86400)
 								$attributes['duration'] = $event['end'] - $event['start'];
 							else
-							$attributes['DTEND'] = self::getDateTime($event['end'],$tzid,$parameters['DTEND']);
+							$attributes['DTEND'] = self::getDateTime($event['end'], $tzid, $parameters['DTEND']);
 						}
 						else
 						{
 							// write start + end of whole day events as dates
-							$event['end-nextday'] = $event['end'] + 12*3600;	// we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
-							foreach (array('start' => 'DTSTART','end-nextday' => 'DTEND') as $f => $t)
+							$event['end-nextday'] = $event['end'] + 12 * 3600; // we need the date of the next day, as DTEND is non-inclusive (= exclusive) in rfc2445
+							foreach (array('start' => 'DTSTART', 'end-nextday' => 'DTEND') as $f => $t)
 							{
-								$time = new Api\DateTime($event[$f],Api\DateTime::$server_timezone);
-								$arr = Api\DateTime::to($time,'array');
-								$vevent->setAttribute($t, array('year' => $arr['year'],'month' => $arr['month'],'mday' => $arr['day']),
+								$time = new Api\DateTime($event[$f], Api\DateTime::$server_timezone);
+								$arr = Api\DateTime::to($time, 'array');
+								$vevent->setAttribute($t, array('year' => $arr['year'], 'month' => $arr['month'], 'mday' => $arr['day']),
 									array('VALUE' => 'DATE'));
 							}
 							unset($attributes['DTSTART']);
 							// Outlook does NOT care about type of DTSTART/END, only setting X-MICROSOFT-CDO-ALLDAYEVENT is used to determine an event is a whole-day event
-							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT','TRUE');
+							$vevent->setAttribute('X-MICROSOFT-CDO-ALLDAYEVENT', 'TRUE');
 						}
 						break;
 
 					case 'RRULE':
-						if ($event['recur_type'] == MCAL_RECUR_NONE) break;		// no recuring event
+						if ($event['recur_type'] == MCAL_RECUR_NONE) break; // no recuring event
 						$rriter = calendar_rrule::event2rrule($event, false, $tzid);
 						$rrule = $rriter->generate_rrule($version);
 						if ($event['recur_enddate'])
@@ -644,16 +644,16 @@ 
 						{
 							if ($event['recur_enddate'] && $tzid)
 							{
-								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'],$tzid);
+								$rrule['UNTIL'] = self::getDateTime($rrule['UNTIL'], $tzid);
 							}
 							$attributes['RRULE'] = $rrule['FREQ'].' '.$rrule['UNTIL'];
 						}
 						else // $version == '2.0'
 						{
 							$attributes['RRULE'] = '';
-							foreach($rrule as $n => $v)
+							foreach ($rrule as $n => $v)
 							{
-								$attributes['RRULE'] .= ($attributes['RRULE']?';':'').$n.'='.$v;
+								$attributes['RRULE'] .= ($attributes['RRULE'] ? ';' : '').$n.'='.$v;
 							}
 						}
 						break;
@@ -668,7 +668,7 @@ 
 								{
 									// current Horde_Icalendar 2.1.4 exports EXDATE always in UTC, so we should not set a timezone here
 									// Apple calendar on OS X 10.11.4 uses a timezone, so does Horde eg. for Recurrence-ID
-									$event['recur_exception'][$key] = self::getDateTime($timestamp,$tzid);//,$parameters['EXDATE']);
+									$event['recur_exception'][$key] = self::getDateTime($timestamp, $tzid); //,$parameters['EXDATE']);
 								}
 							}
 							else
@@ -676,9 +676,9 @@ 
 								// use 'DATE' instead of 'DATE-TIME' on whole day events
 								foreach ($event['recur_exception'] as $id => $timestamp)
 								{
-									$time = new Api\DateTime($timestamp,Api\DateTime::$server_timezone);
+									$time = new Api\DateTime($timestamp, Api\DateTime::$server_timezone);
 									$time->setTimezone(self::$tz_cache[$event['tzid']]);
-									$arr = Api\DateTime::to($time,'array');
+									$arr = Api\DateTime::to($time, 'array');
 									$days[$id] = array(
 										'year'  => $arr['year'],
 										'month' => $arr['month'],
@@ -693,21 +693,21 @@ 
 						break;
 
 					case 'PRIORITY':
-						if (!$event['priority']) continue;	// 0=undefined is default, no need to export, fails CalDAVTester if our default is added
+						if (!$event['priority']) continue; // 0=undefined is default, no need to export, fails CalDAVTester if our default is added
 						if ($this->productManufacturer == 'funambol' &&
 							(strpos($this->productName, 'outlook') !== false
 								|| strpos($this->productName, 'pocket pc') !== false))
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2funambol[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2funambol[$event['priority']];
 						}
 						else
 						{
-							$attributes['PRIORITY'] = (int) $this->priority_egw2ical[$event['priority']];
+							$attributes['PRIORITY'] = (int)$this->priority_egw2ical[$event['priority']];
 						}
 						break;
 
 					case 'TRANSP':
-						if (!$event['non_blocking']) continue;	// OPAQUE is default, no need to export, fails CalDAVTester if added as default
+						if (!$event['non_blocking']) continue; // OPAQUE is default, no need to export, fails CalDAVTester if added as default
 						if ($version == '1.0')
 						{
 							$attributes['TRANSP'] = ($event['non_blocking'] ? 1 : 0);
@@ -746,13 +746,13 @@ 
 							// We handle a pseudo exception
 							if (empty($event['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($recur_date,$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($recur_date, $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new Api\DateTime($recur_date,Api\DateTime::$server_timezone);
+								$time = new Api\DateTime($recur_date, Api\DateTime::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -764,17 +764,17 @@ 
 						elseif ($event['recurrence'] && $event['reference'])
 						{
 							// $event['reference'] is a calendar_id, not a timestamp
-							if (!($revent = $this->read($event['reference']))) break;	// referenced event does not exist
+							if (!($revent = $this->read($event['reference']))) break; // referenced event does not exist
 
 							if (empty($revent['whole_day']))
 							{
-								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'],$tzid,$parameters[$icalFieldName]);
+								$attributes[$icalFieldName] = self::getDateTime($event['recurrence'], $tzid, $parameters[$icalFieldName]);
 							}
 							else
 							{
-								$time = new Api\DateTime($event['recurrence'],Api\DateTime::$server_timezone);
+								$time = new Api\DateTime($event['recurrence'], Api\DateTime::$server_timezone);
 								$time->setTimezone(self::$tz_cache[$event['tzid']]);
-								$arr = Api\DateTime::to($time,'array');
+								$arr = Api\DateTime::to($time, 'array');
 								$vevent->setAttribute($icalFieldName, array(
 									'year' => $arr['year'],
 									'month' => $arr['month'],
@@ -798,9 +798,9 @@ 
 							$noTruncate = $this->clientProperties[$icalFieldName]['NoTruncate'];
 							if ($this->log && $size > 0)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName Size: $size, NoTruncate: " .
-									($noTruncate ? 'TRUE' : 'FALSE') . "\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName Size: $size, NoTruncate: ".
+									($noTruncate ? 'TRUE' : 'FALSE')."\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName Size: $size, NoTruncate: " .
 							//	($noTruncate ? 'TRUE' : 'FALSE'), __FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -818,8 +818,8 @@ 
 							{
 								if ($this->log)
 								{
-									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-										"() $icalFieldName omitted due to maximum size $size\n",3,$this->logfile);
+									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+										"() $icalFieldName omitted due to maximum size $size\n", 3, $this->logfile);
 								}
 								//Horde::logMessage("vCalendar $icalFieldName omitted due to maximum size $size",
 								//	__FILE__, __LINE__, PEAR_LOG_WARNING);
@@ -829,8 +829,8 @@ 
 							$value = substr($value, 0, $size - 1);
 							if ($this->log)
 							{
-								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-									"() $icalFieldName truncated to maximum size $size\n",3,$this->logfile);
+								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+									"() $icalFieldName truncated to maximum size $size\n", 3, $this->logfile);
 							}
 							//Horde::logMessage("vCalendar $icalFieldName truncated to maximum size $size",
 							//	__FILE__, __LINE__, PEAR_LOG_INFO);
@@ -845,7 +845,7 @@ 
 			// for CalDAV add all X-Properties previously parsed
 			if ($this->productManufacturer == 'groupdav' || $this->productManufacturer == 'file')
 			{
-				foreach($event as $name => $value)
+				foreach ($event as $name => $value)
 				{
 					if (substr($name, 0, 2) == '##')
 					{
@@ -917,8 +917,8 @@ 
 						$values['AALARM']['repeat count'] = '';
 						$values['AALARM']['display text'] = $description;
 					}
-					$attributes['DALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['DALARM']);
-					$attributes['AALARM'] = self::getDateTime($alarmData['time'],$tzid,$parameters['AALARM']);
+					$attributes['DALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['DALARM']);
+					$attributes['AALARM'] = self::getDateTime($alarmData['time'], $tzid, $parameters['AALARM']);
 					// lets take only the first alarm
 					break;
 				}
@@ -955,7 +955,7 @@ 
 						$alarmData['offset'] = false;
 					}
 
-					$valarm = Horde_Icalendar::newComponent('VALARM',$vevent);
+					$valarm = Horde_Icalendar::newComponent('VALARM', $vevent);
 					if ($alarmData['offset'] !== false)
 					{
 						$valarm->setAttribute('TRIGGER', -$alarmData['offset'],
@@ -964,7 +964,7 @@ 
 					else
 					{
 						$params = array('VALUE' => 'DATE-TIME');
-						$value = self::getDateTime($alarmData['time'],$tzid,$params);
+						$value = self::getDateTime($alarmData['time'], $tzid, $params);
 						$valarm->setAttribute('TRIGGER', $value, $params);
 					}
 					if (!empty($alarmData['uid']))
@@ -975,7 +975,7 @@ 
 					// set evtl. existing attributes set by iCal clients not used by EGroupware
 					if (isset($alarmData['attrs']))
 					{
-						foreach($alarmData['attrs'] as $attr => $data)
+						foreach ($alarmData['attrs'] as $attr => $data)
 						{
 							$valarm->setAttribute($attr, $data['value'], $data['params']);
 						}
@@ -983,11 +983,11 @@ 
 					// set default ACTION and DESCRIPTION, if not set by a client
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['ACTION']))
 					{
-						$valarm->setAttribute('ACTION','DISPLAY');
+						$valarm->setAttribute('ACTION', 'DISPLAY');
 					}
 					if (!isset($alarmData['attrs']) || !isset($alarmData['attrs']['DESCRIPTION']))
 					{
-						$valarm->setAttribute('DESCRIPTION',$event['title'] ? $event['title'] : $description);
+						$valarm->setAttribute('DESCRIPTION', $event['title'] ? $event['title'] : $description);
 					}
 					$vevent->addComponent($valarm);
 				}
@@ -995,15 +995,15 @@ 
 
 			foreach ($attributes as $key => $value)
 			{
-				foreach (is_array($value) && $parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
+				foreach (is_array($value) && $parameters[$key]['VALUE'] != 'DATE' ? $value : array($value) as $valueID => $valueData)
 				{
-					$valueData = Api\Translation::convert($valueData,Api\Translation::charset(),$charset);
-                    $paramData = (array) Api\Translation::convert(is_array($value) ?
+					$valueData = Api\Translation::convert($valueData, Api\Translation::charset(), $charset);
+                    $paramData = (array)Api\Translation::convert(is_array($value) ?
                     		$parameters[$key][$valueID] : $parameters[$key],
-                            Api\Translation::charset(),$charset);
-                    $valuesData = (array) Api\Translation::convert($values[$key],
-                    		Api\Translation::charset(),$charset);
-                    $content = $valueData . implode(';', $valuesData);
+                            Api\Translation::charset(), $charset);
+                    $valuesData = (array)Api\Translation::convert($values[$key],
+                    		Api\Translation::charset(), $charset);
+                    $content = $valueData.implode(';', $valuesData);
 
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -1053,10 +1053,10 @@ 
 		$retval = $events_exported ? $vcal->exportvCalendar() : false;
  		if ($this->log)
  		{
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"() '$this->productManufacturer','$this->productName'\n",3,$this->logfile);
- 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-				"()\n".array2string($retval)."\n",3,$this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"() '$this->productManufacturer','$this->productName'\n", 3, $this->logfile);
+ 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+				"()\n".array2string($retval)."\n", 3, $this->logfile);
  		}
 		return $retval;
 	}
@@ -1069,15 +1069,15 @@ 
 	 * @param array &$params=null parameter array to set TZID
 	 * @return mixed attribute value to set: integer timestamp if $tzid == 'UTC' otherwise Ymd\THis string IN $tzid
 	 */
-	static function getDateTime($time,$tzid,array &$params=null)
+	static function getDateTime($time, $tzid, array &$params = null)
 	{
 		if (empty($tzid) || $tzid == 'UTC')
 		{
-			return Api\DateTime::to($time,'ts');
+			return Api\DateTime::to($time, 'ts');
 		}
-		if (!is_a($time,'DateTime'))
+		if (!is_a($time, 'DateTime'))
 		{
-			$time = new Api\DateTime($time,Api\DateTime::$server_timezone);
+			$time = new Api\DateTime($time, Api\DateTime::$server_timezone);
 		}
 		if (!isset(self::$tz_cache[$tzid]))
 		{
@@ -1112,11 +1112,11 @@ 
 	 * @param string $caldav_name=null name from CalDAV client or null (to use default)
 	 * @return int|boolean|null cal_id > 0 on success, false on failure or 0 for a failed etag|permission denied or null for "403 Forbidden"
 	 */
-	function importVCal($_vcalData, $cal_id=-1, $etag=null, $merge=false, $recur_date=0, $principalURL='', $user=null, $charset=null, $caldav_name=null,$skip_notification=false)
+	function importVCal($_vcalData, $cal_id = -1, $etag = null, $merge = false, $recur_date = 0, $principalURL = '', $user = null, $charset = null, $caldav_name = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__."(, $cal_id, $etag, $merge, $recur_date, $principalURL, $user, $charset, $caldav_name)");
 		$this->events_imported = 0;
-		$replace = $delete_exceptions= false;
+		$replace = $delete_exceptions = false;
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
 
@@ -1124,7 +1124,7 @@ 
 		{
 			return false;
 		}
-		if (!is_array($events)) $cal_id = -1;	// just to be sure, as iterator does NOT allow array access (eg. $events[0])
+		if (!is_array($events)) $cal_id = -1; // just to be sure, as iterator does NOT allow array access (eg. $events[0])
 
 		if ($cal_id > 0)
 		{
@@ -1132,7 +1132,7 @@ 
 			{
 				$replace = $recur_date == 0;
 				$events[0]['id'] = $cal_id;
-				if (!is_null($etag)) $events[0]['etag'] = (int) $etag;
+				if (!is_null($etag)) $events[0]['etag'] = (int)$etag;
 				if ($recur_date) $events[0]['recurrence'] = $recur_date;
 			}
 			elseif (($foundEvent = $this->find_event(array('id' => $cal_id), 'exact')) &&
@@ -1184,7 +1184,7 @@ 
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 					."($cal_id, $etag, $recur_date, $principalURL, $user, $charset)\n"
-					. array2string($event)."\n",3,$this->logfile);
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			$updated_id = false;
@@ -1207,14 +1207,14 @@ 
 					{
 						if ($delete_exceptions)
 						{
-							$this->delete($id,0,false,$skip_notification);
+							$this->delete($id, 0, false, $skip_notification);
 						}
 						else
 						{
 							if (!($exception = $this->read($id))) continue;
 							$exception['uid'] = Api\CalDAV::generate_uid('calendar', $id);
 							$exception['reference'] = $exception['recurrence'] = 0;
-							$this->update($exception, true,true,false,true,$msg,$skip_notification);
+							$this->update($exception, true, true, false, true, $msg, $skip_notification);
 						}
 					}
 				}
@@ -1231,7 +1231,7 @@ 
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
 						. "(UPDATE Event)\n"
-						. array2string($event_info['stored_event'])."\n",3,$this->logfile);
+						. array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 				}
 				if (empty($event['uid']))
 				{
@@ -1253,7 +1253,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore status for $uid\n",3,$this->logfile);
+										"() Restore status for $uid\n", 3, $this->logfile);
 								}
 								$event['participants'][$uid] = $event_info['stored_event']['participants'][$uid];
 							}
@@ -1277,7 +1277,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"()[MERGE]\n",3,$this->logfile);
+							"()[MERGE]\n", 3, $this->logfile);
 					}
 					// overwrite with server data for merge
 					foreach ($event_info['stored_event'] as $key => $value)
@@ -1307,7 +1307,7 @@ 
 				else
 				{
 					// no merge
-					if(!isset($this->supportedFields['category']) || !isset($event['category']))
+					if (!isset($this->supportedFields['category']) || !isset($event['category']))
 					{
 						$event['category'] = $event_info['stored_event']['category'];
 					}
@@ -1319,7 +1319,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"() No participants\n",3,$this->logfile);
+							"() No participants\n", 3, $this->logfile);
 						}
 
 						// If this is an updated meeting, and the client doesn't support
@@ -1338,7 +1338,7 @@ 
 								if ($this->log)
 								{
 									error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-										"() Restore resource $uid to status $status\n",3,$this->logfile);
+										"() Restore resource $uid to status $status\n", 3, $this->logfile);
 								}
 								// Add it back in
 								$event['participants'][$uid] = $status;
@@ -1426,8 +1426,7 @@ 
 						}
 						// for resources check which new-status to give (eg. with direct booking permision 'A' instead 'U')
 						$event['participants'][$user] = calendar_so::combine_status(
-							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' :
-							ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
+							$user < 0 || !isset($this->resources[$user[0]]['new_status']) ? 'U' : ExecMethod($this->resources[$user[0]]['new_status'], substr($user, 1)));
 					}
 				}
 				// check if an owner is set and the current user has add rights
@@ -1492,9 +1491,9 @@ 
 
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ . '('
-					. $event_info['type'] . ")\n"
-					. array2string($event)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'('
+					. $event_info['type'].")\n"
+					. array2string($event)."\n", 3, $this->logfile);
 			}
 
 			// Android (any maybe others) delete recurrences by setting STATUS: CANCELLED
@@ -1502,10 +1501,10 @@ 
 			if (in_array($event_info['type'], array('SERIES-EXCEPTION', 'SERIES-EXCEPTION-PROPAGATE', 'SERIES-PSEUDO-EXCEPTION')) &&
 				$event['status'] == 'CANCELLED')
 			{
-				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'],false,$skip_notification))
+				if (!$this->delete($event['id'] ? $event['id'] : $cal_id, $event['recurrence'], false, $skip_notification))
 				{
 					// delete fails (because no rights), reject recurrence
-					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'],false,true,$skip_notification);
+					$this->set_status($event['id'] ? $event['id'] : $cal_id, $this->user, 'R', $event['recurrence'], false, true, $skip_notification);
 				}
 				continue;
 			}
@@ -1517,7 +1516,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SINGLE\n",3,$this->logfile);
+							"(): event SINGLE\n", 3, $this->logfile);
 					}
 
 					// update the event
@@ -1527,7 +1526,7 @@ 
 						$event['reference'] = 0;
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1536,7 +1535,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-MASTER\n",3,$this->logfile);
+							"(): event SERIES-MASTER\n", 3, $this->logfile);
 					}
 
 					// remove all known pseudo exceptions and update the event
@@ -1546,8 +1545,8 @@ 
 						$days = $this->so->get_recurrence_exceptions($event_info['stored_event'], $this->tzid, 0, 0, $filter);
 						if ($this->log)
 						{
-							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n" .
-								array2string($days)."\n",3,$this->logfile);
+							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."(EXCEPTIONS MAPPING):\n".
+								array2string($days)."\n", 3, $this->logfile);
 						}
 						if (is_array($days))
 						{
@@ -1565,7 +1564,7 @@ 
 
 						$event_to_store = $event; // prevent $event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1575,7 +1574,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-EXCEPTION\n", 3, $this->logfile);
 					}
 
 					// update event
@@ -1631,13 +1630,13 @@ 
 							$event['owner'] = $event_info['master_event']['owner'];
 							$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 							$this->server2usertime($event_to_store);
-							$this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+							$this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 							unset($event_to_store);
 						}
 
 						$event_to_store = $event; // prevent $event from being changed by update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true,true,false,true,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, true, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 					break;
@@ -1646,7 +1645,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SERIES-PSEUDO-EXCEPTION\n",3,$this->logfile);
+							"(): event SERIES-PSEUDO-EXCEPTION\n", 3, $this->logfile);
 					}
 					//Horde::logMessage('importVCAL event SERIES-PSEUDO-EXCEPTION',
 					//	__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -1667,7 +1666,7 @@ 
 						// save the series master with the adjusted exceptions
 						$event_to_store = $event_info['master_event']; // prevent the master_event from being changed by the update method
 						$this->server2usertime($event_to_store);
-						$updated_id = $this->update($event_to_store, true, true, false, false,$msg,$skip_notification);
+						$updated_id = $this->update($event_to_store, true, true, false, false, $msg, $skip_notification);
 						unset($event_to_store);
 					}
 
@@ -1694,13 +1693,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'],0,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], 0, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['stored_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['stored_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), 0, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1712,13 +1711,13 @@ 
 							if ($event_info['acl_edit'])
 							{
 								// update all participants if we have the right to do that
-								$this->update_status($event, $event_info['stored_event'], $recurrence,$skip_notification);
+								$this->update_status($event, $event_info['stored_event'], $recurrence, $skip_notification);
 							}
 							elseif (isset($event['participants'][$this->user]) || isset($event_info['master_event']['participants'][$this->user]))
 							{
 								// update the users status only
 								$this->set_status($event_info['master_event']['id'], $this->user,
-									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true,true,$skip_notification);
+									($event['participants'][$this->user] ? $event['participants'][$this->user] : 'R'), $recurrence, true, true, $skip_notification);
 							}
 						}
 						break;
@@ -1735,7 +1734,7 @@ 
 					break;
 
 				case 'SERIES-PSEUDO-EXCEPTION':
-					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'] . ':' . $event['recurrence'] : false;
+					$return_id = is_array($event_info['master_event']) ? $event_info['master_event']['id'].':'.$event['recurrence'] : false;
 					break;
 
 				case 'SERIES-EXCEPTION-PROPAGATE':
@@ -1748,7 +1747,7 @@ 
 					{
 						// we did not have sufficient rights to propagate the status only exception to a real one
 						// we have to keep the SERIES-PSEUDO-EXCEPTION id and keep the event untouched
-						$return_id = $event_info['master_event']['id'] . ':' . $event['recurrence'];
+						$return_id = $event_info['master_event']['id'].':'.$event['recurrence'];
 					}
 					break;
 			}
@@ -1762,8 +1761,8 @@ 
 			if ($this->log)
 			{
 				$event_info['stored_event'] = $this->read($event_info['stored_event']['id']);
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n" .
-					array2string($event_info['stored_event'])."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()[$updated_id]\n".
+					array2string($event_info['stored_event'])."\n", 3, $this->logfile);
 			}
 		}
 		date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
@@ -1785,19 +1784,19 @@ 
 	 * @return mixed on success: int $cal_id > 0, on error or conflicts false.
 	 *	Conflicts are passed to $this->conflict_callback
 	 */
-	public function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false,$updateTS=true,&$messages=null, $skip_notification=false)
+	public function update(&$event, $ignore_conflicts = false, $touch_modified = true, $ignore_acl = false, $updateTS = true, &$messages = null, $skip_notification = false)
 	{
-		if($this->conflict_callback !== null)
+		if ($this->conflict_callback !== null)
 		{
 			// calendar_ical overrides search(), which breaks conflict checking
 			// so we make sure to use the original from parent
 			static $bo;
-			if(!$bo)
+			if (!$bo)
 			{
 				$bo = new calendar_boupdate();
 			}
 			$conflicts = $bo->conflicts($event);
-			if(is_array($conflicts) && count($conflicts) > 0)
+			if (is_array($conflicts) && count($conflicts) > 0)
 			{
 				call_user_func_array($this->conflict_callback, array(&$event, &$conflicts));
 				return false;
@@ -1818,10 +1817,10 @@ 
 	{
 		if ($this->debug) error_log(__METHOD__."(".array2string($event).', old_alarms='.array2string($old_alarms).", $user,)");
 		$modified = 0;
-		foreach($event['alarm'] as &$alarm)
+		foreach ($event['alarm'] as &$alarm)
 		{
 			// check if alarm is already stored or from other users
-			foreach($old_alarms as $id => $old_alarm)
+			foreach ($old_alarms as $id => $old_alarm)
 			{
 				// not current users alarm --> ignore
 				if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1858,7 +1857,7 @@ 
 			}
 		}
 		// remove all old alarms left from current user
-		foreach($old_alarms as $id => $old_alarm)
+		foreach ($old_alarms as $id => $old_alarm)
 		{
 			// not current users alarm --> ignore
 			if (!$old_alarm['all'] && $old_alarm['owner'] != $user)
@@ -1881,7 +1880,7 @@ 
 	 * @param string $what ='value'
 	 * @return mixed
 	 */
-	static function _get_attribute($components,$name,$what='value')
+	static function _get_attribute($components, $name, $what = 'value')
 	{
 		foreach ($components as $attribute)
 		{
@@ -1916,7 +1915,7 @@ 
 						case 'DURATION':
 							if (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] == 'END')
 							{
-								$alarm['offset'] = $duration -$vattr['value'];
+								$alarm['offset'] = $duration - $vattr['value'];
 							}
 							elseif (isset($vattr['params']['RELATED']) && $vattr['params']['RELATED'] != 'START')
 							{
@@ -1932,7 +1931,7 @@ 
 							$alarm['time'] = $vattr['value'];
 							break;
 						default:
-							error_log('VALARM/TRIGGER: unsupported value type:' . $vtype);
+							error_log('VALARM/TRIGGER: unsupported value type:'.$vtype);
 					}
 					break;
 
@@ -1957,9 +1956,9 @@ 
 		return 0;
 	}
 
-	function setSupportedFields($_productManufacturer='', $_productName='')
+	function setSupportedFields($_productManufacturer = '', $_productName = '')
 	{
-		$state =& $_SESSION['SyncML.state'];
+		$state = & $_SESSION['SyncML.state'];
 		if (isset($state))
 		{
 			$deviceInfo = $state->getClientDeviceInfo();
@@ -2256,10 +2255,10 @@ 
 		if ($this->log)
 		{
 			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-				'(' . $this->productManufacturer .
-				', '. $this->productName .', ' .
-				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()) .
-				', ' . $this->calendarOwner . ")\n" , 3, $this->logfile);
+				'('.$this->productManufacturer.
+				', '.$this->productName.', '.
+				($this->tzid ? $this->tzid : Api\DateTime::$user_timezone->getName()).
+				', '.$this->calendarOwner.")\n", 3, $this->logfile);
 		}
 
 		//Horde::logMessage('setSupportedFields(' . $this->productManufacturer . ', '
@@ -2277,12 +2276,12 @@ 
      *                         utf-8 for new format, iso-8859-1 for old format.
 	 * @return Iterator|array|boolean Iterator if resource given or array of events on success, false on failure
 	 */
-	function icaltoegw($_vcalData, $principalURL='', $charset=null)
+	function icaltoegw($_vcalData, $principalURL = '', $charset = null)
 	{
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n" .
-				array2string($_vcalData)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($principalURL, $charset)\n".
+				array2string($_vcalData)."\n", 3, $this->logfile);
 		}
 
 		if (!is_array($this->supportedFields)) $this->setSupportedFields();
@@ -2317,14 +2316,14 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-					"(): No vCalendar Container found!\n",3,$this->logfile);
+					"(): No vCalendar Container found!\n", 3, $this->logfile);
 			}
 			date_default_timezone_set($GLOBALS['egw_info']['server']['server_timezone']);
 			return false;
 		}
 		foreach ($vcal->getComponents() as $component)
 		{
-			if (($event = $this->_ical2egw_callback($component,$this->tzid,$principalURL,$vcal)))
+			if (($event = $this->_ical2egw_callback($component, $this->tzid, $principalURL, $vcal)))
 			{
 				$events[] = $event;
 			}
@@ -2369,13 +2368,13 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean event array or false if $component is no Horde_Icalendar_Vevent
 	 */
-	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL='', Horde_Icalendar $container=null)
+	function _ical2egw_callback(Horde_Icalendar $component, $tzid, $principalURL = '', Horde_Icalendar $container = null)
 	{
 		//unset($component->_container); _debug_array($component);
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'() '.get_class($component)." found\n", 3, $this->logfile);
 		}
 
 		// eg. Mozilla holiday calendars contain only a X-WR-TIMEZONE on vCalendar component
@@ -2430,16 +2429,16 @@ 
 	 * @param Horde_Icalendar $container =null container to access attributes on container
 	 * @return array|boolean			event on success, false on failure
 	 */
-	function vevent2egw($component, $version, $supportedFields, $principalURL='', $check_component='Horde_Icalendar_Vevent', Horde_Icalendar $container=null)
+	function vevent2egw($component, $version, $supportedFields, $principalURL = '', $check_component = 'Horde_Icalendar_Vevent', Horde_Icalendar $container = null)
 	{
-		unset($principalURL);	// not longer used, but required in function signature
+		unset($principalURL); // not longer used, but required in function signature
 
 		if ($check_component && !is_a($component, $check_component))
 		{
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()' .
-					get_class($component)." found\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.'()'.
+					get_class($component)." found\n", 3, $this->logfile);
 			}
 			return false;
 		}
@@ -2455,11 +2454,11 @@ 
 
 		$isDate = false;
 		$event		= array();
-		$alarms		= array();
-		$vcardData	= array(
+		$alarms = array();
+		$vcardData = array(
 			'recur_type'		=> MCAL_RECUR_NONE,
 			'recur_exception'	=> array(),
-			'priority'          => 0,	// iCalendar default is 0=undefined, not EGroupware 5=normal
+			'priority'          => 0, // iCalendar default is 0=undefined, not EGroupware 5=normal
 		);
 		// we need to parse DTSTART, DTEND or DURATION (in that order!) first
 		foreach (array_merge(
@@ -2476,7 +2475,7 @@ 
 						$isDate = true;
 					}
 					$dtstart_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					$vcardData['start']	= $dtstart_ts;
+					$vcardData['start'] = $dtstart_ts;
 
 					if ($this->tzid)
 					{
@@ -2499,18 +2498,18 @@ 
 								}
 								else
 								{
-									error_log(__METHOD__ . '() unknown TZID='
-										. $attributes['params']['TZID'] . ', defaulting to timezone "'
-										. date_default_timezone_get() . '".'.array2string($tz));
-									$event['tzid'] = date_default_timezone_get();	// default to current timezone
+									error_log(__METHOD__.'() unknown TZID='
+										. $attributes['params']['TZID'].', defaulting to timezone "'
+										. date_default_timezone_get().'".'.array2string($tz));
+									$event['tzid'] = date_default_timezone_get(); // default to current timezone
 								}
 							}
-							catch(Exception $e)
+							catch (Exception $e)
 							{
-								error_log(__METHOD__ . '() unknown TZID='
-									. $attributes['params']['TZID'] . ', defaulting to timezone "'
-									. date_default_timezone_get() . '".'.$e->getMessage());
-								$event['tzid'] = date_default_timezone_get();	// default to current timezone
+								error_log(__METHOD__.'() unknown TZID='
+									. $attributes['params']['TZID'].', defaulting to timezone "'
+									. date_default_timezone_get().'".'.$e->getMessage());
+								$event['tzid'] = date_default_timezone_get(); // default to current timezone
 							}
 						}
 						else
@@ -2525,11 +2524,11 @@ 
 
 				case 'DTEND':
 					$dtend_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					if (date('H:i:s',$dtend_ts) == '00:00:00')
+					if (date('H:i:s', $dtend_ts) == '00:00:00')
 					{
 						$dtend_ts -= 1;
 					}
-					$vcardData['end']	= $dtend_ts;
+					$vcardData['end'] = $dtend_ts;
 					break;
 
 				case 'DURATION':	// clients can use DTSTART+DURATION, instead of DTSTART+DTEND
@@ -2549,7 +2548,7 @@ 
 			if ($this->log)
 			{
 				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-					. "() DTSTART missing!\n",3,$this->logfile);
+					. "() DTSTART missing!\n", 3, $this->logfile);
 			}
 			return false; // not a valid entry
 		}
@@ -2561,7 +2560,7 @@ 
 				case 'X-MICROSOFT-CDO-ALLDAYEVENT':
 					if (isset($supportedFields['whole_day']))
 					{
-						$event['whole_day'] = (isset($attributes['value'])?strtoupper($attributes['value'])=='TRUE':true);
+						$event['whole_day'] = (isset($attributes['value']) ? strtoupper($attributes['value']) == 'TRUE' : true);
 					}
 					break;
 				case 'AALARM':
@@ -2591,32 +2590,32 @@ 
 					$vcardData['recurrence'] = $attributes['value'];
 					break;
 				case 'LOCATION':
-					$vcardData['location']	= str_replace("\r\n", "\n", $attributes['value']);
+					$vcardData['location'] = str_replace("\r\n", "\n", $attributes['value']);
 					break;
 				case 'RRULE':
 					$recurence = $attributes['value'];
 					$vcardData['recur_interval'] = 1;
-					$type = preg_match('/FREQ=([^;: ]+)/i',$recurence,$matches) ? $matches[1] : $recurence[0];
+					$type = preg_match('/FREQ=([^;: ]+)/i', $recurence, $matches) ? $matches[1] : $recurence[0];
 					// vCard 2.0 values for all types
-					if (preg_match('/UNTIL=([0-9TZ]+)/',$recurence,$matches))
+					if (preg_match('/UNTIL=([0-9TZ]+)/', $recurence, $matches))
 					{
 						$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($matches[1]);
 						// If it couldn't be parsed, treat it as not set
-						if(is_string($vcardData['recur_enddate']))
+						if (is_string($vcardData['recur_enddate']))
 						{
 							unset($vcardData['recur_enddate']);
 						}
 					}
-					elseif (preg_match('/COUNT=([0-9]+)/',$recurence,$matches))
+					elseif (preg_match('/COUNT=([0-9]+)/', $recurence, $matches))
 					{
 						$vcardData['recur_count'] = (int)$matches[1];
 					}
-					if (preg_match('/INTERVAL=([0-9]+)/',$recurence,$matches))
+					if (preg_match('/INTERVAL=([0-9]+)/', $recurence, $matches))
 					{
-						$vcardData['recur_interval'] = (int) $matches[1] ? (int) $matches[1] : 1;
+						$vcardData['recur_interval'] = (int)$matches[1] ? (int)$matches[1] : 1;
 					}
 					$vcardData['recur_data'] = 0;
-					switch($type)
+					switch ($type)
 					{
 						case 'D':	// 1.0
 							$recurenceMatches = null;
@@ -2640,20 +2639,20 @@ 
 						case 'W':
 						case 'WEEKLY':
 							$days = array();
-							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/',$recurence, $recurenceMatches))		// 1.0
+							if (preg_match('/W(\d+) *((?i: [AEFHMORSTUW]{2})+)?( +([^ ]*))$/', $recurence, $recurenceMatches))		// 1.0
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								if (empty($recurenceMatches[2]))
 								{
-									$days[0] = strtoupper(substr(date('D', $vcardData['start']),0,2));
+									$days[0] = strtoupper(substr(date('D', $vcardData['start']), 0, 2));
 								}
 								else
 								{
-									$days = explode(' ',trim($recurenceMatches[2]));
+									$days = explode(' ', trim($recurenceMatches[2]));
 								}
 
 								$repeatMatches = null;
-								if (preg_match('/#(\d+)/',$recurenceMatches[4],$repeatMatches))
+								if (preg_match('/#(\d+)/', $recurenceMatches[4], $repeatMatches))
 								{
 									if ($repeatMatches[1]) $vcardData['recur_count'] = $repeatMatches[1];
 								}
@@ -2664,21 +2663,21 @@ 
 
 								$recur_days = $this->recur_days_1_0;
 							}
-							elseif (preg_match('/BYDAY=([^;: ]+)/',$recurence,$recurenceMatches))	// 2.0
+							elseif (preg_match('/BYDAY=([^;: ]+)/', $recurence, $recurenceMatches))	// 2.0
 							{
-								$days = explode(',',$recurenceMatches[1]);
+								$days = explode(',', $recurenceMatches[1]);
 								$recur_days = $this->recur_days;
 							}
 							else	// no day given, use the day of dtstart
 							{
-								$vcardData['recur_data'] |= 1 << (int)date('w',$vcardData['start']);
+								$vcardData['recur_data'] |= 1 << (int)date('w', $vcardData['start']);
 								$vcardData['recur_type'] = MCAL_RECUR_WEEKLY;
 							}
 							if ($days)
 							{
 								foreach ($recur_days as $id => $day)
 								{
-									if (in_array(strtoupper(substr($day,0,2)),$days))
+									if (in_array(strtoupper(substr($day, 0, 2)), $days))
 									{
 										$vcardData['recur_data'] |= $id;
 									}
@@ -2694,17 +2693,17 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_count'] = $recurenceMatches[2];
 							}
-							elseif (preg_match('/MD(\d+)(?: [^ ]+)? ([0-9TZ]+)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/MD(\d+)(?: [^ ]+)? ([0-9TZ]+)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_MDAY;
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
 							}
-							elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/MP(\d+) (.*) (.*) (.*)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_type'] = MCAL_RECUR_MONTHLY_WDAY;
 								$vcardData['recur_interval'] = $recurenceMatches[1];
-								if (preg_match('/#(\d+)/',$recurenceMatches[4],$recurenceMatches))
+								if (preg_match('/#(\d+)/', $recurenceMatches[4], $recurenceMatches))
 								{
 									$vcardData['recur_count'] = $recurenceMatches[1];
 								}
@@ -2721,7 +2720,7 @@ 
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_count'] = $recurenceMatches[2];
 							}
-							elseif (preg_match('/YM(\d+)(?: [^ ]+)? ([0-9TZ]+)/',$recurence, $recurenceMatches))
+							elseif (preg_match('/YM(\d+)(?: [^ ]+)? ([0-9TZ]+)/', $recurence, $recurenceMatches))
 							{
 								$vcardData['recur_interval'] = $recurenceMatches[1];
 								$vcardData['recur_enddate'] = $this->vCalendar->_parseDateTime($recurenceMatches[2]);
@@ -2735,11 +2734,11 @@ 
 							}
 							// handle FREQ=YEARLY;BYDAY= as FREQ=MONTHLY;BYDAY= with 12*INTERVAL
 							$vcardData['recur_interval'] = $vcardData['recur_interval'] ?
-								12*$vcardData['recur_interval'] : 12;
+								12 * $vcardData['recur_interval'] : 12;
 							// fall-through
 						case 'MONTHLY':
 							// does currently NOT parse BYDAY or BYMONTH, it has to be specified/identical to DTSTART
-							$vcardData['recur_type'] = strpos($recurence,'BYDAY') !== false ?
+							$vcardData['recur_type'] = strpos($recurence, 'BYDAY') !== false ?
 								MCAL_RECUR_MONTHLY_WDAY : MCAL_RECUR_MONTHLY_MDAY;
 							break;
 					}
@@ -2795,11 +2794,11 @@ 
 						(strpos($this->productName, 'outlook') !== false
 							|| strpos($this->productName, 'pocket pc') !== false))
 					{
-						$vcardData['priority'] = (int) $this->priority_funambol2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_funambol2egw[$attributes['value']];
 					}
 					else
 					{
-						$vcardData['priority'] = (int) $this->priority_ical2egw[$attributes['value']];
+						$vcardData['priority'] = (int)$this->priority_ical2egw[$attributes['value']];
 					}
 					break;
 				case 'CATEGORIES':
@@ -2813,10 +2812,10 @@ 
 					}
 					break;
 				case 'ORGANIZER':
-					$event['organizer'] = $attributes['value'];	// no egw field, but needed in AS
-					if (strtolower(substr($event['organizer'],0,7)) == 'mailto:')
+					$event['organizer'] = $attributes['value']; // no egw field, but needed in AS
+					if (strtolower(substr($event['organizer'], 0, 7)) == 'mailto:')
 					{
-						$event['organizer'] = substr($event['organizer'],7);
+						$event['organizer'] = substr($event['organizer'], 7);
 					}
 					if (!empty($attributes['params']['CN']))
 					{
@@ -2853,19 +2852,19 @@ 
 					}
 					// try parsing email and cn from attendee
 					elseif (preg_match('/mailto:([@.a-z0-9_-]+)|mailto:"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$email = $matches[1] ? $matches[1] : $matches[3];
-						$cn = isset($matches[2]) ? $matches[2]: '';
+						$cn = isset($matches[2]) ? $matches[2] : '';
 					}
 					elseif (!empty($attributes['value']) &&
 						preg_match('/"?([.a-z0-9_ -]*)"?[ ]*<([@.a-z0-9_-]*)>/i',
-						$attributes['value'],$matches))
+						$attributes['value'], $matches))
 					{
 						$cn = $matches[1];
 						$email = $matches[2];
 					}
-					elseif (strpos($attributes['value'],'@') !== false)
+					elseif (strpos($attributes['value'], '@') !== false)
 					{
 						$email = $attributes['value'];
 					}
@@ -2882,7 +2881,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "(): Found X-EGROUPWARE-UID: '$uid'\n",3,$this->logfile);
+								. "(): Found X-EGROUPWARE-UID: '$uid'\n", 3, $this->logfile);
 						}
 					}
 					elseif ($attributes['value'] == 'Unknown')
@@ -2900,7 +2899,7 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Found account: '$uid', '$cn', '$email'\n",3,$this->logfile);
+								. "() Found account: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 						}
 					}
 					if (!$uid)
@@ -2917,9 +2916,9 @@ 
 							$cn = str_replace(array('\\,', '\\;', '\\:', '\\\\'),
 										array(',', ';', ':', '\\'),
 										$attributes['params']['CN']);
-							if ($cn[0] == '"' && substr($cn,-1) == '"')
+							if ($cn[0] == '"' && substr($cn, -1) == '"')
 							{
-								$cn = substr($cn,1,-1);
+								$cn = substr($cn, 1, -1);
 							}
 							// not searching for $cn, as match can be not unique or without an email address
 							// --> notification will fail, better store just as email
@@ -2928,19 +2927,19 @@ 
 						if ($this->log)
 						{
 							error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-								. "() Search participant: '$cn', '$email'\n",3,$this->logfile);
+								. "() Search participant: '$cn', '$email'\n", 3, $this->logfile);
 						}
 
 						//elseif (//$attributes['params']['CUTYPE'] == 'GROUP'
-						if (preg_match('/(.*) '. lang('Group') . '/', $cn, $matches))
+						if (preg_match('/(.*) '.lang('Group').'/', $cn, $matches))
 						{
 							// we found a group
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found group: '$matches[1]', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found group: '$matches[1]', '$cn', '$email'\n", 3, $this->logfile);
 							}
-							if (($uid =  $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
+							if (($uid = $GLOBALS['egw']->accounts->name2id($matches[1], 'account_lid', 'g')))
 							{
 								//Horde::logMessage("vevent2egw: group participant $uid",
 								//			__FILE__, __LINE__, PEAR_LOG_DEBUG);
@@ -2954,7 +2953,7 @@ 
 										//Horde::logMessage("vevent2egw: set status to " . $status,
 										//		__FILE__, __LINE__, PEAR_LOG_DEBUG);
 										$vcardData['participants'][$this->user] =
-											calendar_so::combine_status($status,$quantity,$role);
+											calendar_so::combine_status($status, $quantity, $role);
 									}
 								}
 								$status = 'U'; // keep the group
@@ -2963,36 +2962,36 @@ 
 						}
 						elseif (empty($searcharray))
 						{
-							continue;	// participants without email AND CN --> ignore it
+							continue; // participants without email AND CN --> ignore it
 						}
 						elseif ((list($data) = $this->addressbook->search($searcharray,
-							array('id','egw_addressbook.account_id as account_id','n_fn'),
+							array('id', 'egw_addressbook.account_id as account_id', 'n_fn'),
 							'egw_addressbook.account_id IS NOT NULL DESC, n_fn IS NOT NULL DESC',
-							'','',false,'OR')))
+							'', '', false, 'OR')))
 						{
 							// found an addressbook entry
 							$uid = $data['account_id'] ? (int)$data['account_id'] : 'c'.$data['id'];
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Found addressbook entry: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Found addressbook entry: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 						else
 						{
 							if (!$email)
 							{
-								$email = 'no-email@egroupware.org';	// set dummy email to store the CN
+								$email = 'no-email@egroupware.org'; // set dummy email to store the CN
 							}
-							$uid = 'e'. ($cn ? $cn . ' <' . $email . '>' : $email);
+							$uid = 'e'.($cn ? $cn.' <'.$email.'>' : $email);
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
-									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n",3,$this->logfile);
+									. "() Not Found, create dummy: '$uid', '$cn', '$email'\n", 3, $this->logfile);
 							}
 						}
 					}
-					switch($attributes['name'])
+					switch ($attributes['name'])
 					{
 						case 'ATTENDEE':
 							if (!isset($attributes['params']['ROLE']) &&
@@ -3006,7 +3005,7 @@ 
 								// keep role 'CHAIR' from an external organizer, even if he is a regular participant with a different role
 								// as this is currently the only way to store an external organizer and send him iMip responses
 								$q = $r = null;
-								if (isset($vcardData['participants'][$uid]) && ($s=$vcardData['participants'][$uid]) &&
+								if (isset($vcardData['participants'][$uid]) && ($s = $vcardData['participants'][$uid]) &&
 									calendar_so::split_status($s, $q, $r) && $r == 'CHAIR')
 								{
 									$role = 'CHAIR';
@@ -3020,7 +3019,7 @@ 
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
 										$component->getAttribute('ORGANIZER');
 								}
-								catch(Horde_Icalendar_Exception $e)
+								catch (Horde_Icalendar_Exception $e)
 								{
 									// we can store the ORGANIZER as event owner
 									$event['owner'] = $uid;
@@ -3076,7 +3075,7 @@ 
 					break;
 
 				case 'ATTACH':
-					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break;	// handeled by managed attachment code
+					if ($attributes['params'] && !empty($attributes['params']['FMTTYPE'])) break; // handeled by managed attachment code
 					// fall throught to store external attachment url
 				default:	// X- attribute or other by EGroupware unsupported property
 					//error_log(__METHOD__."() $attributes[name] = ".array2string($attributes));
@@ -3134,7 +3133,7 @@ 
 					if ($event['recur_type'] != MCAL_RECUR_NONE)
 					{
 						$event['reference'] = 0;
-						foreach (array('recur_interval','recur_enddate','recur_data','recur_exception','recur_count') as $r)
+						foreach (array('recur_interval', 'recur_enddate', 'recur_data', 'recur_exception', 'recur_count') as $r)
 						{
 							if (isset($vcardData[$r]))
 							{
@@ -3157,12 +3156,12 @@ 
 			// reset recure_enddate to 00:00:00 on the last day
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->normalize_enddate();
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
-					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ .
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3171,16 +3170,16 @@ 
 			$event['recur_enddate'] = Api\DateTime::to($last, 'server');
 		}
 		// translate COUNT into an enddate, as we only store enddates
-		elseif($event['recur_count'])
+		elseif ($event['recur_count'])
 		{
 			$rriter = calendar_rrule::event2rrule($event, false);
 			$last = $rriter->count2date($event['recur_count']);
-			if(!is_object($last))
+			if (!is_object($last))
 			{
-				if($this->log)
+				if ($this->log)
 				{
 					error_log(__FILE__.'['.__LINE__.'] '.__METHOD__,
-					" Unable to determine recurrence end date.  \n".array2string($event),3, $this->logfile);
+					" Unable to determine recurrence end date.  \n".array2string($event), 3, $this->logfile);
 				}
 				return false;
 			}
@@ -3194,7 +3193,7 @@ 
 			if ($this->productManufacturer == 'groupdav' && $container &&
 				($x_calendarserver_access = $container->getAttribute('X-CALENDARSERVER-ACCESS')))
 			{
-				$event['public'] =  (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
+				$event['public'] = (int)(strtoupper($x_calendarserver_access) == 'PUBLIC');
 			}
 			//error_log(__METHOD__."() X-CALENDARSERVER-ACCESS=".array2string($x_calendarserver_access).' --> public='.array2string($event['public']));
 		}
@@ -3215,15 +3214,15 @@ 
 
 		if ($this->log)
 		{
-			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n" .
-				array2string($event)."\n",3,$this->logfile);
+			error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."()\n".
+				array2string($event)."\n", 3, $this->logfile);
 		}
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
         //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
 		return $event;
 	}
 
-	function search($_vcalData, $contentID=null, $relax=false, $charset=null)
+	function search($_vcalData, $contentID = null, $relax = false, $charset = null)
 	{
 		if (($events = $this->icaltoegw($_vcalData, $charset)))
 		{
@@ -3244,8 +3243,8 @@ 
 			}
 			if ($this->log)
 			{
-				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n" .
-					array2string($events)."\n",3,$this->logfile);
+				error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."() found:\n".
+					array2string($events)."\n", 3, $this->logfile);
 			}
 		}
 		return array();
@@ -3263,23 +3262,23 @@ 
 	 * @param array $extra =null extra attributes to add
 	 * 	X-CALENDARSERVER-MASK-UID can be used to not include an event specified by this uid as busy
 	 */
-	function freebusy($user,$end=null,$utc=true, $charset='UTF-8', $start=null, $method='PUBLISH', array $extra=null)
+	function freebusy($user, $end = null, $utc = true, $charset = 'UTF-8', $start = null, $method = 'PUBLISH', array $extra = null)
 	{
-		if (!$start) $start = time();	// default now
-		if (!$end) $end = time() + 100*DAY_s;	// default next 100 days
+		if (!$start) $start = time(); // default now
+		if (!$end) $end = time() + 100 * DAY_s; // default next 100 days
 
 		$vcal = new Horde_Icalendar;
-		$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+		$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
-		$vcal->setAttribute('VERSION','2.0');
-		$vcal->setAttribute('METHOD',$method);
+		$vcal->setAttribute('VERSION', '2.0');
+		$vcal->setAttribute('METHOD', $method);
 
-		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY',$vcal);
+		$vfreebusy = Horde_Icalendar::newComponent('VFREEBUSY', $vcal);
 
 		$attributes = array(
 			'DTSTAMP' => time(),
-			'DTSTART' => $this->date2ts($start,true),	// true = server-time
-			'DTEND' => $this->date2ts($end,true),	// true = server-time
+			'DTSTART' => $this->date2ts($start, true), // true = server-time
+			'DTEND' => $this->date2ts($end, true), // true = server-time
 		);
 		if (!$utc)
 		{
@@ -3290,9 +3289,9 @@ 
 		}
 		if (is_null($extra)) $extra = array(
 			'URL' => $this->freebusy_url($user),
-			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user,'account_email'),
+			'ORGANIZER' => 'mailto:'.$GLOBALS['egw']->accounts->id2name($user, 'account_email'),
 		);
-		foreach($attributes+$extra as $attr => $value)
+		foreach ($attributes + $extra as $attr => $value)
 		{
 			$vfreebusy->setAttribute($attr, $value);
 		}
@@ -3315,16 +3314,16 @@ 
 
 				if ($utc)
 				{
-					$vfreebusy->setAttribute('FREEBUSY',array(array(
+					$vfreebusy->setAttribute('FREEBUSY', array(array(
 						'start' => $event['start'],
 						'end' => $event['end'],
 					)), array('FBTYPE' => $fbtype));
 				}
 				else
 				{
-					$vfreebusy->setAttribute('FREEBUSY',array(array(
-						'start' => date('Ymd\THis',$event['start']),
-						'end' => date('Ymd\THis',$event['end']),
+					$vfreebusy->setAttribute('FREEBUSY', array(array(
+						'start' => date('Ymd\THis', $event['start']),
+						'end' => date('Ymd\THis', $event['end']),
 					)), array('FBTYPE' => $fbtype));
 				}
 			}

calendar/inc/class.calendar_import_csv.inc.php

Doc Comments +2 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 	 * @param importepport_iface_egw_record record The egw_record object being imported
 	 * @param importexport_iface_import_record import_csv Import object contains current state
 	 *
-	 * @return boolean success
+	 * @return null|boolean success
 	 */
 	public function import_record(\importexport_iface_egw_record &$record, &$import_csv)
 	{
@@ -254,7 +254,6 @@ 
 	 * perform the required action
 	 *
 	 * @param int $_action one of $this->actions
-	 * @param array $_data record data for the action
 	 * @return bool success or not
 	 */
 	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
@@ -343,7 +342,7 @@ 
 	/**
 	 * Alter a row for preview to show multiple participants instead of Array
 	 *
-	 * @param egw_record $row_entry
+	 * @param importexport_iface_egw_record $row_entry
 	 */
 	protected function row_preview(importexport_iface_egw_record &$row_entry)
 	{

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
 	protected static $conditions = array('exists');
 
 	/**
-	* For figuring out if an entry has changed
-	*/
+	 * For figuring out if an entry has changed
+	 */
 	protected $tracking;
 
 	/**

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

@@ -57,7 +57,7 @@ 
 		$this->role_map = array_flip($this->bo->roles);
 
 		$this->lookups = array(
-			'priority'	=> Array(
+			'priority'	=> array(
 				0 => lang('None'),
 				1 => lang('Low'),
 				2 => lang('Normal'),
@@ -237,7 +237,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$records = array())
+	protected function exists(importexport_iface_egw_record &$record, array &$condition, &$records = array())
 	{
 		if($record->__get($condition['string']) && $condition['string'] == 'id') {
 			$event = $this->bo->read($record->__get($condition['string']));

Braces +75 added lines, -32 removed lines

@@ -17,7 +17,8 @@ 
 /**
  * class import_csv for calendar
  */
-class calendar_import_csv extends importexport_basic_import_csv  {
+class calendar_import_csv extends importexport_basic_import_csv
+{
 
 	/**
 	 * actions wich could be done to data entries
@@ -83,8 +84,10 @@ 
 		$options['owner'] = $options['owner'] ? $options['owner'] : $this->user;
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($options['owner_from_csv']) {
-			if(!is_numeric($record['owner'])) {
+		if($options['owner_from_csv'])
+		{
+			if(!is_numeric($record['owner']))
+			{
 				$this->errors[$import_csv->get_current_position()] = lang(
 					'Invalid owner ID: %1.  Might be a bad field translation.  Used %2 instead.',
 					$record->owner,
@@ -106,14 +109,16 @@ 
 		}
 
 		// Parse particpants
-		if ($record->participants && !is_array($record->participants)) {
+		if ($record->participants && !is_array($record->participants))
+		{
 			// Importing participants in human friendly format:
 			// Name (quantity)? (status) Role[, Name (quantity)? (status) Role]+
 			preg_match_all('/(([^(]+?)(?: \(([\d]+)\))? \(([^,)]+)\)(?: ([^ ,]+))?)(?:, )?/',$record->participants,$participants);
 			$p_participants = array();
 			$missing = array();
 			list($lines, $p, $names, $quantity, $status, $role) = $participants;
-			foreach($names as $key => $name) {
+			foreach($names as $key => $name)
+			{
 				//error_log("Name: $name Quantity: {$quantity[$key]} Status: {$status[$key]} Role: {$role[$key]}");
 
 				// Search for direct account name, then user in accounts first
@@ -121,9 +126,13 @@ 
 				$id = importexport_helper_functions::account_name2id($name);
 
 				// If not found, or not an exact match to a user (account_name2id is pretty generous)
-				if(!$id || $names[$key] !== $this->bo->participant_name($id)) {
+				if(!$id || $names[$key] !== $this->bo->participant_name($id))
+				{
 					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1));
-					if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
+					if($contacts)
+					{
+						$id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
+					}
 				}
 				if(!$id)
 				{
@@ -131,7 +140,10 @@ 
 					foreach($this->bo->resources as $resource)
 					{
 						// Can't search for email
-						if($resource['app'] == 'email') continue;
+						if($resource['app'] == 'email')
+						{
+							continue;
+						}
 						// Special resource search, since it does special stuff in link_query
 						if($resource['app'] == 'resources')
 						{
@@ -140,7 +152,8 @@ 
 								$this->resource_so = new resources_so();
 							}
 							$result = $this->resource_so->search($search,'res_id');
-							if(count($result) >= 1) {
+							if(count($result) >= 1)
+							{
 								$id = $resource['type'].$result[0]['res_id'];
 								break;
 							}
@@ -159,7 +172,8 @@ 
 						}
 					}
 				}
-				if($id) {
+				if($id)
+				{
 					$p_participants[$id] = calendar_so::combine_status(
 						$this->status_map[lang($status[$key])] ? $this->status_map[lang($status[$key])] : $status[$key][0],
 						$quantity[$key] ? $quantity[$key] : 1,
@@ -188,27 +202,38 @@ 
 		}
 		$record->tzid = calendar_timezones::id2tz($record->tz_id);
 
-		if ( $options['conditions'] ) {
-			foreach ( $options['conditions'] as $condition ) {
+		if ( $options['conditions'] )
+		{
+			foreach ( $options['conditions'] as $condition )
+			{
 				$records = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
 						// Check for that record
 						$result = $this->exists($record, $condition, $records);
 
-						if ( is_array( $records ) && count( $records ) >= 1) {
+						if ( is_array( $records ) && count( $records ) >= 1)
+						{
 							// apply action to all records matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$records as $event ) {
+							foreach ( (array)$records as $event )
+							{
 								$record->id = $event['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $record->category ) ) $record->category = explode( ',', $record->category );
+								if ( $this->definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $record->category ) )
+									{
+										$record->category = explode( ',', $record->category );
+									}
 									$record->category = implode( ',', array_unique( array_merge( $record->category, $event['category'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -219,9 +244,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['last']) break;
+				if ($action['last'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -240,12 +270,14 @@ 
 	 */
 	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$records = array())
 	{
-		if($record->__get($condition['string']) && $condition['string'] == 'id') {
+		if($record->__get($condition['string']) && $condition['string'] == 'id')
+		{
 			$event = $this->bo->read($record->__get($condition['string']));
 			$records = array($event);
 		}
 
-		if ( is_array( $records ) && count( $records ) >= 1) {
+		if ( is_array( $records ) && count( $records ) >= 1)
+		{
 			return true;
 		}
 		return false;
@@ -261,7 +293,8 @@ 
 	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
 	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
@@ -269,7 +302,8 @@ 
 				$old = $this->bo->read($_data['id']);
 
 				// Don't change a user account into a record
-				if(!$this->definition->plugin_options['change_owner']) {
+				if(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change owner of an existing record
 					unset($_data['owner']);
 				}
@@ -277,23 +311,27 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if(count($changed) == 0)
+				{
 					return true;
 				}
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Backend doesn't like inserting with ID specified, can overwrite existing
 					unset($_data['id']);
 				}
 				// Make sure participants are set
-				if(!$_data['participants']) {
+				if(!$_data['participants'])
+				{
 					$user = $_data['owner'] ? $_data['owner'] : $this->user;
 					$_data['participants'] = array(
 						$user => 'U'
 					);
 				}
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					// User is interested in conflict checks, do so for dry run
 					// Otherwise, conflicts are just ignored and imported anyway
@@ -309,7 +347,9 @@ 
 					}
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$messages = null;
 					$result = $this->bo->update( $_data, 
 						!$this->definition->plugin_options['skip_conflicts'],
@@ -360,7 +400,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar CSV import');
 	}
 
@@ -369,7 +410,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports events into your Calendar from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -378,7 +420,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 

Spacing +62 added lines, -62 removed lines

@@ -17,12 +17,12 @@ 
 /**
  * class import_csv for calendar
  */
-class calendar_import_csv extends importexport_basic_import_csv  {
+class calendar_import_csv extends importexport_basic_import_csv {
 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'insert' );
+	protected static $actions = array('none', 'update', 'insert');
 
 	/**
 	 * conditions for actions
@@ -44,16 +44,16 @@ 
 	/**
 	 * Set up tracker
 	 */
-	protected function init(importexport_definition &$definition)
+	protected function init(importexport_definition&$definition)
 	{
 		// fetch the addressbook bo
-		$this->bo= new calendar_boupdate();
+		$this->bo = new calendar_boupdate();
 
 		// Get the tracker for changes
 		$this->tracking = new calendar_tracking();
 
 		// Used for participants
-		$this->status_map = array_flip(array_map('lang',$this->bo->verbose_status));
+		$this->status_map = array_flip(array_map('lang', $this->bo->verbose_status));
 		$this->role_map = array_flip($this->bo->roles);
 
 		$this->lookups = array(
@@ -76,15 +76,15 @@ 
 	 *
 	 * @return boolean success
 	 */
-	public function import_record(\importexport_iface_egw_record &$record, &$import_csv)
+	public function import_record(\importexport_iface_egw_record&$record, &$import_csv)
 	{
 		// set eventOwner
-		$options =& $this->definition->plugin_options;
+		$options = & $this->definition->plugin_options;
 		$options['owner'] = $options['owner'] ? $options['owner'] : $this->user;
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($options['owner_from_csv']) {
-			if(!is_numeric($record['owner'])) {
+		if ($options['owner_from_csv']) {
+			if (!is_numeric($record['owner'])) {
 				$this->errors[$import_csv->get_current_position()] = lang(
 					'Invalid owner ID: %1.  Might be a bad field translation.  Used %2 instead.',
 					$record->owner,
@@ -99,7 +99,7 @@ 
 		}
 		
 		// Handle errors in length or start/end date
-		if($record->start > $record->end)
+		if ($record->start > $record->end)
 		{
 			$record->end = $record->start + $GLOBALS['egw_info']['user']['preferences']['calendar']['defaultlength'] * 60;
 			$this->warnings[$import_csv->get_current_position()] = lang('error: starttime has to be before the endtime !!!');
@@ -109,11 +109,11 @@ 
 		if ($record->participants && !is_array($record->participants)) {
 			// Importing participants in human friendly format:
 			// Name (quantity)? (status) Role[, Name (quantity)? (status) Role]+
-			preg_match_all('/(([^(]+?)(?: \(([\d]+)\))? \(([^,)]+)\)(?: ([^ ,]+))?)(?:, )?/',$record->participants,$participants);
+			preg_match_all('/(([^(]+?)(?: \(([\d]+)\))? \(([^,)]+)\)(?: ([^ ,]+))?)(?:, )?/', $record->participants, $participants);
 			$p_participants = array();
 			$missing = array();
 			list($lines, $p, $names, $quantity, $status, $role) = $participants;
-			foreach($names as $key => $name) {
+			foreach ($names as $key => $name) {
 				//error_log("Name: $name Quantity: {$quantity[$key]} Status: {$status[$key]} Role: {$role[$key]}");
 
 				// Search for direct account name, then user in accounts first
@@ -121,26 +121,26 @@ 
 				$id = importexport_helper_functions::account_name2id($name);
 
 				// If not found, or not an exact match to a user (account_name2id is pretty generous)
-				if(!$id || $names[$key] !== $this->bo->participant_name($id)) {
-					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1));
-					if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
+				if (!$id || $names[$key] !== $this->bo->participant_name($id)) {
+					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search, array('contact_id', 'account_id'), 'org_name,n_family,n_given,cat_id,contact_email', '', '%', false, 'OR', array(0, 1));
+					if ($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
 				}
-				if(!$id)
+				if (!$id)
 				{
 					// Use calendar's registered resources to find participant
-					foreach($this->bo->resources as $resource)
+					foreach ($this->bo->resources as $resource)
 					{
 						// Can't search for email
-						if($resource['app'] == 'email') continue;
+						if ($resource['app'] == 'email') continue;
 						// Special resource search, since it does special stuff in link_query
-						if($resource['app'] == 'resources')
+						if ($resource['app'] == 'resources')
 						{
-							if(!$this->resource_so)
+							if (!$this->resource_so)
 							{
 								$this->resource_so = new resources_so();
 							}
-							$result = $this->resource_so->search($search,'res_id');
-							if(count($result) >= 1) {
+							$result = $this->resource_so->search($search, 'res_id');
+							if (count($result) >= 1) {
 								$id = $resource['type'].$result[0]['res_id'];
 								break;
 							}
@@ -151,15 +151,15 @@ 
 							$link_options = array();
 							$result = Link::query($resource['app'], $search, $link_options);
 
-							if($result)
+							if ($result)
 							{
-								$id = $resource['type'] . key($result);
+								$id = $resource['type'].key($result);
 								break;
 							}
 						}
 					}
 				}
-				if($id) {
+				if ($id) {
 					$p_participants[$id] = calendar_so::combine_status(
 						$this->status_map[lang($status[$key])] ? $this->status_map[lang($status[$key])] : $status[$key][0],
 						$quantity[$key] ? $quantity[$key] : 1,
@@ -170,47 +170,47 @@ 
 				{
 					$missing[] = $name;
 				}
-				if(count($missing) > 0)
+				if (count($missing) > 0)
 				{
-					$this->warnings[$import_csv->get_current_position()] = $record->title . ' ' . lang('participants') . ': ' .
-						lang('Contact not found!') . '<br />'.implode(", ",$missing);
+					$this->warnings[$import_csv->get_current_position()] = $record->title.' '.lang('participants').': '.
+						lang('Contact not found!').'<br />'.implode(", ", $missing);
 				}
 			}
 			$record->participants = $p_participants;
 		}
 
-		if($record->recurrence)
+		if ($record->recurrence)
 		{
-			list($record->recur_type, $record->recur_interval) = explode('/',$record->recurrence,2);
+			list($record->recur_type, $record->recur_interval) = explode('/', $record->recurrence, 2);
 			$record->recur_interval = trim($record->recur_interval);
-			$record->recur_type = array_search(strtolower(trim($record->recur_type)), array_map('strtolower',$this->lookups['recurrence']));
+			$record->recur_type = array_search(strtolower(trim($record->recur_type)), array_map('strtolower', $this->lookups['recurrence']));
 			unset($record->recurrence);
 		}
 		$record->tzid = calendar_timezones::id2tz($record->tz_id);
 
-		if ( $options['conditions'] ) {
-			foreach ( $options['conditions'] as $condition ) {
+		if ($options['conditions']) {
+			foreach ($options['conditions'] as $condition) {
 				$records = array();
-				switch ( $condition['type'] ) {
+				switch ($condition['type']) {
 					// exists
 					case 'exists' :
 						// Check for that record
 						$result = $this->exists($record, $condition, $records);
 
-						if ( is_array( $records ) && count( $records ) >= 1) {
+						if (is_array($records) && count($records) >= 1) {
 							// apply action to all records matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$records as $event ) {
+							foreach ((array)$records as $event) {
 								$record->id = $event['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $record->category ) ) $record->category = explode( ',', $record->category );
-									$record->category = implode( ',', array_unique( array_merge( $record->category, $event['category'] ) ) );
+								if ($this->definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($record->category)) $record->category = explode(',', $record->category);
+									$record->category = implode(',', array_unique(array_merge($record->category, $event['category'])));
 								}
-								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+								$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 							}
 						} else {
 							$action = $condition['false'];
-							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+							$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 						}
 						break;
 
@@ -223,7 +223,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 
 		return $success;
@@ -238,14 +238,14 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$records = array())
+	protected function exists(importexport_iface_egw_record&$record, Array &$condition, &$records = array())
 	{
-		if($record->__get($condition['string']) && $condition['string'] == 'id') {
+		if ($record->__get($condition['string']) && $condition['string'] == 'id') {
 			$event = $this->bo->read($record->__get($condition['string']));
 			$records = array($event);
 		}
 
-		if ( is_array( $records ) && count( $records ) >= 1) {
+		if (is_array($records) && count($records) >= 1) {
 			return true;
 		}
 		return false;
@@ -258,7 +258,7 @@ 
 	 * @param array $_data record data for the action
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	protected function action($_action, importexport_iface_egw_record&$record, $record_num = 0)
 	{
 		$_data = $record->get_record_array();
 		switch ($_action) {
@@ -269,7 +269,7 @@ 
 				$old = $this->bo->read($_data['id']);
 
 				// Don't change a user account into a record
-				if(!$this->definition->plugin_options['change_owner']) {
+				if (!$this->definition->plugin_options['change_owner']) {
 					// Don't change owner of an existing record
 					unset($_data['owner']);
 				}
@@ -277,30 +277,30 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if (count($changed) == 0) {
 					return true;
 				}
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Backend doesn't like inserting with ID specified, can overwrite existing
 					unset($_data['id']);
 				}
 				// Make sure participants are set
-				if(!$_data['participants']) {
+				if (!$_data['participants']) {
 					$user = $_data['owner'] ? $_data['owner'] : $this->user;
 					$_data['participants'] = array(
 						$user => 'U'
 					);
 				}
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					// User is interested in conflict checks, do so for dry run
 					// Otherwise, conflicts are just ignored and imported anyway
-					if($this->definition->plugin_options['skip_conflicts'] && !$_data['non_blocking'])
+					if ($this->definition->plugin_options['skip_conflicts'] && !$_data['non_blocking'])
 					{
 						$conflicts = $this->bo->conflicts($_data);
-						if($conflicts)
+						if ($conflicts)
 						{
 							$this->conflict_warning($record_num, $conflicts);
 							$this->results['skipped']++;
@@ -311,15 +311,15 @@ 
 					return true;
 				} else {
 					$messages = null;
-					$result = $this->bo->update( $_data, 
+					$result = $this->bo->update($_data, 
 						!$this->definition->plugin_options['skip_conflicts'],
 						true, $this->is_admin, true, $messages,
 						$this->definition->plugin_options['no_notification']
 					);
-					if(!$result)
+					if (!$result)
 					{
-						$this->errors[$record_num] = lang('Unable to save') . "\n" .
-							implode("\n",$messages);
+						$this->errors[$record_num] = lang('Unable to save')."\n".
+							implode("\n", $messages);
 					}
 					else if (is_array($result))
 					{
@@ -349,10 +349,10 @@ 
 	 */
 	protected function conflict_warning($record_num, &$conflicts)
 	{
-		$this->warnings[$record_num] = lang('Conflicts') . ':';
-		foreach($conflicts as $conflict)
+		$this->warnings[$record_num] = lang('Conflicts').':';
+		foreach ($conflicts as $conflict)
 		{
-			$this->warnings[$record_num] .= "<br />\n" . Api\DateTime::to($conflict['start']) . "\t" . $conflict['title'];
+			$this->warnings[$record_num] .= "<br />\n".Api\DateTime::to($conflict['start'])."\t".$conflict['title'];
 		}
 	}
 
@@ -388,9 +388,9 @@ 
 	 *
 	 * @param egw_record $row_entry
 	 */
-	protected function row_preview(importexport_iface_egw_record &$row_entry)
+	protected function row_preview(importexport_iface_egw_record&$row_entry)
 	{
-		$row_entry->participants = implode('<br />', $this->bo->participants(array('participants' => $row_entry->participants),true));
+		$row_entry->participants = implode('<br />', $this->bo->participants(array('participants' => $row_entry->participants), true));
 	}
 
 }
\ No newline at end of file

calendar/inc/class.calendar_timezones.inc.php

Doc Comments +1 added lines

@@ -204,6 +204,7 @@
 	 *
 	 * @param boolean &$updated=null on return true if update was neccessary, false if tz's were already up to date
 	 * @param string $file ='calendar/setup/timezones.sqlite' filename relative to EGW_SERVER_ROOT
+	 * @param boolean $updated
 	 * @return string message about update
 	 * @throws Api\Exception\WrongParameter if $file is not readable or wrong format/version
 	 * @throws Api\Exception\WrongUserinput if no PDO sqlite support

Spacing +47 added lines, -47 removed lines

@@ -71,7 +71,7 @@ 
 	 */
 	public static function DateTimeZone($tzid)
 	{
-		if (($id = self::tz2id($tzid,'alias')))
+		if (($id = self::tz2id($tzid, 'alias')))
 		{
 			$tzid = self::id2tz($id);
 		}
@@ -89,34 +89,34 @@ 
 	 * @param string $what ='id' what to return, default id, null for whole array
 	 * @return int tz_id or null if not found
 	 */
-	public static function tz2id($tzid,$what='id')
+	public static function tz2id($tzid, $what = 'id')
 	{
-		$id =& self::$tz2id[$tzid];
+		$id = & self::$tz2id[$tzid];
 
 		if (!isset($id))
 		{
-			if (($data = $GLOBALS['egw']->db->select(self::TABLE,'*',array(
+			if (($data = $GLOBALS['egw']->db->select(self::TABLE, '*', array(
 				'tz_tzid' => $tzid,
-			),__LINE__,__FILE__,false,'','calendar')->fetch()))
+			), __LINE__, __FILE__, false, '', 'calendar')->fetch()))
 			{
 				$id = $data['tz_id'];
-				self::$tz_cache[$id] = Api\Db::strip_array_keys($data,'tz_');
+				self::$tz_cache[$id] = Api\Db::strip_array_keys($data, 'tz_');
 			}
 		}
 		// check if we can find a 3-part America timezone eg. check 'America/Argentina/Buenos_Aires' for 'America/Buenos_Aires'
 		if (!isset($id) && stripos($tzid, 'America/') === 0 && count($parts = explode('/', $tzid)) == 2)
 		{
-			if (($data = $GLOBALS['egw']->db->select(self::TABLE,'*',array(
+			if (($data = $GLOBALS['egw']->db->select(self::TABLE, '*', array(
 				'tz_tzid LIKE '.$GLOBALS['egw']->db->quote($parts[0].'/%/'.$parts[1]),
-			),__LINE__,__FILE__,false,'','calendar')->fetch()))
+			), __LINE__, __FILE__, false, '', 'calendar')->fetch()))
 			{
 				$id = $data['tz_id'];
-				self::$tz_cache[$id] = Api\Db::strip_array_keys($data,'tz_');
+				self::$tz_cache[$id] = Api\Db::strip_array_keys($data, 'tz_');
 			}
 		}
 		if (isset($id) && $what != 'id')
 		{
-			return self::id2tz($id,$what);
+			return self::id2tz($id, $what);
 		}
 		return $id;
 	}
@@ -134,24 +134,24 @@ 
 	 * @param string $what ='tzid' what data to return or null for whole data array, with keys 'id', 'tzid', 'component', 'alias', 'latitude', 'longitude'
 	 * @return mixed false: if not found
 	 */
-	public static function id2tz($id,$what='tzid')
+	public static function id2tz($id, $what = 'tzid')
 	{
-		$data =& self::$tz_cache[$id];
+		$data = & self::$tz_cache[$id];
 
 		if (!isset($data))
 		{
-			if (($data = $GLOBALS['egw']->db->select(self::TABLE,'*',array(
+			if (($data = $GLOBALS['egw']->db->select(self::TABLE, '*', array(
 				'tz_id' => $id,
-			),__LINE__,__FILE__,false,'','calendar')->fetch()))
+			), __LINE__, __FILE__, false, '', 'calendar')->fetch()))
 			{
-				$data = Api\Db::strip_array_keys($data,'tz_');
+				$data = Api\Db::strip_array_keys($data, 'tz_');
 				self::$tz2id[$data['tzid']] = $id;
 			}
 		}
 		// if not tzid queried, resolve aliases automatically
 		if ($data && $data['alias'] && $what != 'tzid' && $what != 'alias')
 		{
-			$data = self::id2tz($data['alias'],null);
+			$data = self::id2tz($data['alias'], null);
 		}
 		return !$data ? $data : ($what ? $data[$what] : $data);
 	}
@@ -170,8 +170,8 @@ 
 	 */
 	public static function init_static()
 	{
-		self::$tz_cache =& Api\Cache::getSession(__CLASS__,'tz_cache');
-		self::$tz2id =& Api\Cache::getSession(__CLASS__,'tz2id');
+		self::$tz_cache = & Api\Cache::getSession(__CLASS__, 'tz_cache');
+		self::$tz2id = & Api\Cache::getSession(__CLASS__, 'tz2id');
 
 		// init cache with mapping UTC <--> -1, as UTC is no real timezone, but we need to be able to use it in calendar
 		if (!is_array(self::$tz2id))
@@ -188,10 +188,10 @@ 
 		{
 			$updated = false;
 			$msg = self::import_zones($updated);
-			if ($updated) error_log($msg);	// log that timezones have been updated
+			if ($updated) error_log($msg); // log that timezones have been updated
 
 			$alias_msg = self::import_tz_aliases($updated);
-			if ($updated) error_log($alias_msg);	// log that timezone aliases have been updated
+			if ($updated) error_log($alias_msg); // log that timezone aliases have been updated
 
 			self::$import_msg = $msg.'<br/>'.$alias_msg;
 
@@ -210,7 +210,7 @@ 
 	 * @throws Api\Exception\WrongUserinput for broken sqlite extension
 	 * @link https://hg.mozilla.org/comm-central/raw-file/tip/calendar/timezones/zones.json
 	 */
-	public static function import_zones(&$updated=null, $file='calendar/setup/zones.json')
+	public static function import_zones(&$updated = null, $file = 'calendar/setup/zones.json')
 	{
 		$path = EGW_SERVER_ROOT.'/'.$file;
 
@@ -232,9 +232,9 @@ 
 		{
 			$updated = false;
 			fclose($fp);
-			return lang('Nothing to update, version is already %1.',$config['tz_version']);	// we already have the right
+			return lang('Nothing to update, version is already %1.', $config['tz_version']); // we already have the right
 		}
-		$json .= fread($fp, 1024*1024);
+		$json .= fread($fp, 1024 * 1024);
 		fclose($fp);
 		if (!($zones = json_decode($json, true)) || !isset($zones['aliases']) || !isset($zones['zones']))
 		{
@@ -242,38 +242,38 @@ 
 		}
 		// import zones first and then aliases
 		$tz2id = array();
-		foreach(array('zones', 'aliases') as $type)
+		foreach (array('zones', 'aliases') as $type)
 		{
-			foreach($zones[$type] as $tzid => $data)
+			foreach ($zones[$type] as $tzid => $data)
 			{
 				if ($type == 'aliases')
 				{
 					$data = array('alias' => $tz2id[$data['aliasTo']]);
-					if (!$data['alias']) continue;	// there's no such tzid
+					if (!$data['alias']) continue; // there's no such tzid
 				}
 				// check if already in database
-				$tz2id[$tzid] = $GLOBALS['egw']->db->select('egw_cal_timezones','tz_id',array(
+				$tz2id[$tzid] = $GLOBALS['egw']->db->select('egw_cal_timezones', 'tz_id', array(
 						'tz_tzid' => $tzid,
-					),__LINE__,__FILE__,false,'','calendar')->fetchColumn();
+					), __LINE__, __FILE__, false, '', 'calendar')->fetchColumn();
 
-				$GLOBALS['egw']->db->insert('egw_cal_timezones',array(
+				$GLOBALS['egw']->db->insert('egw_cal_timezones', array(
 					'tz_alias' => $data['alias'],
 					'tz_latitude' => $data['latitude'],
 					'tz_longitude' => $data['longitude'],
 					'tz_component' => $data['ics'],
-				),array(
+				), array(
 					'tz_tzid' => $tzid,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 
 				// only query last insert id, if not already in database (gives warning for PostgreSQL)
-				if (!$tz2id[$tzid]) $tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id');
+				if (!$tz2id[$tzid]) $tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones', 'tz_id');
 			}
 		}
 		Api\Config::save_value('tz_version', $tz_version, 'phpgwapi');
 
 		//_debug_array($tz2id);
 		$updated = true;
-		return lang('Timezones updated to version %1 (%2 records updated).',$tz_version,count($tz2id));
+		return lang('Timezones updated to version %1 (%2 records updated).', $tz_version, count($tz2id));
 	}
 
 	/**
@@ -284,7 +284,7 @@ 
 	 * @return string message about update
 	 * @throws Api\Exception\WrongParameter if $file is not readable or wrong format/version
 	 */
-	public static function import_tz_aliases(&$updated=null,$file='calendar/setup/tz_aliases.inc.php')
+	public static function import_tz_aliases(&$updated = null, $file = 'calendar/setup/tz_aliases.inc.php')
 	{
 		$path = EGW_SERVER_ROOT.'/'.$file;
 
@@ -297,27 +297,27 @@ 
 		if ($tz_aliases_mtime === $config['tz_aliases_mtime'])
 		{
 			$updated = false;
-			return lang('Nothing to update, version is already %1.',$tz_aliases_mtime);
+			return lang('Nothing to update, version is already %1.', $tz_aliases_mtime);
 		}
 		$tz_aliases = array();
-		include($path);	// sets $tz_aliases
+		include($path); // sets $tz_aliases
 
 		$updates = 0;
-		foreach($tz_aliases as $alias => $tzid)
+		foreach ($tz_aliases as $alias => $tzid)
 		{
-			if ((!($alias_id=self::tz2id($alias, 'alias')) || self::id2tz($alias_id, 'tzid') !== $tzid) &&	// not in DB or different
+			if ((!($alias_id = self::tz2id($alias, 'alias')) || self::id2tz($alias_id, 'tzid') !== $tzid) && // not in DB or different
 				($tz_id = self::tz2id($tzid)))	// given tzid for alias exists in DB
 			{
-				$GLOBALS['egw']->db->insert('egw_cal_timezones',array(
+				$GLOBALS['egw']->db->insert('egw_cal_timezones', array(
 					'tz_alias' => $tz_id,
-				),array(
+				), array(
 					'tz_tzid' => $alias,
-				),__LINE__,__FILE__,'calendar');
+				), __LINE__, __FILE__, 'calendar');
 				++$updates;
 			}
 			//error_log(__METHOD__."() alias=$alias, tzid=$tzid --> self::tz2id('$alias', 'alias') = ".array2string($alias_id).",  self::tz2id('$tzid')=".array2string($tz_id));
 		}
-		Api\Config::save_value('tz_aliases_mtime',$tz_aliases_mtime,$app='phpgwapi');
+		Api\Config::save_value('tz_aliases_mtime', $tz_aliases_mtime, $app = 'phpgwapi');
 
 		//_debug_array($tz2id);
 		$updated = true;
@@ -358,8 +358,8 @@ 
 		}
 		// $vtimezone is a string with a single VTIMEZONE component, afaik Horde_Icalendar can not add it directly
 		// --> we have to parse it and let Horde_Icalendar add it again
-		$horde_vtimezone = Horde_Icalendar::newComponent('VTIMEZONE',$container=false);
-		$horde_vtimezone->parsevCalendar($vtimezone,'VTIMEZONE');
+		$horde_vtimezone = Horde_Icalendar::newComponent('VTIMEZONE', $container = false);
+		$horde_vtimezone->parsevCalendar($vtimezone, 'VTIMEZONE');
 		// DTSTART is in UTC time, Horde_Icalendar parses it in server timezone, which we need to set again for printing
 		$standard = $horde_vtimezone->findComponent('STANDARD');
 		if (is_a($standard, 'Horde_Icalendar'))
@@ -390,7 +390,7 @@ 
 	 * @param string $type ='vcalendar' 'tzid' or everything tz2id supports, default 'vcalendar' = full vcalendar component
 	 * @return string
 	 */
-	public static function user_timezone($user=null, $type='vcalendar')
+	public static function user_timezone($user = null, $type = 'vcalendar')
 	{
 		if (!$user || $user == $GLOBALS['egw_info']['user']['account_id'])
 		{
@@ -409,7 +409,7 @@ 
 			case 'vcalendar':
 				// checking type of $val, now we included the object definition (no need to always include it!)
 				$vcal = new Horde_Icalendar;
-				$vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
+				$vcal->setAttribute('PRODID', '-//EGroupware//NONSGML EGroupware Calendar '.$GLOBALS['egw_info']['apps']['calendar']['version'].'//'.
 					strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
 				self::add_vtimezone($vcal, $tzid);
 				$tzid = $vcal->exportvCalendar('utf-8');
@@ -417,7 +417,7 @@ 
 			case 'tzid':
 				break;
 			default:
-				$tzid = self::tz2id($tzid,$type == 'vcalendar' ? 'component' : $type);
+				$tzid = self::tz2id($tzid, $type == 'vcalendar' ? 'component' : $type);
 				break;
 		}
 		return $tzid;

Braces +27 added lines, -6 removed lines

@@ -188,10 +188,18 @@ 
 		{
 			$updated = false;
 			$msg = self::import_zones($updated);
-			if ($updated) error_log($msg);	// log that timezones have been updated
+			if ($updated)
+			{
+				error_log($msg);
+			}
+			// log that timezones have been updated
 
 			$alias_msg = self::import_tz_aliases($updated);
-			if ($updated) error_log($alias_msg);	// log that timezone aliases have been updated
+			if ($updated)
+			{
+				error_log($alias_msg);
+			}
+			// log that timezone aliases have been updated
 
 			self::$import_msg = $msg.'<br/>'.$alias_msg;
 
@@ -249,7 +257,11 @@ 
 				if ($type == 'aliases')
 				{
 					$data = array('alias' => $tz2id[$data['aliasTo']]);
-					if (!$data['alias']) continue;	// there's no such tzid
+					if (!$data['alias'])
+					{
+						continue;
+					}
+					// there's no such tzid
 				}
 				// check if already in database
 				$tz2id[$tzid] = $GLOBALS['egw']->db->select('egw_cal_timezones','tz_id',array(
@@ -266,7 +278,10 @@ 
 				),__LINE__,__FILE__,'calendar');
 
 				// only query last insert id, if not already in database (gives warning for PostgreSQL)
-				if (!$tz2id[$tzid]) $tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id');
+				if (!$tz2id[$tzid])
+				{
+					$tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id');
+				}
 			}
 		}
 		Api\Config::save_value('tz_version', $tz_version, 'phpgwapi');
@@ -306,13 +321,16 @@ 
 		foreach($tz_aliases as $alias => $tzid)
 		{
 			if ((!($alias_id=self::tz2id($alias, 'alias')) || self::id2tz($alias_id, 'tzid') !== $tzid) &&	// not in DB or different
-				($tz_id = self::tz2id($tzid)))	// given tzid for alias exists in DB
+				($tz_id = self::tz2id($tzid)))
+			{
+				// given tzid for alias exists in DB
 			{
 				$GLOBALS['egw']->db->insert('egw_cal_timezones',array(
 					'tz_alias' => $tz_id,
 				),array(
 					'tz_tzid' => $alias,
 				),__LINE__,__FILE__,'calendar');
+			}
 				++$updates;
 			}
 			//error_log(__METHOD__."() alias=$alias, tzid=$tzid --> self::tz2id('$alias', 'alias') = ".array2string($alias_id).",  self::tz2id('$tzid')=".array2string($tz_id));
@@ -402,7 +420,10 @@ 
 			$prefs = $prefs_obj->read();
 			$tzid = $prefs['common']['tz'];
 		}
-		if (!$tzid) $tzid = Api\DateTime::$server_timezone->getName();
+		if (!$tzid)
+		{
+			$tzid = Api\DateTime::$server_timezone->getName();
+		}
 
 		switch ($type)
 		{

calendar/inc/class.calendar_uiforms.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -1077,7 +1077,7 @@ 
 	 *	date instead of today
 	 * @param boolean $no_notifications Toggle notifications to participants
 	 *
-	 * @return false or error message
+	 * @return string|false or error message
 	 */
 	function _break_recurring(&$event, $old_event, $as_of_date = null, $no_notifications = true)
 	{
@@ -2173,7 +2173,7 @@ 
 	 * Freetime search
 	 *
 	 * As the function is called in a popup via javascript, parametes get initialy transfered via the url
-	 * @param array $content=null array with parameters or false (default) to use the get-params
+	 * @param array $content array with parameters or false (default) to use the get-params
 	 * @param string start[str] start-date
 	 * @param string start[hour] start-hour
 	 * @param string start[min] start-minutes
@@ -2417,7 +2417,7 @@ 
 	/**
      * Export events as vCalendar version 2.0 files (iCal)
      *
-     * @param int|array $content numeric cal_id or submitted content from etempalte::exec
+     * @param integer $content numeric cal_id or submitted content from etempalte::exec
      * @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
      */

Indentation +11 added lines, -11 removed lines

@@ -2415,14 +2415,14 @@ 
 	}
 
 	/**
-     * Export events as vCalendar version 2.0 files (iCal)
-     *
-     * @param int|array $content numeric cal_id or submitted content from etempalte::exec
-     * @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)
-    {
+	 * Export events as vCalendar version 2.0 files (iCal)
+	 *
+	 * @param int|array $content numeric cal_id or submitted content from etempalte::exec
+	 * @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)
+	{
 		$boical = new calendar_ical();
 		#error_log(__METHOD__.print_r($content,true));
 		if (is_numeric($cal_id = $content ? $content : $_REQUEST['cal_id']))
@@ -2476,7 +2476,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('iCal Export');
 		$etpl = new etemplate_new('calendar.export');
 		$etpl->exec('calendar.calendar_uiforms.export',$content);
-    }
+	}
 	
 	/**
 	 * Edit category ACL (admin only)
@@ -2548,8 +2548,8 @@ 
 	}
 
 	/**
-	* Set up the required fields to get the history tab
-	*/
+	 * Set up the required fields to get the history tab
+	 */
 	public function setup_history(&$content, &$sel_options)
 	{
 		$status = 'history_status';

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

@@ -2890,11 +2890,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');
 		}
 	}
 

Braces +286 added lines, -73 removed lines

@@ -110,11 +110,14 @@ 
 		if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
 			!$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 ($owner)
+			{
+				// make an owner who is no user or we have no add-rights a participant
 			{
 				if(!is_array($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')
@@ -146,9 +149,17 @@ 
 		$participant_types['u'] = $participant_types = $participants = array();
 		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))
 			{
@@ -186,10 +197,13 @@ 
 				}
 			}
 		}
-		if (!$participants)	// if all participants got removed, include current user
+		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');
 		}
+		}
 		if(isset($_GET['cat_id']))
 		{
 			$cat_id = explode(',',$_GET['cat_id']);
@@ -239,10 +253,13 @@ 
 	 */
 	function process_edit($content)
 	{
-		if (!is_array($content))	// redirect from etemplate, if POST empty
+		if (!is_array($content))
+		{
+			// redirect from etemplate, if POST empty
 		{
 			return $this->edit(null,null,strip_tags($_GET['msg']));
 		}
+		}
 		// clear notification errors
 		notifications::errors(true);
 		$messages = null;
@@ -255,7 +272,11 @@ 
 		$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'];
@@ -268,7 +289,10 @@ 
 		{
 			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)
 			{
@@ -277,7 +301,10 @@ 
 				foreach ($recur_exceptions as $id)
 				{
 					if (!($exception = $this->bo->read($id)) ||
-							$exception['recurrence'] != $content['recur_exception'][$key]) continue;
+							$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']);
@@ -352,7 +379,10 @@ 
 				$event['end'] = $this->bo->date2ts($event['end']);
 			}
 			// some checks for recurrences, if you give a date, make it a weekly repeating event and visa versa
-			if ($event['recur_type'] == MCAL_RECUR_NONE && $event['recur_data']) $event['recur_type'] = MCAL_RECUR_WEEKLY;
+			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']);
@@ -475,7 +505,11 @@ 
 							break;
 
 						default:		// existing participant row
-							if (!is_array($data)) continue;	// widgets in participant tab, above participant list
+							if (!is_array($data))
+							{
+								continue;
+							}
+							// widgets in participant tab, above participant list
 							foreach(array('uid','status','quantity','role') as $name)
 							{
 								$$name = $data[$name];
@@ -607,7 +641,10 @@ 
 			{
 				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';
@@ -689,17 +726,23 @@ 
 			{
 				foreach (array_keys($event['participants']) as $uid)
 				{
-					if ($uid[0] == 'r') //ressource detection
+					if ($uid[0] == 'r')
+					{
+						//ressource detection
 					{
 						$msg = lang('Error: ressources reservation in private events is not allowed!!!');
+					}
 						$button = '';
 						break 2; //break foreach and case
 					}
 				}
 			}
-			if ($content['edit_single'])	// we edited a single event from a series
+			if ($content['edit_single'])
+			{
+				// we edited a single event from a series
 			{
 				$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']);
@@ -795,7 +838,10 @@ 
 										case 'no':
 											break;
 										case 'startday':
-											if ($sameday) break;
+											if ($sameday)
+											{
+												break;
+											}
 										default:
 											$status_reset_to_unknown = true;
 											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
@@ -957,7 +1003,10 @@ 
 				if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
 				{
 					$msg = lang('Series deleted');
-					if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					if ($exceptions_kept)
+					{
+						$msg .= lang(', exceptions preserved');
+					}
 				}
 				else
 				{
@@ -993,11 +1042,14 @@ 
 				{
 					$msg = lang("Can't add alarms in the past !!!");
 				}
-				elseif ($event['id'])	// save the alarm immediatly
+				elseif ($event['id'])
+				{
+					// save the alarm immediatly
 				{
 					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
 					{
 						$alarm['id'] = $alarm_id;
+				}
 						$event['alarm'][$alarm_id] = $alarm;
 
 						$msg = lang('Alarm added');
@@ -1010,7 +1062,9 @@ 
 				}
 				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;
 				}
 			}
@@ -1033,10 +1087,13 @@ 
 		}
 		if (in_array($button,array('cancel','save','delete','delete_exceptions','delete_keep_exceptions')) && $noerror)
 		{
-			if ($content['lock_token'])	// remove an existing lock
+			if ($content['lock_token'])
+			{
+				// remove an existing lock
 			{
 				Vfs::unlock(Vfs::app_entry_lock_path('calendar',$content['id']),$content['lock_token'],false);
 			}
+			}
 			if ($content['no_popup'])
 			{
 				Egw::redirect_link('/index.php',array(
@@ -1143,8 +1200,7 @@ 
 		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()
-		)
-		{
+		) {
 
 			unset($orig_event);
 			// copy event by unsetting the id(s)
@@ -1232,32 +1288,50 @@ 
 		foreach($event['participants'] as $uid => $status)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$uid.':'.array2string($status));
-			if (empty($status)) continue;
+			if (empty($status))
+			{
+				continue;
+			}
 			$toadd = '';
-			if ((isset($status['status']) && $status['status'] == 'R') || (isset($status['uid']) && $status['uid'] == $this->user)) continue;
+			if ((isset($status['status']) && $status['status'] == 'R') || (isset($status['uid']) && $status['uid'] == $this->user))
+			{
+				continue;
+			}
 
 			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;
+				}
 
 				$lid = $firstname = $lastname = null;
 				$GLOBALS['egw']->accounts->get_account_name($status['uid'],$lid,$firstname,$lastname);
 
 				$toadd = $firstname.' '.$lastname.' <'.$email.'>';
-				if (!in_array($toadd,$to)) $to[] = $toadd;
+				if (!in_array($toadd,$to))
+				{
+					$to[] = $toadd;
+				}
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
 			elseif ($uid < 0)
 			{
 				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;
+					}
 
 					$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
 
 					$toadd = $firstname.' '.$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;
+					}
 					//error_log(__METHOD__.__LINE__.array2string($to));
 				}
 			}
@@ -1310,7 +1384,10 @@ 
 			'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.');
+		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.');
+		}
 		$response = Api\Json\Response::get();
 		$response->call('app.calendar.custom_mail', $vars);
 	}
@@ -1496,9 +1573,15 @@ 
 				}
 			}
 			// 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']);
@@ -1511,10 +1594,13 @@ 
 				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)
 					{
 						$event['title'] = Link::title($link_app,$link_id);
@@ -1523,7 +1609,10 @@ 
 						{
 							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']);
@@ -1549,10 +1638,13 @@ 
 			$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
+			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);
 			}
+			}
 			if (($lock = Vfs::checkLock($lock_path)) && $lock['owner'] != $lock_owner)
 			{
 				$msg .= ' '.lang('This entry is currently opened by %1!',
@@ -1585,14 +1677,20 @@ 
 		));
 		Framework::message($msg, $msg_type);
 		$content['duration'] = $content['end'] - $content['start'];
-		if (isset($this->durations[$content['duration']])) $content['end'] = '';
+		if (isset($this->durations[$content['duration']]))
+		{
+			$content['end'] = '';
+		}
 
 		$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)
 		{
-			if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n];
+			if (isset($event['participants'][$n]))
+			{
+				$content['participants'][$n] = $event['participants'][$n];
+			}
 		}
 		foreach($event['participant_types'] as $type => $participants)
 		{
@@ -1634,9 +1732,13 @@ 
 				//echo "<p>$uid ($quantity): $role --> {$content['participants'][$row]['role']}</p>\n";
 
 				if (($no_status = !$this->bo->check_status_perms($uid,$event)) || $view)
-					$readonlys['participants'][$row]['status'] = $no_status;
+				{
+									$readonlys['participants'][$row]['status'] = $no_status;
+				}
 				if ($preserv['hide_delete'] || !$this->bo->check_perms(Acl::EDIT,$event))
-					$readonlys['participants']['delete'][$uid] = true;
+				{
+									$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
@@ -1667,7 +1769,11 @@ 
 			$content['participants']['cal_resources'] = '';
 			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'];
 			}
 		}
@@ -1695,9 +1801,18 @@ 
 				$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');
+				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'));
 				$content['alarm'][] = $alarm;
 
@@ -1760,25 +1875,34 @@ 
 			'participants' => $this->accountsel->account_selection == 'none',
 			'history' => !$event['id'],
 		);
-		if (!isset($GLOBALS['egw_info']['user']['apps']['mail']))	// no mail without mail-app
+		if (!isset($GLOBALS['egw_info']['user']['apps']['mail']))
+		{
+			// no mail without mail-app
 		{
 			unset($sel_options['action']['mail']);
+		}
 			unset($sel_options['action']['sendmeetingrequest']);
 		}
-		if (!$event['id'])	// no ical export for new (not saved) events
+		if (!$event['id'])
+		{
+			// no ical export for new (not saved) events
 		{
 			$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'])))
 		{
 			$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);
 
-		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');
 		}
+		}
 		if (isset($event['participant_types']['u'][$this->user]))
 		{
 			$sel_options['owner'][$this->user] = $this->bo->participant_name($this->user);
@@ -1820,7 +1944,10 @@ 
 
 		$content['cancel_needs_refresh'] = (bool)$_GET['cancel_needs_refresh'];
 
-		if (!empty($preserved['lock_token'])) $content['lock_token'] = $preserved['lock_token'];
+		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)
@@ -2022,7 +2149,10 @@ 
 					// set status and send notification / meeting response
 					if ($this->bo->set_status($event['id'], $user, $status))
 					{
-						if (!$msg) $msg = lang('Status changed');
+						if (!$msg)
+						{
+							$msg = lang('Status changed');
+						}
 					}
 					break;
 
@@ -2101,13 +2231,16 @@ 
 
 		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'])
 				{
 					case 'no':
 						$readonlys['button[ignore]'] = true;
+			}
 						break;
 					case 'allusers':
 						$readonlys['button[ignore]'] = false;
@@ -2251,7 +2384,10 @@ 
 		}
 		else
 		{
-			if (!$content['duration']) $content['duration'] = $content['end'] - $content['start'];
+			if (!$content['duration'])
+			{
+				$content['duration'] = $content['end'] - $content['start'];
+			}
 			$weekds = 0;
 			foreach ($content['weekdays'] as &$wdays)
 			{
@@ -2273,7 +2409,10 @@ 
 		$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'] = '';
+		if ($content['duration'] && isset($sel_options['duration'][$content['duration']]))
+		{
+			$content['end'] = '';
+		}
 
 		$etpl->exec('calendar.calendar_uiforms.freetimesearch',$content,$sel_options,NULL,array(
 				'participants'	=> $content['participants'],
@@ -2294,7 +2433,10 @@ 
 	 */
 	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,
@@ -2311,15 +2453,26 @@ 
 		$n = 0;
 		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
+ 			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)
 			{
-				if ($event['participants'][$uid] == 'R') continue;
+				if ($event['participants'][$uid] == 'R')
+				{
+					continue;
+				}
 
 				if (isset($event['participants'][$uid]) ||
 					$uid > 0 && array_intersect(array_keys((array)$event['participants']),
@@ -2329,7 +2482,10 @@ 
 					break;
 				}
 			}
-			if (!$non_rejected_found) continue;
+			if (!$non_rejected_found)
+			{
+				continue;
+			}
 
 			if ($this->debug)
 			{
@@ -2360,11 +2516,17 @@ 
 					'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;
 	}
@@ -2384,10 +2546,16 @@ 
 	 */
 	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();
+		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
@@ -2397,7 +2565,10 @@ 
 		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)
@@ -2418,13 +2589,19 @@ 
 				}
 				$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;
 				}
+				}
 				// if end_time given use it, else the original slot's end
 				$end = $end_time ? $daybegin + $end_time*HOUR_s : $ft['end'];
-				if ($end > $ft['end']) $end = $ft['end'];
+				if ($end > $ft['end'])
+				{
+					$end = $ft['end'];
+				}
 
 				// slot to small for duration
 				if ($end - $start < $duration)
@@ -2466,7 +2643,10 @@ 
 			{
 				$msg = lang('Permission denied');
 
-				if ($return_error) return $msg;
+				if ($return_error)
+				{
+					return $msg;
+				}
 			}
 			else
 			{
@@ -2528,27 +2708,42 @@ 
 		{
 			list($button) = each($_content['button']);
 			unset($_content['button']);
-			if ($button != 'cancel')	// store changed Acl
+			if ($button != 'cancel')
+			{
+				// store changed Acl
 			{
 				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)
 					{
 						$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);
+						}
 					}
 				}
 			}
-			if ($button != 'apply')	// end dialog
+			if ($button != 'apply')
+			{
+				// end dialog
 			{
 				Egw::redirect_link('/index.php', array(
 					'menuaction' => 'admin.admin_ui.index',
 					'ajax' => 'true'
 				), 'admin');
 			}
+			}
 		}
 		$content= $preserv = array();
 		$n = 1;
@@ -2562,8 +2757,14 @@ 
 			);
 			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(
@@ -2691,7 +2892,10 @@ 
 					break;
 				}
 			}
-			if($return) return;
+			if($return)
+			{
+				return;
+			}
 		}
 		$old_event=$event=$this->bo->read($eventId);
 		if (!$durationT)
@@ -2784,7 +2988,10 @@ 
 			$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;
@@ -2802,7 +3009,10 @@ 
 					case 'no':
 						break;
 					case 'startday':
-						if ($sameday) break;
+						if ($sameday)
+						{
+							break;
+						}
 					default:
 						$status_reset_to_unknown = true;
 						$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
@@ -2840,7 +3050,10 @@ 
 		{
 			$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)

Switch Indentation +229 added lines, -229 removed lines

@@ -584,214 +584,214 @@ 
 
 		switch((string)$button)
 		{
-		case 'exception':	// create an exception in a recuring event
-			$msg = $this->_create_exception($event,$preserv);
-			break;
+			case 'exception':	// create an exception in a recuring event
+				$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
-			unset($event['id']);
-			unset($event['uid']);
-			unset($event['reference']);
-			unset($preserv['reference']);
-			unset($event['recurrence']);
-			unset($preserv['recurrence']);
-			unset($event['recur_exception']);
-			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'];
+			case 'copy':	// create new event with copied content, some content need to be unset to make a "new" event
+				unset($event['id']);
+				unset($event['uid']);
+				unset($event['reference']);
+				unset($preserv['reference']);
+				unset($event['recurrence']);
+				unset($preserv['recurrence']);
+				unset($event['recur_exception']);
+				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'];
+
+				// Clear participant stati
+				foreach($event['participant_types'] as $type => &$participants)
+				{
+					foreach($participants as $id => &$p_response)
+					{
+						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);
+					}
+				}
 
-			// Clear participant stati
-			foreach($event['participant_types'] as $type => &$participants)
-			{
-				foreach($participants as $id => &$p_response)
+				// Copy alarms
+				if (is_array($event['alarm']))
 				{
-					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);
+					foreach($event['alarm'] as $n => &$alarm)
+					{
+						unset($alarm['id']);
+						unset($alarm['cal_id']);
+					}
 				}
-			}
 
-			// Copy alarms
-			if (is_array($event['alarm']))
-			{
-				foreach($event['alarm'] as $n => &$alarm)
+				// 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)
 				{
-					unset($alarm['id']);
-					unset($alarm['cal_id']);
+					if ($link['app'] != Link::VFS_APPNAME)
+					{
+						Link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					}
+					elseif ($link['app'] == Link::VFS_APPNAME)
+					{
+						Link::link('calendar', $content['link_to']['to_id'], Link::VFS_APPNAME, array(
+							'tmp_name' => Link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
+							'name' => $link['id'],
+						), $link['remark']);
+					}
 				}
-			}
+				unset($link);
+				$preserv['view'] = $preserv['edit_single'] = false;
+				$msg = lang('Event copied - the copy can now be edited');
+				$event['title'] = lang('Copy of:').' '.$event['title'];
+				break;
 
-			// 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)
-			{
-				if ($link['app'] != Link::VFS_APPNAME)
+			case 'mail':
+			case 'sendrequest':
+			case 'save':
+			case 'print':
+			case 'apply':
+			case 'infolog':
+				if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
 				{
-					Link::link('calendar', $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
+					$msg = lang('Permission denied');
+					$button = '';
+					break;
 				}
-				elseif ($link['app'] == Link::VFS_APPNAME)
+				if ($event['start'] > $event['end'])
 				{
-					Link::link('calendar', $content['link_to']['to_id'], Link::VFS_APPNAME, array(
-						'tmp_name' => Link::vfs_path($link['app2'], $link['id2']).'/'.$link['id'],
-						'name' => $link['id'],
-					), $link['remark']);
+					$msg = lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
 				}
-			}
-			unset($link);
-			$preserv['view'] = $preserv['edit_single'] = false;
-			$msg = lang('Event copied - the copy can now be edited');
-			$event['title'] = lang('Copy of:').' '.$event['title'];
-			break;
-
-		case 'mail':
-		case 'sendrequest':
-		case 'save':
-		case 'print':
-		case 'apply':
-		case 'infolog':
-			if ($event['id'] && !$this->bo->check_perms(Acl::EDIT,$event))
-			{
-				$msg = lang('Permission denied');
-				$button = '';
-				break;
-			}
-			if ($event['start'] > $event['end'])
-			{
-				$msg = lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
-			{
-				$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
-				$button = '';
-				break;
-			}
-			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 = '';
-				break;
-			}
-			if (!$event['participants'])
-			{
-				$msg = lang('Error: no participants selected !!!');
-				$button = '';
-				break;
-			}
-			// if private event with ressource reservation is forbidden
-			if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
-			{
-				foreach (array_keys($event['participants']) as $uid)
+				if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'] > $event['recur_enddate'])
 				{
-					if ($uid[0] == 'r') //ressource detection
+					$msg = lang('repetition').': '.lang('Error: Starttime has to be before the endtime !!!');
+					$button = '';
+					break;
+				}
+				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 = '';
+					break;
+				}
+				if (!$event['participants'])
+				{
+					$msg = lang('Error: no participants selected !!!');
+					$button = '';
+					break;
+				}
+				// if private event with ressource reservation is forbidden
+				if (!$event['public'] && $GLOBALS['egw_info']['server']['no_ressources_private'])
+				{
+					foreach (array_keys($event['participants']) as $uid)
 					{
-						$msg = lang('Error: ressources reservation in private events is not allowed!!!');
-						$button = '';
-						break 2; //break foreach and case
+						if ($uid[0] == 'r') //ressource detection
+						{
+							$msg = lang('Error: ressources reservation in private events is not allowed!!!');
+							$button = '';
+							break 2; //break foreach and case
+						}
 					}
 				}
-			}
-			if ($content['edit_single'])	// we edited a single event from a series
-			{
-				$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']);
-				if (!is_array($conflicts) && $conflicts)
+				if ($content['edit_single'])	// we edited a single event from a series
 				{
-					// 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)
+					$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']);
+					if (!is_array($conflicts) && $conflicts)
 					{
-						if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
+						// 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)
 						{
-							$rrule = calendar_rrule::event2rrule($recur_event, true);
-							foreach ($rrule as $time)
+							if ($alarm['time'] == $content['edit_single'] - $alarm['offset'])
 							{
-								if ($content['edit_single'] < $time->format('ts'))
+								$rrule = calendar_rrule::event2rrule($recur_event, true);
+								foreach ($rrule as $time)
 								{
-									$alarm['time'] = $time->format('ts') - $alarm['offset'];
-									$this->bo->save_alarm($event['reference'], $alarm);
-									break;
+									if ($content['edit_single'] < $time->format('ts'))
+									{
+										$alarm['time'] = $time->format('ts') - $alarm['offset'];
+										$this->bo->save_alarm($event['reference'], $alarm);
+										break;
+									}
 								}
 							}
 						}
-					}
-					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
+							Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$content['reference'].':'.$content['actual_date'], 'data' => null));
+						}
+
+						unset($recur_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
 					{
-						// Sending null will trigger a removal of the original
-						// for that date
-						Api\Json\Response::get()->generic('data', array('uid' => 'calendar::'.$content['reference'].':'.$content['actual_date'], 'data' => null));
+						$event['id'] = $event['reference'];
+						$event['reference'] = $event['recurrence'] = 0;
+						$event['uid'] = $content['uid'];
 					}
-
-					unset($recur_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
-				{
-					$event['id'] = $event['reference'];
-					$event['reference'] = $event['recurrence'] = 0;
-					$event['uid'] = $content['uid'];
+					$update_type = 'edit';
 				}
-				$update_type = 'edit';
-			}
-			else	// we edited a non-reccuring event or the whole series
-			{
-				if (($old_event = $this->bo->read($event['id'])))
+				else	// we edited a non-reccuring event or the whole series
 				{
-					if ($event['recur_type'] != MCAL_RECUR_NONE)
+					if (($old_event = $this->bo->read($event['id'])))
 					{
-						$update_type = 'edit';
-
-						// we edit a existing series event
-						if ($event['start'] != $old_event['start'] ||
-							$event['whole_day'] != $old_event['whole_day'] ||
-							$event['end'] != $old_event['end'])
+						if ($event['recur_type'] != MCAL_RECUR_NONE)
 						{
-							// calculate offset against old series start or clicked recurrance,
-							// depending on which is smaller
-							$offset = $event['start'] - $old_event['start'];
-							if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
-							{
-								$offset = $off2;
-							}
-							$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
-							if($msg)
+							$update_type = 'edit';
+
+							// we edit a existing series event
+							if ($event['start'] != $old_event['start'] ||
+								$event['whole_day'] != $old_event['whole_day'] ||
+								$event['end'] != $old_event['end'])
 							{
-								$noerror = false;
+								// calculate offset against old series start or clicked recurrance,
+								// depending on which is smaller
+								$offset = $event['start'] - $old_event['start'];
+								if (abs($offset) > abs($off2 = $event['start'] - $event['actual_date']))
+								{
+									$offset = $off2;
+								}
+								$msg = $this->_break_recurring($event, $old_event, $event['actual_date'] + $offset,$content['no_notifications']);
+								if($msg)
+								{
+									$noerror = false;
+								}
 							}
 						}
-					}
-					else
-					{
-						if ($old_event['start'] != $event['start'] ||
-							$old_event['end'] != $event['end'] ||
-							$event['whole_day'] != $old_event['whole_day'])
+						else
 						{
-							$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
-							foreach((array)$event['participants'] as $uid => $status)
+							if ($old_event['start'] != $event['start'] ||
+								$old_event['end'] != $event['end'] ||
+								$event['whole_day'] != $old_event['whole_day'])
 							{
-								$q = $r = null;
-								calendar_so::split_status($status,$q,$r);
-								if ($uid[0] != 'c' && $uid[0] != 'e' && $uid != $this->bo->user && $status != 'U')
+								$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
+								foreach((array)$event['participants'] as $uid => $status)
 								{
-									$preferences = new Api\Preferences($uid);
-									$part_prefs = $preferences->read_repository();
-									switch ($part_prefs['calendar']['reset_stati'])
+									$q = $r = null;
+									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);
+										$part_prefs = $preferences->read_repository();
+										switch ($part_prefs['calendar']['reset_stati'])
+										{
 										case 'no':
 											break;
 										case 'startday':
@@ -800,7 +800,7 @@ 
 											$status_reset_to_unknown = true;
 											$event['participants'][$uid] = calendar_so::combine_status('U',$q,$r);
 											// todo: report reset status to user
-									}
+										}
 								}
 							}
 							// check if we need to move the alarms, because they are relative
@@ -942,83 +942,83 @@ 
 			}
 			break;
 
-		case 'cancel':
-			if($content['cancel_needs_refresh'])
-			{
-				Framework::refresh_opener($msg, 'calendar');
-			}
-			break;
-
-		case 'delete':					// delete of event (regular or series)
-			$exceptions_kept = null;
-			if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
-				$content['delete_exceptions'] == 'true', $exceptions_kept))
-			{
-				if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+			case 'cancel':
+				if($content['cancel_needs_refresh'])
 				{
-					$msg = lang('Series deleted');
-					if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					Framework::refresh_opener($msg, 'calendar');
 				}
-				else
+				break;
+
+			case 'delete':					// delete of event (regular or series)
+				$exceptions_kept = null;
+				if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
+					$content['delete_exceptions'] == 'true', $exceptions_kept))
 				{
-					$msg = lang('Event deleted');
-				}
+					if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
+					{
+						$msg = lang('Series deleted');
+						if ($exceptions_kept) $msg .= lang(', exceptions preserved');
+					}
+					else
+					{
+						$msg = lang('Event deleted');
+					}
 
-			}
-			break;
+				}
+				break;
 
-		case 'freetime':
-			// the "click" has to be in onload, to make sure the button is already created
-			$event['button_was'] = $button;
-			break;
+			case 'freetime':
+				// the "click" has to be in onload, to make sure the button is already created
+				$event['button_was'] = $button;
+				break;
 
-		case 'add_alarm':
-			$time = $content['start'];
-			$offset = $time - $content['new_alarm']['date'];
-			if ($event['recur_type'] != MCAL_RECUR_NONE &&
-				($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
-				$time < $next_occurrence['start'])
-			{
-				$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']))
-			{
-				$alarm = array(
-					'offset' => $offset,
-					'time'   => $content['new_alarm']['date'],
-					'all'    => !$content['new_alarm']['owner'],
-					'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
-				);
-				if ($alarm['time'] < $this->bo->now_su)
+			case 'add_alarm':
+				$time = $content['start'];
+				$offset = $time - $content['new_alarm']['date'];
+				if ($event['recur_type'] != MCAL_RECUR_NONE &&
+					($next_occurrence = $this->bo->read($event['id'], $this->bo->now_su + $offset, true)) &&
+					$time < $next_occurrence['start'])
 				{
-					$msg = lang("Can't add alarms in the past !!!");
+					$content['new_alarm']['date'] = $next_occurrence['start'] - $offset;
 				}
-				elseif ($event['id'])	// save the alarm immediatly
+				if ($this->bo->check_perms(Acl::EDIT,!$content['new_alarm']['owner'] ? $event : 0,$content['new_alarm']['owner']))
 				{
-					if (($alarm_id = $this->bo->save_alarm($event['id'],$alarm)))
+					$alarm = array(
+						'offset' => $offset,
+						'time'   => $content['new_alarm']['date'],
+						'all'    => !$content['new_alarm']['owner'],
+						'owner'  => $content['new_alarm']['owner'] ? $content['new_alarm']['owner'] : $this->user,
+					);
+					if ($alarm['time'] < $this->bo->now_su)
+					{
+						$msg = lang("Can't add alarms in the past !!!");
+					}
+					elseif ($event['id'])	// save the alarm immediatly
 					{
-						$alarm['id'] = $alarm_id;
-						$event['alarm'][$alarm_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');
+							$msg = lang('Alarm added');
+							Framework::refresh_opener($msg,'calendar', $event['id'], 'update');
+						}
+						else
+						{
+							$msg = lang('Error adding the alarm');
+						}
 					}
 					else
 					{
-						$msg = lang('Error adding the alarm');
+						for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
+						$event['alarm'][$alarm['id']] = $alarm;
 					}
 				}
 				else
 				{
-					for($alarm['id']=1; isset($event['alarm'][$alarm['id']]); $alarm['id']++) {}	// get a temporary non-conflicting, numeric id
-					$event['alarm'][$alarm['id']] = $alarm;
+					$msg = lang('Permission denied');
 				}
-			}
-			else
-			{
-				$msg = lang('Permission denied');
-			}
-			break;
+				break;
 		}
 		// add notification-errors, if we have some
 		if (($notification_errors = notifications::errors(true)))

Spacing +462 added lines, -464 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 = 'u'.$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,7 +506,7 @@ 
 								}
 								else
 								{
-									$id = substr($uid,1);
+									$id = substr($uid, 1);
 									$type = $uid[0];
 								}
 								if ($data['old_status'] != $status && !(!$data['old_status'] && $status == 'G'))
@@ -516,20 +514,20 @@ 
 									//echo "<p>$uid: status changed '$data[old_status]' --> '$status<'/p>\n";
 									$quantity = $role = null;
 									$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
@@ -550,7 +548,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)
 												{
@@ -563,7 +561,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;
@@ -582,26 +580,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
@@ -612,29 +610,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']);
@@ -644,7 +642,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)
 				{
@@ -670,7 +668,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 = '';
@@ -688,7 +686,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 = '';
@@ -718,14 +716,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'])
 						{
@@ -741,11 +739,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
@@ -753,7 +751,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
@@ -784,8 +782,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;
 							}
@@ -798,10 +796,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);
@@ -814,7 +812,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
 									}
 								}
@@ -826,43 +824,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)
@@ -884,19 +882,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)
 						{
@@ -905,9 +903,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',
 					));
@@ -918,7 +916,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']);
 						}
 					}
 				}
@@ -926,12 +924,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);
 						}
 					}
@@ -939,17 +937,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
@@ -959,7 +957,7 @@ 
 			break;
 
 		case 'cancel':
-			if($content['cancel_needs_refresh'])
+			if ($content['cancel_needs_refresh'])
 			{
 				Framework::refresh_opener($msg, 'calendar');
 			}
@@ -997,7 +995,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,
@@ -1011,13 +1009,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
 					{
@@ -1026,7 +1024,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;
 				}
 			}
@@ -1043,31 +1041,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'
 				);
 			}
@@ -1075,7 +1073,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']);
 	}
 
 	/**
@@ -1087,7 +1085,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'];
@@ -1097,17 +1095,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');
 		}
@@ -1134,14 +1132,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;
@@ -1154,11 +1152,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()
 		)
 		{
 
@@ -1178,17 +1176,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']));
@@ -1196,7 +1194,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'];
 			}
@@ -1205,7 +1203,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]);
@@ -1219,18 +1217,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;
 	}
 
@@ -1241,11 +1239,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;
@@ -1254,35 +1252,35 @@ 
 
 			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;
 
 				$lid = $firstname = $lastname = null;
-				$GLOBALS['egw']->accounts->get_account_name($status['uid'],$lid,$firstname,$lastname);
+				$GLOBALS['egw']->accounts->get_account_name($status['uid'], $lid, $firstname, $lastname);
 
 				$toadd = $firstname.' '.$lastname.' <'.$email.'>';
-				if (!in_array($toadd,$to)) $to[] = $toadd;
+				if (!in_array($toadd, $to)) $to[] = $toadd;
 				//error_log(__METHOD__.__LINE__.array2string($to));
 			}
 			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;
 
-					$GLOBALS['egw']->accounts->get_account_name($uid,$lid,$firstname,$lastname);
+					$GLOBALS['egw']->accounts->get_account_name($uid, $lid, $firstname, $lastname);
 
 					$toadd = $firstname.' '.$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;
 					//error_log(__METHOD__.__LINE__.array2string($to));
 				}
 			}
-			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));
@@ -1291,7 +1289,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
 		{
@@ -1306,12 +1304,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));
@@ -1323,7 +1321,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.');
@@ -1379,7 +1377,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,
@@ -1403,8 +1401,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'];
@@ -1422,14 +1420,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']))
 			{
@@ -1438,14 +1436,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');
@@ -1458,7 +1456,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);
@@ -1479,15 +1477,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']))
@@ -1500,10 +1498,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
 					{
@@ -1512,9 +1510,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']);
@@ -1524,30 +1522,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);
 				}
 			}
 		}
@@ -1557,44 +1555,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']),
@@ -1606,11 +1604,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]))
@@ -1619,17 +1617,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
@@ -1638,33 +1636,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',
@@ -1673,7 +1671,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);
 						}
 					}
@@ -1681,43 +1679,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)
 			{
@@ -1732,20 +1730,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']);
 			}
@@ -1756,7 +1754,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);
 			}
@@ -1766,9 +1764,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(
@@ -1785,13 +1783,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');
 		}
@@ -1799,25 +1797,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');
@@ -1829,7 +1827,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')))));
@@ -1839,15 +1837,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);
 		}
 	}
 
@@ -1857,14 +1855,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);
 		}
 	}
 
@@ -1876,17 +1874,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))
 		{
@@ -1915,7 +1913,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!)
@@ -1969,19 +1967,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 &&
@@ -2001,23 +1999,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']] =
@@ -2025,7 +2023,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');
 						}
@@ -2063,7 +2061,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');
@@ -2087,37 +2085,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'])
@@ -2137,7 +2135,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);
 	}
 
 	/**
@@ -2155,7 +2153,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]))
 			{
@@ -2185,7 +2183,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'])])
@@ -2200,21 +2198,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);
 
@@ -2237,26 +2235,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'])
 				{
@@ -2283,19 +2281,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);
 	}
 
 	/**
@@ -2308,15 +2306,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,
@@ -2325,15 +2323,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;
 
@@ -2349,10 +2347,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)
@@ -2376,11 +2374,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;
 	}
@@ -2400,46 +2398,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
@@ -2453,11 +2451,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;
 			}
@@ -2472,13 +2470,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');
 
@@ -2486,20 +2484,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)
 			{
@@ -2507,8 +2505,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();
 			}
@@ -2524,9 +2522,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);
     }
 
 	/**
@@ -2534,7 +2532,7 @@ 
 	 *
 	 * @param array $_content
 	 */
-	function cat_acl(array $_content=null)
+	function cat_acl(array $_content = null)
 	{
 		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
@@ -2546,15 +2544,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);
 					}
 				}
 			}
@@ -2566,20 +2564,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(
@@ -2595,7 +2593,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);
 	}
 
 	/**
@@ -2645,18 +2643,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);
 		}
@@ -2675,44 +2673,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')
@@ -2720,7 +2718,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
 		{
@@ -2733,18 +2731,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
@@ -2752,28 +2750,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;
 
@@ -2784,31 +2782,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);
@@ -2821,23 +2819,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)
@@ -2850,21 +2848,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);
 				}
 			}
@@ -2881,7 +2879,7 @@ 
 	{
 		list($eventId, $date) = explode(':', $_eventId);
 		$event = $this->bo->read($eventId);
-		if($date)
+		if ($date)
 		{
 			$d = new Api\DateTime($date, Api\DateTime::$user_timezone);
 		}
@@ -2891,29 +2889,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;
 				}
 			}
@@ -2921,7 +2919,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);
 	}
 
 	/**
@@ -2929,8 +2927,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))
@@ -2943,11 +2941,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');
 		}
 	}
 
@@ -2960,10 +2958,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);
 		}
@@ -2973,17 +2971,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
@@ -2991,28 +2989,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();
 
@@ -3020,8 +3018,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
@@ -3030,22 +3028,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');
 			}
 		}
 	}
@@ -3056,13 +3054,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;
 		}
 
@@ -3072,7 +3070,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',
@@ -3080,23 +3078,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',
@@ -3104,7 +3102,7 @@ 
 					);
 				}
 			}
-			$participants = array_merge($participants , array(
+			$participants = array_merge($participants, array(
 				"participant" => $accounts,
 				"role" => "REQ-PARTICIPANT",
 				"add" => "pressed"
@@ -3128,14 +3126,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);
 					}
 				}
 			}