YetiForceCompany / YetiForceCRM

include/utils/ConfigReader.php

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
 
 	public function setConfig($key, $value)
 	{
-		if (empty($key))
-			return;
+		if (empty($key)) {
+					return;
+		}
 		$this->properties[$key] = $value;
 		//not neccessary for php5.x versions
 		self::$propertiesCache[$this->name] = $this->properties;
@@ -46,8 +47,9 @@ 
 
 	public function getConfig($key)
 	{
-		if (empty($key))
-			return '';
+		if (empty($key)) {
+					return '';
+		}
 		return $this->properties[$key];
 	}
 }

Doc Comments +7 added lines

@@ -15,6 +15,10 @@ 
 	protected $name;
 	static $propertiesCache = [];
 
+	/**
+	 * @param string $path
+	 * @param string $name
+	 */
 	public function __construct($path, $name, $force = false)
 	{
 		$this->load($path, $name, $force);
@@ -41,6 +45,9 @@ 
 		self::$propertiesCache[$this->name] = $this->properties;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public function getConfig($key)
 	{
 		if (empty($key))

include/utils/ExportUtils.php

Braces +3 added lines, -2 removed lines

@@ -28,8 +28,9 @@
 	$blockid_list = '(';
 	for ($i = 0; $i < $noofrows; $i++) {
 		$blockid = $adb->query_result($result, $i, "blockid");
-		if ($i != 0)
-			$blockid_list .= ', ';
+		if ($i != 0) {
+					$blockid_list .= ', ';
+		}
 		$blockid_list .= $blockid;
 		$block_label[$blockid] = $adb->query_result($result, $i, "blocklabel");
 	}

include/utils/utils.php

Spacing +1 added lines, -1 removed lines

@@ -1401,7 +1401,7 @@
 function isRecordExists($recordId, $cache = true)
 {
 	$recordMetaData = vtlib\Functions::getCRMRecordMetadata($recordId);
-	return (isset($recordMetaData) && $recordMetaData['deleted'] == 0 ) ? true : false;
+	return (isset($recordMetaData) && $recordMetaData['deleted'] == 0) ? true : false;
 }
 
 /** Function to set date values compatible to database (YY_MM_DD)

Doc Comments +3 added lines

@@ -367,6 +367,7 @@ 
 
 /**
  * Function to find the UI type of a field based on the uitype id
+ * @param string $reqtype
  */
 function is_uitype($uitype, $reqtype)
 {
@@ -752,6 +753,8 @@ 
 
 /**
  * Function to get the approximate difference between two date time values as string
+ * @param integer $d1
+ * @param integer $d2
  */
 function dateDiffAsString($d1, $d2)
 {

Braces +35 added lines, -25 removed lines

@@ -289,13 +289,15 @@ 
 		while (($i--) > 0) {
 			if ($data != ($a = $data % ($p = pow(64, $i)))) {
 				$ret = chr(base_convert(str_pad(str_repeat(1, $i + 1), 8, "0"), 2, 10) + (($data - $a) / $p));
-				for ($i; $i > 0; $i--)
-					$ret .= chr(128 + ((($data % pow(64, $i)) - ($data % ($p = pow(64, $i - 1)))) / $p));
+				for ($i; $i > 0; $i--) {
+									$ret .= chr(128 + ((($data % pow(64, $i)) - ($data % ($p = pow(64, $i - 1)))) / $p));
+				}
 				break;
 			}
 		}
-	} else
-		$ret = "&#$data;";
+	} else {
+			$ret = "&#$data;";
+	}
 	return $ret;
 }
 
@@ -344,8 +346,9 @@ 
  */
 function escape_single_quotes($value)
 {
-	if (isset($value))
-		$value = str_replace("'", "\'", $value);
+	if (isset($value)) {
+			$value = str_replace("'", "\'", $value);
+	}
 	return $value;
 }
 
@@ -366,10 +369,11 @@ 
 			$str = str_replace('_', '\_', $str);
 			if ($flag == 0) {
 				// If value what to search is null then we should not add % which will fail
-				if (empty($str))
-					$str = '' . $str . '';
-				else
-					$str = '%' . $str . '%';
+				if (empty($str)) {
+									$str = '' . $str . '';
+				} else {
+									$str = '%' . $str . '%';
+				}
 			} elseif ($flag == 1) {
 				$str = '%' . $str;
 			} elseif ($flag == 2) {
@@ -402,8 +406,9 @@ 
 
 		$ret_str .= " ifnull($tbl_name.$col_name,'null') = ifnull(temp.$col_name,'null')";
 
-		if (count($field_array) != $i)
-			$ret_str .= " and ";
+		if (count($field_array) != $i) {
+					$ret_str .= " and ";
+		}
 		$i++;
 	}
 	return $ret_str;
@@ -430,8 +435,9 @@ 
 	foreach ($name as $module) {
 		$focus = CRMEntity::getInstance($module);
 		$query = $focus->buildSearchQueryForFieldTypes(11, $number);
-		if (empty($query))
-			return;
+		if (empty($query)) {
+					return;
+		}
 
 		$result = $adb->pquery($query, []);
 		if ($adb->num_rows($result) > 0) {
@@ -556,8 +562,9 @@ 
 function relateEntities($focus, $sourceModule, $sourceRecordId, $destinationModule, $destinationRecordIds, $relatedName = false)
 {
 	\App\Log::trace("Entering relateEntities method ($sourceModule, $sourceRecordId, $destinationModule, $destinationRecordIds)");
-	if (!is_array($destinationRecordIds))
-		$destinationRecordIds = [$destinationRecordIds];
+	if (!is_array($destinationRecordIds)) {
+			$destinationRecordIds = [$destinationRecordIds];
+	}
 
 	$data = [
 		'CRMEntity' => $focus,
@@ -600,20 +607,23 @@ 
 	$delim = array('/', '.');
 	foreach ($delim as $delimiter) {
 		$x = strpos($value, $delimiter);
-		if ($x === false)
-			continue;
-		else {
+		if ($x === false) {
+					continue;
+		} else {
 			$value = str_replace($delimiter, '-', $value);
 			break;
 		}
 	}
 	list($y, $m, $d) = explode('-', $value);
-	if (strlen($y) == 1)
-		$y = '0' . $y;
-	if (strlen($m) == 1)
-		$m = '0' . $m;
-	if (strlen($d) == 1)
-		$d = '0' . $d;
+	if (strlen($y) == 1) {
+			$y = '0' . $y;
+	}
+	if (strlen($m) == 1) {
+			$m = '0' . $m;
+	}
+	if (strlen($d) == 1) {
+			$d = '0' . $d;
+	}
 	$value = implode('-', array($y, $m, $d));
 
 	if (strlen($y) < 4) {

include/ConfigUtils.php

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
 		self::$modules[$module] = $CONFIG;
 		switch ($argsLength) {
 			case 2:
-				if (!isset($CONFIG[$key]))
-					return false;
+				if (!isset($CONFIG[$key])) {
+									return false;
+				}
 				return $CONFIG[$key];
 				break;
 			default:

Doc Comments +36 added lines

@@ -16,11 +16,17 @@ 
 	protected static $sounds = [];
 	protected static $search = [];
 
+	/**
+	 * @param string $key
+	 */
 	public static function load($key, $config)
 	{
 		self::$$key = $config;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function main($key, $value = false)
 	{
 		if (isset(self::$main[$key])) {
@@ -75,11 +81,17 @@ 
 		}
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function api($key, $defvalue = false)
 	{
 		return self::$api[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function debug($key, $defvalue = false)
 	{
 		if (empty(self::$debug)) {
@@ -89,6 +101,9 @@ 
 		return self::$debug[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function developer($key, $defvalue = false)
 	{
 		if (empty(self::$developer)) {
@@ -98,6 +113,9 @@ 
 		return self::$developer[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function security($key, $defvalue = false)
 	{
 		if (empty(self::$security)) {
@@ -107,6 +125,9 @@ 
 		return self::$security[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function securityKeys($key, $defvalue = false)
 	{
 		if (empty(self::$securityKeys)) {
@@ -116,6 +137,11 @@ 
 		return self::$securityKeys[$key];
 	}
 
+	/**
+	 * @param string $key
+	 *
+	 * @return integer
+	 */
 	public static function performance($key, $defvalue = false)
 	{
 		if (!self::$performance) {
@@ -125,6 +151,9 @@ 
 		return self::$performance[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function relation($key, $defvalue = false)
 	{
 		if (empty(self::$relation)) {
@@ -147,6 +176,9 @@ 
 		return self::$sounds[$key];
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function search($key, $defvalue = false)
 	{
 		if (empty(self::$search)) {
@@ -156,6 +188,10 @@ 
 		return self::$search[$key];
 	}
 
+	/**
+	 * @param string $key
+	 * @param integer $value
+	 */
 	public static function iniSet($key, $value)
 	{
 		@ini_set($key, $value);

include/Webservices/VtigerCRMObjectMeta.php

Braces +6 added lines, -4 removed lines

@@ -212,8 +212,9 @@ 
 		$adb = PearDatabase::getInstance();
 
 		// administrator's have assign privilege
-		if (\vtlib\Functions::userIsAdministrator($this->user))
-			return true;
+		if (\vtlib\Functions::userIsAdministrator($this->user)) {
+					return true;
+		}
 
 		$idComponents = vtws_getIdComponents($webserviceId);
 		$userId = $idComponents[1];
@@ -353,8 +354,9 @@ 
 		$theme = vtws_preserveGlobal('theme', $this->user->theme);
 		$default_language = AppConfig::main('default_language');
 		$current_language = vglobal('current_language');
-		if (empty($current_language))
-			$current_language = $default_language;
+		if (empty($current_language)) {
+					$current_language = $default_language;
+		}
 		$current_language = vtws_preserveGlobal('current_language', $current_language);
 
 		$this->computeAccess();

include/Webservices/History.php

Braces +7 added lines, -4 removed lines

@@ -31,8 +31,9 @@ 
 	$page = empty($element['page']) ? 0 : intval($element['page']); // Page to start
 
 	$acrossAllModule = false;
-	if ($moduleName == 'Home')
-		$acrossAllModule = true;
+	if ($moduleName == 'Home') {
+			$acrossAllModule = true;
+	}
 
 	// Pre-condition check
 	if (empty($moduleName)) {
@@ -71,8 +72,10 @@ 
 
 	// Get most recently tracked changes with limit
 	$start = $page * $MAXLIMIT;
-	if ($start > 0)
-		$start = $start + 1; // Adjust the start range
+	if ($start > 0) {
+			$start = $start + 1;
+	}
+	// Adjust the start range
 	$sql .= sprintf(' ORDER BY vtiger_modtracker_basic.id DESC LIMIT %s,%s', $start, $MAXLIMIT);
 
 	$result = $adb->pquery($sql, $params);

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