YetiForceCompany / YetiForceCRM

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

Doc Comments +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return Principal
      */
     static function xmlDeserialize(Reader $reader) {
 

Indentation +172 added lines, -172 removed lines

@@ -20,177 +20,177 @@
  */
 class Principal extends DAV\Xml\Property\Href {
 
-    /**
-     * To specify a not-logged-in user, use the UNAUTHENTICATED principal
-     */
-    const UNAUTHENTICATED = 1;
-
-    /**
-     * To specify any principal that is logged in, use AUTHENTICATED
-     */
-    const AUTHENTICATED = 2;
-
-    /**
-     * Specific principals can be specified with the HREF
-     */
-    const HREF = 3;
-
-    /**
-     * Everybody, basically
-     */
-    const ALL = 4;
-
-    /**
-     * Principal-type
-     *
-     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
-     *
-     * @var int
-     */
-    protected $type;
-
-    /**
-     * Creates the property.
-     *
-     * The 'type' argument must be one of the type constants defined in this class.
-     *
-     * 'href' is only required for the HREF type.
-     *
-     * @param int $type
-     * @param string|null $href
-     */
-    public function __construct($type, $href = null) {
-
-        $this->type = $type;
-        if ($type === self::HREF && is_null($href)) {
-            throw new DAV\Exception('The href argument must be specified for the HREF principal type.');
-        }
-        if ($href) {
-            $href = rtrim($href, '/') . '/';
-            parent::__construct($href);
-        }
-
-    }
-
-    /**
-     * Returns the principal type
-     *
-     * @return int
-     */
-    public function getType() {
-
-        return $this->type;
-
-    }
-
-
-    /**
-     * 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) {
-
-        switch ($this->type) {
-
-            case self::UNAUTHENTICATED :
-                $writer->writeElement('{DAV:}unauthenticated');
-                break;
-            case self::AUTHENTICATED :
-                $writer->writeElement('{DAV:}authenticated');
-                break;
-            case self::HREF :
-                parent::xmlSerialize($writer);
-                break;
-            case self::ALL :
-                $writer->writeElement('{DAV:}all');
-                break;
-        }
-
-    }
-
-    /**
-     * 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) {
-
-        switch ($this->type) {
-
-            case self::UNAUTHENTICATED :
-                return '<em>unauthenticated</em>';
-            case self::AUTHENTICATED :
-                return '<em>authenticated</em>';
-            case self::HREF :
-                return parent::toHtml($html);
-            case self::ALL :
-                return '<em>all</em>';
-        }
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called staticly, 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) {
-
-        $tree = $reader->parseInnerTree()[0];
-
-        switch ($tree['name']) {
-            case '{DAV:}unauthenticated' :
-                return new self(self::UNAUTHENTICATED);
-            case '{DAV:}authenticated' :
-                return new self(self::AUTHENTICATED);
-            case '{DAV:}href':
-                return new self(self::HREF, $tree['value']);
-            case '{DAV:}all':
-                return new self(self::ALL);
-            default :
-                throw new BadRequest('Unknown or unsupported principal type: ' . $tree['name']);
-        }
-
-    }
+	/**
+	 * To specify a not-logged-in user, use the UNAUTHENTICATED principal
+	 */
+	const UNAUTHENTICATED = 1;
+
+	/**
+	 * To specify any principal that is logged in, use AUTHENTICATED
+	 */
+	const AUTHENTICATED = 2;
+
+	/**
+	 * Specific principals can be specified with the HREF
+	 */
+	const HREF = 3;
+
+	/**
+	 * Everybody, basically
+	 */
+	const ALL = 4;
+
+	/**
+	 * Principal-type
+	 *
+	 * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
+	 *
+	 * @var int
+	 */
+	protected $type;
+
+	/**
+	 * Creates the property.
+	 *
+	 * The 'type' argument must be one of the type constants defined in this class.
+	 *
+	 * 'href' is only required for the HREF type.
+	 *
+	 * @param int $type
+	 * @param string|null $href
+	 */
+	public function __construct($type, $href = null) {
+
+		$this->type = $type;
+		if ($type === self::HREF && is_null($href)) {
+			throw new DAV\Exception('The href argument must be specified for the HREF principal type.');
+		}
+		if ($href) {
+			$href = rtrim($href, '/') . '/';
+			parent::__construct($href);
+		}
+
+	}
+
+	/**
+	 * Returns the principal type
+	 *
+	 * @return int
+	 */
+	public function getType() {
+
+		return $this->type;
+
+	}
+
+
+	/**
+	 * 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) {
+
+		switch ($this->type) {
+
+			case self::UNAUTHENTICATED :
+				$writer->writeElement('{DAV:}unauthenticated');
+				break;
+			case self::AUTHENTICATED :
+				$writer->writeElement('{DAV:}authenticated');
+				break;
+			case self::HREF :
+				parent::xmlSerialize($writer);
+				break;
+			case self::ALL :
+				$writer->writeElement('{DAV:}all');
+				break;
+		}
+
+	}
+
+	/**
+	 * 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) {
+
+		switch ($this->type) {
+
+			case self::UNAUTHENTICATED :
+				return '<em>unauthenticated</em>';
+			case self::AUTHENTICATED :
+				return '<em>authenticated</em>';
+			case self::HREF :
+				return parent::toHtml($html);
+			case self::ALL :
+				return '<em>all</em>';
+		}
+
+	}
+
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called staticly, 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) {
+
+		$tree = $reader->parseInnerTree()[0];
+
+		switch ($tree['name']) {
+			case '{DAV:}unauthenticated' :
+				return new self(self::UNAUTHENTICATED);
+			case '{DAV:}authenticated' :
+				return new self(self::AUTHENTICATED);
+			case '{DAV:}href':
+				return new self(self::HREF, $tree['value']);
+			case '{DAV:}all':
+				return new self(self::ALL);
+			default :
+				throw new BadRequest('Unknown or unsupported principal type: ' . $tree['name']);
+		}
+
+	}
 
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return ExpandPropertyReport
      */
     static function xmlDeserialize(Reader $reader) {
 

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

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return PrincipalPropertySearchReport
      */
     static function xmlDeserialize(Reader $reader) {
 

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

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

@@ -2,9 +2,9 @@
 
 namespace Sabre\DAVACL\Xml\Request;
 
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
 
 /**
  * PrincipalSearchPropertySetReport request parser.

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

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * the next element.
      *
      * @param Reader $reader
-     * @return mixed
+     * @return PrincipalSearchPropertySetReport
      */
     static function xmlDeserialize(Reader $reader) {
 

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

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

@@ -2,9 +2,9 @@
 
 namespace Sabre\DAVACL\Xml\Request;
 
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\DAV\Exception\BadRequest;
 
 /**
  * PrincipalSearchPropertySetReport request parser.

modules/Accounts/Accounts.php

Doc Comments +2 added lines, -1 removed lines

@@ -611,6 +611,7 @@ 
 	 * @param  integer   $id      		- accountid
 	 * @param  array   $parent_accounts   - Array of all the parent accounts
 	 * returns All the parent accounts of the given accountid in array format
+	 * @param integer[] $encountered_accounts
 	 */
 	public function __getParentAccounts($id, &$parent_accounts, &$encountered_accounts, $depthBase = 0)
 	{
@@ -673,7 +674,7 @@ 
 	 * Function to Recursively get all the child accounts of a given Account
 	 * @param  integer   $id      		- accountid
 	 * @param  array   $child_accounts   - Array of all the child accounts
-	 * @param  integer   $depth          - Depth at which the particular account has to be placed in the hierarchy
+	 * @param  integer   $depthBase          - Depth at which the particular account has to be placed in the hierarchy
 	 * returns All the child accounts of the given accountid in array format
 	 */
 	public function __getChildAccounts($id, &$child_accounts, $depthBase)

Braces +23 added lines, -16 removed lines

@@ -111,10 +111,11 @@ 
 		$query .= $this->getNonAdminAccessControlQuery('Accounts', $current_user);
 		$where_auto = " vtiger_crmentity.deleted = 0 ";
 
-		if ($where != '')
-			$query .= sprintf(' where (%s) && %s', $where, $where_auto);
-		else
-			$query .= sprintf(' where %s', $where_auto);
+		if ($where != '') {
+					$query .= sprintf(' where (%s) && %s', $where, $where_auto);
+		} else {
+					$query .= sprintf(' where %s', $where_auto);
+		}
 
 		\App\Log::trace("Exiting create_export_query method ...");
 		return $query;
@@ -430,8 +431,9 @@ 
 	public function unlinkRelationship($id, $return_module, $return_id, $relatedName = false)
 	{
 
-		if (empty($return_module) || empty($return_id))
-			return;
+		if (empty($return_module) || empty($return_id)) {
+					return;
+		}
 
 		if ($return_module === 'Campaigns') {
 			App\Db::getInstance()->createCommand()->delete('vtiger_campaign_records', ['crmid' => $id, 'campaignid' => $return_id])->execute();
@@ -444,8 +446,9 @@ 
 
 	public function save_related_module($module, $crmid, $with_module, $with_crmids, $relatedName = false)
 	{
-		if (!is_array($with_crmids))
-			$with_crmids = [$with_crmids];
+		if (!is_array($with_crmids)) {
+					$with_crmids = [$with_crmids];
+		}
 		if (!in_array($with_module, ['Products', 'Campaigns'])) {
 			parent::save_related_module($module, $crmid, $with_module, $with_crmids, $relatedName);
 		} else {
@@ -495,10 +498,12 @@ 
 					continue;
 				}
 				// Setup the default JOIN conditions if not specified
-				if (empty($relmap[1]))
-					$relmap[1] = $other->table_name;
-				if (empty($relmap[2]))
-					$relmap[2] = $relmap[0];
+				if (empty($relmap[1])) {
+									$relmap[1] = $other->table_name;
+				}
+				if (empty($relmap[2])) {
+									$relmap[2] = $relmap[0];
+				}
 				$join .= " LEFT JOIN $tname ON $tname.$relmap[0] = $relmap[1].$relmap[2]";
 			}
 		}
@@ -523,14 +528,16 @@ 
 	public function getRelatedContactsIds($id = null)
 	{
 
-		if ($id === null)
-			$id = $this->id;
+		if ($id === null) {
+					$id = $this->id;
+		}
 		$query = (new \App\Db\Query())->select('contactid')->from('vtiger_contactdetails')
 			->innerJoin('vtiger_crmentity', 'vtiger_contactdetails.contactid = vtiger_crmentity.crmid')
 			->where(['vtiger_contactdetails.parentid' => $id, 'vtiger_crmentity.deleted' => 0]);
 		$entityIds = $query->column();
-		if (empty($entityIds))
-			$entityIds = [];
+		if (empty($entityIds)) {
+					$entityIds = [];
+		}
 
 		return $entityIds;
 	}

modules/Calendar/actions/Calendar.php

Doc Comments +3 added lines

@@ -109,6 +109,9 @@
 		$response->emit();
 	}
 
+	/**
+	 * @param string $datetime
+	 */
 	public function changeDateTime($datetime, $delta)
 	{
 		$date = new DateTime($datetime);

modules/Calendar/actions/DragDropAjax.php

Doc Comments +3 added lines

@@ -119,6 +119,9 @@
 	 * Function adds days and minutes to datetime string
 	 */
 
+	/**
+	 * @param string $datetime
+	 */
 	public function changeDateTime($datetime, $daysToAdd, $minutesToAdd)
 	{
 		$datetime = strtotime($datetime);

Braces +11 added lines, -8 removed lines

@@ -51,8 +51,9 @@ 
 			$resultDateTime = $this->changeDateTime($oldDateTime, $dayDelta, $minuteDelta);
 			$parts = explode(' ', $resultDateTime);
 			$record->set('due_date', $parts[0]);
-			if (activitytype != 'Task')
-				$record->set('time_end', $parts[1]);
+			if (activitytype != 'Task') {
+							$record->set('time_end', $parts[1]);
+			}
 
 			$startDateTime[] = $record->get('date_start');
 			$startDateTime[] = $record->get('time_start');
@@ -64,10 +65,11 @@ 
 			$endDateTime = implode(' ', $endDateTime);
 			$endDateTime = new DateTime($endDateTime);
 			//Checking if startDateTime is less than or equal to endDateTime
-			if ($startDateTime <= $endDateTime)
-				$record->save();
-			else
-				$result['error'] = true;
+			if ($startDateTime <= $endDateTime) {
+							$record->save();
+			} else {
+							$result['error'] = true;
+			}
 
 			$response->setResult($result);
 			$response->emit();
@@ -107,8 +109,9 @@ 
 			$resultDateTime = $this->changeDateTime($oldEndDateTime, $dayDelta, $minuteDelta);
 			$parts = explode(' ', $resultDateTime);
 			$record->set('due_date', $parts[0]);
-			if (activitytype != 'Task')
-				$record->set('time_end', $parts[1]);
+			if (activitytype != 'Task') {
+							$record->set('time_end', $parts[1]);
+			}
 			$record->save();
 
 			$response->setResult($result);

modules/Calendar/Date.php

Doc Comments +1 added lines, -5 removed lines

@@ -384,7 +384,7 @@ 
 
 	/**
 	 *
-	 * @return Date
+	 * @return string
 	 */
 	public function get_DB_formatted_date()
 	{
@@ -529,10 +529,6 @@ 
 	 * This should be used whereever possible
 	 *
 	 * @param integer       $index - number between 0 to 42
-	 * @param string        $day   - date
-	 * @param string        $month - month
-	 * @param string        $year  - year
-	 * return vt_DateTime obj  $datetimevalue
 	 */
 	public function getThisMonthsDayByIndex($index)
 	{

Braces +37 added lines, -26 removed lines

@@ -87,12 +87,15 @@ 
 	 */
 	public function getTodayDatetimebyIndex($index, $day = '', $month = '', $year = '')
 	{
-		if ($day === '')
-			$day = $this->day;
-		if ($month === '')
-			$month = $this->month;
-		if ($year === '')
-			$year = $this->year;
+		if ($day === '') {
+					$day = $this->day;
+		}
+		if ($month === '') {
+					$month = $this->month;
+		}
+		if ($year === '') {
+					$year = $this->year;
+		}
 		$day_array = array();
 
 		if ($index < 0 || $index > 23) {
@@ -140,12 +143,15 @@ 
 	 */
 	public function getThismonthDaysbyIndex($index, $day = '', $month = '', $year = '')
 	{
-		if ($day == '')
-			$day = $index + 1;
-		if ($month == '')
-			$month = $this->month;
-		if ($year == '')
-			$year = $this->year;
+		if ($day == '') {
+					$day = $index + 1;
+		}
+		if ($month == '') {
+					$month = $this->month;
+		}
+		if ($year == '') {
+					$year = $this->year;
+		}
 		$month_array = array();
 		$month_array['day'] = $day;
 		$month_array['month'] = $month;
@@ -356,8 +362,9 @@ 
 		} else {
 			throw new \Exception\AppException('year was not set');
 		}
-		if (empty($hour) && $hour !== 0)
-			$hour = 0;
+		if (empty($hour) && $hour !== 0) {
+					$hour = 0;
+		}
 		$this->ts = mktime($hour, $minute, $second, $month, $day, $year);
 		$this->setDateTime($this->ts);
 	}
@@ -399,10 +406,12 @@ 
 	{
 		$hour = $this->z_hour;
 		$min = $this->minute;
-		if (empty($hour))
-			$hour = '00';
-		if (empty($min))
-			$min = '00';
+		if (empty($hour)) {
+					$hour = '00';
+		}
+		if (empty($min)) {
+					$min = '00';
+		}
 		return $hour . ':' . $min;
 	}
 
@@ -413,10 +422,11 @@ 
 	 */
 	public function get_changed_day($mode)
 	{
-		if ($mode == 'increment')
-			$day = $this->day + 1;
-		else
-			$day = $this->day - 1;
+		if ($mode == 'increment') {
+					$day = $this->day + 1;
+		} else {
+					$day = $this->day - 1;
+		}
 		$date_data = array('day' => $day,
 			'month' => $this->month,
 			'year' => $this->year
@@ -432,10 +442,11 @@ 
 	public function get_first_day_of_changed_week($mode)
 	{
 		$first_day = $this->getThisweekDaysbyIndex(1);
-		if ($mode == 'increment')
-			$day = $first_day->day + 7;
-		else
-			$day = $first_day->day - 7;
+		if ($mode == 'increment') {
+					$day = $first_day->day + 7;
+		} else {
+					$day = $first_day->day - 7;
+		}
 		$date_data = array('day' => $day,
 			'month' => $first_day->month,
 			'year' => $first_day->year

modules/Import/helpers/Utils.php

Doc Comments +3 added lines

@@ -233,6 +233,9 @@
 		return false;
 	}
 
+	/**
+	 * @param Vtiger_Request $request
+	 */
 	public static function validateFileUpload($request)
 	{
 		$current_user = Users_Record_Model::getCurrentUserModel();