YetiForceCompany / YetiForceCRM

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

Doc Comments +1 added lines, -1 removed lines

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

Indentation +134 added lines, -134 removed lines

@@ -20,140 +20,140 @@
  */
 class CurrentUserPrivilegeSet implements Element, HtmlOutput {
 
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Creates the object
-     *
-     * Pass the privileges in clark-notation
-     *
-     * @param array $privileges
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $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 $privName) {
-
-            $writer->startElement('{DAV:}privilege');
-            $writer->writeElement($privName);
-            $writer->endElement();
-
-        }
-
-
-    }
-
-    /**
-     * Returns true or false, whether the specified principal appears in the
-     * list.
-     *
-     * @param string $privilegeName
-     * @return bool
-     */
-    public function has($privilegeName) {
-
-        return in_array($privilegeName, $this->privileges);
-
-    }
-
-    /**
-     * Returns the list of privileges.
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->privileges;
-
-    }
-
-    /**
-     * 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) {
-
-        $result = [];
-
-        $tree = $reader->parseInnerTree(['{DAV:}privilege' => 'Sabre\\Xml\\Element\\Elements']);
-        foreach ($tree as $element) {
-            if ($element['name'] !== '{DAV:}privilege') {
-                continue;
-            }
-            $result[] = $element['value'][0];
-        }
-        return new self($result);
-
-    }
-
-    /**
-     * 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) {
-
-        return implode(
-            ', ',
-            array_map([$html, 'xmlName'], $this->getValue())
-        );
-
-    }
+	/**
+	 * List of privileges
+	 *
+	 * @var array
+	 */
+	private $privileges;
+
+	/**
+	 * Creates the object
+	 *
+	 * Pass the privileges in clark-notation
+	 *
+	 * @param array $privileges
+	 */
+	public function __construct(array $privileges) {
+
+		$this->privileges = $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 $privName) {
+
+			$writer->startElement('{DAV:}privilege');
+			$writer->writeElement($privName);
+			$writer->endElement();
+
+		}
+
+
+	}
+
+	/**
+	 * Returns true or false, whether the specified principal appears in the
+	 * list.
+	 *
+	 * @param string $privilegeName
+	 * @return bool
+	 */
+	public function has($privilegeName) {
+
+		return in_array($privilegeName, $this->privileges);
+
+	}
+
+	/**
+	 * Returns the list of privileges.
+	 *
+	 * @return array
+	 */
+	public function getValue() {
+
+		return $this->privileges;
+
+	}
+
+	/**
+	 * 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) {
+
+		$result = [];
+
+		$tree = $reader->parseInnerTree(['{DAV:}privilege' => 'Sabre\\Xml\\Element\\Elements']);
+		foreach ($tree as $element) {
+			if ($element['name'] !== '{DAV:}privilege') {
+				continue;
+			}
+			$result[] = $element['value'][0];
+		}
+		return new self($result);
+
+	}
+
+	/**
+	 * 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) {
+
+		return implode(
+			', ',
+			array_map([$html, 'xmlName'], $this->getValue())
+		);
+
+	}
 
 
 }

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.

libraries/Smarty/libs/plugins/function.html_checkboxes.php

Doc Comments +7 added lines

@@ -177,6 +177,13 @@
     }
 }
 
+/**
+ * @param string $name
+ * @param string $extra
+ * @param string $separator
+ * @param boolean $labels
+ * @param boolean $label_ids
+ */
 function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels,
                                                 $label_ids, $escape = true)
 {

Indentation +197 added lines, -197 removed lines

@@ -45,205 +45,205 @@
  */
 function smarty_function_html_checkboxes($params, $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = 'checkbox';
-    $values = null;
-    $options = null;
-    $selected = array();
-    $separator = '';
-    $escape = true;
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string) $_val;
-                break;
-
-            case 'escape':
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool) $_val;
-                break;
-
-            case 'options':
-                $$_key = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, "__toString")) {
-                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
-                            } else {
-                                trigger_error("html_checkboxes: selected attribute contains an object of class '" .
-                                              get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string) $_sel);
-                        }
-                        $selected[ $_sel ] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) .
-                                      "' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string) $_val);
-                }
-                break;
-
-            case 'checkboxes':
-                trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
-                              E_USER_WARNING);
-                $options = (array) $_val;
-                break;
-
-            case 'assign':
-                break;
-
-            case 'strict':
-                break;
-
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
-                                      E_USER_NOTICE);
-                    }
-
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-
-                    break;
-                }
-            // omit break; to fall through!
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        return '';
-    } /* raise error here? */
-
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] =
-                smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                       $label_ids, $escape);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result[] =
-                smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                       $label_ids, $escape);
-        }
-    }
-
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
-    } else {
-        return implode("\n", $_html_result);
-    }
+	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+	$name = 'checkbox';
+	$values = null;
+	$options = null;
+	$selected = array();
+	$separator = '';
+	$escape = true;
+	$labels = true;
+	$label_ids = false;
+	$output = null;
+
+	$extra = '';
+
+	foreach ($params as $_key => $_val) {
+		switch ($_key) {
+			case 'name':
+			case 'separator':
+				$$_key = (string) $_val;
+				break;
+
+			case 'escape':
+			case 'labels':
+			case 'label_ids':
+				$$_key = (bool) $_val;
+				break;
+
+			case 'options':
+				$$_key = (array) $_val;
+				break;
+
+			case 'values':
+			case 'output':
+				$$_key = array_values((array) $_val);
+				break;
+
+			case 'checked':
+			case 'selected':
+				if (is_array($_val)) {
+					$selected = array();
+					foreach ($_val as $_sel) {
+						if (is_object($_sel)) {
+							if (method_exists($_sel, "__toString")) {
+								$_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+							} else {
+								trigger_error("html_checkboxes: selected attribute contains an object of class '" .
+											  get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
+								continue;
+							}
+						} else {
+							$_sel = smarty_function_escape_special_chars((string) $_sel);
+						}
+						$selected[ $_sel ] = true;
+					}
+				} elseif (is_object($_val)) {
+					if (method_exists($_val, "__toString")) {
+						$selected = smarty_function_escape_special_chars((string) $_val->__toString());
+					} else {
+						trigger_error("html_checkboxes: selected attribute is an object of class '" . get_class($_val) .
+									  "' without __toString() method", E_USER_NOTICE);
+					}
+				} else {
+					$selected = smarty_function_escape_special_chars((string) $_val);
+				}
+				break;
+
+			case 'checkboxes':
+				trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead',
+							  E_USER_WARNING);
+				$options = (array) $_val;
+				break;
+
+			case 'assign':
+				break;
+
+			case 'strict':
+				break;
+
+			case 'disabled':
+			case 'readonly':
+				if (!empty($params[ 'strict' ])) {
+					if (!is_scalar($_val)) {
+						trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+									  E_USER_NOTICE);
+					}
+
+					if ($_val === true || $_val === $_key) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+					}
+
+					break;
+				}
+			// omit break; to fall through!
+
+			default:
+				if (!is_array($_val)) {
+					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+				} else {
+					trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+				}
+				break;
+		}
+	}
+
+	if (!isset($options) && !isset($values)) {
+		return '';
+	} /* raise error here? */
+
+	$_html_result = array();
+
+	if (isset($options)) {
+		foreach ($options as $_key => $_val) {
+			$_html_result[] =
+				smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+													   $label_ids, $escape);
+		}
+	} else {
+		foreach ($values as $_i => $_key) {
+			$_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+			$_html_result[] =
+				smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+													   $label_ids, $escape);
+		}
+	}
+
+	if (!empty($params[ 'assign' ])) {
+		$template->assign($params[ 'assign' ], $_html_result);
+	} else {
+		return implode("\n", $_html_result);
+	}
 }
 
 function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels,
-                                                $label_ids, $escape = true)
+												$label_ids, $escape = true)
 {
-    $_output = '';
-
-    if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
-            $value = (string) $value->__toString();
-        } else {
-            trigger_error("html_options: value is an object of class '" . get_class($value) .
-                          "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $value = (string) $value;
-    }
-
-    if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
-            $output = (string) $output->__toString();
-        } else {
-            trigger_error("html_options: output is an object of class '" . get_class($output) .
-                          "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $output = (string) $output;
-    }
-
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
-                                                                     $name . '_' . $value));
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-
-    $_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
-
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-
-    if (is_array($selected)) {
-        if (isset($selected[ $value ])) {
-            $_output .= ' checked="checked"';
-        }
-    } elseif ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-
-    $_output .= $separator;
-
-    return $_output;
+	$_output = '';
+
+	if (is_object($value)) {
+		if (method_exists($value, "__toString")) {
+			$value = (string) $value->__toString();
+		} else {
+			trigger_error("html_options: value is an object of class '" . get_class($value) .
+						  "' without __toString() method", E_USER_NOTICE);
+
+			return '';
+		}
+	} else {
+		$value = (string) $value;
+	}
+
+	if (is_object($output)) {
+		if (method_exists($output, "__toString")) {
+			$output = (string) $output->__toString();
+		} else {
+			trigger_error("html_options: output is an object of class '" . get_class($output) .
+						  "' without __toString() method", E_USER_NOTICE);
+
+			return '';
+		}
+	} else {
+		$output = (string) $output;
+	}
+
+	if ($labels) {
+		if ($label_ids) {
+			$_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
+																	 $name . '_' . $value));
+			$_output .= '<label for="' . $_id . '">';
+		} else {
+			$_output .= '<label>';
+		}
+	}
+
+	$name = smarty_function_escape_special_chars($name);
+	$value = smarty_function_escape_special_chars($value);
+	if ($escape) {
+		$output = smarty_function_escape_special_chars($output);
+	}
+
+	$_output .= '<input type="checkbox" name="' . $name . '[]" value="' . $value . '"';
+
+	if ($labels && $label_ids) {
+		$_output .= ' id="' . $_id . '"';
+	}
+
+	if (is_array($selected)) {
+		if (isset($selected[ $value ])) {
+			$_output .= ' checked="checked"';
+		}
+	} elseif ($value === $selected) {
+		$_output .= ' checked="checked"';
+	}
+
+	$_output .= $extra . ' />' . $output;
+	if ($labels) {
+		$_output .= '</label>';
+	}
+
+	$_output .= $separator;
+
+	return $_output;
 }

Spacing +6 added lines, -6 removed lines

@@ -97,7 +97,7 @@ 
                         } else {
                             $_sel = smarty_function_escape_special_chars((string) $_sel);
                         }
-                        $selected[ $_sel ] = true;
+                        $selected[$_sel] = true;
                     }
                 } elseif (is_object($_val)) {
                     if (method_exists($_val, "__toString")) {
@@ -125,7 +125,7 @@ 
 
             case 'disabled':
             case 'readonly':
-                if (!empty($params[ 'strict' ])) {
+                if (!empty($params['strict'])) {
                     if (!is_scalar($_val)) {
                         trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
                                       E_USER_NOTICE);
@@ -163,15 +163,15 @@ 
         }
     } else {
         foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result[] =
                 smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
                                                        $label_ids, $escape);
         }
     }
 
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
+    if (!empty($params['assign'])) {
+        $template->assign($params['assign'], $_html_result);
     } else {
         return implode("\n", $_html_result);
     }
@@ -231,7 +231,7 @@ 
     }
 
     if (is_array($selected)) {
-        if (isset($selected[ $value ])) {
+        if (isset($selected[$value])) {
             $_output .= ' checked="checked"';
         }
     } elseif ($value === $selected) {

libraries/Smarty/libs/plugins/function.html_options.php

Doc Comments +4 added lines

@@ -192,6 +192,10 @@
     return $_html_result;
 }
 
+/**
+ * @param string|null $id
+ * @param integer $idx
+ */
 function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
 {
     $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";

Indentation +157 added lines, -157 removed lines

@@ -35,170 +35,170 @@
  */
 function smarty_function_html_options($params)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = null;
-    $values = null;
-    $options = null;
-    $selected = null;
-    $output = null;
-    $id = null;
-    $class = null;
-
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'class':
-            case 'id':
-                $$_key = (string) $_val;
-                break;
-
-            case 'options':
-                $options = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'selected':
-                if (is_array($_val)) {
-                    $selected = array();
-                    foreach ($_val as $_sel) {
-                        if (is_object($_sel)) {
-                            if (method_exists($_sel, "__toString")) {
-                                $_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
-                            } else {
-                                trigger_error("html_options: selected attribute contains an object of class '" .
-                                              get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
-                                continue;
-                            }
-                        } else {
-                            $_sel = smarty_function_escape_special_chars((string) $_sel);
-                        }
-                        $selected[ $_sel ] = true;
-                    }
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) .
-                                      "' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = smarty_function_escape_special_chars((string) $_val);
-                }
-                break;
-
-            case 'strict':
-                break;
-
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
-                                      E_USER_NOTICE);
-                    }
-
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-
-                    break;
-                }
-            // omit break; to fall through!
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-
-        return '';
-    }
-
-    $_html_result = '';
-    $_idx = 0;
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
-        }
-    }
-
-    if (!empty($name)) {
-        $_html_class = !empty($class) ? ' class="' . $class . '"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '"' : '';
-        $_html_result =
-            '<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
-            '</select>' . "\n";
-    }
-
-    return $_html_result;
+	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+	$name = null;
+	$values = null;
+	$options = null;
+	$selected = null;
+	$output = null;
+	$id = null;
+	$class = null;
+
+	$extra = '';
+
+	foreach ($params as $_key => $_val) {
+		switch ($_key) {
+			case 'name':
+			case 'class':
+			case 'id':
+				$$_key = (string) $_val;
+				break;
+
+			case 'options':
+				$options = (array) $_val;
+				break;
+
+			case 'values':
+			case 'output':
+				$$_key = array_values((array) $_val);
+				break;
+
+			case 'selected':
+				if (is_array($_val)) {
+					$selected = array();
+					foreach ($_val as $_sel) {
+						if (is_object($_sel)) {
+							if (method_exists($_sel, "__toString")) {
+								$_sel = smarty_function_escape_special_chars((string) $_sel->__toString());
+							} else {
+								trigger_error("html_options: selected attribute contains an object of class '" .
+											  get_class($_sel) . "' without __toString() method", E_USER_NOTICE);
+								continue;
+							}
+						} else {
+							$_sel = smarty_function_escape_special_chars((string) $_sel);
+						}
+						$selected[ $_sel ] = true;
+					}
+				} elseif (is_object($_val)) {
+					if (method_exists($_val, "__toString")) {
+						$selected = smarty_function_escape_special_chars((string) $_val->__toString());
+					} else {
+						trigger_error("html_options: selected attribute is an object of class '" . get_class($_val) .
+									  "' without __toString() method", E_USER_NOTICE);
+					}
+				} else {
+					$selected = smarty_function_escape_special_chars((string) $_val);
+				}
+				break;
+
+			case 'strict':
+				break;
+
+			case 'disabled':
+			case 'readonly':
+				if (!empty($params[ 'strict' ])) {
+					if (!is_scalar($_val)) {
+						trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+									  E_USER_NOTICE);
+					}
+
+					if ($_val === true || $_val === $_key) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+					}
+
+					break;
+				}
+			// omit break; to fall through!
+
+			default:
+				if (!is_array($_val)) {
+					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+				} else {
+					trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+				}
+				break;
+		}
+	}
+
+	if (!isset($options) && !isset($values)) {
+		/* raise error here? */
+
+		return '';
+	}
+
+	$_html_result = '';
+	$_idx = 0;
+
+	if (isset($options)) {
+		foreach ($options as $_key => $_val) {
+			$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+		}
+	} else {
+		foreach ($values as $_i => $_key) {
+			$_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+			$_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
+		}
+	}
+
+	if (!empty($name)) {
+		$_html_class = !empty($class) ? ' class="' . $class . '"' : '';
+		$_html_id = !empty($id) ? ' id="' . $id . '"' : '';
+		$_html_result =
+			'<select name="' . $name . '"' . $_html_class . $_html_id . $extra . '>' . "\n" . $_html_result .
+			'</select>' . "\n";
+	}
+
+	return $_html_result;
 }
 
 function smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, &$idx)
 {
-    if (!is_array($value)) {
-        $_key = smarty_function_escape_special_chars($key);
-        $_html_result = '<option value="' . $_key . '"';
-        if (is_array($selected)) {
-            if (isset($selected[ $_key ])) {
-                $_html_result .= ' selected="selected"';
-            }
-        } elseif ($_key === $selected) {
-            $_html_result .= ' selected="selected"';
-        }
-        $_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
-        $_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
-        if (is_object($value)) {
-            if (method_exists($value, "__toString")) {
-                $value = smarty_function_escape_special_chars((string) $value->__toString());
-            } else {
-                trigger_error("html_options: value is an object of class '" . get_class($value) .
-                              "' without __toString() method", E_USER_NOTICE);
-
-                return '';
-            }
-        } else {
-            $value = smarty_function_escape_special_chars((string) $value);
-        }
-        $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx ++;
-    } else {
-        $_idx = 0;
-        $_html_result =
-            smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null,
-                                                  $class, $_idx);
-        $idx ++;
-    }
-
-    return $_html_result;
+	if (!is_array($value)) {
+		$_key = smarty_function_escape_special_chars($key);
+		$_html_result = '<option value="' . $_key . '"';
+		if (is_array($selected)) {
+			if (isset($selected[ $_key ])) {
+				$_html_result .= ' selected="selected"';
+			}
+		} elseif ($_key === $selected) {
+			$_html_result .= ' selected="selected"';
+		}
+		$_html_class = !empty($class) ? ' class="' . $class . ' option"' : '';
+		$_html_id = !empty($id) ? ' id="' . $id . '-' . $idx . '"' : '';
+		if (is_object($value)) {
+			if (method_exists($value, "__toString")) {
+				$value = smarty_function_escape_special_chars((string) $value->__toString());
+			} else {
+				trigger_error("html_options: value is an object of class '" . get_class($value) .
+							  "' without __toString() method", E_USER_NOTICE);
+
+				return '';
+			}
+		} else {
+			$value = smarty_function_escape_special_chars((string) $value);
+		}
+		$_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
+		$idx ++;
+	} else {
+		$_idx = 0;
+		$_html_result =
+			smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null,
+												  $class, $_idx);
+		$idx ++;
+	}
+
+	return $_html_result;
 }
 
 function smarty_function_html_options_optgroup($key, $values, $selected, $id, $class, &$idx)
 {
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
-    foreach ($values as $key => $value) {
-        $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
-    }
-    $optgroup_html .= "</optgroup>\n";
+	$optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
+	foreach ($values as $key => $value) {
+		$optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected, $id, $class, $idx);
+	}
+	$optgroup_html .= "</optgroup>\n";
 
-    return $optgroup_html;
+	return $optgroup_html;
 }

Spacing +6 added lines, -6 removed lines

@@ -79,7 +79,7 @@ 
                         } else {
                             $_sel = smarty_function_escape_special_chars((string) $_sel);
                         }
-                        $selected[ $_sel ] = true;
+                        $selected[$_sel] = true;
                     }
                 } elseif (is_object($_val)) {
                     if (method_exists($_val, "__toString")) {
@@ -98,7 +98,7 @@ 
 
             case 'disabled':
             case 'readonly':
-                if (!empty($params[ 'strict' ])) {
+                if (!empty($params['strict'])) {
                     if (!is_scalar($_val)) {
                         trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
                                       E_USER_NOTICE);
@@ -137,7 +137,7 @@ 
         }
     } else {
         foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected, $id, $class, $_idx);
         }
     }
@@ -159,7 +159,7 @@ 
         $_key = smarty_function_escape_special_chars($key);
         $_html_result = '<option value="' . $_key . '"';
         if (is_array($selected)) {
-            if (isset($selected[ $_key ])) {
+            if (isset($selected[$_key])) {
                 $_html_result .= ' selected="selected"';
             }
         } elseif ($_key === $selected) {
@@ -180,13 +180,13 @@ 
             $value = smarty_function_escape_special_chars((string) $value);
         }
         $_html_result .= $_html_class . $_html_id . '>' . $value . '</option>' . "\n";
-        $idx ++;
+        $idx++;
     } else {
         $_idx = 0;
         $_html_result =
             smarty_function_html_options_optgroup($key, $value, $selected, !empty($id) ? ($id . '-' . $idx) : null,
                                                   $class, $_idx);
-        $idx ++;
+        $idx++;
     }
 
     return $_html_result;

libraries/Smarty/libs/plugins/function.html_radios.php

Doc Comments +8 added lines

@@ -164,6 +164,14 @@
     }
 }
 
+/**
+ * @param string $name
+ * @param string $extra
+ * @param string $separator
+ * @param boolean $labels
+ * @param boolean $label_ids
+ * @param boolean $escape
+ */
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids,
                                             $escape)
 {

Indentation +180 added lines, -180 removed lines

@@ -45,188 +45,188 @@
  */
 function smarty_function_html_radios($params, $template)
 {
-    require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-
-    $name = 'radio';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $escape = true;
-    $labels = true;
-    $label_ids = false;
-    $output = null;
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'name':
-            case 'separator':
-                $$_key = (string) $_val;
-                break;
-
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } elseif (is_object($_val)) {
-                    if (method_exists($_val, "__toString")) {
-                        $selected = smarty_function_escape_special_chars((string) $_val->__toString());
-                    } else {
-                        trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) .
-                                      "' without __toString() method", E_USER_NOTICE);
-                    }
-                } else {
-                    $selected = (string) $_val;
-                }
-                break;
-
-            case 'escape':
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool) $_val;
-                break;
-
-            case 'options':
-                $$_key = (array) $_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array) $_val);
-                break;
-
-            case 'radios':
-                trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
-                              E_USER_WARNING);
-                $options = (array) $_val;
-                break;
-
-            case 'assign':
-                break;
-
-            case 'strict':
-                break;
-
-            case 'disabled':
-            case 'readonly':
-                if (!empty($params[ 'strict' ])) {
-                    if (!is_scalar($_val)) {
-                        trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
-                                      E_USER_NOTICE);
-                    }
-
-                    if ($_val === true || $_val === $_key) {
-                        $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
-                    }
-
-                    break;
-                }
-            // omit break; to fall through!
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
-                } else {
-                    trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values)) {
-        /* raise error here? */
-
-        return '';
-    }
-
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key => $_val) {
-            $_html_result[] =
-                smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                   $label_ids, $escape);
-        }
-    } else {
-        foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
-            $_html_result[] =
-                smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
-                                                   $label_ids, $escape);
-        }
-    }
-
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
-    } else {
-        return implode("\n", $_html_result);
-    }
+	require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
+
+	$name = 'radio';
+	$values = null;
+	$options = null;
+	$selected = null;
+	$separator = '';
+	$escape = true;
+	$labels = true;
+	$label_ids = false;
+	$output = null;
+	$extra = '';
+
+	foreach ($params as $_key => $_val) {
+		switch ($_key) {
+			case 'name':
+			case 'separator':
+				$$_key = (string) $_val;
+				break;
+
+			case 'checked':
+			case 'selected':
+				if (is_array($_val)) {
+					trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
+				} elseif (is_object($_val)) {
+					if (method_exists($_val, "__toString")) {
+						$selected = smarty_function_escape_special_chars((string) $_val->__toString());
+					} else {
+						trigger_error("html_radios: selected attribute is an object of class '" . get_class($_val) .
+									  "' without __toString() method", E_USER_NOTICE);
+					}
+				} else {
+					$selected = (string) $_val;
+				}
+				break;
+
+			case 'escape':
+			case 'labels':
+			case 'label_ids':
+				$$_key = (bool) $_val;
+				break;
+
+			case 'options':
+				$$_key = (array) $_val;
+				break;
+
+			case 'values':
+			case 'output':
+				$$_key = array_values((array) $_val);
+				break;
+
+			case 'radios':
+				trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead',
+							  E_USER_WARNING);
+				$options = (array) $_val;
+				break;
+
+			case 'assign':
+				break;
+
+			case 'strict':
+				break;
+
+			case 'disabled':
+			case 'readonly':
+				if (!empty($params[ 'strict' ])) {
+					if (!is_scalar($_val)) {
+						trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
+									  E_USER_NOTICE);
+					}
+
+					if ($_val === true || $_val === $_key) {
+						$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"';
+					}
+
+					break;
+				}
+			// omit break; to fall through!
+
+			default:
+				if (!is_array($_val)) {
+					$extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"';
+				} else {
+					trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
+				}
+				break;
+		}
+	}
+
+	if (!isset($options) && !isset($values)) {
+		/* raise error here? */
+
+		return '';
+	}
+
+	$_html_result = array();
+
+	if (isset($options)) {
+		foreach ($options as $_key => $_val) {
+			$_html_result[] =
+				smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+												   $label_ids, $escape);
+		}
+	} else {
+		foreach ($values as $_i => $_key) {
+			$_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+			$_html_result[] =
+				smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
+												   $label_ids, $escape);
+		}
+	}
+
+	if (!empty($params[ 'assign' ])) {
+		$template->assign($params[ 'assign' ], $_html_result);
+	} else {
+		return implode("\n", $_html_result);
+	}
 }
 
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids,
-                                            $escape)
+											$escape)
 {
-    $_output = '';
-
-    if (is_object($value)) {
-        if (method_exists($value, "__toString")) {
-            $value = (string) $value->__toString();
-        } else {
-            trigger_error("html_options: value is an object of class '" . get_class($value) .
-                          "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $value = (string) $value;
-    }
-
-    if (is_object($output)) {
-        if (method_exists($output, "__toString")) {
-            $output = (string) $output->__toString();
-        } else {
-            trigger_error("html_options: output is an object of class '" . get_class($output) .
-                          "' without __toString() method", E_USER_NOTICE);
-
-            return '';
-        }
-    } else {
-        $output = (string) $output;
-    }
-
-    if ($labels) {
-        if ($label_ids) {
-            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
-                                                                     $name . '_' . $value));
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-
-    $name = smarty_function_escape_special_chars($name);
-    $value = smarty_function_escape_special_chars($value);
-    if ($escape) {
-        $output = smarty_function_escape_special_chars($output);
-    }
-
-    $_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
-
-    if ($labels && $label_ids) {
-        $_output .= ' id="' . $_id . '"';
-    }
-
-    if ($value === $selected) {
-        $_output .= ' checked="checked"';
-    }
-
-    $_output .= $extra . ' />' . $output;
-    if ($labels) {
-        $_output .= '</label>';
-    }
-
-    $_output .= $separator;
-
-    return $_output;
+	$_output = '';
+
+	if (is_object($value)) {
+		if (method_exists($value, "__toString")) {
+			$value = (string) $value->__toString();
+		} else {
+			trigger_error("html_options: value is an object of class '" . get_class($value) .
+						  "' without __toString() method", E_USER_NOTICE);
+
+			return '';
+		}
+	} else {
+		$value = (string) $value;
+	}
+
+	if (is_object($output)) {
+		if (method_exists($output, "__toString")) {
+			$output = (string) $output->__toString();
+		} else {
+			trigger_error("html_options: output is an object of class '" . get_class($output) .
+						  "' without __toString() method", E_USER_NOTICE);
+
+			return '';
+		}
+	} else {
+		$output = (string) $output;
+	}
+
+	if ($labels) {
+		if ($label_ids) {
+			$_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_',
+																	 $name . '_' . $value));
+			$_output .= '<label for="' . $_id . '">';
+		} else {
+			$_output .= '<label>';
+		}
+	}
+
+	$name = smarty_function_escape_special_chars($name);
+	$value = smarty_function_escape_special_chars($value);
+	if ($escape) {
+		$output = smarty_function_escape_special_chars($output);
+	}
+
+	$_output .= '<input type="radio" name="' . $name . '" value="' . $value . '"';
+
+	if ($labels && $label_ids) {
+		$_output .= ' id="' . $_id . '"';
+	}
+
+	if ($value === $selected) {
+		$_output .= ' checked="checked"';
+	}
+
+	$_output .= $extra . ' />' . $output;
+	if ($labels) {
+		$_output .= '</label>';
+	}
+
+	$_output .= $separator;
+
+	return $_output;
 }

Spacing +4 added lines, -4 removed lines

@@ -110,7 +110,7 @@ 
 
             case 'disabled':
             case 'readonly':
-                if (!empty($params[ 'strict' ])) {
+                if (!empty($params['strict'])) {
                     if (!is_scalar($_val)) {
                         trigger_error("html_options: $_key attribute must be a scalar, only boolean true or string '$_key' will actually add the attribute",
                                       E_USER_NOTICE);
@@ -150,15 +150,15 @@ 
         }
     } else {
         foreach ($values as $_i => $_key) {
-            $_val = isset($output[ $_i ]) ? $output[ $_i ] : '';
+            $_val = isset($output[$_i]) ? $output[$_i] : '';
             $_html_result[] =
                 smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels,
                                                    $label_ids, $escape);
         }
     }
 
-    if (!empty($params[ 'assign' ])) {
-        $template->assign($params[ 'assign' ], $_html_result);
+    if (!empty($params['assign'])) {
+        $template->assign($params['assign'], $_html_result);
     } else {
         return implode("\n", $_html_result);
     }

libraries/Smarty/libs/plugins/function.html_table.php

Doc Comments +4 added lines

@@ -164,6 +164,10 @@
     return $output;
 }
 
+/**
+ * @param string $name
+ * @param string $var
+ */
 function smarty_function_html_table_cycle($name, $var, $no)
 {
     if (!is_array($var)) {

Indentation +119 added lines, -119 removed lines

@@ -49,128 +49,128 @@
  */
 function smarty_function_html_table($params)
 {
-    $table_attr = 'border="1"';
-    $tr_attr = '';
-    $th_attr = '';
-    $td_attr = '';
-    $cols = $cols_count = 3;
-    $rows = 3;
-    $trailpad = ' ';
-    $vdir = 'down';
-    $hdir = 'right';
-    $inner = 'cols';
-    $caption = '';
-    $loop = null;
-
-    if (!isset($params[ 'loop' ])) {
-        trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
-
-        return;
-    }
-
-    foreach ($params as $_key => $_value) {
-        switch ($_key) {
-            case 'loop':
-                $$_key = (array) $_value;
-                break;
-
-            case 'cols':
-                if (is_array($_value) && !empty($_value)) {
-                    $cols = $_value;
-                    $cols_count = count($_value);
-                } elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
-                    $cols = explode(',', $_value);
-                    $cols_count = count($cols);
-                } elseif (!empty($_value)) {
-                    $cols_count = (int) $_value;
-                } else {
-                    $cols_count = $cols;
-                }
-                break;
-
-            case 'rows':
-                $$_key = (int) $_value;
-                break;
-
-            case 'table_attr':
-            case 'trailpad':
-            case 'hdir':
-            case 'vdir':
-            case 'inner':
-            case 'caption':
-                $$_key = (string) $_value;
-                break;
-
-            case 'tr_attr':
-            case 'td_attr':
-            case 'th_attr':
-                $$_key = $_value;
-                break;
-        }
-    }
-
-    $loop_count = count($loop);
-    if (empty($params[ 'rows' ])) {
-        /* no rows specified */
-        $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params[ 'cols' ])) {
-        if (!empty($params[ 'rows' ])) {
-            /* no cols specified, but rows */
-            $cols_count = ceil($loop_count / $rows);
-        }
-    }
-
-    $output = "<table $table_attr>\n";
-
-    if (!empty($caption)) {
-        $output .= '<caption>' . $caption . "</caption>\n";
-    }
-
-    if (is_array($cols)) {
-        $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
-        $output .= "<thead><tr>\n";
-
-        for ($r = 0; $r < $cols_count; $r ++) {
-            $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[ $r ];
-            $output .= "</th>\n";
-        }
-        $output .= "</tr></thead>\n";
-    }
-
-    $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r ++) {
-        $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
-        $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
-
-        for ($c = 0; $c < $cols_count; $c ++) {
-            $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
-            if ($inner != 'cols') {
-                /* shuffle x to loop over rows*/
-                $x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
-            }
-
-            if ($x < $loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
-            } else {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
-            }
-        }
-        $output .= "</tr>\n";
-    }
-    $output .= "</tbody>\n";
-    $output .= "</table>\n";
-
-    return $output;
+	$table_attr = 'border="1"';
+	$tr_attr = '';
+	$th_attr = '';
+	$td_attr = '';
+	$cols = $cols_count = 3;
+	$rows = 3;
+	$trailpad = '&nbsp;';
+	$vdir = 'down';
+	$hdir = 'right';
+	$inner = 'cols';
+	$caption = '';
+	$loop = null;
+
+	if (!isset($params[ 'loop' ])) {
+		trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
+
+		return;
+	}
+
+	foreach ($params as $_key => $_value) {
+		switch ($_key) {
+			case 'loop':
+				$$_key = (array) $_value;
+				break;
+
+			case 'cols':
+				if (is_array($_value) && !empty($_value)) {
+					$cols = $_value;
+					$cols_count = count($_value);
+				} elseif (!is_numeric($_value) && is_string($_value) && !empty($_value)) {
+					$cols = explode(',', $_value);
+					$cols_count = count($cols);
+				} elseif (!empty($_value)) {
+					$cols_count = (int) $_value;
+				} else {
+					$cols_count = $cols;
+				}
+				break;
+
+			case 'rows':
+				$$_key = (int) $_value;
+				break;
+
+			case 'table_attr':
+			case 'trailpad':
+			case 'hdir':
+			case 'vdir':
+			case 'inner':
+			case 'caption':
+				$$_key = (string) $_value;
+				break;
+
+			case 'tr_attr':
+			case 'td_attr':
+			case 'th_attr':
+				$$_key = $_value;
+				break;
+		}
+	}
+
+	$loop_count = count($loop);
+	if (empty($params[ 'rows' ])) {
+		/* no rows specified */
+		$rows = ceil($loop_count / $cols_count);
+	} elseif (empty($params[ 'cols' ])) {
+		if (!empty($params[ 'rows' ])) {
+			/* no cols specified, but rows */
+			$cols_count = ceil($loop_count / $rows);
+		}
+	}
+
+	$output = "<table $table_attr>\n";
+
+	if (!empty($caption)) {
+		$output .= '<caption>' . $caption . "</caption>\n";
+	}
+
+	if (is_array($cols)) {
+		$cols = ($hdir == 'right') ? $cols : array_reverse($cols);
+		$output .= "<thead><tr>\n";
+
+		for ($r = 0; $r < $cols_count; $r ++) {
+			$output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
+			$output .= $cols[ $r ];
+			$output .= "</th>\n";
+		}
+		$output .= "</tr></thead>\n";
+	}
+
+	$output .= "<tbody>\n";
+	for ($r = 0; $r < $rows; $r ++) {
+		$output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
+		$rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
+
+		for ($c = 0; $c < $cols_count; $c ++) {
+			$x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
+			if ($inner != 'cols') {
+				/* shuffle x to loop over rows*/
+				$x = floor($x / $cols_count) + ($x % $cols_count) * $rows;
+			}
+
+			if ($x < $loop_count) {
+				$output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
+			} else {
+				$output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
+			}
+		}
+		$output .= "</tr>\n";
+	}
+	$output .= "</tbody>\n";
+	$output .= "</table>\n";
+
+	return $output;
 }
 
 function smarty_function_html_table_cycle($name, $var, $no)
 {
-    if (!is_array($var)) {
-        $ret = $var;
-    } else {
-        $ret = $var[ $no % count($var) ];
-    }
+	if (!is_array($var)) {
+		$ret = $var;
+	} else {
+		$ret = $var[ $no % count($var) ];
+	}
 
-    return ($ret) ? ' ' . $ret : '';
+	return ($ret) ? ' ' . $ret : '';
 }

Spacing +10 added lines, -10 removed lines

@@ -62,7 +62,7 @@ 
     $caption = '';
     $loop = null;
 
-    if (!isset($params[ 'loop' ])) {
+    if (!isset($params['loop'])) {
         trigger_error("html_table: missing 'loop' parameter", E_USER_WARNING);
 
         return;
@@ -110,11 +110,11 @@ 
     }
 
     $loop_count = count($loop);
-    if (empty($params[ 'rows' ])) {
+    if (empty($params['rows'])) {
         /* no rows specified */
         $rows = ceil($loop_count / $cols_count);
-    } elseif (empty($params[ 'cols' ])) {
-        if (!empty($params[ 'rows' ])) {
+    } elseif (empty($params['cols'])) {
+        if (!empty($params['rows'])) {
             /* no cols specified, but rows */
             $cols_count = ceil($loop_count / $rows);
         }
@@ -130,20 +130,20 @@ 
         $cols = ($hdir == 'right') ? $cols : array_reverse($cols);
         $output .= "<thead><tr>\n";
 
-        for ($r = 0; $r < $cols_count; $r ++) {
+        for ($r = 0; $r < $cols_count; $r++) {
             $output .= '<th' . smarty_function_html_table_cycle('th', $th_attr, $r) . '>';
-            $output .= $cols[ $r ];
+            $output .= $cols[$r];
             $output .= "</th>\n";
         }
         $output .= "</tr></thead>\n";
     }
 
     $output .= "<tbody>\n";
-    for ($r = 0; $r < $rows; $r ++) {
+    for ($r = 0; $r < $rows; $r++) {
         $output .= "<tr" . smarty_function_html_table_cycle('tr', $tr_attr, $r) . ">\n";
         $rx = ($vdir == 'down') ? $r * $cols_count : ($rows - 1 - $r) * $cols_count;
 
-        for ($c = 0; $c < $cols_count; $c ++) {
+        for ($c = 0; $c < $cols_count; $c++) {
             $x = ($hdir == 'right') ? $rx + $c : $rx + $cols_count - 1 - $c;
             if ($inner != 'cols') {
                 /* shuffle x to loop over rows*/
@@ -151,7 +151,7 @@ 
             }
 
             if ($x < $loop_count) {
-                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[ $x ] . "</td>\n";
+                $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">" . $loop[$x] . "</td>\n";
             } else {
                 $output .= "<td" . smarty_function_html_table_cycle('td', $td_attr, $c) . ">$trailpad</td>\n";
             }
@@ -169,7 +169,7 @@ 
     if (!is_array($var)) {
         $ret = $var;
     } else {
-        $ret = $var[ $no % count($var) ];
+        $ret = $var[$no % count($var)];
     }
 
     return ($ret) ? ' ' . $ret : '';