YetiForceCompany / YetiForceCRM

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 isset(self::$debug[$key]) ? self::$debug[$key] : false;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function developer($key, $defvalue = false)
 	{
 		if (empty(self::$developer)) {
@@ -98,6 +113,9 @@ 
 		return isset(self::$developer[$key]) ? self::$developer[$key] : false;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function security($key, $defvalue = false)
 	{
 		if (empty(self::$security)) {
@@ -107,6 +125,9 @@ 
 		return isset(self::$security[$key]) ? self::$security[$key] : false;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public static function securityKeys($key, $defvalue = false)
 	{
 		if (empty(self::$securityKeys)) {
@@ -116,6 +137,11 @@ 
 		return isset(self::$securityKeys[$key]) ? self::$securityKeys[$key] : false;
 	}
 
+	/**
+	 * @param string $key
+	 *
+	 * @return integer
+	 */
 	public static function performance($key, $defvalue = false)
 	{
 		if (!self::$performance) {
@@ -125,6 +151,9 @@ 
 		return isset(self::$performance[$key]) ? self::$performance[$key] : false;
 	}
 
+	/**
+	 * @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/Xml/Request/ExpandPropertyReport.php

Indentation +81 added lines, -81 removed lines

@@ -18,86 +18,86 @@
  */
 class ExpandPropertyReport implements XmlDeserializable {
 
-    /**
-     * An array with requested properties.
-     *
-     * The requested properties will be used as keys in this array. The value
-     * is normally null.
-     *
-     * If the value is an array though, it means the property must be expanded.
-     * Within the array, the sub-properties, which themselves may be null or
-     * arrays.
-     *
-     * @var array
-     */
-    public $properties;
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elems = $reader->parseInnerTree();
-
-        $obj = new self();
-        $obj->properties = self::traverse($elems);
-
-        return $obj;
-
-    }
-
-    /**
-     * This method is used by deserializeXml, to recursively parse the
-     * {DAV:}property elements.
-     *
-     * @param array $elems
-     * @return void
-     */
-    private static function traverse($elems) {
-
-        $result = [];
-
-        foreach ($elems as $elem) {
-
-            if ($elem['name'] !== '{DAV:}property') {
-                continue;
-            }
-
-            $namespace = isset($elem['attributes']['namespace']) ?
-                $elem['attributes']['namespace'] :
-                'DAV:';
-
-            $propName = '{' . $namespace . '}' . $elem['attributes']['name'];
-
-            $value = null;
-            if (is_array($elem['value'])) {
-                $value = self::traverse($elem['value']);
-            }
-
-            $result[$propName] = $value;
-
-        }
-
-        return $result;
-
-    }
+	/**
+	 * An array with requested properties.
+	 *
+	 * The requested properties will be used as keys in this array. The value
+	 * is normally null.
+	 *
+	 * If the value is an array though, it means the property must be expanded.
+	 * Within the array, the sub-properties, which themselves may be null or
+	 * arrays.
+	 *
+	 * @var array
+	 */
+	public $properties;
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elems = $reader->parseInnerTree();
+
+		$obj = new self();
+		$obj->properties = self::traverse($elems);
+
+		return $obj;
+
+	}
+
+	/**
+	 * This method is used by deserializeXml, to recursively parse the
+	 * {DAV:}property elements.
+	 *
+	 * @param array $elems
+	 * @return void
+	 */
+	private static function traverse($elems) {
+
+		$result = [];
+
+		foreach ($elems as $elem) {
+
+			if ($elem['name'] !== '{DAV:}property') {
+				continue;
+			}
+
+			$namespace = isset($elem['attributes']['namespace']) ?
+				$elem['attributes']['namespace'] :
+				'DAV:';
+
+			$propName = '{' . $namespace . '}' . $elem['attributes']['name'];
+
+			$value = null;
+			if (is_array($elem['value'])) {
+				$value = self::traverse($elem['value']);
+			}
+
+			$result[$propName] = $value;
+
+		}
+
+		return $result;
+
+	}
 
 }

Spacing +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
             }
 
             $namespace = isset($elem['attributes']['namespace']) ?
-                $elem['attributes']['namespace'] :
-                'DAV:';
+                $elem['attributes']['namespace'] : 'DAV:';
 
             $propName = '{' . $namespace . '}' . $elem['attributes']['name'];
 

libraries/SabreDAV/DAVACL/Xml/Request/PrincipalPropertySearchReport.php

Indentation +102 added lines, -102 removed lines

@@ -20,108 +20,108 @@
  */
 class PrincipalPropertySearchReport implements XmlDeserializable {
 
-    /**
-     * The requested properties.
-     *
-     * @var array|null
-     */
-    public $properties;
-
-    /**
-     * searchProperties
-     *
-     * @var array
-     */
-    public $searchProperties = [];
-
-    /**
-     * By default the property search will be conducted on the url of the http
-     * request. If this is set to true, it will be applied to the principal
-     * collection set instead.
-     *
-     * @var bool
-     */
-    public $applyToPrincipalCollectionSet = false;
-
-    /**
-     * Search for principals matching ANY of the properties (OR) or a ALL of
-     * the properties (AND).
-     *
-     * This property is either "anyof" or "allof".
-     *
-     * @var string
-     */
-    public $test;
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $self = new self();
-
-        $foundSearchProp = false;
-        $self->test = 'allof';
-        if ($reader->getAttribute('test') === 'anyof') {
-            $self->test = 'anyof';
-        }
-
-        $elemMap = [
-            '{DAV:}property-search' => 'Sabre\\Xml\\Element\\KeyValue',
-            '{DAV:}prop'            => 'Sabre\\Xml\\Element\\KeyValue',
-        ];
+	/**
+	 * The requested properties.
+	 *
+	 * @var array|null
+	 */
+	public $properties;
+
+	/**
+	 * searchProperties
+	 *
+	 * @var array
+	 */
+	public $searchProperties = [];
+
+	/**
+	 * By default the property search will be conducted on the url of the http
+	 * request. If this is set to true, it will be applied to the principal
+	 * collection set instead.
+	 *
+	 * @var bool
+	 */
+	public $applyToPrincipalCollectionSet = false;
+
+	/**
+	 * Search for principals matching ANY of the properties (OR) or a ALL of
+	 * the properties (AND).
+	 *
+	 * This property is either "anyof" or "allof".
+	 *
+	 * @var string
+	 */
+	public $test;
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$self = new self();
+
+		$foundSearchProp = false;
+		$self->test = 'allof';
+		if ($reader->getAttribute('test') === 'anyof') {
+			$self->test = 'anyof';
+		}
+
+		$elemMap = [
+			'{DAV:}property-search' => 'Sabre\\Xml\\Element\\KeyValue',
+			'{DAV:}prop'            => 'Sabre\\Xml\\Element\\KeyValue',
+		];
         
-        foreach ($reader->parseInnerTree($elemMap) as $elem) {
-
-            switch ($elem['name']) {
-
-                case '{DAV:}prop' :
-                    $self->properties = array_keys($elem['value']);
-                    break;
-                case '{DAV:}property-search' :
-                    $foundSearchProp = true;
-                    // This property has two sub-elements:
-                    //   {DAV:}prop - The property to be searched on. This may
-                    //                also be more than one
-                    //   {DAV:}match - The value to match with
-                    if (!isset($elem['value']['{DAV:}prop']) || !isset($elem['value']['{DAV:}match'])) {
-                        throw new BadRequest('The {DAV:}property-search element must contain one {DAV:}match and one {DAV:}prop element');
-                    }
-                    foreach ($elem['value']['{DAV:}prop'] as $propName => $discard) {
-                        $self->searchProperties[$propName] = $elem['value']['{DAV:}match'];
-                    }
-                    break;
-                case '{DAV:}apply-to-principal-collection-set' :
-                    $self->applyToPrincipalCollectionSet = true;
-                    break;
-
-            }
-
-        }
-        if (!$foundSearchProp) {
-            throw new BadRequest('The {DAV:}principal-property-search report must contain at least 1 {DAV:}property-search element');
-        }
-
-        return $self;
-
-    }
+		foreach ($reader->parseInnerTree($elemMap) as $elem) {
+
+			switch ($elem['name']) {
+
+				case '{DAV:}prop' :
+					$self->properties = array_keys($elem['value']);
+					break;
+				case '{DAV:}property-search' :
+					$foundSearchProp = true;
+					// This property has two sub-elements:
+					//   {DAV:}prop - The property to be searched on. This may
+					//                also be more than one
+					//   {DAV:}match - The value to match with
+					if (!isset($elem['value']['{DAV:}prop']) || !isset($elem['value']['{DAV:}match'])) {
+						throw new BadRequest('The {DAV:}property-search element must contain one {DAV:}match and one {DAV:}prop element');
+					}
+					foreach ($elem['value']['{DAV:}prop'] as $propName => $discard) {
+						$self->searchProperties[$propName] = $elem['value']['{DAV:}match'];
+					}
+					break;
+				case '{DAV:}apply-to-principal-collection-set' :
+					$self->applyToPrincipalCollectionSet = true;
+					break;
+
+			}
+
+		}
+		if (!$foundSearchProp) {
+			throw new BadRequest('The {DAV:}principal-property-search report must contain at least 1 {DAV:}property-search element');
+		}
+
+		return $self;
+
+	}
 
 }

libraries/SabreDAV/DAVACL/Xml/Request/PrincipalSearchPropertySetReport.php

Indentation +34 added lines, -34 removed lines

@@ -20,39 +20,39 @@
  */
 class PrincipalSearchPropertySetReport implements XmlDeserializable {
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        if (!$reader->isEmptyElement) {
-            throw new BadRequest('The {DAV:}principal-search-property-set element must be empty');
-        }
-
-        // The element is actually empty, so there's not much to do.
-        $reader->next();
-
-        $self = new self();
-        return $self;
-
-    }
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		if (!$reader->isEmptyElement) {
+			throw new BadRequest('The {DAV:}principal-search-property-set element must be empty');
+		}
+
+		// The element is actually empty, so there's not much to do.
+		$reader->next();
+
+		$self = new self();
+		return $self;
+
+	}
 
 }

libraries/SabreDAV/DAVACL/Xml/Property/Acl.php

Spacing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 
         $privileges = [];
 
-        foreach ((array)$reader->parseInnerTree($elementMap) as $element) {
+        foreach ((array) $reader->parseInnerTree($elementMap) as $element) {
 
             if ($element['name'] !== '{DAV:}ace') {
                 continue;

Braces +3 added lines, -1 removed lines

@@ -136,7 +136,9 @@
             }
             echo '<td>', $html->xmlName($privilege['privilege']), '</td>';
             echo '<td>';
-            if (!empty($privilege['protected'])) echo '(protected)';
+            if (!empty($privilege['protected'])) {
+            	echo '(protected)';
+            }
             echo '</td>';
             echo '</tr>';
 

Indentation +246 added lines, -246 removed lines

@@ -27,251 +27,251 @@
  */
 class Acl implements Element, HtmlOutput {
 
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    protected $privileges;
-
-    /**
-     * Whether or not the server base url is required to be prefixed when
-     * serializing the property.
-     *
-     * @var bool
-     */
-    protected $prefixBaseUrl;
-
-    /**
-     * Constructor
-     *
-     * This object requires a structure similar to the return value from
-     * Sabre\DAVACL\Plugin::getACL().
-     *
-     * Each privilege is a an array with at least a 'privilege' property, and a
-     * 'principal' property. A privilege may have a 'protected' property as
-     * well.
-     *
-     * The prefixBaseUrl should be set to false, if the supplied principal urls
-     * are already full urls. If this is kept to true, the servers base url
-     * will automatically be prefixed.
-     *
-     * @param array $privileges
-     * @param bool $prefixBaseUrl
-     */
-    public function __construct(array $privileges, $prefixBaseUrl = true) {
-
-        $this->privileges = $privileges;
-        $this->prefixBaseUrl = $prefixBaseUrl;
-
-    }
-
-    /**
-     * Returns the list of privileges for this property
-     *
-     * @return array
-     */
-    public function getPrivileges() {
-
-        return $this->privileges;
-
-    }
-
-    /**
-     * The xmlSerialize metod is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
-     * @return void
-     */
-    public function xmlSerialize(Writer $writer) {
-
-        foreach ($this->privileges as $ace) {
-
-            $this->serializeAce($writer, $ace);
-
-        }
-
-    }
-
-    /**
-     * Generate html representation for this value.
-     *
-     * The html output is 100% trusted, and no effort is being made to sanitize
-     * it. It's up to the implementor to sanitize user provided values.
-     *
-     * The output must be in UTF-8.
-     *
-     * The baseUri parameter is a url to the root of the application, and can
-     * be used to construct local links.
-     *
-     * @param HtmlOutputHelper $html
-     * @return string
-     */
-    public function toHtml(HtmlOutputHelper $html) {
-
-        ob_start();
-        echo "<table>";
-        echo "<tr><th>Principal</th><th>Privilege</th><th></th></tr>";
-        foreach ($this->privileges as $privilege) {
-
-            echo '<tr>';
-            // if it starts with a {, it's a special principal
-            if ($privilege['principal'][0] === '{') {
-                echo '<td>', $html->xmlName($privilege['principal']), '</td>';
-            } else {
-                echo '<td>', $html->link($privilege['principal']), '</td>';
-            }
-            echo '<td>', $html->xmlName($privilege['privilege']), '</td>';
-            echo '<td>';
-            if (!empty($privilege['protected'])) echo '(protected)';
-            echo '</td>';
-            echo '</tr>';
-
-        }
-        echo "</table>";
-        return ob_get_clean();
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * Important note 2: You are responsible for advancing the reader to the
-     * next element. Not doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $elementMap = [
-            '{DAV:}ace'       => 'Sabre\Xml\Element\KeyValue',
-            '{DAV:}privilege' => 'Sabre\Xml\Element\Elements',
-            '{DAV:}principal' => 'Sabre\DAVACL\Xml\Property\Principal',
-        ];
-
-        $privileges = [];
-
-        foreach ((array)$reader->parseInnerTree($elementMap) as $element) {
-
-            if ($element['name'] !== '{DAV:}ace') {
-                continue;
-            }
-            $ace = $element['value'];
-
-            if (empty($ace['{DAV:}principal'])) {
-                throw new DAV\Exception\BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
-            }
-            $principal = $ace['{DAV:}principal'];
-
-            switch ($principal->getType()) {
-                case Principal::HREF :
-                    $principal = $principal->getHref();
-                    break;
-                case Principal::AUTHENTICATED :
-                    $principal = '{DAV:}authenticated';
-                    break;
-                case Principal::UNAUTHENTICATED :
-                    $principal = '{DAV:}unauthenticated';
-                    break;
-                case Principal::ALL :
-                    $principal = '{DAV:}all';
-                    break;
-
-            }
-
-            $protected = array_key_exists('{DAV:}protected', $ace);
-
-            if (!isset($ace['{DAV:}grant'])) {
-                throw new DAV\Exception\NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
-            }
-            foreach ($ace['{DAV:}grant'] as $elem) {
-                if ($elem['name'] !== '{DAV:}privilege') {
-                    continue;
-                }
-
-                foreach ($elem['value'] as $priv) {
-                    $privileges[] = [
-                        'principal' => $principal,
-                        'protected' => $protected,
-                        'privilege' => $priv,
-                    ];
-                }
-
-            }
-
-        }
-
-        return new self($privileges);
-
-    }
-
-    /**
-     * Serializes a single access control entry.
-     *
-     * @param Writer $writer
-     * @param array $ace
-     * @return void
-     */
-    private function serializeAce(Writer $writer, array $ace) {
-
-        $writer->startElement('{DAV:}ace');
-
-        switch ($ace['principal']) {
-            case '{DAV:}authenticated' :
-                $principal = new Principal(Principal::AUTHENTICATED);
-                break;
-            case '{DAV:}unauthenticated' :
-                $principal = new Principal(Principal::UNAUTHENTICATED);
-                break;
-            case '{DAV:}all' :
-                $principal = new Principal(Principal::ALL);
-                break;
-            default:
-                $principal = new Principal(Principal::HREF, $ace['principal']);
-                break;
-        }
-
-        $writer->writeElement('{DAV:}principal', $principal);
-        $writer->startElement('{DAV:}grant');
-        $writer->startElement('{DAV:}privilege');
-
-        $writer->writeElement($ace['privilege']);
-
-        $writer->endElement(); // privilege
-        $writer->endElement(); // grant
-
-        if (!empty($ace['protected'])) {
-            $writer->writeElement('{DAV:}protected');
-        }
-
-        $writer->endElement(); // ace
-
-    }
+	/**
+	 * List of privileges
+	 *
+	 * @var array
+	 */
+	protected $privileges;
+
+	/**
+	 * Whether or not the server base url is required to be prefixed when
+	 * serializing the property.
+	 *
+	 * @var bool
+	 */
+	protected $prefixBaseUrl;
+
+	/**
+	 * Constructor
+	 *
+	 * This object requires a structure similar to the return value from
+	 * Sabre\DAVACL\Plugin::getACL().
+	 *
+	 * Each privilege is a an array with at least a 'privilege' property, and a
+	 * 'principal' property. A privilege may have a 'protected' property as
+	 * well.
+	 *
+	 * The prefixBaseUrl should be set to false, if the supplied principal urls
+	 * are already full urls. If this is kept to true, the servers base url
+	 * will automatically be prefixed.
+	 *
+	 * @param array $privileges
+	 * @param bool $prefixBaseUrl
+	 */
+	public function __construct(array $privileges, $prefixBaseUrl = true) {
+
+		$this->privileges = $privileges;
+		$this->prefixBaseUrl = $prefixBaseUrl;
+
+	}
+
+	/**
+	 * Returns the list of privileges for this property
+	 *
+	 * @return array
+	 */
+	public function getPrivileges() {
+
+		return $this->privileges;
+
+	}
+
+	/**
+	 * The xmlSerialize metod is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializble should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 *
+	 * @param Writer $writer
+	 * @return void
+	 */
+	public function xmlSerialize(Writer $writer) {
+
+		foreach ($this->privileges as $ace) {
+
+			$this->serializeAce($writer, $ace);
+
+		}
+
+	}
+
+	/**
+	 * Generate html representation for this value.
+	 *
+	 * The html output is 100% trusted, and no effort is being made to sanitize
+	 * it. It's up to the implementor to sanitize user provided values.
+	 *
+	 * The output must be in UTF-8.
+	 *
+	 * The baseUri parameter is a url to the root of the application, and can
+	 * be used to construct local links.
+	 *
+	 * @param HtmlOutputHelper $html
+	 * @return string
+	 */
+	public function toHtml(HtmlOutputHelper $html) {
+
+		ob_start();
+		echo "<table>";
+		echo "<tr><th>Principal</th><th>Privilege</th><th></th></tr>";
+		foreach ($this->privileges as $privilege) {
+
+			echo '<tr>';
+			// if it starts with a {, it's a special principal
+			if ($privilege['principal'][0] === '{') {
+				echo '<td>', $html->xmlName($privilege['principal']), '</td>';
+			} else {
+				echo '<td>', $html->link($privilege['principal']), '</td>';
+			}
+			echo '<td>', $html->xmlName($privilege['privilege']), '</td>';
+			echo '<td>';
+			if (!empty($privilege['protected'])) echo '(protected)';
+			echo '</td>';
+			echo '</tr>';
+
+		}
+		echo "</table>";
+		return ob_get_clean();
+
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statictly, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * Important note 2: You are responsible for advancing the reader to the
+	 * next element. Not doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @param Reader $reader
+	 * @return mixed
+	 */
+	static function xmlDeserialize(Reader $reader) {
+
+		$elementMap = [
+			'{DAV:}ace'       => 'Sabre\Xml\Element\KeyValue',
+			'{DAV:}privilege' => 'Sabre\Xml\Element\Elements',
+			'{DAV:}principal' => 'Sabre\DAVACL\Xml\Property\Principal',
+		];
+
+		$privileges = [];
+
+		foreach ((array)$reader->parseInnerTree($elementMap) as $element) {
+
+			if ($element['name'] !== '{DAV:}ace') {
+				continue;
+			}
+			$ace = $element['value'];
+
+			if (empty($ace['{DAV:}principal'])) {
+				throw new DAV\Exception\BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
+			}
+			$principal = $ace['{DAV:}principal'];
+
+			switch ($principal->getType()) {
+				case Principal::HREF :
+					$principal = $principal->getHref();
+					break;
+				case Principal::AUTHENTICATED :
+					$principal = '{DAV:}authenticated';
+					break;
+				case Principal::UNAUTHENTICATED :
+					$principal = '{DAV:}unauthenticated';
+					break;
+				case Principal::ALL :
+					$principal = '{DAV:}all';
+					break;
+
+			}
+
+			$protected = array_key_exists('{DAV:}protected', $ace);
+
+			if (!isset($ace['{DAV:}grant'])) {
+				throw new DAV\Exception\NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
+			}
+			foreach ($ace['{DAV:}grant'] as $elem) {
+				if ($elem['name'] !== '{DAV:}privilege') {
+					continue;
+				}
+
+				foreach ($elem['value'] as $priv) {
+					$privileges[] = [
+						'principal' => $principal,
+						'protected' => $protected,
+						'privilege' => $priv,
+					];
+				}
+
+			}
+
+		}
+
+		return new self($privileges);
+
+	}
+
+	/**
+	 * Serializes a single access control entry.
+	 *
+	 * @param Writer $writer
+	 * @param array $ace
+	 * @return void
+	 */
+	private function serializeAce(Writer $writer, array $ace) {
+
+		$writer->startElement('{DAV:}ace');
+
+		switch ($ace['principal']) {
+			case '{DAV:}authenticated' :
+				$principal = new Principal(Principal::AUTHENTICATED);
+				break;
+			case '{DAV:}unauthenticated' :
+				$principal = new Principal(Principal::UNAUTHENTICATED);
+				break;
+			case '{DAV:}all' :
+				$principal = new Principal(Principal::ALL);
+				break;
+			default:
+				$principal = new Principal(Principal::HREF, $ace['principal']);
+				break;
+		}
+
+		$writer->writeElement('{DAV:}principal', $principal);
+		$writer->startElement('{DAV:}grant');
+		$writer->startElement('{DAV:}privilege');
+
+		$writer->writeElement($ace['privilege']);
+
+		$writer->endElement(); // privilege
+		$writer->endElement(); // grant
+
+		if (!empty($ace['protected'])) {
+			$writer->writeElement('{DAV:}protected');
+		}
+
+		$writer->endElement(); // ace
+
+	}
 
 }

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)) {
 

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