EGroupware / egroupware

api/src/WebDAV/Server/Filesystem.php

Doc Comments +11 added lines, -9 removed lines

@@ -254,6 +254,7 @@ 
      *
      * @param  string  program name
      * @param  string  optional search path, defaults to $PATH
+     * @param string $name
      * @return bool    true if executable program found in path
      */
     function _can_execute($name, $path = false)
@@ -319,6 +320,7 @@ 
      * try to detect the mime type of a file
      *
      * @param  string  file path
+     * @param string $fspath
      * @return string  guessed mime type
      */
     function _mimetype($fspath)
@@ -416,7 +418,7 @@ 
      * GET method handler
      *
      * @param  array  parameter passing array
-     * @return bool   true on success
+     * @return null|boolean   true on success
      */
     function GET(&$options)
     {
@@ -446,7 +448,7 @@ 
      * See RFC 2518, Section 8.4 on GET/HEAD for collections
      *
      * @param  string  directory path
-     * @return void    function has to handle HTTP response itself
+     * @return null|false    function has to handle HTTP response itself
      */
     function GetDir($fspath, &$options)
     {
@@ -533,7 +535,7 @@ 
      * MKCOL method handler
      *
      * @param  array  general parameter passing array
-     * @return bool   true on success
+     * @return string   true on success
      */
     function MKCOL($options)
     {
@@ -570,7 +572,7 @@ 
      * DELETE method handler
      *
      * @param  array  general parameter passing array
-     * @return bool   true on success
+     * @return string   true on success
      */
     function DELETE($options)
     {
@@ -600,7 +602,7 @@ 
      * MOVE method handler
      *
      * @param  array  general parameter passing array
-     * @return bool   true on success
+     * @return string   true on success
      */
     function MOVE($options)
     {
@@ -611,7 +613,7 @@ 
      * COPY method handler
      *
      * @param  array  general parameter passing array
-     * @return bool   true on success
+     * @return string   true on success
      */
     function COPY($options, $del=false)
     {
@@ -751,7 +753,7 @@ 
      * PROPPATCH method handler
      *
      * @param  array  general parameter passing array
-     * @return bool   true on success
+     * @return string   true on success
      */
     function PROPPATCH(&$options)
     {
@@ -790,7 +792,7 @@ 
      * LOCK method handler
      *
      * @param  array  general parameter passing array
-     * @return bool   true on success
+     * @return string|boolean   true on success
      */
     function LOCK(&$options)
     {
@@ -848,7 +850,7 @@ 
      * UNLOCK method handler
      *
      * @param  array  general parameter passing array
-     * @return bool   true on success
+     * @return string   true on success
      */
     function UNLOCK(&$options)
     {

Indentation +827 added lines, -827 removed lines

@@ -44,793 +44,793 @@ 
  */
 class HTTP_WebDAV_Server_Filesystem extends HTTP_WebDAV_Server
 {
-    /**
-     * Root directory for WebDAV access
-     *
-     * Defaults to webserver document root (set by ServeRequest)
-     *
-     * @access private
-     * @var    string
-     */
-    var $base = "";
-
-    /**
-     * MySQL Host where property and locking information is stored
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_host = "localhost";
-
-    /**
-     * MySQL database for property/locking information storage
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_name = "webdav";
-
-    /**
-     * MySQL table name prefix
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_prefix = "";
-
-    /**
-     * MySQL user for property/locking db access
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_user = "root";
-
-    /**
-     * MySQL password for property/locking db access
-     *
-     * @access private
-     * @var    string
-     */
-    var $db_passwd = "";
-
-    /**
-     * Serve a webdav request
-     *
-     * @access public
-     * @param  string
-     */
-    function ServeRequest($base = false)
-    {
-        // special treatment for litmus compliance test
-        // reply on its identifier header
-        // not needed for the test itself but eases debugging
-        if (isset($this->_SERVER['HTTP_X_LITMUS'])) {
-            error_log("Litmus test ".$this->_SERVER['HTTP_X_LITMUS']);
-            header("X-Litmus-reply: ".$this->_SERVER['HTTP_X_LITMUS']);
-        }
-
-        // set root directory, defaults to webserver document root if not set
-        if ($base) {
-            $this->base = realpath($base); // TODO throw if not a directory
-        } else if (!$this->base) {
-            $this->base = $this->_SERVER['DOCUMENT_ROOT'];
-        }
-
-        // establish connection to property/locking db
-        mysql_connect($this->db_host, $this->db_user, $this->db_passwd) or die(mysql_error());
-        mysql_select_db($this->db_name) or die(mysql_error());
-        // TODO throw on connection problems
-
-        // let the base class do all the work
-        parent::ServeRequest();
-    }
-
-    /**
-     * No authentication is needed here
-     *
-     * @access private
-     * @param  string  HTTP Authentication type (Basic, Digest, ...)
-     * @param  string  Username
-     * @param  string  Password
-     * @return bool    true on successful authentication
-     */
-    function check_auth($type, $user, $pass)
-    {
-        return true;
-    }
-
-
-    /**
-     * PROPFIND method handler
-     *
-     * @param  array  general parameter passing array
-     * @param  array  return array for file properties
-     * @return bool   true on success
-     */
-    function PROPFIND(&$options, &$files)
-    {
-        // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
-
-        // sanity check
-        if (!file_exists($fspath)) {
-            return false;
-        }
-
-        // prepare property array
-        $files["files"] = array();
-
-        // store information for the requested path itself
-        $files["files"][] = $this->fileinfo($options["path"]);
-
-        // information for contained resources requested?
-        if (!empty($options["depth"]) && is_dir($fspath) && $this->_is_readable($fspath)) {
-
-            // make sure path ends with '/'
-            $options["path"] = $this->_slashify($options["path"]);
-
-            // try to open directory
-            $handle = opendir($fspath);
-
-            if ($handle) {
-                // ok, now get all its contents
-                while ($filename = readdir($handle)) {
-                    if ($filename != "." && $filename != "..") {
-                        $files["files"][] = $this->fileinfo($options["path"].$filename);
-                    }
-                }
-                // TODO recursion needed if "Depth: infinite"
-            	closedir($handle);
-            }
-        }
-
-        // ok, all done
-        return true;
-    }
-
-    /**
-     * Get properties for a single file/resource
-     *
-     * @param  string  resource path
-     * @return array   resource properties
-     */
-    function fileinfo($path)
-    {
-        // map URI path to filesystem path
-        $fspath = $this->base . $path;
-
-        // create result array
-        $info = array();
-        // TODO remove slash append code when base clase is able to do it itself
-        $info["path"]  = is_dir($fspath) ? $this->_slashify($path) : $path;
-        $info["props"] = array();
-
-        // no special beautified displayname here ...
-        $info["props"][] = $this->mkprop("displayname", strtoupper($path));
-
-        // creation and modification time
-        $info["props"][] = $this->mkprop("creationdate",    filectime($fspath));
-        $info["props"][] = $this->mkprop("getlastmodified", filemtime($fspath));
-
-        // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = $this->mkprop("lastaccessed",    fileatime($fspath));
-        $info["props"][] = $this->mkprop("ishidden", ('.' === substr(basename($fspath), 0, 1)));
-
-        // type and size (caller already made sure that path exists)
-        if (is_dir($fspath)) {
-            // directory (WebDAV collection)
-            $info["props"][] = $this->mkprop("resourcetype", "collection");
-            $info["props"][] = $this->mkprop("getcontenttype", "httpd/unix-directory");
-        } else {
-            // plain file (WebDAV resource)
-            $info["props"][] = $this->mkprop("resourcetype", "");
-            if ($this->_is_readable($fspath)) {
-                $info["props"][] = $this->mkprop("getcontenttype", $this->_mimetype($fspath));
-            } else {
-                $info["props"][] = $this->mkprop("getcontenttype", "application/x-non-readable");
-            }
-            $info["props"][] = $this->mkprop("getcontentlength", filesize($fspath));
-        }
-
-        // get additional properties from database
-        $query = "SELECT ns, name, value
+	/**
+	 * Root directory for WebDAV access
+	 *
+	 * Defaults to webserver document root (set by ServeRequest)
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $base = "";
+
+	/**
+	 * MySQL Host where property and locking information is stored
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_host = "localhost";
+
+	/**
+	 * MySQL database for property/locking information storage
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_name = "webdav";
+
+	/**
+	 * MySQL table name prefix
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_prefix = "";
+
+	/**
+	 * MySQL user for property/locking db access
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_user = "root";
+
+	/**
+	 * MySQL password for property/locking db access
+	 *
+	 * @access private
+	 * @var    string
+	 */
+	var $db_passwd = "";
+
+	/**
+	 * Serve a webdav request
+	 *
+	 * @access public
+	 * @param  string
+	 */
+	function ServeRequest($base = false)
+	{
+		// special treatment for litmus compliance test
+		// reply on its identifier header
+		// not needed for the test itself but eases debugging
+		if (isset($this->_SERVER['HTTP_X_LITMUS'])) {
+			error_log("Litmus test ".$this->_SERVER['HTTP_X_LITMUS']);
+			header("X-Litmus-reply: ".$this->_SERVER['HTTP_X_LITMUS']);
+		}
+
+		// set root directory, defaults to webserver document root if not set
+		if ($base) {
+			$this->base = realpath($base); // TODO throw if not a directory
+		} else if (!$this->base) {
+			$this->base = $this->_SERVER['DOCUMENT_ROOT'];
+		}
+
+		// establish connection to property/locking db
+		mysql_connect($this->db_host, $this->db_user, $this->db_passwd) or die(mysql_error());
+		mysql_select_db($this->db_name) or die(mysql_error());
+		// TODO throw on connection problems
+
+		// let the base class do all the work
+		parent::ServeRequest();
+	}
+
+	/**
+	 * No authentication is needed here
+	 *
+	 * @access private
+	 * @param  string  HTTP Authentication type (Basic, Digest, ...)
+	 * @param  string  Username
+	 * @param  string  Password
+	 * @return bool    true on successful authentication
+	 */
+	function check_auth($type, $user, $pass)
+	{
+		return true;
+	}
+
+
+	/**
+	 * PROPFIND method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @param  array  return array for file properties
+	 * @return bool   true on success
+	 */
+	function PROPFIND(&$options, &$files)
+	{
+		// get absolute fs path to requested resource
+		$fspath = $this->base . $options["path"];
+
+		// sanity check
+		if (!file_exists($fspath)) {
+			return false;
+		}
+
+		// prepare property array
+		$files["files"] = array();
+
+		// store information for the requested path itself
+		$files["files"][] = $this->fileinfo($options["path"]);
+
+		// information for contained resources requested?
+		if (!empty($options["depth"]) && is_dir($fspath) && $this->_is_readable($fspath)) {
+
+			// make sure path ends with '/'
+			$options["path"] = $this->_slashify($options["path"]);
+
+			// try to open directory
+			$handle = opendir($fspath);
+
+			if ($handle) {
+				// ok, now get all its contents
+				while ($filename = readdir($handle)) {
+					if ($filename != "." && $filename != "..") {
+						$files["files"][] = $this->fileinfo($options["path"].$filename);
+					}
+				}
+				// TODO recursion needed if "Depth: infinite"
+				closedir($handle);
+			}
+		}
+
+		// ok, all done
+		return true;
+	}
+
+	/**
+	 * Get properties for a single file/resource
+	 *
+	 * @param  string  resource path
+	 * @return array   resource properties
+	 */
+	function fileinfo($path)
+	{
+		// map URI path to filesystem path
+		$fspath = $this->base . $path;
+
+		// create result array
+		$info = array();
+		// TODO remove slash append code when base clase is able to do it itself
+		$info["path"]  = is_dir($fspath) ? $this->_slashify($path) : $path;
+		$info["props"] = array();
+
+		// no special beautified displayname here ...
+		$info["props"][] = $this->mkprop("displayname", strtoupper($path));
+
+		// creation and modification time
+		$info["props"][] = $this->mkprop("creationdate",    filectime($fspath));
+		$info["props"][] = $this->mkprop("getlastmodified", filemtime($fspath));
+
+		// Microsoft extensions: last access time and 'hidden' status
+		$info["props"][] = $this->mkprop("lastaccessed",    fileatime($fspath));
+		$info["props"][] = $this->mkprop("ishidden", ('.' === substr(basename($fspath), 0, 1)));
+
+		// type and size (caller already made sure that path exists)
+		if (is_dir($fspath)) {
+			// directory (WebDAV collection)
+			$info["props"][] = $this->mkprop("resourcetype", "collection");
+			$info["props"][] = $this->mkprop("getcontenttype", "httpd/unix-directory");
+		} else {
+			// plain file (WebDAV resource)
+			$info["props"][] = $this->mkprop("resourcetype", "");
+			if ($this->_is_readable($fspath)) {
+				$info["props"][] = $this->mkprop("getcontenttype", $this->_mimetype($fspath));
+			} else {
+				$info["props"][] = $this->mkprop("getcontenttype", "application/x-non-readable");
+			}
+			$info["props"][] = $this->mkprop("getcontentlength", filesize($fspath));
+		}
+
+		// get additional properties from database
+		$query = "SELECT ns, name, value
                         FROM {$this->db_prefix}properties
                        WHERE path = '$path'";
-        $res = mysql_query($query);
-        while ($row = mysql_fetch_assoc($res)) {
-            $info["props"][] = $this->mkprop($row["ns"], $row["name"], $row["value"]);
-        }
-        mysql_free_result($res);
-
-        return $info;
-    }
-
-    /**
-     * detect if a given program is found in the search PATH
-     *
-     * helper function used by _mimetype() to detect if the
-     * external 'file' utility is available
-     *
-     * @param  string  program name
-     * @param  string  optional search path, defaults to $PATH
-     * @return bool    true if executable program found in path
-     */
-    function _can_execute($name, $path = false)
-    {
-        // path defaults to PATH from environment if not set
-        if ($path === false) {
-            $path = getenv("PATH");
-        }
-
-        // check method depends on operating system
-        if (!strncmp(PHP_OS, "WIN", 3)) {
-            // on Windows an appropriate COM or EXE file needs to exist
-            $exts     = array(".exe", ".com");
-            $check_fn = "file_exists";
-        } else {
-            // anywhere else we look for an executable file of that name
-            $exts     = array("");
-            $check_fn = "is_executable";
-        }
-
-        // now check the directories in the path for the program
-        foreach (explode(PATH_SEPARATOR, $path) as $dir) {
-            // skip invalid path entries
-            if (!file_exists($dir)) continue;
-            if (!is_dir($dir)) continue;
-
-            // and now look for the file
-            foreach ($exts as $ext) {
-                if ($check_fn("$dir/$name".$ext)) return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if path is readable by current user
-     *
-     * Allow extending classes to overwrite it
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_readable($fspath)
-    {
-    	return is_readable($fspath);
-    }
-
-    /**
-     * Check if path is writable by current user
-     *
-     * Allow extending classes to overwrite it
-     *
-     * @param string $fspath
-     * @return boolean
-     */
-    function _is_writable($fspath)
-    {
-    	return is_writable($fspath);
-    }
-
-    /**
-     * try to detect the mime type of a file
-     *
-     * @param  string  file path
-     * @return string  guessed mime type
-     */
-    function _mimetype($fspath)
-    {
-        if (is_dir($fspath)) {
-            // directories are easy
-            return "httpd/unix-directory";
-        } else if (function_exists("mime_content_type")) {
-            // use mime magic extension if available
-            $mime_type = mime_content_type($fspath);
-        } else if ($this->_can_execute("file")) {
-            // it looks like we have a 'file' command,
-            // lets see it it does have mime support
-            $fp    = popen("file -i '$fspath' 2>/dev/null", "r");
-            $reply = fgets($fp);
-            pclose($fp);
-
-            // popen will not return an error if the binary was not found
-            // and find may not have mime support using "-i"
-            // so we test the format of the returned string
-
-            // the reply begins with the requested filename
-            if (!strncmp($reply, "$fspath: ", strlen($fspath)+2)) {
-                $reply = substr($reply, strlen($fspath)+2);
-                // followed by the mime type (maybe including options)
-                if (preg_match('|^[[:alnum:]_-]+/[[:alnum:]_-]+;?.*|', $reply, $matches)) {
-                    $mime_type = $matches[0];
-                }
-            }
-        }
-
-        if (empty($mime_type)) {
-            // Fallback solution: try to guess the type by the file extension
-            // TODO: add more ...
-            // TODO: it has been suggested to delegate mimetype detection
-            //       to apache but this has at least three issues:
-            //       - works only with apache
-            //       - needs file to be within the document tree
-            //       - requires apache mod_magic
-            // TODO: can we use the registry for this on Windows?
-            //       OTOH if the server is Windos the clients are likely to
-            //       be Windows, too, and tend do ignore the Content-Type
-            //       anyway (overriding it with information taken from
-            //       the registry)
-            // TODO: have a seperate PEAR class for mimetype detection?
-            switch (strtolower(strrchr(basename($fspath), "."))) {
-            case ".html":
-                $mime_type = "text/html";
-                break;
-            case ".gif":
-                $mime_type = "image/gif";
-                break;
-            case ".jpg":
-                $mime_type = "image/jpeg";
-                break;
-            default:
-                $mime_type = "application/octet-stream";
-                break;
-            }
-        }
-
-        return $mime_type;
-    }
-
-    /**
-     * HEAD method handler
-     *
-     * @param  array  parameter passing array
-     * @return bool   true on success
-     */
-    function HEAD(&$options)
-    {
-        // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
-
-        // sanity check
-        if (!file_exists($fspath)) return false;
-
-        // detect resource type
-        $options['mimetype'] = $this->_mimetype($fspath);
-
-        // detect modification time
-        // see rfc2518, section 13.7
-        // some clients seem to treat this as a reverse rule
-        // requiering a Last-Modified header if the getlastmodified header was set
-        $options['mtime'] = filemtime($fspath);
-
-        // detect resource size
-        $options['size'] = filesize($fspath);
-
-        return true;
-    }
-
-    /**
-     * GET method handler
-     *
-     * @param  array  parameter passing array
-     * @return bool   true on success
-     */
-    function GET(&$options)
-    {
-        // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
-
-        // is this a collection?
-        if (is_dir($fspath)) {
-            return $this->GetDir($fspath, $options);
-        }
-
-        // the header output is the same as for HEAD
-        if (!$this->HEAD($options)) {
-            return false;
-        }
-
-        // no need to check result here, it is handled by the base class
-        $options['stream'] = fopen($fspath, "r");
-
-        return true;
-    }
-
-    /**
-     * GET method handler for directories
-     *
-     * This is a very simple mod_index lookalike.
-     * See RFC 2518, Section 8.4 on GET/HEAD for collections
-     *
-     * @param  string  directory path
-     * @return void    function has to handle HTTP response itself
-     */
-    function GetDir($fspath, &$options)
-    {
-        $path = $this->_slashify($options["path"]);
-        if ($path != $options["path"]) {
-            header("Location: ".$this->base_uri.$path);
-            exit;
-        }
-
-        // fixed width directory column format
-        $format = "%15s  %-19s  %-s\n";
-
-        if (!$this->_is_readable($fspath)) {
-            return false;
-        }
-
-        $handle = opendir($fspath);
-        if (!$handle) {
-            return false;
-        }
-
-        echo "<html><head><title>Index of ".htmlspecialchars(urldecode($options['path']))."</title></head>\n";
-
-        echo "<h1>Index of ".htmlspecialchars($options['path'])."</h1>\n";
-
-        echo "<pre>";
-        printf($format, "Size", "Last modified", "Filename");
-        echo "<hr>";
-
-        while ($filename = readdir($handle)) {
-            if ($filename != "." && $filename != "..") {
-                $fullpath = $fspath.$filename;
-                $name     = htmlspecialchars($filename);
-                printf($format,
-                       number_format(filesize($fullpath)),
-                       strftime("%Y-%m-%d %H:%M:%S", filemtime($fullpath)),
-                       '<a href="'.$name.'">'.urldecode($name).'</a>');
-            }
-        }
-
-        echo "</pre>";
-
-        closedir($handle);
-
-        echo "</html>\n";
-
-        exit;
-    }
-
-    /**
-     * PUT method handler
-     *
-     * @param  array  parameter passing array
-     * @return bool   true on success
-     */
-    function PUT(&$options)
-    {
-        $fspath = $this->base . $options["path"];
-
-        $dir = dirname($fspath);
-        if (!file_exists($dir) || !is_dir($dir)) {
-            return "409 Conflict"; // TODO right status code for both?
-        }
-
-        $options["new"] = ! file_exists($fspath);
-
-        if ($options["new"] && !$this->_is_writable($dir)) {
-            return "403 Forbidden";
-        }
-        if (!$options["new"] && !$this->_is_writable($fspath)) {
-            return "403 Forbidden";
-        }
-        if (!$options["new"] && is_dir($fspath)) {
-            return "403 Forbidden";
-        }
-
-        $fp = fopen($fspath, "w");
-
-        return $fp;
-    }
-
-
-    /**
-     * MKCOL method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function MKCOL($options)
-    {
-        $path   = $this->base .$options["path"];
-        $parent = dirname($path);
-        $name   = basename($path);
-
-        if (!file_exists($parent)) {
-            return "409 Conflict";
-        }
-
-        if (!is_dir($parent)) {
-            return "403 Forbidden";
-        }
-
-        if ( file_exists($parent."/".$name) ) {
-            return "405 Method not allowed";
-        }
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        $stat = mkdir($parent."/".$name, 0777);
-        if (!$stat) {
-            return "403 Forbidden";
-        }
-
-        return ("201 Created");
-    }
-
-
-    /**
-     * DELETE method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function DELETE($options)
-    {
-        $path = $this->base . "/" .$options["path"];
-
-        if (!file_exists($path)) {
-            return "404 Not found";
-        }
-
-        if (is_dir($path)) {
-            $query = "DELETE FROM {$this->db_prefix}properties
+		$res = mysql_query($query);
+		while ($row = mysql_fetch_assoc($res)) {
+			$info["props"][] = $this->mkprop($row["ns"], $row["name"], $row["value"]);
+		}
+		mysql_free_result($res);
+
+		return $info;
+	}
+
+	/**
+	 * detect if a given program is found in the search PATH
+	 *
+	 * helper function used by _mimetype() to detect if the
+	 * external 'file' utility is available
+	 *
+	 * @param  string  program name
+	 * @param  string  optional search path, defaults to $PATH
+	 * @return bool    true if executable program found in path
+	 */
+	function _can_execute($name, $path = false)
+	{
+		// path defaults to PATH from environment if not set
+		if ($path === false) {
+			$path = getenv("PATH");
+		}
+
+		// check method depends on operating system
+		if (!strncmp(PHP_OS, "WIN", 3)) {
+			// on Windows an appropriate COM or EXE file needs to exist
+			$exts     = array(".exe", ".com");
+			$check_fn = "file_exists";
+		} else {
+			// anywhere else we look for an executable file of that name
+			$exts     = array("");
+			$check_fn = "is_executable";
+		}
+
+		// now check the directories in the path for the program
+		foreach (explode(PATH_SEPARATOR, $path) as $dir) {
+			// skip invalid path entries
+			if (!file_exists($dir)) continue;
+			if (!is_dir($dir)) continue;
+
+			// and now look for the file
+			foreach ($exts as $ext) {
+				if ($check_fn("$dir/$name".$ext)) return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check if path is readable by current user
+	 *
+	 * Allow extending classes to overwrite it
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_readable($fspath)
+	{
+		return is_readable($fspath);
+	}
+
+	/**
+	 * Check if path is writable by current user
+	 *
+	 * Allow extending classes to overwrite it
+	 *
+	 * @param string $fspath
+	 * @return boolean
+	 */
+	function _is_writable($fspath)
+	{
+		return is_writable($fspath);
+	}
+
+	/**
+	 * try to detect the mime type of a file
+	 *
+	 * @param  string  file path
+	 * @return string  guessed mime type
+	 */
+	function _mimetype($fspath)
+	{
+		if (is_dir($fspath)) {
+			// directories are easy
+			return "httpd/unix-directory";
+		} else if (function_exists("mime_content_type")) {
+			// use mime magic extension if available
+			$mime_type = mime_content_type($fspath);
+		} else if ($this->_can_execute("file")) {
+			// it looks like we have a 'file' command,
+			// lets see it it does have mime support
+			$fp    = popen("file -i '$fspath' 2>/dev/null", "r");
+			$reply = fgets($fp);
+			pclose($fp);
+
+			// popen will not return an error if the binary was not found
+			// and find may not have mime support using "-i"
+			// so we test the format of the returned string
+
+			// the reply begins with the requested filename
+			if (!strncmp($reply, "$fspath: ", strlen($fspath)+2)) {
+				$reply = substr($reply, strlen($fspath)+2);
+				// followed by the mime type (maybe including options)
+				if (preg_match('|^[[:alnum:]_-]+/[[:alnum:]_-]+;?.*|', $reply, $matches)) {
+					$mime_type = $matches[0];
+				}
+			}
+		}
+
+		if (empty($mime_type)) {
+			// Fallback solution: try to guess the type by the file extension
+			// TODO: add more ...
+			// TODO: it has been suggested to delegate mimetype detection
+			//       to apache but this has at least three issues:
+			//       - works only with apache
+			//       - needs file to be within the document tree
+			//       - requires apache mod_magic
+			// TODO: can we use the registry for this on Windows?
+			//       OTOH if the server is Windos the clients are likely to
+			//       be Windows, too, and tend do ignore the Content-Type
+			//       anyway (overriding it with information taken from
+			//       the registry)
+			// TODO: have a seperate PEAR class for mimetype detection?
+			switch (strtolower(strrchr(basename($fspath), "."))) {
+			case ".html":
+				$mime_type = "text/html";
+				break;
+			case ".gif":
+				$mime_type = "image/gif";
+				break;
+			case ".jpg":
+				$mime_type = "image/jpeg";
+				break;
+			default:
+				$mime_type = "application/octet-stream";
+				break;
+			}
+		}
+
+		return $mime_type;
+	}
+
+	/**
+	 * HEAD method handler
+	 *
+	 * @param  array  parameter passing array
+	 * @return bool   true on success
+	 */
+	function HEAD(&$options)
+	{
+		// get absolute fs path to requested resource
+		$fspath = $this->base . $options["path"];
+
+		// sanity check
+		if (!file_exists($fspath)) return false;
+
+		// detect resource type
+		$options['mimetype'] = $this->_mimetype($fspath);
+
+		// detect modification time
+		// see rfc2518, section 13.7
+		// some clients seem to treat this as a reverse rule
+		// requiering a Last-Modified header if the getlastmodified header was set
+		$options['mtime'] = filemtime($fspath);
+
+		// detect resource size
+		$options['size'] = filesize($fspath);
+
+		return true;
+	}
+
+	/**
+	 * GET method handler
+	 *
+	 * @param  array  parameter passing array
+	 * @return bool   true on success
+	 */
+	function GET(&$options)
+	{
+		// get absolute fs path to requested resource
+		$fspath = $this->base . $options["path"];
+
+		// is this a collection?
+		if (is_dir($fspath)) {
+			return $this->GetDir($fspath, $options);
+		}
+
+		// the header output is the same as for HEAD
+		if (!$this->HEAD($options)) {
+			return false;
+		}
+
+		// no need to check result here, it is handled by the base class
+		$options['stream'] = fopen($fspath, "r");
+
+		return true;
+	}
+
+	/**
+	 * GET method handler for directories
+	 *
+	 * This is a very simple mod_index lookalike.
+	 * See RFC 2518, Section 8.4 on GET/HEAD for collections
+	 *
+	 * @param  string  directory path
+	 * @return void    function has to handle HTTP response itself
+	 */
+	function GetDir($fspath, &$options)
+	{
+		$path = $this->_slashify($options["path"]);
+		if ($path != $options["path"]) {
+			header("Location: ".$this->base_uri.$path);
+			exit;
+		}
+
+		// fixed width directory column format
+		$format = "%15s  %-19s  %-s\n";
+
+		if (!$this->_is_readable($fspath)) {
+			return false;
+		}
+
+		$handle = opendir($fspath);
+		if (!$handle) {
+			return false;
+		}
+
+		echo "<html><head><title>Index of ".htmlspecialchars(urldecode($options['path']))."</title></head>\n";
+
+		echo "<h1>Index of ".htmlspecialchars($options['path'])."</h1>\n";
+
+		echo "<pre>";
+		printf($format, "Size", "Last modified", "Filename");
+		echo "<hr>";
+
+		while ($filename = readdir($handle)) {
+			if ($filename != "." && $filename != "..") {
+				$fullpath = $fspath.$filename;
+				$name     = htmlspecialchars($filename);
+				printf($format,
+					   number_format(filesize($fullpath)),
+					   strftime("%Y-%m-%d %H:%M:%S", filemtime($fullpath)),
+					   '<a href="'.$name.'">'.urldecode($name).'</a>');
+			}
+		}
+
+		echo "</pre>";
+
+		closedir($handle);
+
+		echo "</html>\n";
+
+		exit;
+	}
+
+	/**
+	 * PUT method handler
+	 *
+	 * @param  array  parameter passing array
+	 * @return bool   true on success
+	 */
+	function PUT(&$options)
+	{
+		$fspath = $this->base . $options["path"];
+
+		$dir = dirname($fspath);
+		if (!file_exists($dir) || !is_dir($dir)) {
+			return "409 Conflict"; // TODO right status code for both?
+		}
+
+		$options["new"] = ! file_exists($fspath);
+
+		if ($options["new"] && !$this->_is_writable($dir)) {
+			return "403 Forbidden";
+		}
+		if (!$options["new"] && !$this->_is_writable($fspath)) {
+			return "403 Forbidden";
+		}
+		if (!$options["new"] && is_dir($fspath)) {
+			return "403 Forbidden";
+		}
+
+		$fp = fopen($fspath, "w");
+
+		return $fp;
+	}
+
+
+	/**
+	 * MKCOL method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function MKCOL($options)
+	{
+		$path   = $this->base .$options["path"];
+		$parent = dirname($path);
+		$name   = basename($path);
+
+		if (!file_exists($parent)) {
+			return "409 Conflict";
+		}
+
+		if (!is_dir($parent)) {
+			return "403 Forbidden";
+		}
+
+		if ( file_exists($parent."/".$name) ) {
+			return "405 Method not allowed";
+		}
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		$stat = mkdir($parent."/".$name, 0777);
+		if (!$stat) {
+			return "403 Forbidden";
+		}
+
+		return ("201 Created");
+	}
+
+
+	/**
+	 * DELETE method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function DELETE($options)
+	{
+		$path = $this->base . "/" .$options["path"];
+
+		if (!file_exists($path)) {
+			return "404 Not found";
+		}
+
+		if (is_dir($path)) {
+			$query = "DELETE FROM {$this->db_prefix}properties
                            WHERE path LIKE '".$this->_slashify($options["path"])."%'";
-            mysql_query($query);
-            System::rm(array("-rf", $path));
-        } else {
-            unlink($path);
-        }
-        $query = "DELETE FROM {$this->db_prefix}properties
+			mysql_query($query);
+			System::rm(array("-rf", $path));
+		} else {
+			unlink($path);
+		}
+		$query = "DELETE FROM {$this->db_prefix}properties
                        WHERE path = '$options[path]'";
-        mysql_query($query);
-
-        return "204 No Content";
-    }
-
-
-    /**
-     * MOVE method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function MOVE($options)
-    {
-        return $this->COPY($options, true);
-    }
-
-    /**
-     * COPY method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function COPY($options, $del=false)
-    {
-        // TODO Property updates still broken (Litmus should detect this?)
-
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
-            return "415 Unsupported media type";
-        }
-
-        // no copying to different WebDAV Servers yet
-        if (isset($options["dest_url"])) {
-            return "502 bad gateway";
-        }
-
-        $source = $this->base . $options["path"];
-        if (!file_exists($source)) {
-            return "404 Not found";
-        }
-
-        if (is_dir($source)) { // resource is a collection
-            switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
-            }
-        }
-
-        $dest         = $this->base . $options["dest"];
-        $destdir      = dirname($dest);
-
-        if (!file_exists($destdir) || !is_dir($destdir)) {
-            return "409 Conflict";
-        }
-
-
-        $new          = !file_exists($dest);
-        $existing_col = false;
-
-        if (!$new) {
-            if ($del && is_dir($dest)) {
-                if (!$options["overwrite"]) {
-                    return "412 precondition failed";
-                }
-                $dest .= basename($source);
-                if (file_exists($dest)) {
-                    $options["dest"] .= basename($source);
-                } else {
-                    $new          = true;
-                    $existing_col = true;
-                }
-            }
-        }
-
-        if (!$new) {
-            if ($options["overwrite"]) {
-                $stat = $this->DELETE(array("path" => $options["dest"]));
-                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
-                    return $stat;
-                }
-            } else {
-                return "412 precondition failed";
-            }
-        }
-
-        if ($del) {
-            if (!rename($source, $dest)) {
-                return "500 Internal server error";
-            }
-            $destpath = $this->_unslashify($options["dest"]);
-            if (is_dir($source)) {
-                $query = "UPDATE {$this->db_prefix}properties
+		mysql_query($query);
+
+		return "204 No Content";
+	}
+
+
+	/**
+	 * MOVE method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function MOVE($options)
+	{
+		return $this->COPY($options, true);
+	}
+
+	/**
+	 * COPY method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function COPY($options, $del=false)
+	{
+		// TODO Property updates still broken (Litmus should detect this?)
+
+		if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+			return "415 Unsupported media type";
+		}
+
+		// no copying to different WebDAV Servers yet
+		if (isset($options["dest_url"])) {
+			return "502 bad gateway";
+		}
+
+		$source = $this->base . $options["path"];
+		if (!file_exists($source)) {
+			return "404 Not found";
+		}
+
+		if (is_dir($source)) { // resource is a collection
+			switch ($options["depth"]) {
+			case "infinity": // valid
+				break;
+			case "0": // valid for COPY only
+				if ($del) { // MOVE?
+					return "400 Bad request";
+				}
+				break;
+			case "1": // invalid for both COPY and MOVE
+			default:
+				return "400 Bad request";
+			}
+		}
+
+		$dest         = $this->base . $options["dest"];
+		$destdir      = dirname($dest);
+
+		if (!file_exists($destdir) || !is_dir($destdir)) {
+			return "409 Conflict";
+		}
+
+
+		$new          = !file_exists($dest);
+		$existing_col = false;
+
+		if (!$new) {
+			if ($del && is_dir($dest)) {
+				if (!$options["overwrite"]) {
+					return "412 precondition failed";
+				}
+				$dest .= basename($source);
+				if (file_exists($dest)) {
+					$options["dest"] .= basename($source);
+				} else {
+					$new          = true;
+					$existing_col = true;
+				}
+			}
+		}
+
+		if (!$new) {
+			if ($options["overwrite"]) {
+				$stat = $this->DELETE(array("path" => $options["dest"]));
+				if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+					return $stat;
+				}
+			} else {
+				return "412 precondition failed";
+			}
+		}
+
+		if ($del) {
+			if (!rename($source, $dest)) {
+				return "500 Internal server error";
+			}
+			$destpath = $this->_unslashify($options["dest"]);
+			if (is_dir($source)) {
+				$query = "UPDATE {$this->db_prefix}properties
                                  SET path = REPLACE(path, '".$options["path"]."', '".$destpath."')
                                WHERE path LIKE '".$this->_slashify($options["path"])."%'";
-                mysql_query($query);
-            }
+				mysql_query($query);
+			}
 
-            $query = "UPDATE {$this->db_prefix}properties
+			$query = "UPDATE {$this->db_prefix}properties
                              SET path = '".$destpath."'
                            WHERE path = '".$options["path"]."'";
-            mysql_query($query);
-        } else {
-            if (is_dir($source) && $options["depth"] == "infinity") {	// no find for depth="0"
-                $files = System::find($source);
-                $files = array_reverse($files);
-            } else {
-                $files = array($source);
-            }
-
-            if (!is_array($files) || empty($files)) {
-                return "500 Internal server error";
-            }
-
-
-            foreach ($files as $file) {
-                if (is_dir($file)) {
-                    $file = $this->_slashify($file);
-                }
-
-                $destfile = str_replace($source, $dest, $file);
-
-                if (is_dir($file)) {
-                    if (!file_exists($destfile)) {
-                        if (!$this->_is_writable(dirname($destfile))) {
-                            return "403 Forbidden";
-                        }
-                        if (!mkdir($destfile)) {
-                            return "409 Conflict";
-                        }
-                    } else if (!is_dir($destfile)) {
-                        return "409 Conflict";
-                    }
-                } else {
-
-                    if (!copy($file, $destfile)) {
-                        return "409 Conflict";
-                    }
-                }
-            }
-
-            $query = "INSERT INTO {$this->db_prefix}properties
+			mysql_query($query);
+		} else {
+			if (is_dir($source) && $options["depth"] == "infinity") {	// no find for depth="0"
+				$files = System::find($source);
+				$files = array_reverse($files);
+			} else {
+				$files = array($source);
+			}
+
+			if (!is_array($files) || empty($files)) {
+				return "500 Internal server error";
+			}
+
+
+			foreach ($files as $file) {
+				if (is_dir($file)) {
+					$file = $this->_slashify($file);
+				}
+
+				$destfile = str_replace($source, $dest, $file);
+
+				if (is_dir($file)) {
+					if (!file_exists($destfile)) {
+						if (!$this->_is_writable(dirname($destfile))) {
+							return "403 Forbidden";
+						}
+						if (!mkdir($destfile)) {
+							return "409 Conflict";
+						}
+					} else if (!is_dir($destfile)) {
+						return "409 Conflict";
+					}
+				} else {
+
+					if (!copy($file, $destfile)) {
+						return "409 Conflict";
+					}
+				}
+			}
+
+			$query = "INSERT INTO {$this->db_prefix}properties
                                SELECT *
                                  FROM {$this->db_prefix}properties
                                 WHERE path = '".$options['path']."'";
-        }
-
-        return ($new && !$existing_col) ? "201 Created" : "204 No Content";
-    }
-
-    /**
-     * PROPPATCH method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function PROPPATCH(&$options)
-    {
-        global $prefs, $tab;
-
-        $msg  = "";
-        $path = $options["path"];
-        $dir  = dirname($path)."/";
-        $base = basename($path);
-
-        foreach ($options["props"] as $key => $prop) {
-            if ($prop["ns"] == "DAV:") {
-                $options["props"][$key]['status'] = "403 Forbidden";
-            } else {
-                if (isset($prop["val"])) {
-                    $query = "REPLACE INTO {$this->db_prefix}properties
+		}
+
+		return ($new && !$existing_col) ? "201 Created" : "204 No Content";
+	}
+
+	/**
+	 * PROPPATCH method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function PROPPATCH(&$options)
+	{
+		global $prefs, $tab;
+
+		$msg  = "";
+		$path = $options["path"];
+		$dir  = dirname($path)."/";
+		$base = basename($path);
+
+		foreach ($options["props"] as $key => $prop) {
+			if ($prop["ns"] == "DAV:") {
+				$options["props"][$key]['status'] = "403 Forbidden";
+			} else {
+				if (isset($prop["val"])) {
+					$query = "REPLACE INTO {$this->db_prefix}properties
                                            SET path = '$options[path]'
                                              , name = '$prop[name]'
                                              , ns= '$prop[ns]'
                                              , value = '$prop[val]'";
-                } else {
-                    $query = "DELETE FROM {$this->db_prefix}properties
+				} else {
+					$query = "DELETE FROM {$this->db_prefix}properties
                                         WHERE path = '$options[path]'
                                           AND name = '$prop[name]'
                                           AND ns = '$prop[ns]'";
-                }
-                mysql_query($query);
-            }
-        }
-
-        return "";
-    }
-
-
-    /**
-     * LOCK method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function LOCK(&$options)
-    {
-        // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
-
-        // TODO recursive locks on directories not supported yet
-        // makes litmus test "32. lock_collection" fail
-        if (is_dir($fspath) && !empty($options["depth"])) {
-            return "409 Conflict";
-        }
-
-        $options["timeout"] = time()+300; // 5min. hardcoded
-
-        if (isset($options["update"])) { // Lock Update
-            $where = "WHERE path = '$options[path]' AND token = '$options[update]'";
-
-            $query = "SELECT owner, exclusivelock FROM {$this->db_prefix}locks $where";
-            $res   = mysql_query($query);
-            $row   = mysql_fetch_assoc($res);
-            mysql_free_result($res);
-
-            if (is_array($row)) {
-                $query = "UPDATE {$this->db_prefix}locks
+				}
+				mysql_query($query);
+			}
+		}
+
+		return "";
+	}
+
+
+	/**
+	 * LOCK method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function LOCK(&$options)
+	{
+		// get absolute fs path to requested resource
+		$fspath = $this->base . $options["path"];
+
+		// TODO recursive locks on directories not supported yet
+		// makes litmus test "32. lock_collection" fail
+		if (is_dir($fspath) && !empty($options["depth"])) {
+			return "409 Conflict";
+		}
+
+		$options["timeout"] = time()+300; // 5min. hardcoded
+
+		if (isset($options["update"])) { // Lock Update
+			$where = "WHERE path = '$options[path]' AND token = '$options[update]'";
+
+			$query = "SELECT owner, exclusivelock FROM {$this->db_prefix}locks $where";
+			$res   = mysql_query($query);
+			$row   = mysql_fetch_assoc($res);
+			mysql_free_result($res);
+
+			if (is_array($row)) {
+				$query = "UPDATE {$this->db_prefix}locks
                                  SET expires = '$options[timeout]'
                                    , modified = ".time()."
                               $where";
-                mysql_query($query);
+				mysql_query($query);
 
-                $options['owner'] = $row['owner'];
-                $options['scope'] = $row["exclusivelock"] ? "exclusive" : "shared";
-                $options['type']  = $row["exclusivelock"] ? "write"     : "read";
+				$options['owner'] = $row['owner'];
+				$options['scope'] = $row["exclusivelock"] ? "exclusive" : "shared";
+				$options['type']  = $row["exclusivelock"] ? "write"     : "read";
 
-                return true;
-            } else {
-                return false;
-            }
-        }
+				return true;
+			} else {
+				return false;
+			}
+		}
 
-        $query = "INSERT INTO {$this->db_prefix}locks
+		$query = "INSERT INTO {$this->db_prefix}locks
                         SET token   = '$options[locktoken]'
                           , path    = '$options[path]'
                           , created = ".time()."
@@ -838,76 +838,76 @@ 
                           , owner   = '$options[owner]'
                           , expires = '$options[timeout]'
                           , exclusivelock  = " .($options['scope'] === "exclusive" ? "1" : "0")
-            ;
-        mysql_query($query);
-
-        return mysql_affected_rows() ? "200 OK" : "409 Conflict";
-    }
-
-    /**
-     * UNLOCK method handler
-     *
-     * @param  array  general parameter passing array
-     * @return bool   true on success
-     */
-    function UNLOCK(&$options)
-    {
-        $query = "DELETE FROM {$this->db_prefix}locks
+			;
+		mysql_query($query);
+
+		return mysql_affected_rows() ? "200 OK" : "409 Conflict";
+	}
+
+	/**
+	 * UNLOCK method handler
+	 *
+	 * @param  array  general parameter passing array
+	 * @return bool   true on success
+	 */
+	function UNLOCK(&$options)
+	{
+		$query = "DELETE FROM {$this->db_prefix}locks
                       WHERE path = '$options[path]'
                         AND token = '$options[token]'";
-        mysql_query($query);
-
-        return mysql_affected_rows() ? "204 No Content" : "409 Conflict";
-    }
-
-    /**
-     * checkLock() helper
-     *
-     * @param  string resource path to check for locks
-     * @return bool   true on success
-     */
-    function checkLock($path)
-    {
-        $result = false;
-
-        $query = "SELECT owner, token, created, modified, expires, exclusivelock
+		mysql_query($query);
+
+		return mysql_affected_rows() ? "204 No Content" : "409 Conflict";
+	}
+
+	/**
+	 * checkLock() helper
+	 *
+	 * @param  string resource path to check for locks
+	 * @return bool   true on success
+	 */
+	function checkLock($path)
+	{
+		$result = false;
+
+		$query = "SELECT owner, token, created, modified, expires, exclusivelock
                   FROM {$this->db_prefix}locks
                  WHERE path = '$path'
                ";
-        $res = mysql_query($query);
-
-        if ($res) {
-            $row = mysql_fetch_array($res);
-            mysql_free_result($res);
-
-            if ($row) {
-                $result = array( "type"    => "write",
-                                 "scope"   => $row["exclusivelock"] ? "exclusive" : "shared",
-                                 "depth"   => 0,
-                                 "owner"   => $row['owner'],
-                                 "token"   => $row['token'],
-                                 "created" => $row['created'],
-                                 "modified" => $row['modified'],
-                                 "expires" => $row['expires']
-                                 );
-            }
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * create database tables for property and lock storage
-     *
-     * @param  void
-     * @return bool   true on success
-     */
-    function create_database()
-    {
-        // TODO
-        return false;
-    }
+		$res = mysql_query($query);
+
+		if ($res) {
+			$row = mysql_fetch_array($res);
+			mysql_free_result($res);
+
+			if ($row) {
+				$result = array( "type"    => "write",
+								 "scope"   => $row["exclusivelock"] ? "exclusive" : "shared",
+								 "depth"   => 0,
+								 "owner"   => $row['owner'],
+								 "token"   => $row['token'],
+								 "created" => $row['created'],
+								 "modified" => $row['modified'],
+								 "expires" => $row['expires']
+								 );
+			}
+		}
+
+		return $result;
+	}
+
+
+	/**
+	 * create database tables for property and lock storage
+	 *
+	 * @param  void
+	 * @return bool   true on success
+	 */
+	function create_database()
+	{
+		// TODO
+		return false;
+	}
 }
 
 

Switch Indentation +22 added lines, -22 removed lines

@@ -365,18 +365,18 @@ 
             //       the registry)
             // TODO: have a seperate PEAR class for mimetype detection?
             switch (strtolower(strrchr(basename($fspath), "."))) {
-            case ".html":
-                $mime_type = "text/html";
-                break;
-            case ".gif":
-                $mime_type = "image/gif";
-                break;
-            case ".jpg":
-                $mime_type = "image/jpeg";
-                break;
-            default:
-                $mime_type = "application/octet-stream";
-                break;
+            	case ".html":
+                	$mime_type = "text/html";
+                	break;
+            	case ".gif":
+                	$mime_type = "image/gif";
+                	break;
+            	case ".jpg":
+                	$mime_type = "image/jpeg";
+                	break;
+            	default:
+                	$mime_type = "application/octet-stream";
+                	break;
             }
         }
 
@@ -633,16 +633,16 @@ 
 
         if (is_dir($source)) { // resource is a collection
             switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
+            	case "infinity": // valid
+                	break;
+            	case "0": // valid for COPY only
+                	if ($del) { // MOVE?
+                    	return "400 Bad request";
+                	}
+                	break;
+            	case "1": // invalid for both COPY and MOVE
+            	default:
+                	return "400 Bad request";
             }
         }
 

Spacing +21 added lines, -21 removed lines

@@ -151,7 +151,7 @@ 
     function PROPFIND(&$options, &$files)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // sanity check
         if (!file_exists($fspath)) {
@@ -198,7 +198,7 @@ 
     function fileinfo($path)
     {
         // map URI path to filesystem path
-        $fspath = $this->base . $path;
+        $fspath = $this->base.$path;
 
         // create result array
         $info = array();
@@ -210,11 +210,11 @@ 
         $info["props"][] = $this->mkprop("displayname", strtoupper($path));
 
         // creation and modification time
-        $info["props"][] = $this->mkprop("creationdate",    filectime($fspath));
+        $info["props"][] = $this->mkprop("creationdate", filectime($fspath));
         $info["props"][] = $this->mkprop("getlastmodified", filemtime($fspath));
 
         // Microsoft extensions: last access time and 'hidden' status
-        $info["props"][] = $this->mkprop("lastaccessed",    fileatime($fspath));
+        $info["props"][] = $this->mkprop("lastaccessed", fileatime($fspath));
         $info["props"][] = $this->mkprop("ishidden", ('.' === substr(basename($fspath), 0, 1)));
 
         // type and size (caller already made sure that path exists)
@@ -341,8 +341,8 @@ 
             // so we test the format of the returned string
 
             // the reply begins with the requested filename
-            if (!strncmp($reply, "$fspath: ", strlen($fspath)+2)) {
-                $reply = substr($reply, strlen($fspath)+2);
+            if (!strncmp($reply, "$fspath: ", strlen($fspath) + 2)) {
+                $reply = substr($reply, strlen($fspath) + 2);
                 // followed by the mime type (maybe including options)
                 if (preg_match('|^[[:alnum:]_-]+/[[:alnum:]_-]+;?.*|', $reply, $matches)) {
                     $mime_type = $matches[0];
@@ -392,7 +392,7 @@ 
     function HEAD(&$options)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // sanity check
         if (!file_exists($fspath)) return false;
@@ -421,7 +421,7 @@ 
     function GET(&$options)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // is this a collection?
         if (is_dir($fspath)) {
@@ -504,14 +504,14 @@ 
      */
     function PUT(&$options)
     {
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         $dir = dirname($fspath);
         if (!file_exists($dir) || !is_dir($dir)) {
             return "409 Conflict"; // TODO right status code for both?
         }
 
-        $options["new"] = ! file_exists($fspath);
+        $options["new"] = !file_exists($fspath);
 
         if ($options["new"] && !$this->_is_writable($dir)) {
             return "403 Forbidden";
@@ -537,7 +537,7 @@ 
      */
     function MKCOL($options)
     {
-        $path   = $this->base .$options["path"];
+        $path   = $this->base.$options["path"];
         $parent = dirname($path);
         $name   = basename($path);
 
@@ -549,7 +549,7 @@ 
             return "403 Forbidden";
         }
 
-        if ( file_exists($parent."/".$name) ) {
+        if (file_exists($parent."/".$name)) {
             return "405 Method not allowed";
         }
 
@@ -574,7 +574,7 @@ 
      */
     function DELETE($options)
     {
-        $path = $this->base . "/" .$options["path"];
+        $path = $this->base."/".$options["path"];
 
         if (!file_exists($path)) {
             return "404 Not found";
@@ -613,7 +613,7 @@ 
      * @param  array  general parameter passing array
      * @return bool   true on success
      */
-    function COPY($options, $del=false)
+    function COPY($options, $del = false)
     {
         // TODO Property updates still broken (Litmus should detect this?)
 
@@ -626,7 +626,7 @@ 
             return "502 bad gateway";
         }
 
-        $source = $this->base . $options["path"];
+        $source = $this->base.$options["path"];
         if (!file_exists($source)) {
             return "404 Not found";
         }
@@ -646,7 +646,7 @@ 
             }
         }
 
-        $dest         = $this->base . $options["dest"];
+        $dest         = $this->base.$options["dest"];
         $destdir      = dirname($dest);
 
         if (!file_exists($destdir) || !is_dir($destdir)) {
@@ -795,7 +795,7 @@ 
     function LOCK(&$options)
     {
         // get absolute fs path to requested resource
-        $fspath = $this->base . $options["path"];
+        $fspath = $this->base.$options["path"];
 
         // TODO recursive locks on directories not supported yet
         // makes litmus test "32. lock_collection" fail
@@ -803,7 +803,7 @@ 
             return "409 Conflict";
         }
 
-        $options["timeout"] = time()+300; // 5min. hardcoded
+        $options["timeout"] = time() + 300; // 5min. hardcoded
 
         if (isset($options["update"])) { // Lock Update
             $where = "WHERE path = '$options[path]' AND token = '$options[update]'";
@@ -822,7 +822,7 @@ 
 
                 $options['owner'] = $row['owner'];
                 $options['scope'] = $row["exclusivelock"] ? "exclusive" : "shared";
-                $options['type']  = $row["exclusivelock"] ? "write"     : "read";
+                $options['type']  = $row["exclusivelock"] ? "write" : "read";
 
                 return true;
             } else {
@@ -837,7 +837,7 @@ 
                           , modified = ".time()."
                           , owner   = '$options[owner]'
                           , expires = '$options[timeout]'
-                          , exclusivelock  = " .($options['scope'] === "exclusive" ? "1" : "0")
+                          , exclusivelock  = ".($options['scope'] === "exclusive" ? "1" : "0")
             ;
         mysql_query($query);
 
@@ -881,7 +881,7 @@ 
             mysql_free_result($res);
 
             if ($row) {
-                $result = array( "type"    => "write",
+                $result = array("type"    => "write",
                                  "scope"   => $row["exclusivelock"] ? "exclusive" : "shared",
                                  "depth"   => 0,
                                  "owner"   => $row['owner'],

Braces +212 added lines, -91 removed lines

@@ -105,15 +105,19 @@ 
         // special treatment for litmus compliance test
         // reply on its identifier header
         // not needed for the test itself but eases debugging
-        if (isset($this->_SERVER['HTTP_X_LITMUS'])) {
+        if (isset($this->_SERVER['HTTP_X_LITMUS']))
+        {
             error_log("Litmus test ".$this->_SERVER['HTTP_X_LITMUS']);
             header("X-Litmus-reply: ".$this->_SERVER['HTTP_X_LITMUS']);
         }
 
         // set root directory, defaults to webserver document root if not set
-        if ($base) {
+        if ($base)
+        {
             $this->base = realpath($base); // TODO throw if not a directory
-        } else if (!$this->base) {
+        }
+        else if (!$this->base)
+        {
             $this->base = $this->_SERVER['DOCUMENT_ROOT'];
         }
 
@@ -154,7 +158,8 @@ 
         $fspath = $this->base . $options["path"];
 
         // sanity check
-        if (!file_exists($fspath)) {
+        if (!file_exists($fspath))
+        {
             return false;
         }
 
@@ -165,7 +170,8 @@ 
         $files["files"][] = $this->fileinfo($options["path"]);
 
         // information for contained resources requested?
-        if (!empty($options["depth"]) && is_dir($fspath) && $this->_is_readable($fspath)) {
+        if (!empty($options["depth"]) && is_dir($fspath) && $this->_is_readable($fspath))
+        {
 
             // make sure path ends with '/'
             $options["path"] = $this->_slashify($options["path"]);
@@ -173,10 +179,13 @@ 
             // try to open directory
             $handle = opendir($fspath);
 
-            if ($handle) {
+            if ($handle)
+            {
                 // ok, now get all its contents
-                while ($filename = readdir($handle)) {
-                    if ($filename != "." && $filename != "..") {
+                while ($filename = readdir($handle))
+                {
+                    if ($filename != "." && $filename != "..")
+                    {
                         $files["files"][] = $this->fileinfo($options["path"].$filename);
                     }
                 }
@@ -218,16 +227,22 @@ 
         $info["props"][] = $this->mkprop("ishidden", ('.' === substr(basename($fspath), 0, 1)));
 
         // type and size (caller already made sure that path exists)
-        if (is_dir($fspath)) {
+        if (is_dir($fspath))
+        {
             // directory (WebDAV collection)
             $info["props"][] = $this->mkprop("resourcetype", "collection");
             $info["props"][] = $this->mkprop("getcontenttype", "httpd/unix-directory");
-        } else {
+        }
+        else
+        {
             // plain file (WebDAV resource)
             $info["props"][] = $this->mkprop("resourcetype", "");
-            if ($this->_is_readable($fspath)) {
+            if ($this->_is_readable($fspath))
+            {
                 $info["props"][] = $this->mkprop("getcontenttype", $this->_mimetype($fspath));
-            } else {
+            }
+            else
+            {
                 $info["props"][] = $this->mkprop("getcontenttype", "application/x-non-readable");
             }
             $info["props"][] = $this->mkprop("getcontentlength", filesize($fspath));
@@ -238,7 +253,8 @@ 
                         FROM {$this->db_prefix}properties
                        WHERE path = '$path'";
         $res = mysql_query($query);
-        while ($row = mysql_fetch_assoc($res)) {
+        while ($row = mysql_fetch_assoc($res))
+        {
             $info["props"][] = $this->mkprop($row["ns"], $row["name"], $row["value"]);
         }
         mysql_free_result($res);
@@ -259,30 +275,45 @@ 
     function _can_execute($name, $path = false)
     {
         // path defaults to PATH from environment if not set
-        if ($path === false) {
+        if ($path === false)
+        {
             $path = getenv("PATH");
         }
 
         // check method depends on operating system
-        if (!strncmp(PHP_OS, "WIN", 3)) {
+        if (!strncmp(PHP_OS, "WIN", 3))
+        {
             // on Windows an appropriate COM or EXE file needs to exist
             $exts     = array(".exe", ".com");
             $check_fn = "file_exists";
-        } else {
+        }
+        else
+        {
             // anywhere else we look for an executable file of that name
             $exts     = array("");
             $check_fn = "is_executable";
         }
 
         // now check the directories in the path for the program
-        foreach (explode(PATH_SEPARATOR, $path) as $dir) {
+        foreach (explode(PATH_SEPARATOR, $path) as $dir)
+        {
             // skip invalid path entries
-            if (!file_exists($dir)) continue;
-            if (!is_dir($dir)) continue;
+            if (!file_exists($dir))
+            {
+            	continue;
+            }
+            if (!is_dir($dir))
+            {
+            	continue;
+            }
 
             // and now look for the file
-            foreach ($exts as $ext) {
-                if ($check_fn("$dir/$name".$ext)) return true;
+            foreach ($exts as $ext)
+            {
+                if ($check_fn("$dir/$name".$ext))
+                {
+                	return true;
+                }
             }
         }
 
@@ -323,13 +354,18 @@ 
      */
     function _mimetype($fspath)
     {
-        if (is_dir($fspath)) {
+        if (is_dir($fspath))
+        {
             // directories are easy
             return "httpd/unix-directory";
-        } else if (function_exists("mime_content_type")) {
+        }
+        else if (function_exists("mime_content_type"))
+        {
             // use mime magic extension if available
             $mime_type = mime_content_type($fspath);
-        } else if ($this->_can_execute("file")) {
+        }
+        else if ($this->_can_execute("file"))
+        {
             // it looks like we have a 'file' command,
             // lets see it it does have mime support
             $fp    = popen("file -i '$fspath' 2>/dev/null", "r");
@@ -341,16 +377,19 @@ 
             // so we test the format of the returned string
 
             // the reply begins with the requested filename
-            if (!strncmp($reply, "$fspath: ", strlen($fspath)+2)) {
+            if (!strncmp($reply, "$fspath: ", strlen($fspath)+2))
+            {
                 $reply = substr($reply, strlen($fspath)+2);
                 // followed by the mime type (maybe including options)
-                if (preg_match('|^[[:alnum:]_-]+/[[:alnum:]_-]+;?.*|', $reply, $matches)) {
+                if (preg_match('|^[[:alnum:]_-]+/[[:alnum:]_-]+;?.*|', $reply, $matches))
+                {
                     $mime_type = $matches[0];
                 }
             }
         }
 
-        if (empty($mime_type)) {
+        if (empty($mime_type))
+        {
             // Fallback solution: try to guess the type by the file extension
             // TODO: add more ...
             // TODO: it has been suggested to delegate mimetype detection
@@ -364,7 +403,8 @@ 
             //       anyway (overriding it with information taken from
             //       the registry)
             // TODO: have a seperate PEAR class for mimetype detection?
-            switch (strtolower(strrchr(basename($fspath), "."))) {
+            switch (strtolower(strrchr(basename($fspath), ".")))
+            {
             case ".html":
                 $mime_type = "text/html";
                 break;
@@ -395,7 +435,10 @@ 
         $fspath = $this->base . $options["path"];
 
         // sanity check
-        if (!file_exists($fspath)) return false;
+        if (!file_exists($fspath))
+        {
+        	return false;
+        }
 
         // detect resource type
         $options['mimetype'] = $this->_mimetype($fspath);
@@ -424,12 +467,14 @@ 
         $fspath = $this->base . $options["path"];
 
         // is this a collection?
-        if (is_dir($fspath)) {
+        if (is_dir($fspath))
+        {
             return $this->GetDir($fspath, $options);
         }
 
         // the header output is the same as for HEAD
-        if (!$this->HEAD($options)) {
+        if (!$this->HEAD($options))
+        {
             return false;
         }
 
@@ -451,7 +496,8 @@ 
     function GetDir($fspath, &$options)
     {
         $path = $this->_slashify($options["path"]);
-        if ($path != $options["path"]) {
+        if ($path != $options["path"])
+        {
             header("Location: ".$this->base_uri.$path);
             exit;
         }
@@ -459,12 +505,14 @@ 
         // fixed width directory column format
         $format = "%15s  %-19s  %-s\n";
 
-        if (!$this->_is_readable($fspath)) {
+        if (!$this->_is_readable($fspath))
+        {
             return false;
         }
 
         $handle = opendir($fspath);
-        if (!$handle) {
+        if (!$handle)
+        {
             return false;
         }
 
@@ -476,8 +524,10 @@ 
         printf($format, "Size", "Last modified", "Filename");
         echo "<hr>";
 
-        while ($filename = readdir($handle)) {
-            if ($filename != "." && $filename != "..") {
+        while ($filename = readdir($handle))
+        {
+            if ($filename != "." && $filename != "..")
+            {
                 $fullpath = $fspath.$filename;
                 $name     = htmlspecialchars($filename);
                 printf($format,
@@ -507,19 +557,23 @@ 
         $fspath = $this->base . $options["path"];
 
         $dir = dirname($fspath);
-        if (!file_exists($dir) || !is_dir($dir)) {
+        if (!file_exists($dir) || !is_dir($dir))
+        {
             return "409 Conflict"; // TODO right status code for both?
         }
 
         $options["new"] = ! file_exists($fspath);
 
-        if ($options["new"] && !$this->_is_writable($dir)) {
+        if ($options["new"] && !$this->_is_writable($dir))
+        {
             return "403 Forbidden";
         }
-        if (!$options["new"] && !$this->_is_writable($fspath)) {
+        if (!$options["new"] && !$this->_is_writable($fspath))
+        {
             return "403 Forbidden";
         }
-        if (!$options["new"] && is_dir($fspath)) {
+        if (!$options["new"] && is_dir($fspath))
+        {
             return "403 Forbidden";
         }
 
@@ -541,24 +595,30 @@ 
         $parent = dirname($path);
         $name   = basename($path);
 
-        if (!file_exists($parent)) {
+        if (!file_exists($parent))
+        {
             return "409 Conflict";
         }
 
-        if (!is_dir($parent)) {
+        if (!is_dir($parent))
+        {
             return "403 Forbidden";
         }
 
-        if ( file_exists($parent."/".$name) ) {
+        if ( file_exists($parent."/".$name) )
+        {
             return "405 Method not allowed";
         }
 
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+        if (!empty($this->_SERVER["CONTENT_LENGTH"]))
+        {
+// no body parsing yet
             return "415 Unsupported media type";
         }
 
         $stat = mkdir($parent."/".$name, 0777);
-        if (!$stat) {
+        if (!$stat)
+        {
             return "403 Forbidden";
         }
 
@@ -576,16 +636,20 @@ 
     {
         $path = $this->base . "/" .$options["path"];
 
-        if (!file_exists($path)) {
+        if (!file_exists($path))
+        {
             return "404 Not found";
         }
 
-        if (is_dir($path)) {
+        if (is_dir($path))
+        {
             $query = "DELETE FROM {$this->db_prefix}properties
                            WHERE path LIKE '".$this->_slashify($options["path"])."%'";
             mysql_query($query);
             System::rm(array("-rf", $path));
-        } else {
+        }
+        else
+        {
             unlink($path);
         }
         $query = "DELETE FROM {$this->db_prefix}properties
@@ -617,26 +681,35 @@ 
     {
         // TODO Property updates still broken (Litmus should detect this?)
 
-        if (!empty($this->_SERVER["CONTENT_LENGTH"])) { // no body parsing yet
+        if (!empty($this->_SERVER["CONTENT_LENGTH"]))
+        {
+// no body parsing yet
             return "415 Unsupported media type";
         }
 
         // no copying to different WebDAV Servers yet
-        if (isset($options["dest_url"])) {
+        if (isset($options["dest_url"]))
+        {
             return "502 bad gateway";
         }
 
         $source = $this->base . $options["path"];
-        if (!file_exists($source)) {
+        if (!file_exists($source))
+        {
             return "404 Not found";
         }
 
-        if (is_dir($source)) { // resource is a collection
-            switch ($options["depth"]) {
+        if (is_dir($source))
+        {
+// resource is a collection
+            switch ($options["depth"])
+            {
             case "infinity": // valid
                 break;
             case "0": // valid for COPY only
-                if ($del) { // MOVE?
+                if ($del)
+                {
+// MOVE?
                     return "400 Bad request";
                 }
                 break;
@@ -649,7 +722,8 @@ 
         $dest         = $this->base . $options["dest"];
         $destdir      = dirname($dest);
 
-        if (!file_exists($destdir) || !is_dir($destdir)) {
+        if (!file_exists($destdir) || !is_dir($destdir))
+        {
             return "409 Conflict";
         }
 
@@ -657,38 +731,52 @@ 
         $new          = !file_exists($dest);
         $existing_col = false;
 
-        if (!$new) {
-            if ($del && is_dir($dest)) {
-                if (!$options["overwrite"]) {
+        if (!$new)
+        {
+            if ($del && is_dir($dest))
+            {
+                if (!$options["overwrite"])
+                {
                     return "412 precondition failed";
                 }
                 $dest .= basename($source);
-                if (file_exists($dest)) {
+                if (file_exists($dest))
+                {
                     $options["dest"] .= basename($source);
-                } else {
+                }
+                else
+                {
                     $new          = true;
                     $existing_col = true;
                 }
             }
         }
 
-        if (!$new) {
-            if ($options["overwrite"]) {
+        if (!$new)
+        {
+            if ($options["overwrite"])
+            {
                 $stat = $this->DELETE(array("path" => $options["dest"]));
-                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) {
+                if (($stat{0} != "2") && (substr($stat, 0, 3) != "404"))
+                {
                     return $stat;
                 }
-            } else {
+            }
+            else
+            {
                 return "412 precondition failed";
             }
         }
 
-        if ($del) {
-            if (!rename($source, $dest)) {
+        if ($del)
+        {
+            if (!rename($source, $dest))
+            {
                 return "500 Internal server error";
             }
             $destpath = $this->_unslashify($options["dest"]);
-            if (is_dir($source)) {
+            if (is_dir($source))
+            {
                 $query = "UPDATE {$this->db_prefix}properties
                                  SET path = REPLACE(path, '".$options["path"]."', '".$destpath."')
                                WHERE path LIKE '".$this->_slashify($options["path"])."%'";
@@ -699,40 +787,58 @@ 
                              SET path = '".$destpath."'
                            WHERE path = '".$options["path"]."'";
             mysql_query($query);
-        } else {
-            if (is_dir($source) && $options["depth"] == "infinity") {	// no find for depth="0"
+        }
+        else
+        {
+            if (is_dir($source) && $options["depth"] == "infinity")
+            {
+// no find for depth="0"
                 $files = System::find($source);
                 $files = array_reverse($files);
-            } else {
+            }
+            else
+            {
                 $files = array($source);
             }
 
-            if (!is_array($files) || empty($files)) {
+            if (!is_array($files) || empty($files))
+            {
                 return "500 Internal server error";
             }
 
 
-            foreach ($files as $file) {
-                if (is_dir($file)) {
+            foreach ($files as $file)
+            {
+                if (is_dir($file))
+                {
                     $file = $this->_slashify($file);
                 }
 
                 $destfile = str_replace($source, $dest, $file);
 
-                if (is_dir($file)) {
-                    if (!file_exists($destfile)) {
-                        if (!$this->_is_writable(dirname($destfile))) {
+                if (is_dir($file))
+                {
+                    if (!file_exists($destfile))
+                    {
+                        if (!$this->_is_writable(dirname($destfile)))
+                        {
                             return "403 Forbidden";
                         }
-                        if (!mkdir($destfile)) {
+                        if (!mkdir($destfile))
+                        {
                             return "409 Conflict";
                         }
-                    } else if (!is_dir($destfile)) {
+                    }
+                    else if (!is_dir($destfile))
+                    {
                         return "409 Conflict";
                     }
-                } else {
+                }
+                else
+                {
 
-                    if (!copy($file, $destfile)) {
+                    if (!copy($file, $destfile))
+                    {
                         return "409 Conflict";
                     }
                 }
@@ -762,17 +868,24 @@ 
         $dir  = dirname($path)."/";
         $base = basename($path);
 
-        foreach ($options["props"] as $key => $prop) {
-            if ($prop["ns"] == "DAV:") {
+        foreach ($options["props"] as $key => $prop)
+        {
+            if ($prop["ns"] == "DAV:")
+            {
                 $options["props"][$key]['status'] = "403 Forbidden";
-            } else {
-                if (isset($prop["val"])) {
+            }
+            else
+            {
+                if (isset($prop["val"]))
+                {
                     $query = "REPLACE INTO {$this->db_prefix}properties
                                            SET path = '$options[path]'
                                              , name = '$prop[name]'
                                              , ns= '$prop[ns]'
                                              , value = '$prop[val]'";
-                } else {
+                }
+                else
+                {
                     $query = "DELETE FROM {$this->db_prefix}properties
                                         WHERE path = '$options[path]'
                                           AND name = '$prop[name]'
@@ -799,13 +912,16 @@ 
 
         // TODO recursive locks on directories not supported yet
         // makes litmus test "32. lock_collection" fail
-        if (is_dir($fspath) && !empty($options["depth"])) {
+        if (is_dir($fspath) && !empty($options["depth"]))
+        {
             return "409 Conflict";
         }
 
         $options["timeout"] = time()+300; // 5min. hardcoded
 
-        if (isset($options["update"])) { // Lock Update
+        if (isset($options["update"]))
+        {
+// Lock Update
             $where = "WHERE path = '$options[path]' AND token = '$options[update]'";
 
             $query = "SELECT owner, exclusivelock FROM {$this->db_prefix}locks $where";
@@ -813,7 +929,8 @@ 
             $row   = mysql_fetch_assoc($res);
             mysql_free_result($res);
 
-            if (is_array($row)) {
+            if (is_array($row))
+            {
                 $query = "UPDATE {$this->db_prefix}locks
                                  SET expires = '$options[timeout]'
                                    , modified = ".time()."
@@ -825,7 +942,9 @@ 
                 $options['type']  = $row["exclusivelock"] ? "write"     : "read";
 
                 return true;
-            } else {
+            }
+            else
+            {
                 return false;
             }
         }
@@ -876,11 +995,13 @@ 
                ";
         $res = mysql_query($query);
 
-        if ($res) {
+        if ($res)
+        {
             $row = mysql_fetch_array($res);
             mysql_free_result($res);
 
-            if ($row) {
+            if ($row)
+            {
                 $result = array( "type"    => "write",
                                  "scope"   => $row["exclusivelock"] ? "exclusive" : "shared",
                                  "depth"   => 0,

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

@@ -689,13 +689,13 @@ 
             }
             $destpath = $this->_unslashify($options["dest"]);
             if (is_dir($source)) {
-                $query = "UPDATE {$this->db_prefix}properties
+                $query = "update {$this->db_prefix}properties
                                  SET path = REPLACE(path, '".$options["path"]."', '".$destpath."')
                                WHERE path LIKE '".$this->_slashify($options["path"])."%'";
                 mysql_query($query);
             }
 
-            $query = "UPDATE {$this->db_prefix}properties
+            $query = "update {$this->db_prefix}properties
                              SET path = '".$destpath."'
                            WHERE path = '".$options["path"]."'";
             mysql_query($query);
@@ -814,7 +814,7 @@ 
             mysql_free_result($res);
 
             if (is_array($row)) {
-                $query = "UPDATE {$this->db_prefix}locks
+                $query = "update {$this->db_prefix}locks
                                  SET expires = '$options[timeout]'
                                    , modified = ".time()."
                               $where";

api/src/WebDAV/Tools/_parse_lockinfo.php

Doc Comments +1 added lines

@@ -87,6 +87,7 @@
      * constructor
      *
      * @param  string  path of stream to read
+     * @param string $path
      * @access public
      */
     function __construct($path)

Indentation +203 added lines, -203 removed lines

@@ -43,209 +43,209 @@
  */
 class _parse_lockinfo
 {
-    /**
-     * success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = false;
-
-    /**
-     * lock type, currently only "write"
-     *
-     * @var string
-     * @access public
-     */
-    var $locktype = "";
-
-    /**
-     * lock scope, "shared" or "exclusive"
-     *
-     * @var string
-     * @access public
-     */
-    var $lockscope = "";
-
-    /**
-     * lock owner information
-     *
-     * @var string
-     * @access public
-     */
-    var $owner = "";
-
-    /**
-     * flag that is set during lock owner read
-     *
-     * @var bool
-     * @access private
-     */
-    var $collect_owner = false;
-
-    /**
-     * constructor
-     *
-     * @param  string  path of stream to read
-     * @access public
-     */
-    function __construct($path)
-    {
-        // we assume success unless problems occur
-        $this->success = true;
-
-        // remember if any input was parsed
-        $had_input = false;
-
-        // open stream
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
-
-        // create namespace aware parser
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
-
-        // set tag and data handlers
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
-        xml_set_character_data_handler($xml_parser,
-                                       array(&$this, "_data"));
-
-        // we want a case sensitive parser
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
-
-        // parse input
-        while ($this->success && !feof($f_in)) {
-            $line = fgets($f_in);
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($xml_parser, $line, false);
-            }
-        }
-
-        // finish parsing
-        if ($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
-
-        // check if required tags where found
-        $this->success &= !empty($this->locktype);
-        $this->success &= !empty($this->lockscope);
-
-        // free parser resource
-        xml_parser_free($xml_parser);
-
-        // close input stream
-        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)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-
-        if ($this->collect_owner) {
-            // everything within the <owner> tag needs to be collected
-            $ns_short = "";
-            $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "<$ns_short$tag$ns_attr>";
-        } else if ($ns == "DAV:") {
-            // parse only the essential tags
-            switch ($tag) {
-            case "write":
-                $this->locktype = $tag;
-                break;
-            case "exclusive":
-            case "shared":
-                $this->lockscope = $tag;
-                break;
-            case "owner":
-                $this->collect_owner = true;
-                break;
-            }
-        }
-    }
-
-    /**
-     * data handler
-     *
-     * @param  resource  parser
-     * @param  string    data
-     * @return void
-     * @access private
-     */
-    function _data($parser, $data)
-    {
-        // only the <owner> tag has data content
-        if ($this->collect_owner) {
-            $this->owner .= $data;
-        }
-    }
-
-    /**
-     * tag end handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @return void
-     * @access private
-     */
-    function _endElement($parser, $name)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-        // <owner> finished?
-        if (($ns == "DAV:") && ($tag == "owner")) {
-            $this->collect_owner = false;
-        }
-
-        // within <owner> we have to collect everything
-        if ($this->collect_owner) {
-            $ns_short = "";
-            $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "</$ns_short$tag$ns_attr>";
-        }
-    }
+	/**
+	 * success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = false;
+
+	/**
+	 * lock type, currently only "write"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $locktype = "";
+
+	/**
+	 * lock scope, "shared" or "exclusive"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $lockscope = "";
+
+	/**
+	 * lock owner information
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $owner = "";
+
+	/**
+	 * flag that is set during lock owner read
+	 *
+	 * @var bool
+	 * @access private
+	 */
+	var $collect_owner = false;
+
+	/**
+	 * constructor
+	 *
+	 * @param  string  path of stream to read
+	 * @access public
+	 */
+	function __construct($path)
+	{
+		// we assume success unless problems occur
+		$this->success = true;
+
+		// remember if any input was parsed
+		$had_input = false;
+
+		// open stream
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
+
+		// create namespace aware parser
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
+
+		// set tag and data handlers
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
+		xml_set_character_data_handler($xml_parser,
+									   array(&$this, "_data"));
+
+		// we want a case sensitive parser
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
+
+		// parse input
+		while ($this->success && !feof($f_in)) {
+			$line = fgets($f_in);
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($xml_parser, $line, false);
+			}
+		}
+
+		// finish parsing
+		if ($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
+
+		// check if required tags where found
+		$this->success &= !empty($this->locktype);
+		$this->success &= !empty($this->lockscope);
+
+		// free parser resource
+		xml_parser_free($xml_parser);
+
+		// close input stream
+		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)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+
+		if ($this->collect_owner) {
+			// everything within the <owner> tag needs to be collected
+			$ns_short = "";
+			$ns_attr  = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "<$ns_short$tag$ns_attr>";
+		} else if ($ns == "DAV:") {
+			// parse only the essential tags
+			switch ($tag) {
+			case "write":
+				$this->locktype = $tag;
+				break;
+			case "exclusive":
+			case "shared":
+				$this->lockscope = $tag;
+				break;
+			case "owner":
+				$this->collect_owner = true;
+				break;
+			}
+		}
+	}
+
+	/**
+	 * data handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    data
+	 * @return void
+	 * @access private
+	 */
+	function _data($parser, $data)
+	{
+		// only the <owner> tag has data content
+		if ($this->collect_owner) {
+			$this->owner .= $data;
+		}
+	}
+
+	/**
+	 * tag end handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @return void
+	 * @access private
+	 */
+	function _endElement($parser, $name)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+		// <owner> finished?
+		if (($ns == "DAV:") && ($tag == "owner")) {
+			$this->collect_owner = false;
+		}
+
+		// within <owner> we have to collect everything
+		if ($this->collect_owner) {
+			$ns_short = "";
+			$ns_attr  = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "</$ns_short$tag$ns_attr>";
+		}
+	}
 }
 
 ?>

Switch Indentation +10 added lines, -10 removed lines

@@ -179,16 +179,16 @@
         } else if ($ns == "DAV:") {
             // parse only the essential tags
             switch ($tag) {
-            case "write":
-                $this->locktype = $tag;
-                break;
-            case "exclusive":
-            case "shared":
-                $this->lockscope = $tag;
-                break;
-            case "owner":
-                $this->collect_owner = true;
-                break;
+            	case "write":
+                	$this->locktype = $tag;
+                	break;
+            	case "exclusive":
+            	case "shared":
+                	$this->lockscope = $tag;
+                	break;
+            	case "owner":
+                	$this->collect_owner = true;
+                	break;
             }
         }
     }

Braces +45 added lines, -20 removed lines

@@ -99,7 +99,8 @@ 
 
         // open stream
         $f_in = fopen($path, "r");
-        if (!$f_in) {
+        if (!$f_in)
+        {
             $this->success = false;
             return;
         }
@@ -119,16 +120,19 @@ 
                               XML_OPTION_CASE_FOLDING, false);
 
         // parse input
-        while ($this->success && !feof($f_in)) {
+        while ($this->success && !feof($f_in))
+        {
             $line = fgets($f_in);
-            if (is_string($line)) {
+            if (is_string($line))
+            {
                 $had_input = true;
                 $this->success &= xml_parse($xml_parser, $line, false);
             }
         }
 
         // finish parsing
-        if ($had_input) {
+        if ($had_input)
+        {
             $this->success &= xml_parse($xml_parser, "", true);
         }
 
@@ -156,29 +160,40 @@ 
     function _startElement($parser, $name, $attrs)
     {
         // namespace handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
-        } else {
+        }
+        else
+        {
             $ns  = "";
             $tag = $name;
         }
 
 
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             // everything within the <owner> tag needs to be collected
             $ns_short = "";
             $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
+            if ($ns)
+            {
+                if ($ns == "DAV:")
+                {
                     $ns_short = "D:";
-                } else {
+                }
+                else
+                {
                     $ns_attr = " xmlns='$ns'";
                 }
             }
             $this->owner .= "<$ns_short$tag$ns_attr>";
-        } else if ($ns == "DAV:") {
+        }
+        else if ($ns == "DAV:")
+        {
             // parse only the essential tags
-            switch ($tag) {
+            switch ($tag)
+            {
             case "write":
                 $this->locktype = $tag;
                 break;
@@ -204,7 +219,8 @@ 
     function _data($parser, $data)
     {
         // only the <owner> tag has data content
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             $this->owner .= $data;
         }
     }
@@ -220,26 +236,35 @@ 
     function _endElement($parser, $name)
     {
         // namespace handling
-        if (strstr($name, " ")) {
+        if (strstr($name, " "))
+        {
             list($ns, $tag) = explode(" ", $name);
-        } else {
+        }
+        else
+        {
             $ns  = "";
             $tag = $name;
         }
 
         // <owner> finished?
-        if (($ns == "DAV:") && ($tag == "owner")) {
+        if (($ns == "DAV:") && ($tag == "owner"))
+        {
             $this->collect_owner = false;
         }
 
         // within <owner> we have to collect everything
-        if ($this->collect_owner) {
+        if ($this->collect_owner)
+        {
             $ns_short = "";
             $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
+            if ($ns)
+            {
+                if ($ns == "DAV:")
+                {
                     $ns_short = "D:";
-                } else {
+                }
+                else
+                {
                     $ns_attr = " xmlns='$ns'";
                 }
             }

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

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]++;

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'] );
 		}
 
@@ -133,12 +136,16 @@ 
 		$_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 );
-			} else {
+			}
+			else
+			{
 				$lid = $GLOBALS['egw']->accounts->id2name( $_definition->plugin_options['events_owner'] );
 				echo "Attension: All Events of '$lid' would be deleted!\n";
 			}
@@ -147,38 +154,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;
@@ -192,9 +224,14 @@ 
 							throw new Exception('condition not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// unconditional insert
 				$this->action( 'insert', $record );
 			}
@@ -208,8 +245,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;
 
@@ -219,32 +258,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;
@@ -259,7 +308,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar CSV export');
 	}
 
@@ -268,7 +318,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.");
 	}
 
@@ -277,7 +328,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -293,7 +345,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -302,7 +355,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -314,7 +368,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -326,7 +381,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
 		return $this->results;
 	}
 } // end of iface_export_plugin

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;
 

Spacing +307 added lines, -309 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,16 +116,16 @@ 
 	 * +      + +  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)
 	{
-		unset($updateTS);	// ignored, as updating timestamps is required for sync!
+		unset($updateTS); // ignored, as updating timestamps is required for sync!
 		//error_log(__METHOD__."(".array2string($event).",$ignore_conflicts,$touch_modified,$ignore_acl)");
 		if (!is_array($messages)) $messages = $messages ? (array)$messages : array();
 
 		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
@@ -153,11 +153,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)
@@ -166,24 +166,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();
@@ -192,38 +192,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)
 			{
@@ -259,30 +259,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;
 	}
@@ -300,27 +300,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 = $role = null;
 			calendar_so::split_status($status, $q, $role);
-			if ($status == 'R' || $role == 'NON-PARTICIPANT') continue;	// ignore rejected or non-participants
+			if ($status == 'R' || $role == 'NON-PARTICIPANT') continue; // ignore rejected or non-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;
 			}
@@ -343,58 +343,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, $role);
@@ -403,9 +403,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]))
 					{
@@ -415,7 +415,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;
 					}
@@ -425,22 +425,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];
 				}
 			}
 		}
@@ -448,10 +448,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'],
@@ -464,7 +464,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;
@@ -476,22 +476,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;
 			}
 		}
@@ -507,19 +507,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";
@@ -533,7 +533,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();
@@ -541,9 +541,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];
 			}
@@ -553,27 +553,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);
 			}
 		}
 	}
@@ -590,11 +590,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;
 
@@ -602,7 +602,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;
@@ -616,8 +616,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)
 					{
@@ -637,13 +637,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;
@@ -668,7 +668,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))
@@ -692,7 +692,7 @@ 
 				)
 			);
 		}
-		switch($ical_method)
+		switch ($ical_method)
 		{
 			default:
 			case 'REQUEST':
@@ -717,9 +717,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';
@@ -771,7 +771,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;
@@ -787,7 +787,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))
@@ -799,11 +799,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;
 		}
@@ -813,7 +813,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)
 		{
@@ -829,16 +829,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
 					}
 				}
 			}
@@ -850,7 +850,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);
@@ -873,14 +873,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'))
 					{
@@ -892,12 +892,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)
@@ -906,8 +906,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)
 				{
@@ -918,7 +918,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;
@@ -943,14 +943,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';
@@ -959,7 +959,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);
@@ -968,7 +968,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)
 				{
@@ -977,15 +977,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']),
@@ -1004,11 +1003,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':
@@ -1017,7 +1016,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;
 							 	}
 							}
@@ -1025,7 +1024,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");
@@ -1049,9 +1048,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");
 						}
@@ -1090,14 +1089,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);
 	}
 
 	/**
@@ -1111,37 +1110,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;
 	}
@@ -1157,14 +1156,14 @@ 
 	 * Please note: you should ALLWAYS update timestamps, 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)
 	{
 		//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;
 		}
@@ -1185,7 +1184,7 @@ 
 		if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'])
 		{
 			$event['recur_enddate'] = new Api\DateTime($event['recur_enddate'], calendar_timezones::DateTimeZone($event['tzid']));
-			$event['recur_enddate']->setTime(23,59,59);
+			$event['recur_enddate']->setTime(23, 59, 59);
 			$rrule = calendar_rrule::event2rrule($event, true, Api\DateTime::$user_timezone->getName());
 			$rrule->rewind();
 			$enddate = $rrule->current();
@@ -1244,19 +1243,19 @@ 
 
 				$event['recur_enddate'] = $save_event['recur_enddate'] = $time;
 			}
-			$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'])))
@@ -1266,7 +1265,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'])
 				{
@@ -1275,7 +1274,7 @@ 
 				}
 				else
 				{
-					$date = $this->date2ts($date,true);
+					$date = $this->date2ts($date, true);
 				}
 			}
 			unset($date);
@@ -1283,7 +1282,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']))
@@ -1301,15 +1300,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);
@@ -1338,7 +1336,7 @@ 
 		}
 		$set_recurrences = $old_event ? abs($event['recur_enddate'] - $old_event['recur_enddate']) > 1 : 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
@@ -1349,7 +1347,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);
@@ -1362,7 +1360,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;
@@ -1377,16 +1375,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;
@@ -1396,17 +1394,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);
 	}
 
 	/**
@@ -1420,16 +1418,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;
@@ -1437,7 +1435,7 @@ 
 				}
 				if ($access === false)
 				{
-					$ret = false;	// cat denies access --> check further cats
+					$ret = false; // cat denies access --> check further cats
 				}
 			}
 		}
@@ -1458,12 +1456,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;
@@ -1476,7 +1474,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);
@@ -1486,15 +1484,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);
 		}
 	}
 
@@ -1505,9 +1503,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]))
 		{
@@ -1515,21 +1513,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";
@@ -1549,13 +1547,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;
 		}
@@ -1564,16 +1562,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, $ignore_acl, '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(is_array($event) && isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
+				foreach (is_array($event) && isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
 				{
 					if ((string)$alarm['owner'] === (string)$uid)
 					{
@@ -1592,8 +1590,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
@@ -1613,14 +1611,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';
             }
@@ -1633,7 +1631,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);
 		}
     }
 
@@ -1648,43 +1646,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);
 					}
@@ -1706,7 +1704,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;
 					}
 				}
@@ -1718,9 +1716,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));
@@ -1728,12 +1726,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']);
@@ -1747,7 +1745,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'])
 		{
@@ -1765,19 +1763,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
@@ -1798,7 +1796,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'],
 									'ajax' => true
@@ -1807,11 +1805,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;
 	}
 
@@ -1835,13 +1833,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(
@@ -1887,7 +1885,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'),
@@ -1910,26 +1908,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;
@@ -1950,14 +1948,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 && is_object($instance_date))
+			if ($event['recur_type'] != MCAL_RECUR_NONE && is_object($instance_date))
 			{
 				calendar_so::shift_alarm($event, $alarm, $instance_date->format('ts'));
 			}
@@ -1977,14 +1975,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);
 	}
@@ -1997,11 +1995,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);
@@ -2016,13 +2014,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)
 			{
@@ -2076,7 +2074,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)
@@ -2101,7 +2099,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();
@@ -2109,14 +2107,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')
@@ -2137,14 +2135,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']))
@@ -2163,7 +2161,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' ||
@@ -2182,19 +2180,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;
@@ -2205,7 +2203,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) &&
@@ -2221,7 +2219,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))
 						{
@@ -2247,24 +2245,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')
@@ -2287,14 +2285,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))))
@@ -2302,19 +2300,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;
@@ -2388,7 +2386,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;
 						}
 					}
@@ -2406,7 +2404,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;
 					}
@@ -2418,7 +2416,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;
 					}
@@ -2439,8 +2437,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
 				}
@@ -2458,7 +2456,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;
 					}
@@ -2470,7 +2468,7 @@ 
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 							'() event has additional categories:'
-							. array2string($newCategories)."\n",3,$this->logfile);
+							. array2string($newCategories)."\n", 3, $this->logfile);
 					}
 					continue;
 				}
@@ -2490,7 +2488,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;
 						}
@@ -2513,8 +2511,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;
 					}
@@ -2526,7 +2524,7 @@ 
 				if ($egwEvent['recur_type'] != MCAL_RECUR_NONE)
 				{
 					// We found a pseudo Exception
-					$pseudos[] = $egwEvent['id'] . ':' . $event['start'];
+					$pseudos[] = $egwEvent['id'].':'.$event['start'];
 					continue;
 				}
 			}
@@ -2548,7 +2546,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;
 						}
@@ -2558,8 +2556,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;
 					}
@@ -2574,8 +2572,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;
 					}
@@ -2591,7 +2589,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();
 		}
@@ -2602,7 +2600,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;
 	}
@@ -2675,7 +2673,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')))
@@ -2696,7 +2694,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'];
@@ -2713,8 +2711,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)
 							{
@@ -2747,8 +2745,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])
 				{
@@ -2806,10 +2804,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;
@@ -2817,7 +2815,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);
 			}
@@ -2825,7 +2823,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']);
 			}
@@ -2842,7 +2840,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);
 		}
 	}
 }

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);
+		}
 	}
 
 	/**
@@ -120,7 +126,10 @@ 
 	{
 		unset($updateTS);	// ignored, as updating timestamps is required for sync!
 		//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')
 		{
@@ -140,10 +149,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']))
 			{
@@ -183,7 +195,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();
@@ -235,13 +250,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;
 		}
 
@@ -305,7 +323,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();
@@ -313,12 +334,19 @@ 
 		{
 			$q = $role = null;
 			calendar_so::split_status($status, $q, $role);
-			if ($status == 'R' || $role == 'NON-PARTICIPANT') continue;	// ignore rejected or non-participants
+			if ($status == 'R' || $role == 'NON-PARTICIPANT')
+			{
+				continue;
+			}
+			// ignore rejected or non-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))
 			{
@@ -349,18 +377,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;
@@ -384,10 +418,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);
@@ -507,7 +544,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))
 					{
@@ -947,7 +998,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)
@@ -982,9 +1036,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!
@@ -998,7 +1055,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':
@@ -1049,7 +1109,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)
 						{
@@ -1085,7 +1147,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;
 	}
@@ -1120,10 +1185,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
@@ -1172,14 +1240,20 @@ 
 		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
 		{
 			$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);
+		}
 
 		// set recur-enddate/range-end to real end-date of last recurrence
 		if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate'] && $event['start'])
@@ -1256,7 +1330,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'])))
@@ -1306,7 +1383,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']];
@@ -1362,7 +1442,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;
@@ -1379,9 +1462,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']);
 		}
@@ -1392,13 +1478,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]))
@@ -1422,7 +1514,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'])
@@ -1479,7 +1574,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])
 		{
@@ -1491,7 +1589,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);
@@ -1524,7 +1625,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)
@@ -1571,13 +1675,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(is_array($event) && 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));
 					}
 				}
@@ -1594,8 +1701,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);
 			}
 
@@ -1618,12 +1732,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';
             }
@@ -1706,7 +1824,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);
@@ -1777,7 +1898,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']) : '';
@@ -1950,7 +2074,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']))
@@ -2024,7 +2151,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)
@@ -2115,7 +2245,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')
 		{
@@ -2169,19 +2302,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();
@@ -2190,17 +2330,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')
@@ -2280,7 +2426,10 @@ 
 			}
 			foreach ($matchFields as $key)
 			{
-				if (isset($event[$key])) $query['cal_'.$key] = $event[$key];
+				if (isset($event[$key]))
+				{
+					$query['cal_'.$key] = $event[$key];
+				}
 			}
 		}
 
@@ -2320,7 +2469,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'])))
@@ -2487,13 +2639,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;
 						}
@@ -2815,7 +2970,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']))
@@ -2843,9 +3001,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);
 		}
+		}
 	}
 }

calendar/inc/class.calendar_export_csv.inc.php

Doc Comments +1 added lines, -1 removed lines

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

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

@@ -366,7 +366,7 @@ 
 	 */
 	protected function get_selects()
 	{
-		$this->selects['priority'] = Array(
+		$this->selects['priority'] = array(
 			0 => lang('None'),
 			1 => lang('Low'),
 			2 => lang('Normal'),
@@ -394,7 +394,7 @@ 
 	/**
 	 * Adjust automatically generated field filters
 	 */
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 
 		// Calendar SO doesn't support filtering by column, so we have to remove pretty much everything

Spacing +38 added lines, -38 removed lines

@@ -29,15 +29,15 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
 		if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('calendar');
 		// Custom fields need to be specifically requested
 		$cfs = array();
-		foreach($options['mapping'] + (array)$_definition->filter as $key => $label) {
-			if($key[0] == '#') $cfs[] = substr($key,1);
+		foreach ($options['mapping'] + (array)$_definition->filter as $key => $label) {
+			if ($key[0] == '#') $cfs[] = substr($key, 1);
 		}
 
 		$query = array(
@@ -45,7 +45,7 @@ 
 			'num_rows'	=> -1,
 			'csv_export'	=> true
 		);
-		switch($options['selection'])
+		switch ($options['selection'])
 		{
 			case 'criteria':
 				$query = array(
@@ -55,33 +55,33 @@ 
 					'users'         => $options['criteria']['owner'],
 					'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 				);
-				if($options['criteria']['start'])
+				if ($options['criteria']['start'])
 				{
 					$query['start'] = $options['criteria']['start'];
 				}
-				if($options['criteria']['end'])
+				if ($options['criteria']['end'])
 				{
-					$query['end'] = strtotime('+1 day',$options['criteria']['end'])-1;
+					$query['end'] = strtotime('+1 day', $options['criteria']['end']) - 1;
 				}
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
 					$query['offset'] = 0;
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
-				$events =& $this->bo->search($query);
+				$events = & $this->bo->search($query);
 				break;
 			case 'search_results':
 				$states = $this->bo->cal_prefs['saved_states'];
 				$query = Api\Cache::getSession('calendar', 'calendar_list');
-				$query['num_rows'] = -1;        // all
-				$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
+				$query['num_rows'] = -1; // all
+				$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
 				$query['start'] = 0;
 				$query['cfs'] = $cfs;
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+				if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
 				{
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
 				$ui = new calendar_uilist();
-				if($states['view'] == 'listview')
+				if ($states['view'] == 'listview')
 				{
 					$ui->get_rows($query, $events, $unused);
 				} 
@@ -98,35 +98,35 @@ 
 				$filter = $_definition->filter;
 
 				// Handle ranges
-				foreach($filter as $field => $value)
+				foreach ($filter as $field => $value)
 				{
-					if($field == 'filter' && $value)
+					if ($field == 'filter' && $value)
 					{
 						$query['filter'] = $value;
 						continue;
 					}
-					if(!is_array($value) || (!$value['from'] && !$value['to']))
+					if (!is_array($value) || (!$value['from'] && !$value['to']))
 					{
 						$query['query']["cal_$field"] = $value;
 						continue;
 					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['sql_filter'][] = "cal_$field >= " . (int)$value['from'];
-					if($value['to']) $query['sql_filter'][] = "cal_$field <= " . (int)$value['to'];
+					if ($value['from']) $query['sql_filter'][] = "cal_$field >= ".(int)$value['from'];
+					if ($value['to']) $query['sql_filter'][] = "cal_$field <= ".(int)$value['to'];
 
 				}
-				if($query['sql_filter'] && is_array($query['sql_filter']))
+				if ($query['sql_filter'] && is_array($query['sql_filter']))
 				{
 					// Set as an extra parameter
-					$sql_filter = implode(' AND ',$query['sql_filter']);
+					$sql_filter = implode(' AND ', $query['sql_filter']);
 				}
 
 			case 'all':
 				$events = $this->bo->search($query + array(
 					'offset' => 0,
 					'order' => 'cal_start',
-				),$sql_filter);
+				), $sql_filter);
 				break;
 		}
 
@@ -145,30 +145,30 @@ 
 			// Get rid of yearly recurring events that don't belong
 			//if($options['selection']['select'] == 'criteria' && ($event['start'] > $query['end'] || $event['end'] < $query['start'])) continue;
 			// Add in participants
-			if($options['mapping']['participants'])
+			if ($options['mapping']['participants'])
 			{
-				$event['participants'] = implode(", ",$this->bo->participants($event,true));
+				$event['participants'] = implode(", ", $this->bo->participants($event, true));
 			}
 			if (is_array($event))
 			{
 				$record->set_record($event);
-				if($options['mapping']['recurrence'])
+				if ($options['mapping']['recurrence'])
 				{
 					$rrule = calendar_rrule::event2rrule($event);
 					$record->recurrence = $rrule->__toString();
 				}
 
 				// Standard stuff
-				if($options['convert'])
+				if ($options['convert'])
 				{
 					importexport_export_csv::convert($record, $convert_fields, 'calendar', $this->selects);
 				}
 				else
 				{
 					// Implode arrays, so they don't say 'Array'
-					foreach($record->get_record_array() as $key => $value)
+					foreach ($record->get_record_array() as $key => $value)
 					{
-						if(is_array($value)) $record->$key = implode(',', $value);
+						if (is_array($value)) $record->$key = implode(',', $value);
 					}
 	 			}
 				$export_object->export_record($record);
@@ -230,7 +230,7 @@ 
 		$states = $this->bo->cal_prefs['saved_states'];
 		$list = Api\Cache::getSession('calendar', 'calendar_list');
 		
-		$start= new Api\DateTime($list['startdate']);
+		$start = new Api\DateTime($list['startdate']);
 		$end = new Api\DateTime($list['enddate']);
 		
 		if ($states['view'] == 'listview')
@@ -239,24 +239,24 @@ 
 
 			// Use UI to get dates
 			$ui = new calendar_uilist();
-			$list['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$ui->get_rows($list,$rows,$readonlys);
+			$list['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$ui->get_rows($list, $rows, $readonlys);
 			$start = $ui->first ? $ui->first : new Api\DateTime($ui->date);
 			$end = $ui->last;
 
 			// Special handling
-			if($list['filter'] == 'all') $start = $end = null;
-			if($list['filter'] == 'before')
+			if ($list['filter'] == 'all') $start = $end = null;
+			if ($list['filter'] == 'before')
 			{
 				$end = $start;
 				$start = null;
 			}
 			$ui = null;
 		}
-		else if(!$end)
+		else if (!$end)
 		{
-			$end = '+1 ' . $states['view'];
-			$end = strtotime($end, $start->format('ts'))-1;
+			$end = '+1 '.$states['view'];
+			$end = strtotime($end, $start->format('ts')) - 1;
 		}
 		$prefs = unserialize($GLOBALS['egw_info']['user']['preferences']['importexport'][$definition->definition_id]);
 		$data = array(
@@ -322,17 +322,17 @@ 
 		);
 		$filters = array_reverse($filters, true);
 
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
 			// Can't filter on a custom field
-			if(strpos($field_name, '#') === 0)
+			if (strpos($field_name, '#') === 0)
 			{
 				unset($filters[$field_name]);
 				continue;
 			}
 
 			// Pass on select options
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 
 	}

Braces +39 added lines, -13 removed lines

@@ -16,9 +16,11 @@ 
 /**
  * export CSV plugin of calendar
  */
-class calendar_export_csv implements importexport_iface_export_plugin {
+class calendar_export_csv implements importexport_iface_export_plugin
+{
 
-	public function __construct() {
+	public function __construct()
+	{
 		Api\Translation::add_app('calendar');
 		$this->bo = new calendar_bo();
 		$this->get_selects();
@@ -29,15 +31,23 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
-		if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('calendar');
+		if (!$limit_exception)
+		{
+			$export_limit = Api\Storage\Merge::getExportLimit('calendar');
+		}
 		// Custom fields need to be specifically requested
 		$cfs = array();
-		foreach($options['mapping'] + (array)$_definition->filter as $key => $label) {
-			if($key[0] == '#') $cfs[] = substr($key,1);
+		foreach($options['mapping'] + (array)$_definition->filter as $key => $label)
+		{
+			if($key[0] == '#')
+			{
+				$cfs[] = substr($key,1);
+			}
 		}
 
 		$query = array(
@@ -63,7 +73,8 @@ 
 				{
 					$query['end'] = strtotime('+1 day',$options['criteria']['end'])-1;
 				}
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+				{
 					$query['offset'] = 0;
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
@@ -84,7 +95,7 @@ 
 				if($states['view'] == 'listview')
 				{
 					$ui->get_rows($query, $events, $unused);
-				} 
+				}
 				else
 				{
 					$query['filter'] = 'custom';
@@ -112,8 +123,14 @@ 
 					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['sql_filter'][] = "cal_$field >= " . (int)$value['from'];
-					if($value['to']) $query['sql_filter'][] = "cal_$field <= " . (int)$value['to'];
+					if($value['from'])
+					{
+						$query['sql_filter'][] = "cal_$field >= " . (int)$value['from'];
+					}
+					if($value['to'])
+					{
+						$query['sql_filter'][] = "cal_$field <= " . (int)$value['to'];
+					}
 
 				}
 				if($query['sql_filter'] && is_array($query['sql_filter']))
@@ -168,7 +185,10 @@ 
 					// Implode arrays, so they don't say 'Array'
 					foreach($record->get_record_array() as $key => $value)
 					{
-						if(is_array($value)) $record->$key = implode(',', $value);
+						if(is_array($value))
+						{
+							$record->$key = implode(',', $value);
+						}
 					}
 	 			}
 				$export_object->export_record($record);
@@ -245,7 +265,10 @@ 
 			$end = $ui->last;
 
 			// Special handling
-			if($list['filter'] == 'all') $start = $end = null;
+			if($list['filter'] == 'all')
+			{
+				$start = $end = null;
+			}
 			if($list['filter'] == 'before')
 			{
 				$end = $start;
@@ -332,7 +355,10 @@ 
 			}
 
 			// Pass on select options
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 
 	}

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;
 	}
 

Spacing +269 added lines, -270 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'])
@@ -652,16 +652,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;
@@ -676,7 +676,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
@@ -684,9 +684,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'],
@@ -701,21 +701,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);
@@ -754,13 +754,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'],
@@ -772,17 +772,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'],
@@ -806,9 +806,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);
@@ -826,8 +826,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);
@@ -837,8 +837,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);
@@ -853,7 +853,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) == '##')
 					{
@@ -925,8 +925,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;
 				}
@@ -963,7 +963,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'],
@@ -972,7 +972,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']))
@@ -983,7 +983,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']);
 						}
@@ -991,11 +991,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);
 				}
@@ -1003,15 +1003,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']))))
@@ -1061,10 +1061,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;
 	}
@@ -1077,15 +1077,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]))
 		{
@@ -1120,11 +1120,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();
 
@@ -1132,7 +1132,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)
 		{
@@ -1140,7 +1140,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')) &&
@@ -1192,7 +1192,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;
@@ -1215,14 +1215,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);
 						}
 					}
 				}
@@ -1239,7 +1239,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']))
 				{
@@ -1261,7 +1261,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];
 							}
@@ -1285,7 +1285,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)
@@ -1315,7 +1315,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'];
 					}
@@ -1327,7 +1327,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
@@ -1346,7 +1346,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;
@@ -1434,8 +1434,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
@@ -1500,9 +1499,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
@@ -1510,10 +1509,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;
 			}
@@ -1525,7 +1524,7 @@ 
 					if ($this->log)
 					{
 						error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
-							"(): event SINGLE\n",3,$this->logfile);
+							"(): event SINGLE\n", 3, $this->logfile);
 					}
 
 					// update the event
@@ -1535,7 +1534,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;
@@ -1544,7 +1543,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
@@ -1554,8 +1553,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))
 						{
@@ -1573,7 +1572,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;
@@ -1583,7 +1582,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
@@ -1639,13 +1638,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;
@@ -1654,7 +1653,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);
@@ -1675,7 +1674,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);
 					}
 
@@ -1702,13 +1701,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;
@@ -1720,13 +1719,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;
@@ -1743,7 +1742,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':
@@ -1756,7 +1755,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;
 			}
@@ -1770,8 +1769,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']);
@@ -1793,19 +1792,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 = null;
-			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;
@@ -1826,11 +1825,11 @@ 
 	{
 		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
 			$found = false;
-			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)
@@ -1846,7 +1845,7 @@ 
 					break;
 				}
 			}
-			if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found?'existing':'new')." alarm ".array2string($alarm));
+			if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found ? 'existing' : 'new')." alarm ".array2string($alarm));
 			if (!empty($alarm['attrs']['X-LIC-ERROR']))
 			{
 				if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) ignored X-LIC-ERROR=".array2string($alarm['X-LIC-ERROR']));
@@ -1874,7 +1873,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)
@@ -1897,7 +1896,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)
 		{
@@ -1932,7 +1931,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')
 							{
@@ -1948,7 +1947,7 @@ 
 							$alarm['time'] = $vattr['value'];
 							break;
 						default:
-							error_log('VALARM/TRIGGER: unsupported value type:' . $vtype);
+							error_log('VALARM/TRIGGER: unsupported value type:'.$vtype);
 					}
 					break;
 
@@ -1973,9 +1972,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();
@@ -2272,10 +2271,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 . ', '
@@ -2293,12 +2292,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();
@@ -2333,14 +2332,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;
 			}
@@ -2385,13 +2384,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
@@ -2451,16 +2450,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;
 		}
@@ -2476,11 +2475,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(
@@ -2497,7 +2496,7 @@ 
 						$isDate = true;
 					}
 					$dtstart_ts = is_numeric($attributes['value']) ? $attributes['value'] : $this->date2ts($attributes['value']);
-					$vcardData['start']	= $dtstart_ts;
+					$vcardData['start'] = $dtstart_ts;
 
 					// set event timezone from dtstart, if specified there
 					if (!empty($attributes['params']['TZID']))
@@ -2515,18 +2514,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
 						}
 					}
 					// if no timezone given and one is specified in class (never the case for CalDAV)
@@ -2550,11 +2549,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
@@ -2574,7 +2573,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
 		}
@@ -2593,7 +2592,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':
@@ -2623,18 +2622,18 @@ 
 					$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']);
 						}
@@ -2644,16 +2643,16 @@ 
 							self::check_fix_endate($vcardData);
 						}
 					}
-					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;
@@ -2677,20 +2676,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];
 								}
@@ -2701,21 +2700,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;
 									}
@@ -2731,17 +2730,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];
 								}
@@ -2758,7 +2757,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]);
@@ -2772,11 +2771,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;
 					}
@@ -2832,11 +2831,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':
@@ -2850,10 +2849,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']))
 					{
@@ -2890,19 +2889,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'];
 					}
@@ -2919,7 +2918,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')
@@ -2937,7 +2936,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)
@@ -2954,9 +2953,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
@@ -2965,19 +2964,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);
@@ -2991,7 +2990,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
@@ -3000,36 +2999,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']) &&
@@ -3043,7 +3042,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';
@@ -3057,7 +3056,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;
@@ -3113,7 +3112,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));
@@ -3171,7 +3170,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]))
 							{
@@ -3194,12 +3193,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;
 			}
@@ -3208,16 +3207,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;
 			}
@@ -3231,7 +3230,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']));
 		}
@@ -3252,15 +3251,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)))
 		{
@@ -3281,8 +3280,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();
@@ -3321,23 +3320,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)
 		{
@@ -3348,9 +3347,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);
 		}
@@ -3376,16 +3375,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));
 				}
 			}

Braces +321 added lines, -82 removed lines

@@ -183,7 +183,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;
@@ -232,10 +235,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';
 		}
 
@@ -243,10 +250,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)
@@ -312,7 +325,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)
 			{
@@ -323,7 +339,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']))
 				{
@@ -380,7 +399,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'] . "]";
 				}
 			}
@@ -440,11 +460,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)
 							{
@@ -523,24 +553,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')
@@ -572,9 +627,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;
 		    				}
@@ -603,9 +667,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
 						{
@@ -625,7 +692,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'])
@@ -667,7 +738,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']))
@@ -694,14 +768,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))
@@ -715,7 +796,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);
@@ -772,7 +857,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']))
 							{
@@ -898,7 +987,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)
@@ -915,7 +1007,10 @@ 
 
 				if ($version == '1.0')
 				{
-					if ($event['title']) $description = $event['title'];
+					if ($event['title'])
+					{
+						$description = $event['title'];
+					}
 					if ($description)
 					{
 						$values['DALARM']['snooze_time'] = '';
@@ -935,7 +1030,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
@@ -1126,13 +1224,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)
 		{
@@ -1140,8 +1245,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)) &&
@@ -1149,7 +1260,10 @@ 
 			{
 				foreach ($events as $k => $event)
 				{
-					if (!isset($event['uid'])) $events[$k]['uid'] = $egwEvent['uid'];
+					if (!isset($event['uid']))
+					{
+						$events[$k]['uid'] = $egwEvent['uid'];
+					}
 				}
 			}
 		}
@@ -1179,10 +1293,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'],
@@ -1219,7 +1340,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);
@@ -1308,7 +1432,10 @@ 
 								break;
 
 							default:
-								if (!empty($value)) $event[$key] = $value;
+								if (!empty($value))
+								{
+									$event[$key] = $value;
+								}
 						}
 					}
 				}
@@ -1406,7 +1533,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)
 				{
@@ -1454,7 +1584,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
@@ -1607,7 +1740,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)
@@ -1697,12 +1833,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]))
 							{
@@ -1714,9 +1853,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
@@ -1824,7 +1966,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)
 		{
@@ -1846,29 +1991,56 @@ 
 					break;
 				}
 			}
-			if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found?'existing':'new')." alarm ".array2string($alarm));
+			if ($this->debug)
+			{
+				error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found?'existing':'new')." alarm ".array2string($alarm));
+			}
 			if (!empty($alarm['attrs']['X-LIC-ERROR']))
 			{
-				if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) ignored X-LIC-ERROR=".array2string($alarm['X-LIC-ERROR']));
+				if ($this->debug)
+				{
+					error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) ignored X-LIC-ERROR=".array2string($alarm['X-LIC-ERROR']));
+				}
 				unset($alarm['attrs']['X-LIC-ERROR']);
 			}
 			// alarm not found --> add it
 			if (!$found)
 			{
 				$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
 			else
 			{
-				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;
 			}
@@ -1882,7 +2054,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;
 		}
@@ -2301,7 +2476,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))
@@ -2667,19 +2845,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));
@@ -2692,7 +2878,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
 								{
@@ -2701,9 +2890,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
@@ -2762,7 +2954,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)
@@ -2855,13 +3050,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
 					{
@@ -2921,7 +3119,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')))
@@ -2989,7 +3190,10 @@ 
 								}
 								$status = 'U'; // keep the group
 							}
-							else continue; // can't find this group
+							else {
+								continue;
+							}
+							// can't find this group
 						}
 						elseif (empty($searcharray))
 						{
@@ -3048,7 +3252,9 @@ 
 
 								try {
 									if (!$this->calendarOwner && is_numeric($uid) && $role == 'CHAIR')
-										$component->getAttribute('ORGANIZER');
+									{
+																			$component->getAttribute('ORGANIZER');
+									}
 								}
 								catch(Horde_Icalendar_Exception $e)
 								{
@@ -3085,7 +3291,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'];
@@ -3106,7 +3315,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));
@@ -3237,7 +3450,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';
@@ -3263,7 +3479,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);
@@ -3316,8 +3535,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'].'//'.
@@ -3339,10 +3566,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);
@@ -3358,12 +3588,21 @@ 
 		{
 			foreach ($fbdata as $event)
 			{
-				if ($event['non_blocking']) continue;
-				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID']) continue;
+				if ($event['non_blocking'])
+				{
+					continue;
+				}
+				if ($event['uid'] === $extra['X-CALENDARSERVER-MASK-UID'])
+				{
+					continue;
+				}
 				$status = $event['participants'][$user];
 				$quantity = $role = null;
 				calendar_so::split_status($status, $quantity, $role);
-				if ($status == 'R' || $role == 'NON-PARTICIPANT') continue;
+				if ($status == 'R' || $role == 'NON-PARTICIPANT')
+				{
+					continue;
+				}
 
 				$fbtype = $status == 'T' ? 'BUSY-TENTATIVE' : 'BUSY';
 

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,16 +170,16 @@ 
 				{
 					$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)
 		{
 			$start = new Api\DateTime($record->start);
 			try
@@ -194,37 +194,37 @@ 
 			catch (Exception $e)
 			{
 				// Try old way from export using just recur_type / interval
-				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;
 
@@ -237,7 +237,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;
@@ -252,14 +252,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;
@@ -272,7 +272,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) {
@@ -283,7 +283,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']);
 				}
@@ -291,30 +291,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']++;
@@ -325,15 +325,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))
 					{
@@ -363,10 +363,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'];
 		}
 	}
 
@@ -402,9 +402,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