YetiForceCompany / YetiForceCRM

libraries/SabreDAV/DAVACL/AbstractPrincipalCollection.php

Braces +6 added lines, -3 removed lines

@@ -91,8 +91,9 @@ 
      */
     function getChildren() {
 
-        if ($this->disableListing)
-            throw new DAV\Exception\MethodNotAllowed('Listing members of this collection is disabled');
+        if ($this->disableListing) {
+                    throw new DAV\Exception\MethodNotAllowed('Listing members of this collection is disabled');
+        }
 
         $children = [];
         foreach ($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
@@ -115,7 +116,9 @@ 
     function getChild($name) {
 
         $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
-        if (!$principalInfo) throw new DAV\Exception\NotFound('Principal with name ' . $name . ' not found');
+        if (!$principalInfo) {
+        	throw new DAV\Exception\NotFound('Principal with name ' . $name . ' not found');
+        }
         return $this->getChildForPrincipal($principalInfo);
 
     }

Indentation +158 added lines, -158 removed lines

@@ -19,163 +19,163 @@
  */
 abstract class AbstractPrincipalCollection extends DAV\Collection implements IPrincipalCollection {
 
-    /**
-     * Principal backend
-     *
-     * @var PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * The path to the principals we're listing from.
-     *
-     * @var string
-     */
-    protected $principalPrefix;
-
-    /**
-     * If this value is set to true, it effectively disables listing of users
-     * it still allows user to find other users if they have an exact url.
-     *
-     * @var bool
-     */
-    public $disableListing = false;
-
-    /**
-     * Creates the object
-     *
-     * This object must be passed the principal backend. This object will
-     * filter all principals from a specified prefix ($principalPrefix). The
-     * default is 'principals', if your principals are stored in a different
-     * collection, override $principalPrefix
-     *
-     *
-     * @param PrincipalBackend\BackendInterface $principalBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(PrincipalBackend\BackendInterface $principalBackend, $principalPrefix = 'principals') {
-
-        $this->principalPrefix = $principalPrefix;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principalInfo
-     * @return IPrincipal
-     */
-    abstract function getChildForPrincipal(array $principalInfo);
-
-    /**
-     * Returns the name of this collection.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(, $name) = URLUtil::splitPath($this->principalPrefix);
-        return $name;
-
-    }
-
-    /**
-     * Return the list of users
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        if ($this->disableListing)
-            throw new DAV\Exception\MethodNotAllowed('Listing members of this collection is disabled');
-
-        $children = [];
-        foreach ($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
-
-            $children[] = $this->getChildForPrincipal($principalInfo);
-
-
-        }
-        return $children;
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * @param string $name
-     * @throws DAV\Exception\NotFound
-     * @return IPrincipal
-     */
-    public function getChild($name) {
-
-        $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
-        if (!$principalInfo) throw new DAV\Exception\NotFound('Principal with name ' . $name . ' not found');
-        return $this->getChildForPrincipal($principalInfo);
-
-    }
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * By default, if multiple properties are submitted to this method, the
-     * various properties should be combined with 'AND'. If $test is set to
-     * 'anyof', it should be combined using 'OR'.
-     *
-     * This method should simply return a list of 'child names', which may be
-     * used to call $this->getChild in the future.
-     *
-     * @param array $searchProperties
-     * @param string $test
-     * @return array
-     */
-    public function searchPrincipals(array $searchProperties, $test = 'allof') {
-
-        $result = $this->principalBackend->searchPrincipals($this->principalPrefix, $searchProperties, $test);
-        $r = [];
-
-        foreach ($result as $row) {
-            list(, $r[]) = URLUtil::splitPath($row);
-        }
-
-        return $r;
-
-    }
-
-    /**
-     * Finds a principal by its URI.
-     *
-     * This method may receive any type of uri, but mailto: addresses will be
-     * the most common.
-     *
-     * Implementation of this API is optional. It is currently used by the
-     * CalDAV system to find principals based on their email addresses. If this
-     * API is not implemented, some features may not work correctly.
-     *
-     * This method must return a relative principal path, or null, if the
-     * principal was not found or you refuse to find it.
-     *
-     * @param string $uri
-     * @return string
-     */
-    public function findByUri($uri) {
-
-        return $this->principalBackend->findByUri($uri, $this->principalPrefix);
-
-    }
+	/**
+	 * Principal backend
+	 *
+	 * @var PrincipalBackend\BackendInterface
+	 */
+	protected $principalBackend;
+
+	/**
+	 * The path to the principals we're listing from.
+	 *
+	 * @var string
+	 */
+	protected $principalPrefix;
+
+	/**
+	 * If this value is set to true, it effectively disables listing of users
+	 * it still allows user to find other users if they have an exact url.
+	 *
+	 * @var bool
+	 */
+	public $disableListing = false;
+
+	/**
+	 * Creates the object
+	 *
+	 * This object must be passed the principal backend. This object will
+	 * filter all principals from a specified prefix ($principalPrefix). The
+	 * default is 'principals', if your principals are stored in a different
+	 * collection, override $principalPrefix
+	 *
+	 *
+	 * @param PrincipalBackend\BackendInterface $principalBackend
+	 * @param string $principalPrefix
+	 */
+	public function __construct(PrincipalBackend\BackendInterface $principalBackend, $principalPrefix = 'principals') {
+
+		$this->principalPrefix = $principalPrefix;
+		$this->principalBackend = $principalBackend;
+
+	}
+
+	/**
+	 * This method returns a node for a principal.
+	 *
+	 * The passed array contains principal information, and is guaranteed to
+	 * at least contain a uri item. Other properties may or may not be
+	 * supplied by the authentication backend.
+	 *
+	 * @param array $principalInfo
+	 * @return IPrincipal
+	 */
+	abstract function getChildForPrincipal(array $principalInfo);
+
+	/**
+	 * Returns the name of this collection.
+	 *
+	 * @return string
+	 */
+	public function getName() {
+
+		list(, $name) = URLUtil::splitPath($this->principalPrefix);
+		return $name;
+
+	}
+
+	/**
+	 * Return the list of users
+	 *
+	 * @return array
+	 */
+	public function getChildren() {
+
+		if ($this->disableListing)
+			throw new DAV\Exception\MethodNotAllowed('Listing members of this collection is disabled');
+
+		$children = [];
+		foreach ($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
+
+			$children[] = $this->getChildForPrincipal($principalInfo);
+
+
+		}
+		return $children;
+
+	}
+
+	/**
+	 * Returns a child object, by its name.
+	 *
+	 * @param string $name
+	 * @throws DAV\Exception\NotFound
+	 * @return IPrincipal
+	 */
+	public function getChild($name) {
+
+		$principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
+		if (!$principalInfo) throw new DAV\Exception\NotFound('Principal with name ' . $name . ' not found');
+		return $this->getChildForPrincipal($principalInfo);
+
+	}
+
+	/**
+	 * This method is used to search for principals matching a set of
+	 * properties.
+	 *
+	 * This search is specifically used by RFC3744's principal-property-search
+	 * REPORT. You should at least allow searching on
+	 * http://sabredav.org/ns}email-address.
+	 *
+	 * The actual search should be a unicode-non-case-sensitive search. The
+	 * keys in searchProperties are the WebDAV property names, while the values
+	 * are the property values to search on.
+	 *
+	 * By default, if multiple properties are submitted to this method, the
+	 * various properties should be combined with 'AND'. If $test is set to
+	 * 'anyof', it should be combined using 'OR'.
+	 *
+	 * This method should simply return a list of 'child names', which may be
+	 * used to call $this->getChild in the future.
+	 *
+	 * @param array $searchProperties
+	 * @param string $test
+	 * @return array
+	 */
+	public function searchPrincipals(array $searchProperties, $test = 'allof') {
+
+		$result = $this->principalBackend->searchPrincipals($this->principalPrefix, $searchProperties, $test);
+		$r = [];
+
+		foreach ($result as $row) {
+			list(, $r[]) = URLUtil::splitPath($row);
+		}
+
+		return $r;
+
+	}
+
+	/**
+	 * Finds a principal by its URI.
+	 *
+	 * This method may receive any type of uri, but mailto: addresses will be
+	 * the most common.
+	 *
+	 * Implementation of this API is optional. It is currently used by the
+	 * CalDAV system to find principals based on their email addresses. If this
+	 * API is not implemented, some features may not work correctly.
+	 *
+	 * This method must return a relative principal path, or null, if the
+	 * principal was not found or you refuse to find it.
+	 *
+	 * @param string $uri
+	 * @return string
+	 */
+	public function findByUri($uri) {
+
+		return $this->principalBackend->findByUri($uri, $this->principalPrefix);
+
+	}
 
 }

libraries/SabreDAV/DAVACL/FS/Collection.php

Braces +6 added lines, -2 removed lines

@@ -59,8 +59,12 @@
 
         $path = $this->path . '/' . $name;
 
-        if (!file_exists($path)) throw new NotFound('File could not be located');
-        if ($name == '.' || $name == '..') throw new Forbidden('Permission denied to . and ..');
+        if (!file_exists($path)) {
+        	throw new NotFound('File could not be located');
+        }
+        if ($name == '.' || $name == '..') {
+        	throw new Forbidden('Permission denied to . and ..');
+        }
 
         if (is_dir($path)) {
 

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,10 +2,10 @@
 
 namespace Sabre\DAVACL\FS;
 
-use Sabre\DAV\FSExt\Directory as BaseCollection;
 use Sabre\DAVACL\IACL;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
+use Sabre\DAV\FSExt\Directory as BaseCollection;
 
 /**
  * This is an ACL-enabled collection.

Indentation +133 added lines, -133 removed lines

@@ -16,138 +16,138 @@
  */
 class Collection extends BaseCollection implements IACL {
 
-    /**
-     * A list of ACL rules.
-     *
-     * @var array
-     */
-    protected $acl;
-
-    /**
-     * Owner uri, or null for no owner.
-     *
-     * @var string|null
-     */
-    protected $owner;
-
-    /**
-     * Constructor
-     *
-     * @param string $path on-disk path.
-     * @param array $acl ACL rules.
-     * @param string|null $owner principal owner string.
-     */
-    public function __construct($path, array $acl, $owner = null) {
-
-        parent::__construct($path);
-        $this->acl = $acl;
-        $this->owner = $owner;
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-     * exist.
-     *
-     * @param string $name
-     * @throws DAV\Exception\NotFound
-     * @return DAV\INode
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new NotFound('File could not be located');
-        if ($name == '.' || $name == '..') throw new Forbidden('Permission denied to . and ..');
-
-        if (is_dir($path)) {
-
-            return new self($path, $this->acl, $this->owner);
-
-        } else {
-
-            return new File($path, $this->acl, $this->owner);
-
-        }
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->owner;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return $this->acl;
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Forbidden('Setting ACL is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
+	/**
+	 * A list of ACL rules.
+	 *
+	 * @var array
+	 */
+	protected $acl;
+
+	/**
+	 * Owner uri, or null for no owner.
+	 *
+	 * @var string|null
+	 */
+	protected $owner;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $path on-disk path.
+	 * @param array $acl ACL rules.
+	 * @param string|null $owner principal owner string.
+	 */
+	public function __construct($path, array $acl, $owner = null) {
+
+		parent::__construct($path);
+		$this->acl = $acl;
+		$this->owner = $owner;
+
+	}
+
+	/**
+	 * Returns a specific child node, referenced by its name
+	 *
+	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+	 * exist.
+	 *
+	 * @param string $name
+	 * @throws DAV\Exception\NotFound
+	 * @return DAV\INode
+	 */
+	public function getChild($name) {
+
+		$path = $this->path . '/' . $name;
+
+		if (!file_exists($path)) throw new NotFound('File could not be located');
+		if ($name == '.' || $name == '..') throw new Forbidden('Permission denied to . and ..');
+
+		if (is_dir($path)) {
+
+			return new self($path, $this->acl, $this->owner);
+
+		} else {
+
+			return new File($path, $this->acl, $this->owner);
+
+		}
+
+	}
+
+	/**
+	 * Returns the owner principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner() {
+
+		return $this->owner;
+
+	}
+
+	/**
+	 * Returns a group principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getGroup() {
+
+		return null;
+
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL() {
+
+		return $this->acl;
+
+	}
+
+	/**
+	 * Updates the ACL
+	 *
+	 * This method will receive a list of new ACE's as an array argument.
+	 *
+	 * @param array $acl
+	 * @return void
+	 */
+	public function setACL(array $acl) {
+
+		throw new Forbidden('Setting ACL is not allowed here');
+
+	}
+
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	public function getSupportedPrivilegeSet() {
+
+		return null;
+
+	}
 
 }

libraries/SabreDAV/Uri/functions.php

Indentation +186 added lines, -186 removed lines

@@ -22,80 +22,80 @@ 
  */
 function resolve($basePath, $newPath) {
 
-    $base = parse($basePath);
-    $delta = parse($newPath);
-
-    $pick = function($part) use ($base, $delta) {
-
-        if ($delta[$part]) {
-            return $delta[$part];
-        } elseif ($base[$part]) {
-            return $base[$part];
-        }
-        return null;
-
-    };
-
-    // If the new path defines a scheme, it's absolute and we can just return
-    // that.
-    if ($delta['scheme']) {
-        return build($delta);
-    }
-
-    $newParts = [];
-
-    $newParts['scheme'] = $pick('scheme');
-    $newParts['host']   = $pick('host');
-    $newParts['port']   = $pick('port');
-
-    $path = '';
-    if ($delta['path']) {
-        // If the path starts with a slash
-        if ($delta['path'][0] === '/') {
-            $path = $delta['path'];
-        } else {
-            // Removing last component from base path.
-            $path = $base['path'];
-            if (strpos($path, '/') !== false) {
-                $path = substr($path, 0, strrpos($path, '/'));
-            }
-            $path .= '/' . $delta['path'];
-        }
-    } else {
-        $path = $base['path'] ?: '/';
-    }
-    // Removing .. and .
-    $pathParts = explode('/', $path);
-    $newPathParts = [];
-    foreach ($pathParts as $pathPart) {
-
-        switch ($pathPart) {
-            //case '' :
-            case '.' :
-                break;
-            case '..' :
-                array_pop($newPathParts);
-                break;
-            default :
-                $newPathParts[] = $pathPart;
-                break;
-        }
-    }
-
-    $path = implode('/', $newPathParts);
-
-    // If the source url ended with a /, we want to preserve that.
-    $newParts['path'] = $path;
-    if ($delta['query']) {
-        $newParts['query'] = $delta['query'];
-    } elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
-        // Keep the old query if host and path didn't change
-        $newParts['query'] = $base['query'];
-    }
-    if ($delta['fragment']) {
-        $newParts['fragment'] = $delta['fragment'];
-    }
-    return build($newParts);
+	$base = parse($basePath);
+	$delta = parse($newPath);
+
+	$pick = function($part) use ($base, $delta) {
+
+		if ($delta[$part]) {
+			return $delta[$part];
+		} elseif ($base[$part]) {
+			return $base[$part];
+		}
+		return null;
+
+	};
+
+	// If the new path defines a scheme, it's absolute and we can just return
+	// that.
+	if ($delta['scheme']) {
+		return build($delta);
+	}
+
+	$newParts = [];
+
+	$newParts['scheme'] = $pick('scheme');
+	$newParts['host']   = $pick('host');
+	$newParts['port']   = $pick('port');
+
+	$path = '';
+	if ($delta['path']) {
+		// If the path starts with a slash
+		if ($delta['path'][0] === '/') {
+			$path = $delta['path'];
+		} else {
+			// Removing last component from base path.
+			$path = $base['path'];
+			if (strpos($path, '/') !== false) {
+				$path = substr($path, 0, strrpos($path, '/'));
+			}
+			$path .= '/' . $delta['path'];
+		}
+	} else {
+		$path = $base['path'] ?: '/';
+	}
+	// Removing .. and .
+	$pathParts = explode('/', $path);
+	$newPathParts = [];
+	foreach ($pathParts as $pathPart) {
+
+		switch ($pathPart) {
+			//case '' :
+			case '.' :
+				break;
+			case '..' :
+				array_pop($newPathParts);
+				break;
+			default :
+				$newPathParts[] = $pathPart;
+				break;
+		}
+	}
+
+	$path = implode('/', $newPathParts);
+
+	// If the source url ended with a /, we want to preserve that.
+	$newParts['path'] = $path;
+	if ($delta['query']) {
+		$newParts['query'] = $delta['query'];
+	} elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
+		// Keep the old query if host and path didn't change
+		$newParts['query'] = $base['query'];
+	}
+	if ($delta['fragment']) {
+		$newParts['fragment'] = $delta['fragment'];
+	}
+	return build($newParts);
 
 }
 
@@ -113,55 +113,55 @@ 
  */
 function normalize($uri) {
 
-    $parts = parse($uri);
-
-    if (!empty($parts['path'])) {
-        $pathParts = explode('/', ltrim($parts['path'], '/'));
-        $newPathParts = [];
-        foreach ($pathParts as $pathPart) {
-            switch ($pathPart) {
-                case '.':
-                    // skip
-                    break;
-                case '..' :
-                    // One level up in the hierarchy
-                    array_pop($newPathParts);
-                    break;
-                default :
-                    // Ensuring that everything is correctly percent-encoded.
-                    $newPathParts[] = rawurlencode(rawurldecode($pathPart));
-                    break;
-            }
-        }
-        $parts['path'] = '/' . implode('/', $newPathParts);
-    }
-
-    if ($parts['scheme']) {
-        $parts['scheme'] = strtolower($parts['scheme']);
-        $defaultPorts = [
-            'http'  => '80',
-            'https' => '443',
-        ];
-
-        if (!empty($parts['port']) && isset($defaultPorts[$parts['scheme']]) && $defaultPorts[$parts['scheme']] == $parts['port']) {
-            // Removing default ports.
-            unset($parts['port']);
-        }
-        // A few HTTP specific rules.
-        switch ($parts['scheme']) {
-            case 'http' :
-            case 'https' :
-                if (empty($parts['path'])) {
-                    // An empty path is equivalent to / in http.
-                    $parts['path'] = '/';
-                }
-                break;
-        }
-    }
-
-    if ($parts['host']) $parts['host'] = strtolower($parts['host']);
-
-    return build($parts);
+	$parts = parse($uri);
+
+	if (!empty($parts['path'])) {
+		$pathParts = explode('/', ltrim($parts['path'], '/'));
+		$newPathParts = [];
+		foreach ($pathParts as $pathPart) {
+			switch ($pathPart) {
+				case '.':
+					// skip
+					break;
+				case '..' :
+					// One level up in the hierarchy
+					array_pop($newPathParts);
+					break;
+				default :
+					// Ensuring that everything is correctly percent-encoded.
+					$newPathParts[] = rawurlencode(rawurldecode($pathPart));
+					break;
+			}
+		}
+		$parts['path'] = '/' . implode('/', $newPathParts);
+	}
+
+	if ($parts['scheme']) {
+		$parts['scheme'] = strtolower($parts['scheme']);
+		$defaultPorts = [
+			'http'  => '80',
+			'https' => '443',
+		];
+
+		if (!empty($parts['port']) && isset($defaultPorts[$parts['scheme']]) && $defaultPorts[$parts['scheme']] == $parts['port']) {
+			// Removing default ports.
+			unset($parts['port']);
+		}
+		// A few HTTP specific rules.
+		switch ($parts['scheme']) {
+			case 'http' :
+			case 'https' :
+				if (empty($parts['path'])) {
+					// An empty path is equivalent to / in http.
+					$parts['path'] = '/';
+				}
+				break;
+		}
+	}
+
+	if ($parts['host']) $parts['host'] = strtolower($parts['host']);
+
+	return build($parts);
 
 }
 
@@ -180,29 +180,29 @@ 
  */
 function parse($uri) {
 
-    // Normally a URI must be ASCII, however. However, often it's not and
-    // parse_url might corrupt these strings.
-    //
-    // For that reason we take any non-ascii characters from the uri and
-    // uriencode them first.
-    $uri = preg_replace_callback(
-        '/[^[:ascii:]]/u',
-        function($matches) {
-            return rawurlencode($matches[0]);
-        },
-        $uri
-    );
-
-    return
-        parse_url($uri) + [
-            'scheme'   => null,
-            'host'     => null,
-            'path'     => null,
-            'port'     => null,
-            'user'     => null,
-            'query'    => null,
-            'fragment' => null,
-        ];
+	// Normally a URI must be ASCII, however. However, often it's not and
+	// parse_url might corrupt these strings.
+	//
+	// For that reason we take any non-ascii characters from the uri and
+	// uriencode them first.
+	$uri = preg_replace_callback(
+		'/[^[:ascii:]]/u',
+		function($matches) {
+			return rawurlencode($matches[0]);
+		},
+		$uri
+	);
+
+	return
+		parse_url($uri) + [
+			'scheme'   => null,
+			'host'     => null,
+			'path'     => null,
+			'port'     => null,
+			'user'     => null,
+			'query'    => null,
+			'fragment' => null,
+		];
 
 }
 
@@ -215,41 +215,41 @@ 
  */
 function build(array $parts) {
 
-    $uri = '';
-
-    $authority = '';
-    if (!empty($parts['host'])) {
-        $authority = $parts['host'];
-        if (!empty($parts['user'])) {
-            $authority = $parts['user'] . '@' . $authority;
-        }
-        if (!empty($parts['port'])) {
-            $authority = $authority . ':' . $parts['port'];
-        }
-    }
-
-    if (!empty($parts['scheme'])) {
-        // If there's a scheme, there's also a host.
-        $uri = $parts['scheme'] . ':';
-
-    }
-    if ($authority) {
-        // No scheme, but there is a host.
-        $uri .= '//' . $authority;
-
-    }
-
-    if (!empty($parts['path'])) {
-        $uri .= $parts['path'];
-    }
-    if (!empty($parts['query'])) {
-        $uri .= '?' . $parts['query'];
-    }
-    if (!empty($parts['fragment'])) {
-        $uri .= '#' . $parts['fragment'];
-    }
-
-    return $uri;
+	$uri = '';
+
+	$authority = '';
+	if (!empty($parts['host'])) {
+		$authority = $parts['host'];
+		if (!empty($parts['user'])) {
+			$authority = $parts['user'] . '@' . $authority;
+		}
+		if (!empty($parts['port'])) {
+			$authority = $authority . ':' . $parts['port'];
+		}
+	}
+
+	if (!empty($parts['scheme'])) {
+		// If there's a scheme, there's also a host.
+		$uri = $parts['scheme'] . ':';
+
+	}
+	if ($authority) {
+		// No scheme, but there is a host.
+		$uri .= '//' . $authority;
+
+	}
+
+	if (!empty($parts['path'])) {
+		$uri .= $parts['path'];
+	}
+	if (!empty($parts['query'])) {
+		$uri .= '?' . $parts['query'];
+	}
+	if (!empty($parts['fragment'])) {
+		$uri .= '#' . $parts['fragment'];
+	}
+
+	return $uri;
 
 }
 
@@ -273,10 +273,10 @@ 
  */
 function split($path) {
 
-    $matches = [];
-    if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
-        return [$matches[1], $matches[2]];
-    }
-    return [null,null];
+	$matches = [];
+	if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
+		return [$matches[1], $matches[2]];
+	}
+	return [null,null];
 
 }

Spacing +1 added lines, -1 removed lines

@@ -277,6 +277,6 @@
     if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
         return [$matches[1], $matches[2]];
     }
-    return [null,null];
+    return [null, null];
 
 }

Braces +3 added lines, -1 removed lines

@@ -159,7 +159,9 @@
         }
     }
 
-    if ($parts['host']) $parts['host'] = strtolower($parts['host']);
+    if ($parts['host']) {
+    	$parts['host'] = strtolower($parts['host']);
+    }
 
     return build($parts);
 

libraries/SabreDAV/Uri/Version.php

Indentation +4 added lines, -4 removed lines

@@ -11,9 +11,9 @@
  */
 class Version {
 
-    /**
-     * Full version number
-     */
-    const VERSION = '1.1.0';
+	/**
+	 * Full version number
+	 */
+	const VERSION = '1.1.0';
 
 }

vtlib/Vtiger/PackageExport.php

Spacing +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
 		if ($dir = @opendir($languageFolder)) {  // open languages folder
 			while (($langName = readdir($dir)) !== false) {
 				if ($langName != '..' && $langName != '.' && is_dir($languageFolder . "/" . $langName)) {
-					$langDir = @opendir($languageFolder . '/' . $langName);  //open languages/en_us folder
+					$langDir = @opendir($languageFolder . '/' . $langName); //open languages/en_us folder
 					while (($moduleLangFile = readdir($langDir)) !== false) {
 						$langFilePath = $languageFolder . '/' . $langName . '/' . $moduleLangFile;
 						if (is_file($langFilePath) && $moduleLangFile === $module . '.php') { //check if languages/en_us/module.php file exists

Braces +57 added lines, -38 removed lines

@@ -48,11 +48,13 @@ 
 	/** @access private */
 	public function outputNode($value, $node = '')
 	{
-		if ($node != '')
-			$this->openNode($node, '');
+		if ($node != '') {
+					$this->openNode($node, '');
+		}
 		$this->__write($value);
-		if ($node != '')
-			$this->closeNode($node);
+		if ($node != '') {
+					$this->closeNode($node);
+		}
 	}
 
 	/** @access private */
@@ -145,20 +147,24 @@ 
 		$zip->copyDirectoryFromDisk("modules/$module");
 
 		// Copy Settings/module directory
-		if (is_dir("modules/Settings/$module"))
-			$zip->copyDirectoryFromDisk("modules/Settings/$module", 'settings/');
+		if (is_dir("modules/Settings/$module")) {
+					$zip->copyDirectoryFromDisk("modules/Settings/$module", 'settings/');
+		}
 
 		// Copy cron files of the module (if any)
-		if (is_dir("cron/modules/$module"))
-			$zip->copyDirectoryFromDisk("cron/modules/$module", "cron");
+		if (is_dir("cron/modules/$module")) {
+					$zip->copyDirectoryFromDisk("cron/modules/$module", "cron");
+		}
 
 		//Copy module templates files
-		if (is_dir('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . '/modules/' . $module))
-			$zip->copyDirectoryFromDisk('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . '/modules/' . $module, 'templates');
+		if (is_dir('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . '/modules/' . $module)) {
+					$zip->copyDirectoryFromDisk('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . '/modules/' . $module, 'templates');
+		}
 
 		//Copy Settings module templates files, if any
-		if (is_dir('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . "/modules/Settings/$module"))
-			$zip->copyDirectoryFromDisk('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . "/modules/Settings/$module", "settings/templates");
+		if (is_dir('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . "/modules/Settings/$module")) {
+					$zip->copyDirectoryFromDisk('layouts/' . \Vtiger_Viewer::getDefaultLayoutName() . "/modules/Settings/$module", "settings/templates");
+		}
 
 		//Support to multiple layouts of module
 		$layoutDirectories = glob('layouts' . '/*', GLOB_ONLYDIR);
@@ -262,8 +268,9 @@ 
 		}
 		$this->openNode('dependencies');
 		$this->outputNode($minVersion, 'vtiger_version');
-		if ($maxVersion !== false)
-			$this->outputNode($maxVersion, 'vtiger_max_version');
+		if ($maxVersion !== false) {
+					$this->outputNode($maxVersion, 'vtiger_max_version');
+		}
 		$this->closeNode('dependencies');
 	}
 
@@ -382,8 +389,9 @@ 
 		$sqlresult = $adb->pquery("SELECT * FROM vtiger_blocks WHERE tabid = ?", Array($moduleInstance->id));
 		$resultrows = $adb->num_rows($sqlresult);
 
-		if (empty($resultrows))
-			return;
+		if (empty($resultrows)) {
+					return;
+		}
 
 		$this->openNode('blocks');
 		for ($index = 0; $index < $resultrows; ++$index) {
@@ -429,8 +437,9 @@ 
 		$fieldresult = $adb->pquery("SELECT * FROM vtiger_field WHERE tabid=? && block=?", Array($moduleInstance->id, $blockid));
 		$fieldcount = $adb->num_rows($fieldresult);
 
-		if (empty($fieldcount))
-			return;
+		if (empty($fieldcount)) {
+					return;
+		}
 
 		$entityresult = $adb->pquery("SELECT * FROM vtiger_entityname WHERE tabid=?", Array($moduleInstance->id));
 		$entity_fieldname = $adb->query_result($entityresult, 0, 'fieldname');
@@ -545,8 +554,9 @@ 
 		$db = \PearDatabase::getInstance();
 
 		$customviewres = $db->pquery("SELECT * FROM vtiger_customview WHERE entitytype = ?", [$moduleInstance->name]);
-		if (!$customviewres->rowCount())
-			return;
+		if (!$customviewres->rowCount()) {
+					return;
+		}
 
 		$this->openNode('customviews');
 		while ($row = $db->getRow($customviewres)) {
@@ -606,22 +616,27 @@ 
 		$deforgshare = $adb->pquery("SELECT * FROM vtiger_def_org_share WHERE tabid=?", Array($moduleInstance->id));
 		$deforgshareCount = $adb->num_rows($deforgshare);
 
-		if (empty($deforgshareCount))
-			return;
+		if (empty($deforgshareCount)) {
+					return;
+		}
 
 		$this->openNode('sharingaccess');
 		if ($deforgshareCount) {
 			for ($index = 0; $index < $deforgshareCount; ++$index) {
 				$permission = $adb->query_result($deforgshare, $index, 'permission');
 				$permissiontext = '';
-				if ($permission == '0')
-					$permissiontext = 'public_readonly';
-				if ($permission == '1')
-					$permissiontext = 'public_readwrite';
-				if ($permission == '2')
-					$permissiontext = 'public_readwritedelete';
-				if ($permission == '3')
-					$permissiontext = 'private';
+				if ($permission == '0') {
+									$permissiontext = 'public_readonly';
+				}
+				if ($permission == '1') {
+									$permissiontext = 'public_readwrite';
+				}
+				if ($permission == '2') {
+									$permissiontext = 'public_readwritedelete';
+				}
+				if ($permission == '3') {
+									$permissiontext = 'private';
+				}
 
 				$this->outputNode($permissiontext, 'default');
 			}
@@ -636,8 +651,9 @@ 
 	public function export_Events($moduleInstance)
 	{
 		$events = Event::getAll($moduleInstance);
-		if (!$events)
-			return;
+		if (!$events) {
+					return;
+		}
 
 		$this->openNode('events');
 		foreach ($events as $event) {
@@ -654,8 +670,9 @@ 
 	public function export_Actions($moduleInstance)
 	{
 
-		if (!$moduleInstance->isentitytype)
-			return;
+		if (!$moduleInstance->isentitytype) {
+					return;
+		}
 
 		$adb = \PearDatabase::getInstance();
 		$result = $adb->pquery('SELECT distinct(actionname) FROM vtiger_profile2utility, vtiger_actionmapping
@@ -680,8 +697,9 @@ 
 	public function export_RelatedLists($moduleInstance)
 	{
 
-		if (!$moduleInstance->isentitytype)
-			return;
+		if (!$moduleInstance->isentitytype) {
+					return;
+		}
 
 		$adb = \PearDatabase::getInstance();
 		$result = $adb->pquery("SELECT * FROM vtiger_relatedlists WHERE tabid = ?", Array($moduleInstance->id));
@@ -815,8 +833,9 @@ 
 		$tableName = $inventoryFieldModel->getTableName('fields');
 
 		$result = $db->query(sprintf('SELECT * FROM %s', $tableName));
-		if ($db->getRowCount($result) == 0)
-			return false;
+		if ($db->getRowCount($result) == 0) {
+					return false;
+		}
 
 		$this->openNode('inventory');
 		$this->openNode('fields');

Doc Comments +13 added lines, -1 removed lines

@@ -118,6 +118,7 @@ 
 	 * @param Path Output directory path
 	 * @param String Zipfilename to use
 	 * @param Boolean True for sending the output as download
+	 * @param \Vtiger_Module_Model $moduleInstance
 	 */
 	public function export($moduleInstance, $todir = '', $zipfilename = '', $directDownload = false)
 	{
@@ -205,7 +206,7 @@ 
 
 	/**
 	 * Function copies language files to zip
-	 * @param <vtlib\Zip> $zip
+	 * @param Zip $zip
 	 * @param <String> $module
 	 */
 	public function __copyLanguageFiles($zip, $module)
@@ -240,6 +241,7 @@ 
 	/**
 	 * Export vtiger dependencies
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_Dependencies($moduleInstance)
 	{
@@ -375,6 +377,7 @@ 
 	/**
 	 * Export module blocks with its related fields
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_Blocks($moduleInstance)
 	{
@@ -539,6 +542,7 @@ 
 	/**
 	 * Export Custom views of the module
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_CustomViews($moduleInstance)
 	{
@@ -598,6 +602,7 @@ 
 	/**
 	 * Export Sharing Access of the module
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_SharingAccess($moduleInstance)
 	{
@@ -632,6 +637,7 @@ 
 	/**
 	 * Export Events of the module
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_Events($moduleInstance)
 	{
@@ -651,6 +657,9 @@ 
 		$this->closeNode('events');
 	}
 
+	/**
+	 * @param boolean $moduleInstance
+	 */
 	public function export_Actions($moduleInstance)
 	{
 
@@ -676,6 +685,7 @@ 
 	/**
 	 * Export related lists associated with module.
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_RelatedLists($moduleInstance)
 	{
@@ -750,6 +760,7 @@ 
 	/**
 	 * Export custom links of the module.
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_CustomLinks($moduleInstance)
 	{
@@ -775,6 +786,7 @@ 
 	/**
 	 * Export cron tasks for the module.
 	 * @access private
+	 * @param boolean $moduleInstance
 	 */
 	public function export_CronTasks($moduleInstance)
 	{

vtlib/Vtiger/Unzip.php

Braces +34 added lines, -22 removed lines

@@ -25,8 +25,9 @@ 
 	public function __checkPathInArray($path, $pathArray)
 	{
 		foreach ($pathArray as $checkPath) {
-			if (strpos($path, $checkPath) === 0)
-				return true;
+			if (strpos($path, $checkPath) === 0) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -37,8 +38,9 @@ 
 	 */
 	public function isdir($filepath)
 	{
-		if (substr($filepath, -1, 1) == "/")
-			return true;
+		if (substr($filepath, -1, 1) == "/") {
+					return true;
+		}
 		return false;
 	}
 
@@ -53,11 +55,13 @@ 
 		// We want to always maintain the structure
 		$maintainStructure = true;
 
-		if ($targetDir === false)
-			$targetDir = dirname(__FILE__) . "/";
+		if ($targetDir === false) {
+					$targetDir = dirname(__FILE__) . "/";
+		}
 
-		if ($renamePaths === false)
-			$renamePaths = [];
+		if ($renamePaths === false) {
+					$renamePaths = [];
+		}
 
 		/*
 		 * Setup includeExclude parameter
@@ -70,17 +74,19 @@ 
 		 * DEFAULT: If include is specified only files under the specified path will be included.
 		 * If exclude is specified folders or files will be excluded.
 		 */
-		if ($includeExclude === false)
-			$includeExclude = [];
+		if ($includeExclude === false) {
+					$includeExclude = [];
+		}
 
 		$lista = $this->getList();
-		if (sizeof($lista))
-			foreach ($lista as $fileName => $trash) {
+		if (sizeof($lista)) {
+					foreach ($lista as $fileName => $trash) {
 				// Should the file be ignored?
 				if ($includeExclude['include'] &&
 					!$this->__checkPathInArray($fileName, $includeExclude['include'])) {
 					// Do not include something not specified in include
 					continue;
+		}
 				}
 				if ($includeExclude['exclude'] &&
 					$this->__checkPathInArray($fileName, $includeExclude['exclude'])) {
@@ -104,8 +110,9 @@ 
 
 				$outDN = "$targetDir/$dirname";
 
-				if (substr($dirname, 0, strlen($baseDir)) != $baseDir)
-					continue;
+				if (substr($dirname, 0, strlen($baseDir)) != $baseDir) {
+									continue;
+				}
 
 				if (!is_dir($outDN) && $maintainStructure) {
 					$str = '';
@@ -115,16 +122,20 @@ 
 						if (!is_dir("$targetDir/$str")) {
 							$this->debugMsg(1, "Creating folder: $targetDir/$str");
 							mkdir("$targetDir/$str");
-							if ($applyChmod)
-								@chmod("$targetDir/$str", $applyChmod);
+							if ($applyChmod) {
+															@chmod("$targetDir/$str", $applyChmod);
+							}
 						}
 					}
 				}
-				if (substr($fileName, -1, 1) == '/')
-					continue;
+				if (substr($fileName, -1, 1) == '/') {
+									continue;
+				}
 
-				if (substr($fileName, -3) == '.sh')
-					$applyChmod = 0775; // Script executable.
+				if (substr($fileName, -3) == '.sh') {
+									$applyChmod = 0775;
+				}
+				// Script executable.
 				$this->unzip($fileName, "$targetDir/$dirname/" . basename($fileName), $applyChmod);
 			}
 	}
@@ -138,8 +149,9 @@ 
 	{
 		$fileList = $this->getList();
 		foreach ($fileList as $file => $details) {
-			if ($fileName === $file)
-				return true;
+			if ($fileName === $file) {
+							return true;
+			}
 		}
 		return false;
 	}

vtlib/Vtiger/LanguageImport.php

Braces +6 added lines, -4 removed lines

@@ -84,8 +84,9 @@ 
 		foreach ($filelist as $filename => $fileinfo) {
 			if (!$unzip->isdir($filename)) {
 
-				if (strpos($filename, '/') === false)
-					continue;
+				if (strpos($filename, '/') === false) {
+									continue;
+				}
 
 				$targetdir = substr($filename, 0, strripos($filename, '/'));
 				$targetfile = basename($filename);
@@ -146,8 +147,9 @@ 
 				}
 			}
 		}
-		if ($unzip)
-			$unzip->close();
+		if ($unzip) {
+					$unzip->close();
+		}
 
 		self::register($prefix, $label, $name);
 

modules/WSAPP/WorkFlowHandlers/WSAPPAssignToTracker.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 		//END
 
 		$recordId = $entityData->getId();
-		$vtEntityDelta = new VTEntityDelta ();
+		$vtEntityDelta = new VTEntityDelta();
 		$newEntityData = $vtEntityDelta->getNewEntity($moduleName, $recordId);
 		$recordValues = $newEntityData->getData();
 		$isAssignToModified = $this->isAssignToChanged($moduleName, $recordId, $current_user);
@@ -60,7 +60,7 @@ 
 		$meta = $handler->getMeta();
 		$moduleOwnerFields = $meta->getOwnerFields();
 		$assignToChanged = false;
-		$vtEntityDelta = new VTEntityDelta ();
+		$vtEntityDelta = new VTEntityDelta();
 		foreach ($moduleOwnerFields as $ownerField) {
 			$assignToChanged = $vtEntityDelta->hasChanged($moduleName, $recordId, $ownerField);
 			if ($assignToChanged)

Braces +6 added lines, -4 removed lines

@@ -63,8 +63,9 @@ 
 		$vtEntityDelta = new VTEntityDelta ();
 		foreach ($moduleOwnerFields as $ownerField) {
 			$assignToChanged = $vtEntityDelta->hasChanged($moduleName, $recordId, $ownerField);
-			if ($assignToChanged)
-				break;
+			if ($assignToChanged) {
+							break;
+			}
 		}
 		return $assignToChanged;
 	}
@@ -73,8 +74,9 @@ 
 	{
 		//TODO: Handle getting the webservice modulename in a better way
 		$wsModuleName = $workFlowModuleName;
-		if ($workFlowModuleName == "Activity")
-			$wsModuleName = "Calendar";
+		if ($workFlowModuleName == "Activity") {
+					$wsModuleName = "Calendar";
+		}
 		return $wsModuleName;
 	}
 }

modules/WSAPP/Utils.php

Braces +25 added lines, -17 removed lines

@@ -42,15 +42,19 @@ 
 	$entityMetaList = array();
 	$db = PearDatabase::getInstance();
 
-	if (empty($entityNames))
-		return;
-
-	if (!is_array($entityNames))
-		$entityNames = array($entityNames);
-	if (empty($modules))
-		return array();
-	if (!is_array($modules))
-		$modules = array($modules);
+	if (empty($entityNames)) {
+			return;
+	}
+
+	if (!is_array($entityNames)) {
+			$entityNames = array($entityNames);
+	}
+	if (empty($modules)) {
+			return array();
+	}
+	if (!is_array($modules)) {
+			$modules = array($modules);
+	}
 	$entityNameIds = array();
 	foreach ($modules as $moduleName) {
 		if (empty($entityMetaList[$moduleName])) {
@@ -62,8 +66,9 @@ 
 		$nameFieldsArray = explode(",", $meta->getNameFields());
 		if (count($nameFieldsArray) > 1) {
 			$nameFields = "concat(" . implode(",' ',", $nameFieldsArray) . ")";
-		} else
-			$nameFields = $nameFieldsArray[0];
+		} else {
+					$nameFields = $nameFieldsArray[0];
+		}
 
 		$query = sprintf("SELECT %s as id,%s as entityname 
 				FROM %s as moduleentity 
@@ -102,12 +107,15 @@ 
 function wsapp_checkIfRecordsAssignToUser($recordsIds, $userIds)
 {
 	$assignedRecordIds = [];
-	if (!is_array($recordsIds))
-		$recordsIds = [$recordsIds];
-	if (count($recordsIds) <= 0)
-		return $assignedRecordIds;
-	if (!is_array($userIds))
-		$userIds = [$userIds];
+	if (!is_array($recordsIds)) {
+			$recordsIds = [$recordsIds];
+	}
+	if (count($recordsIds) <= 0) {
+			return $assignedRecordIds;
+	}
+	if (!is_array($userIds)) {
+			$userIds = [$userIds];
+	}
 	$db = PearDatabase::getInstance();
 	$query = sprintf("SELECT * FROM vtiger_crmentity where crmid IN (%s) and smownerid in (%s)", generateQuestionMarks($recordsIds), generateQuestionMarks($userIds));
 	$params = [];

Doc Comments +8 added lines

@@ -126,6 +126,9 @@ 
 	return $assignedRecordIds;
 }
 
+/**
+ * @param string $appName
+ */
 function wsapp_getAppKey($appName)
 {
 	$db = PearDatabase::getInstance();
@@ -152,6 +155,11 @@ 
 	return $syncType;
 }
 
+/**
+ * @param string $type
+ * @param string $handlerClass
+ * @param string $handlerPath
+ */
 function wsapp_RegisterHandler($type, $handlerClass, $handlerPath)
 {
 	$db = PearDatabase::getInstance();