Dolibarr / dolibarr

htdocs/includes/sabre/sabre/vobject/lib/Parameter.php

Spacing +1 added lines, -1 removed lines

@@ -275,7 +275,7 @@
 
         return $this->name.'='.array_reduce(
             $value,
-            function ($out, $item) {
+            function($out, $item) {
                 if (!is_null($out)) {
                     $out .= ',';
                 }

Indentation +320 added lines, -320 removed lines

@@ -19,350 +19,350 @@
  */
 class Parameter extends Node
 {
-    /**
-     * Parameter name.
-     *
-     * @var string
-     */
-    public $name;
+	/**
+	 * Parameter name.
+	 *
+	 * @var string
+	 */
+	public $name;
 
-    /**
-     * vCard 2.1 allows parameters to be encoded without a name.
-     *
-     * We can deduce the parameter name based on its value.
-     *
-     * @var bool
-     */
-    public $noName = false;
+	/**
+	 * vCard 2.1 allows parameters to be encoded without a name.
+	 *
+	 * We can deduce the parameter name based on its value.
+	 *
+	 * @var bool
+	 */
+	public $noName = false;
 
-    /**
-     * Parameter value.
-     *
-     * @var string
-     */
-    protected $value;
+	/**
+	 * Parameter value.
+	 *
+	 * @var string
+	 */
+	protected $value;
 
-    /**
-     * Sets up the object.
-     *
-     * It's recommended to use the create:: factory method instead.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __construct(Document $root, $name, $value = null)
-    {
-        $this->root = $root;
-        if (is_null($name)) {
-            $this->noName = true;
-            $this->name = static::guessParameterNameByValue($value);
-        } else {
-            $this->name = strtoupper($name);
-        }
+	/**
+	 * Sets up the object.
+	 *
+	 * It's recommended to use the create:: factory method instead.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 */
+	public function __construct(Document $root, $name, $value = null)
+	{
+		$this->root = $root;
+		if (is_null($name)) {
+			$this->noName = true;
+			$this->name = static::guessParameterNameByValue($value);
+		} else {
+			$this->name = strtoupper($name);
+		}
 
-        // If guessParameterNameByValue() returns an empty string
-        // above, we're actually dealing with a parameter that has no value.
-        // In that case we have to move the value to the name.
-        if ('' === $this->name) {
-            $this->noName = false;
-            $this->name = strtoupper($value);
-        } else {
-            $this->setValue($value);
-        }
-    }
+		// If guessParameterNameByValue() returns an empty string
+		// above, we're actually dealing with a parameter that has no value.
+		// In that case we have to move the value to the name.
+		if ('' === $this->name) {
+			$this->noName = false;
+			$this->name = strtoupper($value);
+		} else {
+			$this->setValue($value);
+		}
+	}
 
-    /**
-     * Try to guess property name by value, can be used for vCard 2.1 nameless parameters.
-     *
-     * Figuring out what the name should have been. Note that a ton of
-     * these are rather silly in 2014 and would probably rarely be
-     * used, but we like to be complete.
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    public static function guessParameterNameByValue($value)
-    {
-        switch (strtoupper($value)) {
-            // Encodings
-            case '7-BIT':
-            case 'QUOTED-PRINTABLE':
-            case 'BASE64':
-                $name = 'ENCODING';
-                break;
+	/**
+	 * Try to guess property name by value, can be used for vCard 2.1 nameless parameters.
+	 *
+	 * Figuring out what the name should have been. Note that a ton of
+	 * these are rather silly in 2014 and would probably rarely be
+	 * used, but we like to be complete.
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public static function guessParameterNameByValue($value)
+	{
+		switch (strtoupper($value)) {
+			// Encodings
+			case '7-BIT':
+			case 'QUOTED-PRINTABLE':
+			case 'BASE64':
+				$name = 'ENCODING';
+				break;
 
-            // Common types
-            case 'WORK':
-            case 'HOME':
-            case 'PREF':
-            // Delivery Label Type
-            case 'DOM':
-            case 'INTL':
-            case 'POSTAL':
-            case 'PARCEL':
-            // Telephone types
-            case 'VOICE':
-            case 'FAX':
-            case 'MSG':
-            case 'CELL':
-            case 'PAGER':
-            case 'BBS':
-            case 'MODEM':
-            case 'CAR':
-            case 'ISDN':
-            case 'VIDEO':
-            // EMAIL types (lol)
-            case 'AOL':
-            case 'APPLELINK':
-            case 'ATTMAIL':
-            case 'CIS':
-            case 'EWORLD':
-            case 'INTERNET':
-            case 'IBMMAIL':
-            case 'MCIMAIL':
-            case 'POWERSHARE':
-            case 'PRODIGY':
-            case 'TLX':
-            case 'X400':
-            // Photo / Logo format types
-            case 'GIF':
-            case 'CGM':
-            case 'WMF':
-            case 'BMP':
-            case 'DIB':
-            case 'PICT':
-            case 'TIFF':
-            case 'PDF':
-            case 'PS':
-            case 'JPEG':
-            case 'MPEG':
-            case 'MPEG2':
-            case 'AVI':
-            case 'QTIME':
-            // Sound Digital Audio Type
-            case 'WAVE':
-            case 'PCM':
-            case 'AIFF':
-            // Key types
-            case 'X509':
-            case 'PGP':
-                $name = 'TYPE';
-                break;
+			// Common types
+			case 'WORK':
+			case 'HOME':
+			case 'PREF':
+			// Delivery Label Type
+			case 'DOM':
+			case 'INTL':
+			case 'POSTAL':
+			case 'PARCEL':
+			// Telephone types
+			case 'VOICE':
+			case 'FAX':
+			case 'MSG':
+			case 'CELL':
+			case 'PAGER':
+			case 'BBS':
+			case 'MODEM':
+			case 'CAR':
+			case 'ISDN':
+			case 'VIDEO':
+			// EMAIL types (lol)
+			case 'AOL':
+			case 'APPLELINK':
+			case 'ATTMAIL':
+			case 'CIS':
+			case 'EWORLD':
+			case 'INTERNET':
+			case 'IBMMAIL':
+			case 'MCIMAIL':
+			case 'POWERSHARE':
+			case 'PRODIGY':
+			case 'TLX':
+			case 'X400':
+			// Photo / Logo format types
+			case 'GIF':
+			case 'CGM':
+			case 'WMF':
+			case 'BMP':
+			case 'DIB':
+			case 'PICT':
+			case 'TIFF':
+			case 'PDF':
+			case 'PS':
+			case 'JPEG':
+			case 'MPEG':
+			case 'MPEG2':
+			case 'AVI':
+			case 'QTIME':
+			// Sound Digital Audio Type
+			case 'WAVE':
+			case 'PCM':
+			case 'AIFF':
+			// Key types
+			case 'X509':
+			case 'PGP':
+				$name = 'TYPE';
+				break;
 
-            // Value types
-            case 'INLINE':
-            case 'URL':
-            case 'CONTENT-ID':
-            case 'CID':
-                $name = 'VALUE';
-                break;
+			// Value types
+			case 'INLINE':
+			case 'URL':
+			case 'CONTENT-ID':
+			case 'CID':
+				$name = 'VALUE';
+				break;
 
-            default:
-                $name = '';
-        }
+			default:
+				$name = '';
+		}
 
-        return $name;
-    }
+		return $name;
+	}
 
-    /**
-     * Updates the current value.
-     *
-     * This may be either a single, or multiple strings in an array.
-     *
-     * @param string|array $value
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-    }
+	/**
+	 * Updates the current value.
+	 *
+	 * This may be either a single, or multiple strings in an array.
+	 *
+	 * @param string|array $value
+	 */
+	public function setValue($value)
+	{
+		$this->value = $value;
+	}
 
-    /**
-     * Returns the current value.
-     *
-     * This method will always return a string, or null. If there were multiple
-     * values, it will automatically concatenate them (separated by comma).
-     *
-     * @return string|null
-     */
-    public function getValue()
-    {
-        if (is_array($this->value)) {
-            return implode(',', $this->value);
-        } else {
-            return $this->value;
-        }
-    }
+	/**
+	 * Returns the current value.
+	 *
+	 * This method will always return a string, or null. If there were multiple
+	 * values, it will automatically concatenate them (separated by comma).
+	 *
+	 * @return string|null
+	 */
+	public function getValue()
+	{
+		if (is_array($this->value)) {
+			return implode(',', $this->value);
+		} else {
+			return $this->value;
+		}
+	}
 
-    /**
-     * Sets multiple values for this parameter.
-     */
-    public function setParts(array $value)
-    {
-        $this->value = $value;
-    }
+	/**
+	 * Sets multiple values for this parameter.
+	 */
+	public function setParts(array $value)
+	{
+		$this->value = $value;
+	}
 
-    /**
-     * Returns all values for this parameter.
-     *
-     * If there were no values, an empty array will be returned.
-     *
-     * @return array
-     */
-    public function getParts()
-    {
-        if (is_array($this->value)) {
-            return $this->value;
-        } elseif (is_null($this->value)) {
-            return [];
-        } else {
-            return [$this->value];
-        }
-    }
+	/**
+	 * Returns all values for this parameter.
+	 *
+	 * If there were no values, an empty array will be returned.
+	 *
+	 * @return array
+	 */
+	public function getParts()
+	{
+		if (is_array($this->value)) {
+			return $this->value;
+		} elseif (is_null($this->value)) {
+			return [];
+		} else {
+			return [$this->value];
+		}
+	}
 
-    /**
-     * Adds a value to this parameter.
-     *
-     * If the argument is specified as an array, all items will be added to the
-     * parameter value list.
-     *
-     * @param string|array $part
-     */
-    public function addValue($part)
-    {
-        if (is_null($this->value)) {
-            $this->value = $part;
-        } else {
-            $this->value = array_merge((array) $this->value, (array) $part);
-        }
-    }
+	/**
+	 * Adds a value to this parameter.
+	 *
+	 * If the argument is specified as an array, all items will be added to the
+	 * parameter value list.
+	 *
+	 * @param string|array $part
+	 */
+	public function addValue($part)
+	{
+		if (is_null($this->value)) {
+			$this->value = $part;
+		} else {
+			$this->value = array_merge((array) $this->value, (array) $part);
+		}
+	}
 
-    /**
-     * Checks if this parameter contains the specified value.
-     *
-     * This is a case-insensitive match. It makes sense to call this for for
-     * instance the TYPE parameter, to see if it contains a keyword such as
-     * 'WORK' or 'FAX'.
-     *
-     * @param string $value
-     *
-     * @return bool
-     */
-    public function has($value)
-    {
-        return in_array(
-            strtolower($value),
-            array_map('strtolower', (array) $this->value)
-        );
-    }
+	/**
+	 * Checks if this parameter contains the specified value.
+	 *
+	 * This is a case-insensitive match. It makes sense to call this for for
+	 * instance the TYPE parameter, to see if it contains a keyword such as
+	 * 'WORK' or 'FAX'.
+	 *
+	 * @param string $value
+	 *
+	 * @return bool
+	 */
+	public function has($value)
+	{
+		return in_array(
+			strtolower($value),
+			array_map('strtolower', (array) $this->value)
+		);
+	}
 
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        $value = $this->getParts();
+	/**
+	 * Turns the object back into a serialized blob.
+	 *
+	 * @return string
+	 */
+	public function serialize()
+	{
+		$value = $this->getParts();
 
-        if (0 === count($value)) {
-            return $this->name.'=';
-        }
+		if (0 === count($value)) {
+			return $this->name.'=';
+		}
 
-        if (Document::VCARD21 === $this->root->getDocumentType() && $this->noName) {
-            return implode(';', $value);
-        }
+		if (Document::VCARD21 === $this->root->getDocumentType() && $this->noName) {
+			return implode(';', $value);
+		}
 
-        return $this->name.'='.array_reduce(
-            $value,
-            function ($out, $item) {
-                if (!is_null($out)) {
-                    $out .= ',';
-                }
+		return $this->name.'='.array_reduce(
+			$value,
+			function ($out, $item) {
+				if (!is_null($out)) {
+					$out .= ',';
+				}
 
-                // If there's no special characters in the string, we'll use the simple
-                // format.
-                //
-                // The list of special characters is defined as:
-                //
-                // Any character except CONTROL, DQUOTE, ";", ":", ","
-                //
-                // by the iCalendar spec:
-                // https://tools.ietf.org/html/rfc5545#section-3.1
-                //
-                // And we add ^ to that because of:
-                // https://tools.ietf.org/html/rfc6868
-                //
-                // But we've found that iCal (7.0, shipped with OSX 10.9)
-                // severely trips on + characters not being quoted, so we
-                // added + as well.
-                if (!preg_match('#(?: [\n":;\^,\+] )#x', $item)) {
-                    return $out.$item;
-                } else {
-                    // Enclosing in double-quotes, and using RFC6868 for encoding any
-                    // special characters
-                    $out .= '"'.strtr(
-                        $item,
-                        [
-                            '^' => '^^',
-                            "\n" => '^n',
-                            '"' => '^\'',
-                        ]
-                    ).'"';
+				// If there's no special characters in the string, we'll use the simple
+				// format.
+				//
+				// The list of special characters is defined as:
+				//
+				// Any character except CONTROL, DQUOTE, ";", ":", ","
+				//
+				// by the iCalendar spec:
+				// https://tools.ietf.org/html/rfc5545#section-3.1
+				//
+				// And we add ^ to that because of:
+				// https://tools.ietf.org/html/rfc6868
+				//
+				// But we've found that iCal (7.0, shipped with OSX 10.9)
+				// severely trips on + characters not being quoted, so we
+				// added + as well.
+				if (!preg_match('#(?: [\n":;\^,\+] )#x', $item)) {
+					return $out.$item;
+				} else {
+					// Enclosing in double-quotes, and using RFC6868 for encoding any
+					// special characters
+					$out .= '"'.strtr(
+						$item,
+						[
+							'^' => '^^',
+							"\n" => '^n',
+							'"' => '^\'',
+						]
+					).'"';
 
-                    return $out;
-                }
-            }
-        );
-    }
+					return $out;
+				}
+			}
+		);
+	}
 
-    /**
-     * This method returns an array, with the representation as it should be
-     * encoded in JSON. This is used to create jCard or jCal documents.
-     *
-     * @return array
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
-    {
-        return $this->value;
-    }
+	/**
+	 * This method returns an array, with the representation as it should be
+	 * encoded in JSON. This is used to create jCard or jCal documents.
+	 *
+	 * @return array
+	 */
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return $this->value;
+	}
 
-    /**
-     * This method serializes the data into XML. This is used to create xCard or
-     * xCal documents.
-     *
-     * @param Xml\Writer $writer XML writer
-     */
-    public function xmlSerialize(Xml\Writer $writer): void
-    {
-        foreach (explode(',', $this->value) as $value) {
-            $writer->writeElement('text', $value);
-        }
-    }
+	/**
+	 * This method serializes the data into XML. This is used to create xCard or
+	 * xCal documents.
+	 *
+	 * @param Xml\Writer $writer XML writer
+	 */
+	public function xmlSerialize(Xml\Writer $writer): void
+	{
+		foreach (explode(',', $this->value) as $value) {
+			$writer->writeElement('text', $value);
+		}
+	}
 
-    /**
-     * Called when this object is being cast to a string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getValue();
-    }
+	/**
+	 * Called when this object is being cast to a string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return (string) $this->getValue();
+	}
 
-    /**
-     * Returns the iterator for this object.
-     *
-     * @return ElementList
-     */
-    #[\ReturnTypeWillChange]
-    public function getIterator()
-    {
-        if (!is_null($this->iterator)) {
-            return $this->iterator;
-        }
+	/**
+	 * Returns the iterator for this object.
+	 *
+	 * @return ElementList
+	 */
+	#[\ReturnTypeWillChange]
+	public function getIterator()
+	{
+		if (!is_null($this->iterator)) {
+			return $this->iterator;
+		}
 
-        return $this->iterator = new ArrayIterator((array) $this->value);
-    }
+		return $this->iterator = new ArrayIterator((array) $this->value);
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/FreeBusyGenerator.php

Indentation +521 added lines, -521 removed lines

@@ -25,525 +25,525 @@
  */
 class FreeBusyGenerator
 {
-    /**
-     * Input objects.
-     *
-     * @var array
-     */
-    protected $objects = [];
-
-    /**
-     * Start of range.
-     *
-     * @var DateTimeInterface|null
-     */
-    protected $start;
-
-    /**
-     * End of range.
-     *
-     * @var DateTimeInterface|null
-     */
-    protected $end;
-
-    /**
-     * VCALENDAR object.
-     *
-     * @var Document
-     */
-    protected $baseObject;
-
-    /**
-     * Reference timezone.
-     *
-     * When we are calculating busy times, and we come across so-called
-     * floating times (times without a timezone), we use the reference timezone
-     * instead.
-     *
-     * This is also used for all-day events.
-     *
-     * This defaults to UTC.
-     *
-     * @var DateTimeZone
-     */
-    protected $timeZone;
-
-    /**
-     * A VAVAILABILITY document.
-     *
-     * If this is set, its information will be included when calculating
-     * freebusy time.
-     *
-     * @var Document
-     */
-    protected $vavailability;
-
-    /**
-     * Creates the generator.
-     *
-     * Check the setTimeRange and setObjects methods for details about the
-     * arguments.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     * @param mixed             $objects
-     * @param DateTimeZone      $timeZone
-     */
-    public function __construct(DateTimeInterface $start = null, DateTimeInterface $end = null, $objects = null, DateTimeZone $timeZone = null)
-    {
-        $this->setTimeRange($start, $end);
-
-        if ($objects) {
-            $this->setObjects($objects);
-        }
-        if (is_null($timeZone)) {
-            $timeZone = new DateTimeZone('UTC');
-        }
-        $this->setTimeZone($timeZone);
-    }
-
-    /**
-     * Sets the VCALENDAR object.
-     *
-     * If this is set, it will not be generated for you. You are responsible
-     * for setting things like the METHOD, CALSCALE, VERSION, etc..
-     *
-     * The VFREEBUSY object will be automatically added though.
-     */
-    public function setBaseObject(Document $vcalendar)
-    {
-        $this->baseObject = $vcalendar;
-    }
-
-    /**
-     * Sets a VAVAILABILITY document.
-     */
-    public function setVAvailability(Document $vcalendar)
-    {
-        $this->vavailability = $vcalendar;
-    }
-
-    /**
-     * Sets the input objects.
-     *
-     * You must either specify a vcalendar object as a string, or as the parse
-     * Component.
-     * It's also possible to specify multiple objects as an array.
-     *
-     * @param mixed $objects
-     */
-    public function setObjects($objects)
-    {
-        if (!is_array($objects)) {
-            $objects = [$objects];
-        }
-
-        $this->objects = [];
-        foreach ($objects as $object) {
-            if (is_string($object) || is_resource($object)) {
-                $this->objects[] = Reader::read($object);
-            } elseif ($object instanceof Component) {
-                $this->objects[] = $object;
-            } else {
-                throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component arguments to setObjects');
-            }
-        }
-    }
-
-    /**
-     * Sets the time range.
-     *
-     * Any freebusy object falling outside of this time range will be ignored.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     */
-    public function setTimeRange(DateTimeInterface $start = null, DateTimeInterface $end = null)
-    {
-        if (!$start) {
-            $start = new DateTimeImmutable(Settings::$minDate);
-        }
-        if (!$end) {
-            $end = new DateTimeImmutable(Settings::$maxDate);
-        }
-        $this->start = $start;
-        $this->end = $end;
-    }
-
-    /**
-     * Sets the reference timezone for floating times.
-     */
-    public function setTimeZone(DateTimeZone $timeZone)
-    {
-        $this->timeZone = $timeZone;
-    }
-
-    /**
-     * Parses the input data and returns a correct VFREEBUSY object, wrapped in
-     * a VCALENDAR.
-     *
-     * @return Component
-     */
-    public function getResult()
-    {
-        $fbData = new FreeBusyData(
-            $this->start->getTimeStamp(),
-            $this->end->getTimeStamp()
-        );
-        if ($this->vavailability) {
-            $this->calculateAvailability($fbData, $this->vavailability);
-        }
-
-        $this->calculateBusy($fbData, $this->objects);
-
-        return $this->generateFreeBusyCalendar($fbData);
-    }
-
-    /**
-     * This method takes a VAVAILABILITY component and figures out all the
-     * available times.
-     */
-    protected function calculateAvailability(FreeBusyData $fbData, VCalendar $vavailability)
-    {
-        $vavailComps = iterator_to_array($vavailability->VAVAILABILITY);
-        usort(
-            $vavailComps,
-            function ($a, $b) {
-                // We need to order the components by priority. Priority 1
-                // comes first, up until priority 9. Priority 0 comes after
-                // priority 9. No priority implies priority 0.
-                //
-                // Yes, I'm serious.
-                $priorityA = isset($a->PRIORITY) ? (int) $a->PRIORITY->getValue() : 0;
-                $priorityB = isset($b->PRIORITY) ? (int) $b->PRIORITY->getValue() : 0;
-
-                if (0 === $priorityA) {
-                    $priorityA = 10;
-                }
-                if (0 === $priorityB) {
-                    $priorityB = 10;
-                }
-
-                return $priorityA - $priorityB;
-            }
-        );
-
-        // Now we go over all the VAVAILABILITY components and figure if
-        // there's any we don't need to consider.
-        //
-        // This is can be because of one of two reasons: either the
-        // VAVAILABILITY component falls outside the time we are interested in,
-        // or a different VAVAILABILITY component with a higher priority has
-        // already completely covered the time-range.
-        $old = $vavailComps;
-        $new = [];
-
-        foreach ($old as $vavail) {
-            list($compStart, $compEnd) = $vavail->getEffectiveStartEnd();
-
-            // We don't care about datetimes that are earlier or later than the
-            // start and end of the freebusy report, so this gets normalized
-            // first.
-            if (is_null($compStart) || $compStart < $this->start) {
-                $compStart = $this->start;
-            }
-            if (is_null($compEnd) || $compEnd > $this->end) {
-                $compEnd = $this->end;
-            }
-
-            // If the item fell out of the timerange, we can just skip it.
-            if ($compStart > $this->end || $compEnd < $this->start) {
-                continue;
-            }
-
-            // Going through our existing list of components to see if there's
-            // a higher priority component that already fully covers this one.
-            foreach ($new as $higherVavail) {
-                list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
-                if (
-                    (is_null($higherStart) || $higherStart < $compStart) &&
-                    (is_null($higherEnd) || $higherEnd > $compEnd)
-                ) {
-                    // Component is fully covered by a higher priority
-                    // component. We can skip this component.
-                    continue 2;
-                }
-            }
-
-            // We're keeping it!
-            $new[] = $vavail;
-        }
-
-        // Lastly, we need to traverse the remaining components and fill in the
-        // freebusydata slots.
-        //
-        // We traverse the components in reverse, because we want the higher
-        // priority components to override the lower ones.
-        foreach (array_reverse($new) as $vavail) {
-            $busyType = isset($vavail->BUSYTYPE) ? strtoupper($vavail->BUSYTYPE) : 'BUSY-UNAVAILABLE';
-            list($vavailStart, $vavailEnd) = $vavail->getEffectiveStartEnd();
-
-            // Making the component size no larger than the requested free-busy
-            // report range.
-            if (!$vavailStart || $vavailStart < $this->start) {
-                $vavailStart = $this->start;
-            }
-            if (!$vavailEnd || $vavailEnd > $this->end) {
-                $vavailEnd = $this->end;
-            }
-
-            // Marking the entire time range of the VAVAILABILITY component as
-            // busy.
-            $fbData->add(
-                $vavailStart->getTimeStamp(),
-                $vavailEnd->getTimeStamp(),
-                $busyType
-            );
-
-            // Looping over the AVAILABLE components.
-            if (isset($vavail->AVAILABLE)) {
-                foreach ($vavail->AVAILABLE as $available) {
-                    list($availStart, $availEnd) = $available->getEffectiveStartEnd();
-                    $fbData->add(
-                    $availStart->getTimeStamp(),
-                    $availEnd->getTimeStamp(),
-                    'FREE'
-                );
-
-                    if ($available->RRULE) {
-                        // Our favourite thing: recurrence!!
-
-                        $rruleIterator = new Recur\RRuleIterator(
-                        $available->RRULE->getValue(),
-                        $availStart
-                    );
-                        $rruleIterator->fastForward($vavailStart);
-
-                        $startEndDiff = $availStart->diff($availEnd);
-
-                        while ($rruleIterator->valid()) {
-                            $recurStart = $rruleIterator->current();
-                            $recurEnd = $recurStart->add($startEndDiff);
-
-                            if ($recurStart > $vavailEnd) {
-                                // We're beyond the legal timerange.
-                                break;
-                            }
-
-                            if ($recurEnd > $vavailEnd) {
-                                // Truncating the end if it exceeds the
-                                // VAVAILABILITY end.
-                                $recurEnd = $vavailEnd;
-                            }
-
-                            $fbData->add(
-                            $recurStart->getTimeStamp(),
-                            $recurEnd->getTimeStamp(),
-                            'FREE'
-                        );
-
-                            $rruleIterator->next();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * This method takes an array of iCalendar objects and applies its busy
-     * times on fbData.
-     *
-     * @param VCalendar[] $objects
-     */
-    protected function calculateBusy(FreeBusyData $fbData, array $objects)
-    {
-        foreach ($objects as $key => $object) {
-            foreach ($object->getBaseComponents() as $component) {
-                switch ($component->name) {
-                    case 'VEVENT':
-                        $FBTYPE = 'BUSY';
-                        if (isset($component->TRANSP) && ('TRANSPARENT' === strtoupper($component->TRANSP))) {
-                            break;
-                        }
-                        if (isset($component->STATUS)) {
-                            $status = strtoupper($component->STATUS);
-                            if ('CANCELLED' === $status) {
-                                break;
-                            }
-                            if ('TENTATIVE' === $status) {
-                                $FBTYPE = 'BUSY-TENTATIVE';
-                            }
-                        }
-
-                        $times = [];
-
-                        if ($component->RRULE) {
-                            try {
-                                $iterator = new EventIterator($object, (string) $component->UID, $this->timeZone);
-                            } catch (NoInstancesException $e) {
-                                // This event is recurring, but it doesn't have a single
-                                // instance. We are skipping this event from the output
-                                // entirely.
-                                unset($this->objects[$key]);
-                                break;
-                            }
-
-                            if ($this->start) {
-                                $iterator->fastForward($this->start);
-                            }
-
-                            $maxRecurrences = Settings::$maxRecurrences;
-
-                            while ($iterator->valid() && --$maxRecurrences) {
-                                $startTime = $iterator->getDTStart();
-                                if ($this->end && $startTime > $this->end) {
-                                    break;
-                                }
-                                $times[] = [
-                                    $iterator->getDTStart(),
-                                    $iterator->getDTEnd(),
-                                ];
-
-                                $iterator->next();
-                            }
-                        } else {
-                            $startTime = $component->DTSTART->getDateTime($this->timeZone);
-                            if ($this->end && $startTime > $this->end) {
-                                break;
-                            }
-                            $endTime = null;
-                            if (isset($component->DTEND)) {
-                                $endTime = $component->DTEND->getDateTime($this->timeZone);
-                            } elseif (isset($component->DURATION)) {
-                                $duration = DateTimeParser::parseDuration((string) $component->DURATION);
-                                $endTime = clone $startTime;
-                                $endTime = $endTime->add($duration);
-                            } elseif (!$component->DTSTART->hasTime()) {
-                                $endTime = clone $startTime;
-                                $endTime = $endTime->modify('+1 day');
-                            } else {
-                                // The event had no duration (0 seconds)
-                                break;
-                            }
-
-                            $times[] = [$startTime, $endTime];
-                        }
-
-                        foreach ($times as $time) {
-                            if ($this->end && $time[0] > $this->end) {
-                                break;
-                            }
-                            if ($this->start && $time[1] < $this->start) {
-                                break;
-                            }
-
-                            $fbData->add(
-                                $time[0]->getTimeStamp(),
-                                $time[1]->getTimeStamp(),
-                                $FBTYPE
-                            );
-                        }
-                        break;
-
-                    case 'VFREEBUSY':
-                        foreach ($component->FREEBUSY as $freebusy) {
-                            $fbType = isset($freebusy['FBTYPE']) ? strtoupper($freebusy['FBTYPE']) : 'BUSY';
-
-                            // Skipping intervals marked as 'free'
-                            if ('FREE' === $fbType) {
-                                continue;
-                            }
-
-                            $values = explode(',', $freebusy);
-                            foreach ($values as $value) {
-                                list($startTime, $endTime) = explode('/', $value);
-                                $startTime = DateTimeParser::parseDateTime($startTime);
-
-                                if ('P' === substr($endTime, 0, 1) || '-P' === substr($endTime, 0, 2)) {
-                                    $duration = DateTimeParser::parseDuration($endTime);
-                                    $endTime = clone $startTime;
-                                    $endTime = $endTime->add($duration);
-                                } else {
-                                    $endTime = DateTimeParser::parseDateTime($endTime);
-                                }
-
-                                if ($this->start && $this->start > $endTime) {
-                                    continue;
-                                }
-                                if ($this->end && $this->end < $startTime) {
-                                    continue;
-                                }
-                                $fbData->add(
-                                    $startTime->getTimeStamp(),
-                                    $endTime->getTimeStamp(),
-                                    $fbType
-                                );
-                            }
-                        }
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-     * This method takes a FreeBusyData object and generates the VCALENDAR
-     * object associated with it.
-     *
-     * @return VCalendar
-     */
-    protected function generateFreeBusyCalendar(FreeBusyData $fbData)
-    {
-        if ($this->baseObject) {
-            $calendar = $this->baseObject;
-        } else {
-            $calendar = new VCalendar();
-        }
-
-        $vfreebusy = $calendar->createComponent('VFREEBUSY');
-        $calendar->add($vfreebusy);
-
-        if ($this->start) {
-            $dtstart = $calendar->createProperty('DTSTART');
-            $dtstart->setDateTime($this->start);
-            $vfreebusy->add($dtstart);
-        }
-        if ($this->end) {
-            $dtend = $calendar->createProperty('DTEND');
-            $dtend->setDateTime($this->end);
-            $vfreebusy->add($dtend);
-        }
-
-        $tz = new \DateTimeZone('UTC');
-        $dtstamp = $calendar->createProperty('DTSTAMP');
-        $dtstamp->setDateTime(new DateTimeImmutable('now', $tz));
-        $vfreebusy->add($dtstamp);
-
-        foreach ($fbData->getData() as $busyTime) {
-            $busyType = strtoupper($busyTime['type']);
-
-            // Ignoring all the FREE parts, because those are already assumed.
-            if ('FREE' === $busyType) {
-                continue;
-            }
-
-            $busyTime[0] = new \DateTimeImmutable('@'.$busyTime['start'], $tz);
-            $busyTime[1] = new \DateTimeImmutable('@'.$busyTime['end'], $tz);
-
-            $prop = $calendar->createProperty(
-                'FREEBUSY',
-                $busyTime[0]->format('Ymd\\THis\\Z').'/'.$busyTime[1]->format('Ymd\\THis\\Z')
-            );
-
-            // Only setting FBTYPE if it's not BUSY, because BUSY is the
-            // default anyway.
-            if ('BUSY' !== $busyType) {
-                $prop['FBTYPE'] = $busyType;
-            }
-            $vfreebusy->add($prop);
-        }
-
-        return $calendar;
-    }
+	/**
+	 * Input objects.
+	 *
+	 * @var array
+	 */
+	protected $objects = [];
+
+	/**
+	 * Start of range.
+	 *
+	 * @var DateTimeInterface|null
+	 */
+	protected $start;
+
+	/**
+	 * End of range.
+	 *
+	 * @var DateTimeInterface|null
+	 */
+	protected $end;
+
+	/**
+	 * VCALENDAR object.
+	 *
+	 * @var Document
+	 */
+	protected $baseObject;
+
+	/**
+	 * Reference timezone.
+	 *
+	 * When we are calculating busy times, and we come across so-called
+	 * floating times (times without a timezone), we use the reference timezone
+	 * instead.
+	 *
+	 * This is also used for all-day events.
+	 *
+	 * This defaults to UTC.
+	 *
+	 * @var DateTimeZone
+	 */
+	protected $timeZone;
+
+	/**
+	 * A VAVAILABILITY document.
+	 *
+	 * If this is set, its information will be included when calculating
+	 * freebusy time.
+	 *
+	 * @var Document
+	 */
+	protected $vavailability;
+
+	/**
+	 * Creates the generator.
+	 *
+	 * Check the setTimeRange and setObjects methods for details about the
+	 * arguments.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 * @param mixed             $objects
+	 * @param DateTimeZone      $timeZone
+	 */
+	public function __construct(DateTimeInterface $start = null, DateTimeInterface $end = null, $objects = null, DateTimeZone $timeZone = null)
+	{
+		$this->setTimeRange($start, $end);
+
+		if ($objects) {
+			$this->setObjects($objects);
+		}
+		if (is_null($timeZone)) {
+			$timeZone = new DateTimeZone('UTC');
+		}
+		$this->setTimeZone($timeZone);
+	}
+
+	/**
+	 * Sets the VCALENDAR object.
+	 *
+	 * If this is set, it will not be generated for you. You are responsible
+	 * for setting things like the METHOD, CALSCALE, VERSION, etc..
+	 *
+	 * The VFREEBUSY object will be automatically added though.
+	 */
+	public function setBaseObject(Document $vcalendar)
+	{
+		$this->baseObject = $vcalendar;
+	}
+
+	/**
+	 * Sets a VAVAILABILITY document.
+	 */
+	public function setVAvailability(Document $vcalendar)
+	{
+		$this->vavailability = $vcalendar;
+	}
+
+	/**
+	 * Sets the input objects.
+	 *
+	 * You must either specify a vcalendar object as a string, or as the parse
+	 * Component.
+	 * It's also possible to specify multiple objects as an array.
+	 *
+	 * @param mixed $objects
+	 */
+	public function setObjects($objects)
+	{
+		if (!is_array($objects)) {
+			$objects = [$objects];
+		}
+
+		$this->objects = [];
+		foreach ($objects as $object) {
+			if (is_string($object) || is_resource($object)) {
+				$this->objects[] = Reader::read($object);
+			} elseif ($object instanceof Component) {
+				$this->objects[] = $object;
+			} else {
+				throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component arguments to setObjects');
+			}
+		}
+	}
+
+	/**
+	 * Sets the time range.
+	 *
+	 * Any freebusy object falling outside of this time range will be ignored.
+	 *
+	 * @param DateTimeInterface $start
+	 * @param DateTimeInterface $end
+	 */
+	public function setTimeRange(DateTimeInterface $start = null, DateTimeInterface $end = null)
+	{
+		if (!$start) {
+			$start = new DateTimeImmutable(Settings::$minDate);
+		}
+		if (!$end) {
+			$end = new DateTimeImmutable(Settings::$maxDate);
+		}
+		$this->start = $start;
+		$this->end = $end;
+	}
+
+	/**
+	 * Sets the reference timezone for floating times.
+	 */
+	public function setTimeZone(DateTimeZone $timeZone)
+	{
+		$this->timeZone = $timeZone;
+	}
+
+	/**
+	 * Parses the input data and returns a correct VFREEBUSY object, wrapped in
+	 * a VCALENDAR.
+	 *
+	 * @return Component
+	 */
+	public function getResult()
+	{
+		$fbData = new FreeBusyData(
+			$this->start->getTimeStamp(),
+			$this->end->getTimeStamp()
+		);
+		if ($this->vavailability) {
+			$this->calculateAvailability($fbData, $this->vavailability);
+		}
+
+		$this->calculateBusy($fbData, $this->objects);
+
+		return $this->generateFreeBusyCalendar($fbData);
+	}
+
+	/**
+	 * This method takes a VAVAILABILITY component and figures out all the
+	 * available times.
+	 */
+	protected function calculateAvailability(FreeBusyData $fbData, VCalendar $vavailability)
+	{
+		$vavailComps = iterator_to_array($vavailability->VAVAILABILITY);
+		usort(
+			$vavailComps,
+			function ($a, $b) {
+				// We need to order the components by priority. Priority 1
+				// comes first, up until priority 9. Priority 0 comes after
+				// priority 9. No priority implies priority 0.
+				//
+				// Yes, I'm serious.
+				$priorityA = isset($a->PRIORITY) ? (int) $a->PRIORITY->getValue() : 0;
+				$priorityB = isset($b->PRIORITY) ? (int) $b->PRIORITY->getValue() : 0;
+
+				if (0 === $priorityA) {
+					$priorityA = 10;
+				}
+				if (0 === $priorityB) {
+					$priorityB = 10;
+				}
+
+				return $priorityA - $priorityB;
+			}
+		);
+
+		// Now we go over all the VAVAILABILITY components and figure if
+		// there's any we don't need to consider.
+		//
+		// This is can be because of one of two reasons: either the
+		// VAVAILABILITY component falls outside the time we are interested in,
+		// or a different VAVAILABILITY component with a higher priority has
+		// already completely covered the time-range.
+		$old = $vavailComps;
+		$new = [];
+
+		foreach ($old as $vavail) {
+			list($compStart, $compEnd) = $vavail->getEffectiveStartEnd();
+
+			// We don't care about datetimes that are earlier or later than the
+			// start and end of the freebusy report, so this gets normalized
+			// first.
+			if (is_null($compStart) || $compStart < $this->start) {
+				$compStart = $this->start;
+			}
+			if (is_null($compEnd) || $compEnd > $this->end) {
+				$compEnd = $this->end;
+			}
+
+			// If the item fell out of the timerange, we can just skip it.
+			if ($compStart > $this->end || $compEnd < $this->start) {
+				continue;
+			}
+
+			// Going through our existing list of components to see if there's
+			// a higher priority component that already fully covers this one.
+			foreach ($new as $higherVavail) {
+				list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
+				if (
+					(is_null($higherStart) || $higherStart < $compStart) &&
+					(is_null($higherEnd) || $higherEnd > $compEnd)
+				) {
+					// Component is fully covered by a higher priority
+					// component. We can skip this component.
+					continue 2;
+				}
+			}
+
+			// We're keeping it!
+			$new[] = $vavail;
+		}
+
+		// Lastly, we need to traverse the remaining components and fill in the
+		// freebusydata slots.
+		//
+		// We traverse the components in reverse, because we want the higher
+		// priority components to override the lower ones.
+		foreach (array_reverse($new) as $vavail) {
+			$busyType = isset($vavail->BUSYTYPE) ? strtoupper($vavail->BUSYTYPE) : 'BUSY-UNAVAILABLE';
+			list($vavailStart, $vavailEnd) = $vavail->getEffectiveStartEnd();
+
+			// Making the component size no larger than the requested free-busy
+			// report range.
+			if (!$vavailStart || $vavailStart < $this->start) {
+				$vavailStart = $this->start;
+			}
+			if (!$vavailEnd || $vavailEnd > $this->end) {
+				$vavailEnd = $this->end;
+			}
+
+			// Marking the entire time range of the VAVAILABILITY component as
+			// busy.
+			$fbData->add(
+				$vavailStart->getTimeStamp(),
+				$vavailEnd->getTimeStamp(),
+				$busyType
+			);
+
+			// Looping over the AVAILABLE components.
+			if (isset($vavail->AVAILABLE)) {
+				foreach ($vavail->AVAILABLE as $available) {
+					list($availStart, $availEnd) = $available->getEffectiveStartEnd();
+					$fbData->add(
+					$availStart->getTimeStamp(),
+					$availEnd->getTimeStamp(),
+					'FREE'
+				);
+
+					if ($available->RRULE) {
+						// Our favourite thing: recurrence!!
+
+						$rruleIterator = new Recur\RRuleIterator(
+						$available->RRULE->getValue(),
+						$availStart
+					);
+						$rruleIterator->fastForward($vavailStart);
+
+						$startEndDiff = $availStart->diff($availEnd);
+
+						while ($rruleIterator->valid()) {
+							$recurStart = $rruleIterator->current();
+							$recurEnd = $recurStart->add($startEndDiff);
+
+							if ($recurStart > $vavailEnd) {
+								// We're beyond the legal timerange.
+								break;
+							}
+
+							if ($recurEnd > $vavailEnd) {
+								// Truncating the end if it exceeds the
+								// VAVAILABILITY end.
+								$recurEnd = $vavailEnd;
+							}
+
+							$fbData->add(
+							$recurStart->getTimeStamp(),
+							$recurEnd->getTimeStamp(),
+							'FREE'
+						);
+
+							$rruleIterator->next();
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This method takes an array of iCalendar objects and applies its busy
+	 * times on fbData.
+	 *
+	 * @param VCalendar[] $objects
+	 */
+	protected function calculateBusy(FreeBusyData $fbData, array $objects)
+	{
+		foreach ($objects as $key => $object) {
+			foreach ($object->getBaseComponents() as $component) {
+				switch ($component->name) {
+					case 'VEVENT':
+						$FBTYPE = 'BUSY';
+						if (isset($component->TRANSP) && ('TRANSPARENT' === strtoupper($component->TRANSP))) {
+							break;
+						}
+						if (isset($component->STATUS)) {
+							$status = strtoupper($component->STATUS);
+							if ('CANCELLED' === $status) {
+								break;
+							}
+							if ('TENTATIVE' === $status) {
+								$FBTYPE = 'BUSY-TENTATIVE';
+							}
+						}
+
+						$times = [];
+
+						if ($component->RRULE) {
+							try {
+								$iterator = new EventIterator($object, (string) $component->UID, $this->timeZone);
+							} catch (NoInstancesException $e) {
+								// This event is recurring, but it doesn't have a single
+								// instance. We are skipping this event from the output
+								// entirely.
+								unset($this->objects[$key]);
+								break;
+							}
+
+							if ($this->start) {
+								$iterator->fastForward($this->start);
+							}
+
+							$maxRecurrences = Settings::$maxRecurrences;
+
+							while ($iterator->valid() && --$maxRecurrences) {
+								$startTime = $iterator->getDTStart();
+								if ($this->end && $startTime > $this->end) {
+									break;
+								}
+								$times[] = [
+									$iterator->getDTStart(),
+									$iterator->getDTEnd(),
+								];
+
+								$iterator->next();
+							}
+						} else {
+							$startTime = $component->DTSTART->getDateTime($this->timeZone);
+							if ($this->end && $startTime > $this->end) {
+								break;
+							}
+							$endTime = null;
+							if (isset($component->DTEND)) {
+								$endTime = $component->DTEND->getDateTime($this->timeZone);
+							} elseif (isset($component->DURATION)) {
+								$duration = DateTimeParser::parseDuration((string) $component->DURATION);
+								$endTime = clone $startTime;
+								$endTime = $endTime->add($duration);
+							} elseif (!$component->DTSTART->hasTime()) {
+								$endTime = clone $startTime;
+								$endTime = $endTime->modify('+1 day');
+							} else {
+								// The event had no duration (0 seconds)
+								break;
+							}
+
+							$times[] = [$startTime, $endTime];
+						}
+
+						foreach ($times as $time) {
+							if ($this->end && $time[0] > $this->end) {
+								break;
+							}
+							if ($this->start && $time[1] < $this->start) {
+								break;
+							}
+
+							$fbData->add(
+								$time[0]->getTimeStamp(),
+								$time[1]->getTimeStamp(),
+								$FBTYPE
+							);
+						}
+						break;
+
+					case 'VFREEBUSY':
+						foreach ($component->FREEBUSY as $freebusy) {
+							$fbType = isset($freebusy['FBTYPE']) ? strtoupper($freebusy['FBTYPE']) : 'BUSY';
+
+							// Skipping intervals marked as 'free'
+							if ('FREE' === $fbType) {
+								continue;
+							}
+
+							$values = explode(',', $freebusy);
+							foreach ($values as $value) {
+								list($startTime, $endTime) = explode('/', $value);
+								$startTime = DateTimeParser::parseDateTime($startTime);
+
+								if ('P' === substr($endTime, 0, 1) || '-P' === substr($endTime, 0, 2)) {
+									$duration = DateTimeParser::parseDuration($endTime);
+									$endTime = clone $startTime;
+									$endTime = $endTime->add($duration);
+								} else {
+									$endTime = DateTimeParser::parseDateTime($endTime);
+								}
+
+								if ($this->start && $this->start > $endTime) {
+									continue;
+								}
+								if ($this->end && $this->end < $startTime) {
+									continue;
+								}
+								$fbData->add(
+									$startTime->getTimeStamp(),
+									$endTime->getTimeStamp(),
+									$fbType
+								);
+							}
+						}
+						break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * This method takes a FreeBusyData object and generates the VCALENDAR
+	 * object associated with it.
+	 *
+	 * @return VCalendar
+	 */
+	protected function generateFreeBusyCalendar(FreeBusyData $fbData)
+	{
+		if ($this->baseObject) {
+			$calendar = $this->baseObject;
+		} else {
+			$calendar = new VCalendar();
+		}
+
+		$vfreebusy = $calendar->createComponent('VFREEBUSY');
+		$calendar->add($vfreebusy);
+
+		if ($this->start) {
+			$dtstart = $calendar->createProperty('DTSTART');
+			$dtstart->setDateTime($this->start);
+			$vfreebusy->add($dtstart);
+		}
+		if ($this->end) {
+			$dtend = $calendar->createProperty('DTEND');
+			$dtend->setDateTime($this->end);
+			$vfreebusy->add($dtend);
+		}
+
+		$tz = new \DateTimeZone('UTC');
+		$dtstamp = $calendar->createProperty('DTSTAMP');
+		$dtstamp->setDateTime(new DateTimeImmutable('now', $tz));
+		$vfreebusy->add($dtstamp);
+
+		foreach ($fbData->getData() as $busyTime) {
+			$busyType = strtoupper($busyTime['type']);
+
+			// Ignoring all the FREE parts, because those are already assumed.
+			if ('FREE' === $busyType) {
+				continue;
+			}
+
+			$busyTime[0] = new \DateTimeImmutable('@'.$busyTime['start'], $tz);
+			$busyTime[1] = new \DateTimeImmutable('@'.$busyTime['end'], $tz);
+
+			$prop = $calendar->createProperty(
+				'FREEBUSY',
+				$busyTime[0]->format('Ymd\\THis\\Z').'/'.$busyTime[1]->format('Ymd\\THis\\Z')
+			);
+
+			// Only setting FBTYPE if it's not BUSY, because BUSY is the
+			// default anyway.
+			if ('BUSY' !== $busyType) {
+				$prop['FBTYPE'] = $busyType;
+			}
+			$vfreebusy->add($prop);
+		}
+
+		return $calendar;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -208,7 +208,7 @@
         $vavailComps = iterator_to_array($vavailability->VAVAILABILITY);
         usort(
             $vavailComps,
-            function ($a, $b) {
+            function($a, $b) {
                 // We need to order the components by priority. Priority 1
                 // comes first, up until priority 9. Priority 0 comes after
                 // priority 9. No priority implies priority 0.

htdocs/includes/sabre/sabre/vobject/lib/timezonedata/lotuszones.php

Indentation +90 added lines, -90 removed lines

@@ -8,94 +8,94 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 return [
-    'Dateline' => 'Etc/GMT-12',
-    'Samoa' => 'Pacific/Apia',
-    'Hawaiian' => 'Pacific/Honolulu',
-    'Alaskan' => 'America/Anchorage',
-    'Pacific' => 'America/Los_Angeles',
-    'Pacific Standard Time' => 'America/Los_Angeles',
-    'Mexico Standard Time 2' => 'America/Chihuahua',
-    'Mountain' => 'America/Denver',
-    // 'Mountain Standard Time' => 'America/Chihuahua', // conflict with windows timezones.
-    'US Mountain' => 'America/Phoenix',
-    'Canada Central' => 'America/Edmonton',
-    'Central America' => 'America/Guatemala',
-    'Central' => 'America/Chicago',
-    // 'Central Standard Time'  => 'America/Mexico_City', // conflict with windows timezones.
-    'Mexico' => 'America/Mexico_City',
-    'Eastern' => 'America/New_York',
-    'SA Pacific' => 'America/Bogota',
-    'US Eastern' => 'America/Indiana/Indianapolis',
-    'Venezuela' => 'America/Caracas',
-    'Atlantic' => 'America/Halifax',
-    'Central Brazilian' => 'America/Manaus',
-    'Pacific SA' => 'America/Santiago',
-    'SA Western' => 'America/La_Paz',
-    'Newfoundland' => 'America/St_Johns',
-    'Argentina' => 'America/Argentina/Buenos_Aires',
-    'E. South America' => 'America/Belem',
-    'Greenland' => 'America/Godthab',
-    'Montevideo' => 'America/Montevideo',
-    'SA Eastern' => 'America/Belem',
-    // 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
-    'Azores' => 'Atlantic/Azores',
-    'Cape Verde' => 'Atlantic/Cape_Verde',
-    'Greenwich' => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
-    'Morocco' => 'Africa/Casablanca',
-    'Central Europe' => 'Europe/Prague',
-    'Central European' => 'Europe/Sarajevo',
-    'Romance' => 'Europe/Paris',
-    'W. Central Africa' => 'Africa/Lagos', // Best guess
-    'W. Europe' => 'Europe/Amsterdam',
-    'E. Europe' => 'Europe/Minsk',
-    'Egypt' => 'Africa/Cairo',
-    'FLE' => 'Europe/Helsinki',
-    'GTB' => 'Europe/Athens',
-    'Israel' => 'Asia/Jerusalem',
-    'Jordan' => 'Asia/Amman',
-    'Middle East' => 'Asia/Beirut',
-    'Namibia' => 'Africa/Windhoek',
-    'South Africa' => 'Africa/Harare',
-    'Arab' => 'Asia/Kuwait',
-    'Arabic' => 'Asia/Baghdad',
-    'E. Africa' => 'Africa/Nairobi',
-    'Georgian' => 'Asia/Tbilisi',
-    'Russian' => 'Europe/Moscow',
-    'Iran' => 'Asia/Tehran',
-    'Arabian' => 'Asia/Muscat',
-    'Armenian' => 'Asia/Yerevan',
-    'Azerbijan' => 'Asia/Baku',
-    'Caucasus' => 'Asia/Yerevan',
-    'Mauritius' => 'Indian/Mauritius',
-    'Afghanistan' => 'Asia/Kabul',
-    'Ekaterinburg' => 'Asia/Yekaterinburg',
-    'Pakistan' => 'Asia/Karachi',
-    'West Asia' => 'Asia/Tashkent',
-    'India' => 'Asia/Calcutta',
-    'Sri Lanka' => 'Asia/Colombo',
-    'Nepal' => 'Asia/Kathmandu',
-    'Central Asia' => 'Asia/Dhaka',
-    'N. Central Asia' => 'Asia/Almaty',
-    'Myanmar' => 'Asia/Rangoon',
-    'North Asia' => 'Asia/Krasnoyarsk',
-    'SE Asia' => 'Asia/Bangkok',
-    'China' => 'Asia/Shanghai',
-    'North Asia East' => 'Asia/Irkutsk',
-    'Singapore' => 'Asia/Singapore',
-    'Taipei' => 'Asia/Taipei',
-    'W. Australia' => 'Australia/Perth',
-    'Korea' => 'Asia/Seoul',
-    'Tokyo' => 'Asia/Tokyo',
-    'Yakutsk' => 'Asia/Yakutsk',
-    'AUS Central' => 'Australia/Darwin',
-    'Cen. Australia' => 'Australia/Adelaide',
-    'AUS Eastern' => 'Australia/Sydney',
-    'E. Australia' => 'Australia/Brisbane',
-    'Tasmania' => 'Australia/Hobart',
-    'Vladivostok' => 'Asia/Vladivostok',
-    'West Pacific' => 'Pacific/Guam',
-    'Central Pacific' => 'Asia/Magadan',
-    'Fiji' => 'Pacific/Fiji',
-    'New Zealand' => 'Pacific/Auckland',
-    'Tonga' => 'Pacific/Tongatapu',
+	'Dateline' => 'Etc/GMT-12',
+	'Samoa' => 'Pacific/Apia',
+	'Hawaiian' => 'Pacific/Honolulu',
+	'Alaskan' => 'America/Anchorage',
+	'Pacific' => 'America/Los_Angeles',
+	'Pacific Standard Time' => 'America/Los_Angeles',
+	'Mexico Standard Time 2' => 'America/Chihuahua',
+	'Mountain' => 'America/Denver',
+	// 'Mountain Standard Time' => 'America/Chihuahua', // conflict with windows timezones.
+	'US Mountain' => 'America/Phoenix',
+	'Canada Central' => 'America/Edmonton',
+	'Central America' => 'America/Guatemala',
+	'Central' => 'America/Chicago',
+	// 'Central Standard Time'  => 'America/Mexico_City', // conflict with windows timezones.
+	'Mexico' => 'America/Mexico_City',
+	'Eastern' => 'America/New_York',
+	'SA Pacific' => 'America/Bogota',
+	'US Eastern' => 'America/Indiana/Indianapolis',
+	'Venezuela' => 'America/Caracas',
+	'Atlantic' => 'America/Halifax',
+	'Central Brazilian' => 'America/Manaus',
+	'Pacific SA' => 'America/Santiago',
+	'SA Western' => 'America/La_Paz',
+	'Newfoundland' => 'America/St_Johns',
+	'Argentina' => 'America/Argentina/Buenos_Aires',
+	'E. South America' => 'America/Belem',
+	'Greenland' => 'America/Godthab',
+	'Montevideo' => 'America/Montevideo',
+	'SA Eastern' => 'America/Belem',
+	// 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
+	'Azores' => 'Atlantic/Azores',
+	'Cape Verde' => 'Atlantic/Cape_Verde',
+	'Greenwich' => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
+	'Morocco' => 'Africa/Casablanca',
+	'Central Europe' => 'Europe/Prague',
+	'Central European' => 'Europe/Sarajevo',
+	'Romance' => 'Europe/Paris',
+	'W. Central Africa' => 'Africa/Lagos', // Best guess
+	'W. Europe' => 'Europe/Amsterdam',
+	'E. Europe' => 'Europe/Minsk',
+	'Egypt' => 'Africa/Cairo',
+	'FLE' => 'Europe/Helsinki',
+	'GTB' => 'Europe/Athens',
+	'Israel' => 'Asia/Jerusalem',
+	'Jordan' => 'Asia/Amman',
+	'Middle East' => 'Asia/Beirut',
+	'Namibia' => 'Africa/Windhoek',
+	'South Africa' => 'Africa/Harare',
+	'Arab' => 'Asia/Kuwait',
+	'Arabic' => 'Asia/Baghdad',
+	'E. Africa' => 'Africa/Nairobi',
+	'Georgian' => 'Asia/Tbilisi',
+	'Russian' => 'Europe/Moscow',
+	'Iran' => 'Asia/Tehran',
+	'Arabian' => 'Asia/Muscat',
+	'Armenian' => 'Asia/Yerevan',
+	'Azerbijan' => 'Asia/Baku',
+	'Caucasus' => 'Asia/Yerevan',
+	'Mauritius' => 'Indian/Mauritius',
+	'Afghanistan' => 'Asia/Kabul',
+	'Ekaterinburg' => 'Asia/Yekaterinburg',
+	'Pakistan' => 'Asia/Karachi',
+	'West Asia' => 'Asia/Tashkent',
+	'India' => 'Asia/Calcutta',
+	'Sri Lanka' => 'Asia/Colombo',
+	'Nepal' => 'Asia/Kathmandu',
+	'Central Asia' => 'Asia/Dhaka',
+	'N. Central Asia' => 'Asia/Almaty',
+	'Myanmar' => 'Asia/Rangoon',
+	'North Asia' => 'Asia/Krasnoyarsk',
+	'SE Asia' => 'Asia/Bangkok',
+	'China' => 'Asia/Shanghai',
+	'North Asia East' => 'Asia/Irkutsk',
+	'Singapore' => 'Asia/Singapore',
+	'Taipei' => 'Asia/Taipei',
+	'W. Australia' => 'Australia/Perth',
+	'Korea' => 'Asia/Seoul',
+	'Tokyo' => 'Asia/Tokyo',
+	'Yakutsk' => 'Asia/Yakutsk',
+	'AUS Central' => 'Australia/Darwin',
+	'Cen. Australia' => 'Australia/Adelaide',
+	'AUS Eastern' => 'Australia/Sydney',
+	'E. Australia' => 'Australia/Brisbane',
+	'Tasmania' => 'Australia/Hobart',
+	'Vladivostok' => 'Asia/Vladivostok',
+	'West Pacific' => 'Pacific/Guam',
+	'Central Pacific' => 'Asia/Magadan',
+	'Fiji' => 'Pacific/Fiji',
+	'New Zealand' => 'Pacific/Auckland',
+	'Tonga' => 'Pacific/Tongatapu',
 ];

htdocs/includes/sabre/sabre/vobject/lib/timezonedata/exchangezones.php

Indentation +79 added lines, -79 removed lines

@@ -12,83 +12,83 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 return [
-    'Universal Coordinated Time' => 'UTC',
-    'Casablanca, Monrovia' => 'Africa/Casablanca',
-    'Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London' => 'Europe/Lisbon',
-    'Greenwich Mean Time; Dublin, Edinburgh, London' => 'Europe/London',
-    'Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna' => 'Europe/Berlin',
-    'Belgrade, Pozsony, Budapest, Ljubljana, Prague' => 'Europe/Prague',
-    'Brussels, Copenhagen, Madrid, Paris' => 'Europe/Paris',
-    'Paris, Madrid, Brussels, Copenhagen' => 'Europe/Paris',
-    'Prague, Central Europe' => 'Europe/Prague',
-    'Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb' => 'Europe/Sarajevo',
-    'West Central Africa' => 'Africa/Luanda', // This was a best guess
-    'Athens, Istanbul, Minsk' => 'Europe/Athens',
-    'Bucharest' => 'Europe/Bucharest',
-    'Cairo' => 'Africa/Cairo',
-    'Harare, Pretoria' => 'Africa/Harare',
-    'Helsinki, Riga, Tallinn' => 'Europe/Helsinki',
-    'Israel, Jerusalem Standard Time' => 'Asia/Jerusalem',
-    'Baghdad' => 'Asia/Baghdad',
-    'Arab, Kuwait, Riyadh' => 'Asia/Kuwait',
-    'Moscow, St. Petersburg, Volgograd' => 'Europe/Moscow',
-    'East Africa, Nairobi' => 'Africa/Nairobi',
-    'Tehran' => 'Asia/Tehran',
-    'Abu Dhabi, Muscat' => 'Asia/Muscat', // Best guess
-    'Baku, Tbilisi, Yerevan' => 'Asia/Baku',
-    'Kabul' => 'Asia/Kabul',
-    'Ekaterinburg' => 'Asia/Yekaterinburg',
-    'Islamabad, Karachi, Tashkent' => 'Asia/Karachi',
-    'Kolkata, Chennai, Mumbai, New Delhi, India Standard Time' => 'Asia/Calcutta',
-    'Kathmandu, Nepal' => 'Asia/Kathmandu',
-    'Almaty, Novosibirsk, North Central Asia' => 'Asia/Almaty',
-    'Astana, Dhaka' => 'Asia/Dhaka',
-    'Sri Jayawardenepura, Sri Lanka' => 'Asia/Colombo',
-    'Rangoon' => 'Asia/Rangoon',
-    'Bangkok, Hanoi, Jakarta' => 'Asia/Bangkok',
-    'Krasnoyarsk' => 'Asia/Krasnoyarsk',
-    'Beijing, Chongqing, Hong Kong SAR, Urumqi' => 'Asia/Shanghai',
-    'Irkutsk, Ulaan Bataar' => 'Asia/Irkutsk',
-    'Kuala Lumpur, Singapore' => 'Asia/Singapore',
-    'Perth, Western Australia' => 'Australia/Perth',
-    'Taipei' => 'Asia/Taipei',
-    'Osaka, Sapporo, Tokyo' => 'Asia/Tokyo',
-    'Seoul, Korea Standard time' => 'Asia/Seoul',
-    'Yakutsk' => 'Asia/Yakutsk',
-    'Adelaide, Central Australia' => 'Australia/Adelaide',
-    'Darwin' => 'Australia/Darwin',
-    'Brisbane, East Australia' => 'Australia/Brisbane',
-    'Canberra, Melbourne, Sydney, Hobart (year 2000 only)' => 'Australia/Sydney',
-    'Guam, Port Moresby' => 'Pacific/Guam',
-    'Hobart, Tasmania' => 'Australia/Hobart',
-    'Vladivostok' => 'Asia/Vladivostok',
-    'Magadan, Solomon Is., New Caledonia' => 'Asia/Magadan',
-    'Auckland, Wellington' => 'Pacific/Auckland',
-    'Fiji Islands, Kamchatka, Marshall Is.' => 'Pacific/Fiji',
-    'Nuku\'alofa, Tonga' => 'Pacific/Tongatapu',
-    'Azores' => 'Atlantic/Azores',
-    'Cape Verde Is.' => 'Atlantic/Cape_Verde',
-    'Mid-Atlantic' => 'America/Noronha',
-    'Brasilia' => 'America/Sao_Paulo', // Best guess
-    'Buenos Aires' => 'America/Argentina/Buenos_Aires',
-    'Greenland' => 'America/Godthab',
-    'Newfoundland' => 'America/St_Johns',
-    'Atlantic Time (Canada)' => 'America/Halifax',
-    'Caracas, La Paz' => 'America/Caracas',
-    'Santiago' => 'America/Santiago',
-    'Bogota, Lima, Quito' => 'America/Bogota',
-    'Eastern Time (US & Canada)' => 'America/New_York',
-    'Indiana (East)' => 'America/Indiana/Indianapolis',
-    'Central America' => 'America/Guatemala',
-    'Central Time (US & Canada)' => 'America/Chicago',
-    'Mexico City, Tegucigalpa' => 'America/Mexico_City',
-    'Saskatchewan' => 'America/Edmonton',
-    'Arizona' => 'America/Phoenix',
-    'Mountain Time (US & Canada)' => 'America/Denver', // Best guess
-    'Pacific Time (US & Canada)' => 'America/Los_Angeles', // Best guess
-    'Pacific Time (US & Canada); Tijuana' => 'America/Los_Angeles', // Best guess
-    'Alaska' => 'America/Anchorage',
-    'Hawaii' => 'Pacific/Honolulu',
-    'Midway Island, Samoa' => 'Pacific/Midway',
-    'Eniwetok, Kwajalein, Dateline Time' => 'Pacific/Kwajalein',
+	'Universal Coordinated Time' => 'UTC',
+	'Casablanca, Monrovia' => 'Africa/Casablanca',
+	'Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London' => 'Europe/Lisbon',
+	'Greenwich Mean Time; Dublin, Edinburgh, London' => 'Europe/London',
+	'Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna' => 'Europe/Berlin',
+	'Belgrade, Pozsony, Budapest, Ljubljana, Prague' => 'Europe/Prague',
+	'Brussels, Copenhagen, Madrid, Paris' => 'Europe/Paris',
+	'Paris, Madrid, Brussels, Copenhagen' => 'Europe/Paris',
+	'Prague, Central Europe' => 'Europe/Prague',
+	'Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb' => 'Europe/Sarajevo',
+	'West Central Africa' => 'Africa/Luanda', // This was a best guess
+	'Athens, Istanbul, Minsk' => 'Europe/Athens',
+	'Bucharest' => 'Europe/Bucharest',
+	'Cairo' => 'Africa/Cairo',
+	'Harare, Pretoria' => 'Africa/Harare',
+	'Helsinki, Riga, Tallinn' => 'Europe/Helsinki',
+	'Israel, Jerusalem Standard Time' => 'Asia/Jerusalem',
+	'Baghdad' => 'Asia/Baghdad',
+	'Arab, Kuwait, Riyadh' => 'Asia/Kuwait',
+	'Moscow, St. Petersburg, Volgograd' => 'Europe/Moscow',
+	'East Africa, Nairobi' => 'Africa/Nairobi',
+	'Tehran' => 'Asia/Tehran',
+	'Abu Dhabi, Muscat' => 'Asia/Muscat', // Best guess
+	'Baku, Tbilisi, Yerevan' => 'Asia/Baku',
+	'Kabul' => 'Asia/Kabul',
+	'Ekaterinburg' => 'Asia/Yekaterinburg',
+	'Islamabad, Karachi, Tashkent' => 'Asia/Karachi',
+	'Kolkata, Chennai, Mumbai, New Delhi, India Standard Time' => 'Asia/Calcutta',
+	'Kathmandu, Nepal' => 'Asia/Kathmandu',
+	'Almaty, Novosibirsk, North Central Asia' => 'Asia/Almaty',
+	'Astana, Dhaka' => 'Asia/Dhaka',
+	'Sri Jayawardenepura, Sri Lanka' => 'Asia/Colombo',
+	'Rangoon' => 'Asia/Rangoon',
+	'Bangkok, Hanoi, Jakarta' => 'Asia/Bangkok',
+	'Krasnoyarsk' => 'Asia/Krasnoyarsk',
+	'Beijing, Chongqing, Hong Kong SAR, Urumqi' => 'Asia/Shanghai',
+	'Irkutsk, Ulaan Bataar' => 'Asia/Irkutsk',
+	'Kuala Lumpur, Singapore' => 'Asia/Singapore',
+	'Perth, Western Australia' => 'Australia/Perth',
+	'Taipei' => 'Asia/Taipei',
+	'Osaka, Sapporo, Tokyo' => 'Asia/Tokyo',
+	'Seoul, Korea Standard time' => 'Asia/Seoul',
+	'Yakutsk' => 'Asia/Yakutsk',
+	'Adelaide, Central Australia' => 'Australia/Adelaide',
+	'Darwin' => 'Australia/Darwin',
+	'Brisbane, East Australia' => 'Australia/Brisbane',
+	'Canberra, Melbourne, Sydney, Hobart (year 2000 only)' => 'Australia/Sydney',
+	'Guam, Port Moresby' => 'Pacific/Guam',
+	'Hobart, Tasmania' => 'Australia/Hobart',
+	'Vladivostok' => 'Asia/Vladivostok',
+	'Magadan, Solomon Is., New Caledonia' => 'Asia/Magadan',
+	'Auckland, Wellington' => 'Pacific/Auckland',
+	'Fiji Islands, Kamchatka, Marshall Is.' => 'Pacific/Fiji',
+	'Nuku\'alofa, Tonga' => 'Pacific/Tongatapu',
+	'Azores' => 'Atlantic/Azores',
+	'Cape Verde Is.' => 'Atlantic/Cape_Verde',
+	'Mid-Atlantic' => 'America/Noronha',
+	'Brasilia' => 'America/Sao_Paulo', // Best guess
+	'Buenos Aires' => 'America/Argentina/Buenos_Aires',
+	'Greenland' => 'America/Godthab',
+	'Newfoundland' => 'America/St_Johns',
+	'Atlantic Time (Canada)' => 'America/Halifax',
+	'Caracas, La Paz' => 'America/Caracas',
+	'Santiago' => 'America/Santiago',
+	'Bogota, Lima, Quito' => 'America/Bogota',
+	'Eastern Time (US & Canada)' => 'America/New_York',
+	'Indiana (East)' => 'America/Indiana/Indianapolis',
+	'Central America' => 'America/Guatemala',
+	'Central Time (US & Canada)' => 'America/Chicago',
+	'Mexico City, Tegucigalpa' => 'America/Mexico_City',
+	'Saskatchewan' => 'America/Edmonton',
+	'Arizona' => 'America/Phoenix',
+	'Mountain Time (US & Canada)' => 'America/Denver', // Best guess
+	'Pacific Time (US & Canada)' => 'America/Los_Angeles', // Best guess
+	'Pacific Time (US & Canada); Tijuana' => 'America/Los_Angeles', // Best guess
+	'Alaska' => 'America/Anchorage',
+	'Hawaii' => 'Pacific/Honolulu',
+	'Midway Island, Samoa' => 'Pacific/Midway',
+	'Eniwetok, Kwajalein, Dateline Time' => 'Pacific/Kwajalein',
 ];

htdocs/includes/sabre/sabre/vobject/lib/timezonedata/php-workaround.php

Indentation +28 added lines, -28 removed lines

@@ -15,32 +15,32 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 return [
-    'CST6CDT' => 'America/Chicago',
-    'Cuba' => 'America/Havana',
-    'Egypt' => 'Africa/Cairo',
-    'Eire' => 'Europe/Dublin',
-    'EST5EDT' => 'America/New_York',
-    'Factory' => 'UTC',
-    'GB-Eire' => 'Europe/London',
-    'GMT0' => 'UTC',
-    'Greenwich' => 'UTC',
-    'Hongkong' => 'Asia/Hong_Kong',
-    'Iceland' => 'Atlantic/Reykjavik',
-    'Iran' => 'Asia/Tehran',
-    'Israel' => 'Asia/Jerusalem',
-    'Jamaica' => 'America/Jamaica',
-    'Japan' => 'Asia/Tokyo',
-    'Kwajalein' => 'Pacific/Kwajalein',
-    'Libya' => 'Africa/Tripoli',
-    'MST7MDT' => 'America/Denver',
-    'Navajo' => 'America/Denver',
-    'NZ-CHAT' => 'Pacific/Chatham',
-    'Poland' => 'Europe/Warsaw',
-    'Portugal' => 'Europe/Lisbon',
-    'PST8PDT' => 'America/Los_Angeles',
-    'Singapore' => 'Asia/Singapore',
-    'Turkey' => 'Europe/Istanbul',
-    'Universal' => 'UTC',
-    'W-SU' => 'Europe/Moscow',
-    'Zulu' => 'UTC',
+	'CST6CDT' => 'America/Chicago',
+	'Cuba' => 'America/Havana',
+	'Egypt' => 'Africa/Cairo',
+	'Eire' => 'Europe/Dublin',
+	'EST5EDT' => 'America/New_York',
+	'Factory' => 'UTC',
+	'GB-Eire' => 'Europe/London',
+	'GMT0' => 'UTC',
+	'Greenwich' => 'UTC',
+	'Hongkong' => 'Asia/Hong_Kong',
+	'Iceland' => 'Atlantic/Reykjavik',
+	'Iran' => 'Asia/Tehran',
+	'Israel' => 'Asia/Jerusalem',
+	'Jamaica' => 'America/Jamaica',
+	'Japan' => 'Asia/Tokyo',
+	'Kwajalein' => 'Pacific/Kwajalein',
+	'Libya' => 'Africa/Tripoli',
+	'MST7MDT' => 'America/Denver',
+	'Navajo' => 'America/Denver',
+	'NZ-CHAT' => 'Pacific/Chatham',
+	'Poland' => 'Europe/Warsaw',
+	'Portugal' => 'Europe/Lisbon',
+	'PST8PDT' => 'America/Los_Angeles',
+	'Singapore' => 'Asia/Singapore',
+	'Turkey' => 'Europe/Istanbul',
+	'Universal' => 'UTC',
+	'W-SU' => 'Europe/Moscow',
+	'Zulu' => 'UTC',
 ];

htdocs/includes/sabre/sabre/vobject/lib/timezonedata/php-bc.php

Indentation +133 added lines, -133 removed lines

@@ -16,137 +16,137 @@
  * @license http://sabre.io/license/ Modified BSD License
  */
 return [
-    'Africa/Asmera',
-    'Africa/Timbuktu',
-    'America/Argentina/ComodRivadavia',
-    'America/Atka',
-    'America/Buenos_Aires',
-    'America/Catamarca',
-    'America/Coral_Harbour',
-    'America/Cordoba',
-    'America/Ensenada',
-    'America/Fort_Wayne',
-    'America/Indianapolis',
-    'America/Jujuy',
-    'America/Knox_IN',
-    'America/Louisville',
-    'America/Mendoza',
-    'America/Montreal',
-    'America/Porto_Acre',
-    'America/Rosario',
-    'America/Shiprock',
-    'America/Virgin',
-    'Antarctica/South_Pole',
-    'Asia/Ashkhabad',
-    'Asia/Calcutta',
-    'Asia/Chungking',
-    'Asia/Dacca',
-    'Asia/Istanbul',
-    'Asia/Katmandu',
-    'Asia/Macao',
-    'Asia/Saigon',
-    'Asia/Tel_Aviv',
-    'Asia/Thimbu',
-    'Asia/Ujung_Pandang',
-    'Asia/Ulan_Bator',
-    'Atlantic/Faeroe',
-    'Atlantic/Jan_Mayen',
-    'Australia/ACT',
-    'Australia/Canberra',
-    'Australia/LHI',
-    'Australia/North',
-    'Australia/NSW',
-    'Australia/Queensland',
-    'Australia/South',
-    'Australia/Tasmania',
-    'Australia/Victoria',
-    'Australia/West',
-    'Australia/Yancowinna',
-    'Brazil/Acre',
-    'Brazil/DeNoronha',
-    'Brazil/East',
-    'Brazil/West',
-    'Canada/Atlantic',
-    'Canada/Central',
-    'Canada/Eastern',
-    'Canada/Mountain',
-    'Canada/Newfoundland',
-    'Canada/Pacific',
-    'Canada/Saskatchewan',
-    'Canada/Yukon',
-    'CET',
-    'Chile/Continental',
-    'Chile/EasterIsland',
-    'EET',
-    'EST',
-    'Etc/GMT',
-    'Etc/GMT+0',
-    'Etc/GMT+1',
-    'Etc/GMT+10',
-    'Etc/GMT+11',
-    'Etc/GMT+12',
-    'Etc/GMT+2',
-    'Etc/GMT+3',
-    'Etc/GMT+4',
-    'Etc/GMT+5',
-    'Etc/GMT+6',
-    'Etc/GMT+7',
-    'Etc/GMT+8',
-    'Etc/GMT+9',
-    'Etc/GMT-0',
-    'Etc/GMT-1',
-    'Etc/GMT-10',
-    'Etc/GMT-11',
-    'Etc/GMT-12',
-    'Etc/GMT-13',
-    'Etc/GMT-14',
-    'Etc/GMT-2',
-    'Etc/GMT-3',
-    'Etc/GMT-4',
-    'Etc/GMT-5',
-    'Etc/GMT-6',
-    'Etc/GMT-7',
-    'Etc/GMT-8',
-    'Etc/GMT-9',
-    'Etc/GMT0',
-    'Etc/Greenwich',
-    'Etc/UCT',
-    'Etc/Universal',
-    'Etc/UTC',
-    'Etc/Zulu',
-    'Europe/Belfast',
-    'Europe/Nicosia',
-    'Europe/Tiraspol',
-    'GB',
-    'GMT',
-    'GMT+0',
-    'GMT-0',
-    'HST',
-    'MET',
-    'Mexico/BajaNorte',
-    'Mexico/BajaSur',
-    'Mexico/General',
-    'MST',
-    'NZ',
-    'Pacific/Ponape',
-    'Pacific/Samoa',
-    'Pacific/Truk',
-    'Pacific/Yap',
-    'PRC',
-    'ROC',
-    'ROK',
-    'UCT',
-    'US/Alaska',
-    'US/Aleutian',
-    'US/Arizona',
-    'US/Central',
-    'US/East-Indiana',
-    'US/Eastern',
-    'US/Hawaii',
-    'US/Indiana-Starke',
-    'US/Michigan',
-    'US/Mountain',
-    'US/Pacific',
-    'US/Samoa',
-    'WET',
+	'Africa/Asmera',
+	'Africa/Timbuktu',
+	'America/Argentina/ComodRivadavia',
+	'America/Atka',
+	'America/Buenos_Aires',
+	'America/Catamarca',
+	'America/Coral_Harbour',
+	'America/Cordoba',
+	'America/Ensenada',
+	'America/Fort_Wayne',
+	'America/Indianapolis',
+	'America/Jujuy',
+	'America/Knox_IN',
+	'America/Louisville',
+	'America/Mendoza',
+	'America/Montreal',
+	'America/Porto_Acre',
+	'America/Rosario',
+	'America/Shiprock',
+	'America/Virgin',
+	'Antarctica/South_Pole',
+	'Asia/Ashkhabad',
+	'Asia/Calcutta',
+	'Asia/Chungking',
+	'Asia/Dacca',
+	'Asia/Istanbul',
+	'Asia/Katmandu',
+	'Asia/Macao',
+	'Asia/Saigon',
+	'Asia/Tel_Aviv',
+	'Asia/Thimbu',
+	'Asia/Ujung_Pandang',
+	'Asia/Ulan_Bator',
+	'Atlantic/Faeroe',
+	'Atlantic/Jan_Mayen',
+	'Australia/ACT',
+	'Australia/Canberra',
+	'Australia/LHI',
+	'Australia/North',
+	'Australia/NSW',
+	'Australia/Queensland',
+	'Australia/South',
+	'Australia/Tasmania',
+	'Australia/Victoria',
+	'Australia/West',
+	'Australia/Yancowinna',
+	'Brazil/Acre',
+	'Brazil/DeNoronha',
+	'Brazil/East',
+	'Brazil/West',
+	'Canada/Atlantic',
+	'Canada/Central',
+	'Canada/Eastern',
+	'Canada/Mountain',
+	'Canada/Newfoundland',
+	'Canada/Pacific',
+	'Canada/Saskatchewan',
+	'Canada/Yukon',
+	'CET',
+	'Chile/Continental',
+	'Chile/EasterIsland',
+	'EET',
+	'EST',
+	'Etc/GMT',
+	'Etc/GMT+0',
+	'Etc/GMT+1',
+	'Etc/GMT+10',
+	'Etc/GMT+11',
+	'Etc/GMT+12',
+	'Etc/GMT+2',
+	'Etc/GMT+3',
+	'Etc/GMT+4',
+	'Etc/GMT+5',
+	'Etc/GMT+6',
+	'Etc/GMT+7',
+	'Etc/GMT+8',
+	'Etc/GMT+9',
+	'Etc/GMT-0',
+	'Etc/GMT-1',
+	'Etc/GMT-10',
+	'Etc/GMT-11',
+	'Etc/GMT-12',
+	'Etc/GMT-13',
+	'Etc/GMT-14',
+	'Etc/GMT-2',
+	'Etc/GMT-3',
+	'Etc/GMT-4',
+	'Etc/GMT-5',
+	'Etc/GMT-6',
+	'Etc/GMT-7',
+	'Etc/GMT-8',
+	'Etc/GMT-9',
+	'Etc/GMT0',
+	'Etc/Greenwich',
+	'Etc/UCT',
+	'Etc/Universal',
+	'Etc/UTC',
+	'Etc/Zulu',
+	'Europe/Belfast',
+	'Europe/Nicosia',
+	'Europe/Tiraspol',
+	'GB',
+	'GMT',
+	'GMT+0',
+	'GMT-0',
+	'HST',
+	'MET',
+	'Mexico/BajaNorte',
+	'Mexico/BajaSur',
+	'Mexico/General',
+	'MST',
+	'NZ',
+	'Pacific/Ponape',
+	'Pacific/Samoa',
+	'Pacific/Truk',
+	'Pacific/Yap',
+	'PRC',
+	'ROC',
+	'ROK',
+	'UCT',
+	'US/Alaska',
+	'US/Aleutian',
+	'US/Arizona',
+	'US/Central',
+	'US/East-Indiana',
+	'US/Eastern',
+	'US/Hawaii',
+	'US/Indiana-Starke',
+	'US/Michigan',
+	'US/Mountain',
+	'US/Pacific',
+	'US/Samoa',
+	'WET',
 ];

htdocs/includes/sabre/sabre/vobject/lib/PHPUnitAssertions.php

Indentation +53 added lines, -53 removed lines

@@ -14,62 +14,62 @@
  */
 trait PHPUnitAssertions
 {
-    /**
-     * This method tests whether two vcards or icalendar objects are
-     * semantically identical.
-     *
-     * It supports objects being supplied as strings, streams or
-     * Sabre\VObject\Component instances.
-     *
-     * PRODID is removed from both objects as this is often changes and would
-     * just get in the way.
-     *
-     * CALSCALE will automatically get removed if it's set to GREGORIAN.
-     *
-     * Any property that has the value **ANY** will be treated as a wildcard.
-     *
-     * @param resource|string|Component $expected
-     * @param resource|string|Component $actual
-     * @param string                    $message
-     */
-    public function assertVObjectEqualsVObject($expected, $actual, $message = '')
-    {
-        $getObj = function ($input) {
-            if (is_resource($input)) {
-                $input = stream_get_contents($input);
-            }
-            if (is_string($input)) {
-                $input = Reader::read($input);
-            }
-            if (!$input instanceof Component) {
-                $this->fail('Input must be a string, stream or VObject component');
-            }
-            unset($input->PRODID);
-            if ($input instanceof Component\VCalendar && 'GREGORIAN' === (string) $input->CALSCALE) {
-                unset($input->CALSCALE);
-            }
+	/**
+	 * This method tests whether two vcards or icalendar objects are
+	 * semantically identical.
+	 *
+	 * It supports objects being supplied as strings, streams or
+	 * Sabre\VObject\Component instances.
+	 *
+	 * PRODID is removed from both objects as this is often changes and would
+	 * just get in the way.
+	 *
+	 * CALSCALE will automatically get removed if it's set to GREGORIAN.
+	 *
+	 * Any property that has the value **ANY** will be treated as a wildcard.
+	 *
+	 * @param resource|string|Component $expected
+	 * @param resource|string|Component $actual
+	 * @param string                    $message
+	 */
+	public function assertVObjectEqualsVObject($expected, $actual, $message = '')
+	{
+		$getObj = function ($input) {
+			if (is_resource($input)) {
+				$input = stream_get_contents($input);
+			}
+			if (is_string($input)) {
+				$input = Reader::read($input);
+			}
+			if (!$input instanceof Component) {
+				$this->fail('Input must be a string, stream or VObject component');
+			}
+			unset($input->PRODID);
+			if ($input instanceof Component\VCalendar && 'GREGORIAN' === (string) $input->CALSCALE) {
+				unset($input->CALSCALE);
+			}
 
-            return $input;
-        };
+			return $input;
+		};
 
-        $expected = $getObj($expected)->serialize();
-        $actual = $getObj($actual)->serialize();
+		$expected = $getObj($expected)->serialize();
+		$actual = $getObj($actual)->serialize();
 
-        // Finding wildcards in expected.
-        preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expected, $matches, PREG_SET_ORDER);
+		// Finding wildcards in expected.
+		preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expected, $matches, PREG_SET_ORDER);
 
-        foreach ($matches as $match) {
-            $actual = preg_replace(
-                '|^'.preg_quote($match[1], '|').':(.*)\r$|m',
-                $match[1].':**ANY**'."\r",
-                $actual
-            );
-        }
+		foreach ($matches as $match) {
+			$actual = preg_replace(
+				'|^'.preg_quote($match[1], '|').':(.*)\r$|m',
+				$match[1].':**ANY**'."\r",
+				$actual
+			);
+		}
 
-        $this->assertEquals(
-            $expected,
-            $actual,
-            $message
-        );
-    }
+		$this->assertEquals(
+			$expected,
+			$actual,
+			$message
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     public function assertVObjectEqualsVObject($expected, $actual, $message = '')
     {
-        $getObj = function ($input) {
+        $getObj = function($input) {
             if (is_resource($input)) {
                 $input = stream_get_contents($input);
             }

htdocs/includes/sabre/sabre/vobject/lib/Splitter/VCard.php

Indentation +45 added lines, -45 removed lines

@@ -21,54 +21,54 @@
  */
 class VCard implements SplitterInterface
 {
-    /**
-     * File handle.
-     *
-     * @var resource
-     */
-    protected $input;
+	/**
+	 * File handle.
+	 *
+	 * @var resource
+	 */
+	protected $input;
 
-    /**
-     * Persistent parser.
-     *
-     * @var MimeDir
-     */
-    protected $parser;
+	/**
+	 * Persistent parser.
+	 *
+	 * @var MimeDir
+	 */
+	protected $parser;
 
-    /**
-     * Constructor.
-     *
-     * The splitter should receive an readable file stream as its input.
-     *
-     * @param resource $input
-     * @param int      $options parser options, see the OPTIONS constants
-     */
-    public function __construct($input, $options = 0)
-    {
-        $this->input = $input;
-        $this->parser = new MimeDir($input, $options);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * The splitter should receive an readable file stream as its input.
+	 *
+	 * @param resource $input
+	 * @param int      $options parser options, see the OPTIONS constants
+	 */
+	public function __construct($input, $options = 0)
+	{
+		$this->input = $input;
+		$this->parser = new MimeDir($input, $options);
+	}
 
-    /**
-     * Every time getNext() is called, a new object will be parsed, until we
-     * hit the end of the stream.
-     *
-     * When the end is reached, null will be returned.
-     *
-     * @return \Sabre\VObject\Component|null
-     */
-    public function getNext()
-    {
-        try {
-            $object = $this->parser->parse();
+	/**
+	 * Every time getNext() is called, a new object will be parsed, until we
+	 * hit the end of the stream.
+	 *
+	 * When the end is reached, null will be returned.
+	 *
+	 * @return \Sabre\VObject\Component|null
+	 */
+	public function getNext()
+	{
+		try {
+			$object = $this->parser->parse();
 
-            if (!$object instanceof VObject\Component\VCard) {
-                throw new VObject\ParseException('The supplied input contained non-VCARD data.');
-            }
-        } catch (VObject\EofException $e) {
-            return;
-        }
+			if (!$object instanceof VObject\Component\VCard) {
+				throw new VObject\ParseException('The supplied input contained non-VCARD data.');
+			}
+		} catch (VObject\EofException $e) {
+			return;
+		}
 
-        return $object;
-    }
+		return $object;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Splitter/ICalendar.php

Indentation +71 added lines, -71 removed lines

@@ -21,86 +21,86 @@
  */
 class ICalendar implements SplitterInterface
 {
-    /**
-     * Timezones.
-     *
-     * @var array
-     */
-    protected $vtimezones = [];
+	/**
+	 * Timezones.
+	 *
+	 * @var array
+	 */
+	protected $vtimezones = [];
 
-    /**
-     * iCalendar objects.
-     *
-     * @var array
-     */
-    protected $objects = [];
+	/**
+	 * iCalendar objects.
+	 *
+	 * @var array
+	 */
+	protected $objects = [];
 
-    /**
-     * Constructor.
-     *
-     * The splitter should receive an readable file stream as its input.
-     *
-     * @param resource $input
-     * @param int      $options parser options, see the OPTIONS constants
-     */
-    public function __construct($input, $options = 0)
-    {
-        $data = VObject\Reader::read($input, $options);
+	/**
+	 * Constructor.
+	 *
+	 * The splitter should receive an readable file stream as its input.
+	 *
+	 * @param resource $input
+	 * @param int      $options parser options, see the OPTIONS constants
+	 */
+	public function __construct($input, $options = 0)
+	{
+		$data = VObject\Reader::read($input, $options);
 
-        if (!$data instanceof VObject\Component\VCalendar) {
-            throw new VObject\ParseException('Supplied input could not be parsed as VCALENDAR.');
-        }
+		if (!$data instanceof VObject\Component\VCalendar) {
+			throw new VObject\ParseException('Supplied input could not be parsed as VCALENDAR.');
+		}
 
-        foreach ($data->children() as $component) {
-            if (!$component instanceof VObject\Component) {
-                continue;
-            }
+		foreach ($data->children() as $component) {
+			if (!$component instanceof VObject\Component) {
+				continue;
+			}
 
-            // Get all timezones
-            if ('VTIMEZONE' === $component->name) {
-                $this->vtimezones[(string) $component->TZID] = $component;
-                continue;
-            }
+			// Get all timezones
+			if ('VTIMEZONE' === $component->name) {
+				$this->vtimezones[(string) $component->TZID] = $component;
+				continue;
+			}
 
-            // Get component UID for recurring Events search
-            if (!$component->UID) {
-                $component->UID = sha1(microtime()).'-vobjectimport';
-            }
-            $uid = (string) $component->UID;
+			// Get component UID for recurring Events search
+			if (!$component->UID) {
+				$component->UID = sha1(microtime()).'-vobjectimport';
+			}
+			$uid = (string) $component->UID;
 
-            // Take care of recurring events
-            if (!array_key_exists($uid, $this->objects)) {
-                $this->objects[$uid] = new VCalendar();
-            }
+			// Take care of recurring events
+			if (!array_key_exists($uid, $this->objects)) {
+				$this->objects[$uid] = new VCalendar();
+			}
 
-            $this->objects[$uid]->add(clone $component);
-        }
-    }
+			$this->objects[$uid]->add(clone $component);
+		}
+	}
 
-    /**
-     * Every time getNext() is called, a new object will be parsed, until we
-     * hit the end of the stream.
-     *
-     * When the end is reached, null will be returned.
-     *
-     * @return \Sabre\VObject\Component|null
-     */
-    public function getNext()
-    {
-        if ($object = array_shift($this->objects)) {
-            // create our baseobject
-            $object->version = '2.0';
-            $object->prodid = '-//Sabre//Sabre VObject '.VObject\Version::VERSION.'//EN';
-            $object->calscale = 'GREGORIAN';
+	/**
+	 * Every time getNext() is called, a new object will be parsed, until we
+	 * hit the end of the stream.
+	 *
+	 * When the end is reached, null will be returned.
+	 *
+	 * @return \Sabre\VObject\Component|null
+	 */
+	public function getNext()
+	{
+		if ($object = array_shift($this->objects)) {
+			// create our baseobject
+			$object->version = '2.0';
+			$object->prodid = '-//Sabre//Sabre VObject '.VObject\Version::VERSION.'//EN';
+			$object->calscale = 'GREGORIAN';
 
-            // add vtimezone information to obj (if we have it)
-            foreach ($this->vtimezones as $vtimezone) {
-                $object->add($vtimezone);
-            }
+			// add vtimezone information to obj (if we have it)
+			foreach ($this->vtimezones as $vtimezone) {
+				$object->add($vtimezone);
+			}
 
-            return $object;
-        } else {
-            return;
-        }
-    }
+			return $object;
+		} else {
+			return;
+		}
+	}
 }