Dolibarr / dolibarr

htdocs/includes/sabre/sabre/vobject/lib/Property/VCard/Date.php

Indentation +19 added lines, -19 removed lines

@@ -13,24 +13,24 @@
  */
 class Date extends DateAndOrTime
 {
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType()
-    {
-        return 'DATE';
-    }
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType()
+	{
+		return 'DATE';
+	}
 
-    /**
-     * Sets the property as a DateTime object.
-     */
-    public function setDateTime(\DateTimeInterface $dt)
-    {
-        $this->value = $dt->format('Ymd');
-    }
+	/**
+	 * Sets the property as a DateTime object.
+	 */
+	public function setDateTime(\DateTimeInterface $dt)
+	{
+		$this->value = $dt->format('Ymd');
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Property/VCard/DateAndOrTime.php

Indentation +343 added lines, -343 removed lines

@@ -21,347 +21,347 @@
  */
 class DateAndOrTime extends Property
 {
-    /**
-     * Field separator.
-     *
-     * @var string
-     */
-    public $delimiter = '';
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType()
-    {
-        return 'DATE-AND-OR-TIME';
-    }
-
-    /**
-     * Sets a multi-valued property.
-     *
-     * You may also specify DateTimeInterface objects here.
-     */
-    public function setParts(array $parts)
-    {
-        if (count($parts) > 1) {
-            throw new \InvalidArgumentException('Only one value allowed');
-        }
-        if (isset($parts[0]) && $parts[0] instanceof DateTimeInterface) {
-            $this->setDateTime($parts[0]);
-        } else {
-            parent::setParts($parts);
-        }
-    }
-
-    /**
-     * Updates the current value.
-     *
-     * This may be either a single, or multiple strings in an array.
-     *
-     * Instead of strings, you may also use DateTimeInterface here.
-     *
-     * @param string|array|DateTimeInterface $value
-     */
-    public function setValue($value)
-    {
-        if ($value instanceof DateTimeInterface) {
-            $this->setDateTime($value);
-        } else {
-            parent::setValue($value);
-        }
-    }
-
-    /**
-     * Sets the property as a DateTime object.
-     */
-    public function setDateTime(DateTimeInterface $dt)
-    {
-        $tz = $dt->getTimeZone();
-        $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
-
-        if ($isUtc) {
-            $value = $dt->format('Ymd\\THis\\Z');
-        } else {
-            // Calculating the offset.
-            $value = $dt->format('Ymd\\THisO');
-        }
-
-        $this->value = $value;
-    }
-
-    /**
-     * Returns a date-time value.
-     *
-     * Note that if this property contained more than 1 date-time, only the
-     * first will be returned. To get an array with multiple values, call
-     * getDateTimes.
-     *
-     * If no time was specified, we will always use midnight (in the default
-     * timezone) as the time.
-     *
-     * If parts of the date were omitted, such as the year, we will grab the
-     * current values for those. So at the time of writing, if the year was
-     * omitted, we would have filled in 2014.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDateTime()
-    {
-        $now = new DateTime();
-
-        $tzFormat = 0 === $now->getTimezone()->getOffset($now) ? '\\Z' : 'O';
-        $nowParts = DateTimeParser::parseVCardDateTime($now->format('Ymd\\This'.$tzFormat));
-
-        $dateParts = DateTimeParser::parseVCardDateTime($this->getValue());
-
-        // This sets all the missing parts to the current date/time.
-        // So if the year was missing for a birthday, we're making it 'this
-        // year'.
-        foreach ($dateParts as $k => $v) {
-            if (is_null($v)) {
-                $dateParts[$k] = $nowParts[$k];
-            }
-        }
-
-        return new DateTimeImmutable("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue()
-    {
-        $parts = DateTimeParser::parseVCardDateTime($this->getValue());
-
-        $dateStr = '';
-
-        // Year
-        if (!is_null($parts['year'])) {
-            $dateStr .= $parts['year'];
-
-            if (!is_null($parts['month'])) {
-                // If a year and a month is set, we need to insert a separator
-                // dash.
-                $dateStr .= '-';
-            }
-        } else {
-            if (!is_null($parts['month']) || !is_null($parts['date'])) {
-                // Inserting two dashes
-                $dateStr .= '--';
-            }
-        }
-
-        // Month
-        if (!is_null($parts['month'])) {
-            $dateStr .= $parts['month'];
-
-            if (isset($parts['date'])) {
-                // If month and date are set, we need the separator dash.
-                $dateStr .= '-';
-            }
-        } elseif (isset($parts['date'])) {
-            // If the month is empty, and a date is set, we need a 'empty
-            // dash'
-            $dateStr .= '-';
-        }
-
-        // Date
-        if (!is_null($parts['date'])) {
-            $dateStr .= $parts['date'];
-        }
-
-        // Early exit if we don't have a time string.
-        if (is_null($parts['hour']) && is_null($parts['minute']) && is_null($parts['second'])) {
-            return [$dateStr];
-        }
-
-        $dateStr .= 'T';
-
-        // Hour
-        if (!is_null($parts['hour'])) {
-            $dateStr .= $parts['hour'];
-
-            if (!is_null($parts['minute'])) {
-                $dateStr .= ':';
-            }
-        } else {
-            // We know either minute or second _must_ be set, so we insert a
-            // dash for an empty value.
-            $dateStr .= '-';
-        }
-
-        // Minute
-        if (!is_null($parts['minute'])) {
-            $dateStr .= $parts['minute'];
-
-            if (!is_null($parts['second'])) {
-                $dateStr .= ':';
-            }
-        } elseif (isset($parts['second'])) {
-            // Dash for empty minute
-            $dateStr .= '-';
-        }
-
-        // Second
-        if (!is_null($parts['second'])) {
-            $dateStr .= $parts['second'];
-        }
-
-        // Timezone
-        if (!is_null($parts['timezone'])) {
-            $dateStr .= $parts['timezone'];
-        }
-
-        return [$dateStr];
-    }
-
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer XML writer
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer)
-    {
-        $valueType = strtolower($this->getValueType());
-        $parts = DateTimeParser::parseVCardDateAndOrTime($this->getValue());
-        $value = '';
-
-        // $d = defined
-        $d = function ($part) use ($parts) {
-            return !is_null($parts[$part]);
-        };
-
-        // $r = read
-        $r = function ($part) use ($parts) {
-            return $parts[$part];
-        };
-
-        // From the Relax NG Schema.
-        //
-        // # 4.3.1
-        // value-date = element date {
-        //     xsd:string { pattern = "\d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d" }
-        //   }
-        if (($d('year') || $d('month') || $d('date'))
-            && (!$d('hour') && !$d('minute') && !$d('second') && !$d('timezone'))) {
-            if ($d('year') && $d('month') && $d('date')) {
-                $value .= $r('year').$r('month').$r('date');
-            } elseif ($d('year') && $d('month') && !$d('date')) {
-                $value .= $r('year').'-'.$r('month');
-            } elseif (!$d('year') && $d('month')) {
-                $value .= '--'.$r('month').$r('date');
-            } elseif (!$d('year') && !$d('month') && $d('date')) {
-                $value .= '---'.$r('date');
-            }
-
-            // # 4.3.2
-        // value-time = element time {
-        //     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
-        //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
-        //   }
-        } elseif ((!$d('year') && !$d('month') && !$d('date'))
-                  && ($d('hour') || $d('minute') || $d('second'))) {
-            if ($d('hour')) {
-                $value .= $r('hour').$r('minute').$r('second');
-            } elseif ($d('minute')) {
-                $value .= '-'.$r('minute').$r('second');
-            } elseif ($d('second')) {
-                $value .= '--'.$r('second');
-            }
-
-            $value .= $r('timezone');
-
-        // # 4.3.3
-        // value-date-time = element date-time {
-        //     xsd:string { pattern = "(\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?"
-        //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
-        //   }
-        } elseif ($d('date') && $d('hour')) {
-            if ($d('year') && $d('month') && $d('date')) {
-                $value .= $r('year').$r('month').$r('date');
-            } elseif (!$d('year') && $d('month') && $d('date')) {
-                $value .= '--'.$r('month').$r('date');
-            } elseif (!$d('year') && !$d('month') && $d('date')) {
-                $value .= '---'.$r('date');
-            }
-
-            $value .= 'T'.$r('hour').$r('minute').$r('second').
-                      $r('timezone');
-        }
-
-        $writer->writeElement($valueType, $value);
-    }
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     */
-    public function setRawMimeDirValue($val)
-    {
-        $this->setValue($val);
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue()
-    {
-        return implode($this->delimiter, $this->getParts());
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   Node::REPAIR - May attempt to automatically repair the problem.
-     *
-     * This method returns an array with detected problems.
-     * Every element has the following properties:
-     *
-     *  * level - problem level.
-     *  * message - A human-readable string describing the issue.
-     *  * node - A reference to the problematic node.
-     *
-     * The level means:
-     *   1 - The issue was repaired (only happens if REPAIR was turned on)
-     *   2 - An inconsequential issue
-     *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0)
-    {
-        $messages = parent::validate($options);
-        $value = $this->getValue();
-
-        try {
-            DateTimeParser::parseVCardDateTime($value);
-        } catch (InvalidDataException $e) {
-            $messages[] = [
-                'level' => 3,
-                'message' => 'The supplied value ('.$value.') is not a correct DATE-AND-OR-TIME property',
-                'node' => $this,
-            ];
-        }
-
-        return $messages;
-    }
+	/**
+	 * Field separator.
+	 *
+	 * @var string
+	 */
+	public $delimiter = '';
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType()
+	{
+		return 'DATE-AND-OR-TIME';
+	}
+
+	/**
+	 * Sets a multi-valued property.
+	 *
+	 * You may also specify DateTimeInterface objects here.
+	 */
+	public function setParts(array $parts)
+	{
+		if (count($parts) > 1) {
+			throw new \InvalidArgumentException('Only one value allowed');
+		}
+		if (isset($parts[0]) && $parts[0] instanceof DateTimeInterface) {
+			$this->setDateTime($parts[0]);
+		} else {
+			parent::setParts($parts);
+		}
+	}
+
+	/**
+	 * Updates the current value.
+	 *
+	 * This may be either a single, or multiple strings in an array.
+	 *
+	 * Instead of strings, you may also use DateTimeInterface here.
+	 *
+	 * @param string|array|DateTimeInterface $value
+	 */
+	public function setValue($value)
+	{
+		if ($value instanceof DateTimeInterface) {
+			$this->setDateTime($value);
+		} else {
+			parent::setValue($value);
+		}
+	}
+
+	/**
+	 * Sets the property as a DateTime object.
+	 */
+	public function setDateTime(DateTimeInterface $dt)
+	{
+		$tz = $dt->getTimeZone();
+		$isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
+
+		if ($isUtc) {
+			$value = $dt->format('Ymd\\THis\\Z');
+		} else {
+			// Calculating the offset.
+			$value = $dt->format('Ymd\\THisO');
+		}
+
+		$this->value = $value;
+	}
+
+	/**
+	 * Returns a date-time value.
+	 *
+	 * Note that if this property contained more than 1 date-time, only the
+	 * first will be returned. To get an array with multiple values, call
+	 * getDateTimes.
+	 *
+	 * If no time was specified, we will always use midnight (in the default
+	 * timezone) as the time.
+	 *
+	 * If parts of the date were omitted, such as the year, we will grab the
+	 * current values for those. So at the time of writing, if the year was
+	 * omitted, we would have filled in 2014.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDateTime()
+	{
+		$now = new DateTime();
+
+		$tzFormat = 0 === $now->getTimezone()->getOffset($now) ? '\\Z' : 'O';
+		$nowParts = DateTimeParser::parseVCardDateTime($now->format('Ymd\\This'.$tzFormat));
+
+		$dateParts = DateTimeParser::parseVCardDateTime($this->getValue());
+
+		// This sets all the missing parts to the current date/time.
+		// So if the year was missing for a birthday, we're making it 'this
+		// year'.
+		foreach ($dateParts as $k => $v) {
+			if (is_null($v)) {
+				$dateParts[$k] = $nowParts[$k];
+			}
+		}
+
+		return new DateTimeImmutable("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
+	}
+
+	/**
+	 * Returns the value, in the format it should be encoded for json.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue()
+	{
+		$parts = DateTimeParser::parseVCardDateTime($this->getValue());
+
+		$dateStr = '';
+
+		// Year
+		if (!is_null($parts['year'])) {
+			$dateStr .= $parts['year'];
+
+			if (!is_null($parts['month'])) {
+				// If a year and a month is set, we need to insert a separator
+				// dash.
+				$dateStr .= '-';
+			}
+		} else {
+			if (!is_null($parts['month']) || !is_null($parts['date'])) {
+				// Inserting two dashes
+				$dateStr .= '--';
+			}
+		}
+
+		// Month
+		if (!is_null($parts['month'])) {
+			$dateStr .= $parts['month'];
+
+			if (isset($parts['date'])) {
+				// If month and date are set, we need the separator dash.
+				$dateStr .= '-';
+			}
+		} elseif (isset($parts['date'])) {
+			// If the month is empty, and a date is set, we need a 'empty
+			// dash'
+			$dateStr .= '-';
+		}
+
+		// Date
+		if (!is_null($parts['date'])) {
+			$dateStr .= $parts['date'];
+		}
+
+		// Early exit if we don't have a time string.
+		if (is_null($parts['hour']) && is_null($parts['minute']) && is_null($parts['second'])) {
+			return [$dateStr];
+		}
+
+		$dateStr .= 'T';
+
+		// Hour
+		if (!is_null($parts['hour'])) {
+			$dateStr .= $parts['hour'];
+
+			if (!is_null($parts['minute'])) {
+				$dateStr .= ':';
+			}
+		} else {
+			// We know either minute or second _must_ be set, so we insert a
+			// dash for an empty value.
+			$dateStr .= '-';
+		}
+
+		// Minute
+		if (!is_null($parts['minute'])) {
+			$dateStr .= $parts['minute'];
+
+			if (!is_null($parts['second'])) {
+				$dateStr .= ':';
+			}
+		} elseif (isset($parts['second'])) {
+			// Dash for empty minute
+			$dateStr .= '-';
+		}
+
+		// Second
+		if (!is_null($parts['second'])) {
+			$dateStr .= $parts['second'];
+		}
+
+		// Timezone
+		if (!is_null($parts['timezone'])) {
+			$dateStr .= $parts['timezone'];
+		}
+
+		return [$dateStr];
+	}
+
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer XML writer
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer)
+	{
+		$valueType = strtolower($this->getValueType());
+		$parts = DateTimeParser::parseVCardDateAndOrTime($this->getValue());
+		$value = '';
+
+		// $d = defined
+		$d = function ($part) use ($parts) {
+			return !is_null($parts[$part]);
+		};
+
+		// $r = read
+		$r = function ($part) use ($parts) {
+			return $parts[$part];
+		};
+
+		// From the Relax NG Schema.
+		//
+		// # 4.3.1
+		// value-date = element date {
+		//     xsd:string { pattern = "\d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d" }
+		//   }
+		if (($d('year') || $d('month') || $d('date'))
+			&& (!$d('hour') && !$d('minute') && !$d('second') && !$d('timezone'))) {
+			if ($d('year') && $d('month') && $d('date')) {
+				$value .= $r('year').$r('month').$r('date');
+			} elseif ($d('year') && $d('month') && !$d('date')) {
+				$value .= $r('year').'-'.$r('month');
+			} elseif (!$d('year') && $d('month')) {
+				$value .= '--'.$r('month').$r('date');
+			} elseif (!$d('year') && !$d('month') && $d('date')) {
+				$value .= '---'.$r('date');
+			}
+
+			// # 4.3.2
+		// value-time = element time {
+		//     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
+		//                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
+		//   }
+		} elseif ((!$d('year') && !$d('month') && !$d('date'))
+				  && ($d('hour') || $d('minute') || $d('second'))) {
+			if ($d('hour')) {
+				$value .= $r('hour').$r('minute').$r('second');
+			} elseif ($d('minute')) {
+				$value .= '-'.$r('minute').$r('second');
+			} elseif ($d('second')) {
+				$value .= '--'.$r('second');
+			}
+
+			$value .= $r('timezone');
+
+		// # 4.3.3
+		// value-date-time = element date-time {
+		//     xsd:string { pattern = "(\d{8}|--\d{4}|---\d\d)T\d\d(\d\d(\d\d)?)?"
+		//                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
+		//   }
+		} elseif ($d('date') && $d('hour')) {
+			if ($d('year') && $d('month') && $d('date')) {
+				$value .= $r('year').$r('month').$r('date');
+			} elseif (!$d('year') && $d('month') && $d('date')) {
+				$value .= '--'.$r('month').$r('date');
+			} elseif (!$d('year') && !$d('month') && $d('date')) {
+				$value .= '---'.$r('date');
+			}
+
+			$value .= 'T'.$r('hour').$r('minute').$r('second').
+					  $r('timezone');
+		}
+
+		$writer->writeElement($valueType, $value);
+	}
+
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 */
+	public function setRawMimeDirValue($val)
+	{
+		$this->setValue($val);
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue()
+	{
+		return implode($this->delimiter, $this->getParts());
+	}
+
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   Node::REPAIR - May attempt to automatically repair the problem.
+	 *
+	 * This method returns an array with detected problems.
+	 * Every element has the following properties:
+	 *
+	 *  * level - problem level.
+	 *  * message - A human-readable string describing the issue.
+	 *  * node - A reference to the problematic node.
+	 *
+	 * The level means:
+	 *   1 - The issue was repaired (only happens if REPAIR was turned on)
+	 *   2 - An inconsequential issue
+	 *   3 - A severe issue.
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0)
+	{
+		$messages = parent::validate($options);
+		$value = $this->getValue();
+
+		try {
+			DateTimeParser::parseVCardDateTime($value);
+		} catch (InvalidDataException $e) {
+			$messages[] = [
+				'level' => 3,
+				'message' => 'The supplied value ('.$value.') is not a correct DATE-AND-OR-TIME property',
+				'node' => $this,
+			];
+		}
+
+		return $messages;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Property/VCard/PhoneNumber.php

Indentation +13 added lines, -13 removed lines

@@ -13,18 +13,18 @@
  */
 class PhoneNumber extends Property\Text
 {
-    protected $structuredValues = [];
+	protected $structuredValues = [];
 
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType()
-    {
-        return 'PHONE-NUMBER';
-    }
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType()
+	{
+		return 'PHONE-NUMBER';
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Property/VCard/LanguageTag.php

Indentation +33 added lines, -33 removed lines

@@ -15,39 +15,39 @@
  */
 class LanguageTag extends Property
 {
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     */
-    public function setRawMimeDirValue($val)
-    {
-        $this->setValue($val);
-    }
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 */
+	public function setRawMimeDirValue($val)
+	{
+		$this->setValue($val);
+	}
 
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue()
-    {
-        return $this->getValue();
-    }
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue()
+	{
+		return $this->getValue();
+	}
 
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType()
-    {
-        return 'LANGUAGE-TAG';
-    }
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType()
+	{
+		return 'LANGUAGE-TAG';
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Property/VCard/DateTime.php

Indentation +12 added lines, -12 removed lines

@@ -13,16 +13,16 @@
  */
 class DateTime extends DateAndOrTime
 {
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType()
-    {
-        return 'DATE-TIME';
-    }
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType()
+	{
+		return 'DATE-TIME';
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Property/FlatText.php

Indentation +18 added lines, -18 removed lines

@@ -24,23 +24,23 @@
  */
 class FlatText extends Text
 {
-    /**
-     * Field separator.
-     *
-     * @var string
-     */
-    public $delimiter = ',';
+	/**
+	 * Field separator.
+	 *
+	 * @var string
+	 */
+	public $delimiter = ',';
 
-    /**
-     * Sets the value as a quoted-printable encoded string.
-     *
-     * Overriding this so we're not splitting on a ; delimiter.
-     *
-     * @param string $val
-     */
-    public function setQuotedPrintableValue($val)
-    {
-        $val = quoted_printable_decode($val);
-        $this->setValue($val);
-    }
+	/**
+	 * Sets the value as a quoted-printable encoded string.
+	 *
+	 * Overriding this so we're not splitting on a ; delimiter.
+	 *
+	 * @param string $val
+	 */
+	public function setQuotedPrintableValue($val)
+	{
+		$val = quoted_printable_decode($val);
+		$this->setValue($val);
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Property/FloatValue.php

Indentation +95 added lines, -95 removed lines

@@ -17,108 +17,108 @@
  */
 class FloatValue extends Property
 {
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string
-     */
-    public $delimiter = ';';
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string
+	 */
+	public $delimiter = ';';
 
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     */
-    public function setRawMimeDirValue($val)
-    {
-        $val = explode($this->delimiter, $val);
-        foreach ($val as &$item) {
-            $item = (float) $item;
-        }
-        $this->setParts($val);
-    }
+	/**
+	 * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+	 *
+	 * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+	 * not yet done, but parameters are not included.
+	 *
+	 * @param string $val
+	 */
+	public function setRawMimeDirValue($val)
+	{
+		$val = explode($this->delimiter, $val);
+		foreach ($val as &$item) {
+			$item = (float) $item;
+		}
+		$this->setParts($val);
+	}
 
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue()
-    {
-        return implode(
-            $this->delimiter,
-            $this->getParts()
-        );
-    }
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue()
+	{
+		return implode(
+			$this->delimiter,
+			$this->getParts()
+		);
+	}
 
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType()
-    {
-        return 'FLOAT';
-    }
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType()
+	{
+		return 'FLOAT';
+	}
 
-    /**
-     * Returns the value, in the format it should be encoded for JSON.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue()
-    {
-        $val = array_map('floatval', $this->getParts());
+	/**
+	 * Returns the value, in the format it should be encoded for JSON.
+	 *
+	 * This method must always return an array.
+	 *
+	 * @return array
+	 */
+	public function getJsonValue()
+	{
+		$val = array_map('floatval', $this->getParts());
 
-        // Special-casing the GEO property.
-        //
-        // See:
-        // http://tools.ietf.org/html/draft-ietf-jcardcal-jcal-04#section-3.4.1.2
-        if ('GEO' === $this->name) {
-            return [$val];
-        }
+		// Special-casing the GEO property.
+		//
+		// See:
+		// http://tools.ietf.org/html/draft-ietf-jcardcal-jcal-04#section-3.4.1.2
+		if ('GEO' === $this->name) {
+			return [$val];
+		}
 
-        return $val;
-    }
+		return $val;
+	}
 
-    /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
-     * object.
-     */
-    public function setXmlValue(array $value)
-    {
-        $value = array_map('floatval', $value);
-        parent::setXmlValue($value);
-    }
+	/**
+	 * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+	 * object.
+	 */
+	public function setXmlValue(array $value)
+	{
+		$value = array_map('floatval', $value);
+		parent::setXmlValue($value);
+	}
 
-    /**
-     * This method serializes only the value of a property. This is used to
-     * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer XML writer
-     */
-    protected function xmlSerializeValue(Xml\Writer $writer)
-    {
-        // Special-casing the GEO property.
-        //
-        // See:
-        // http://tools.ietf.org/html/rfc6321#section-3.4.1.2
-        if ('GEO' === $this->name) {
-            $value = array_map('floatval', $this->getParts());
+	/**
+	 * This method serializes only the value of a property. This is used to
+	 * create xCard or xCal documents.
+	 *
+	 * @param Xml\Writer $writer XML writer
+	 */
+	protected function xmlSerializeValue(Xml\Writer $writer)
+	{
+		// Special-casing the GEO property.
+		//
+		// See:
+		// http://tools.ietf.org/html/rfc6321#section-3.4.1.2
+		if ('GEO' === $this->name) {
+			$value = array_map('floatval', $this->getParts());
 
-            $writer->writeElement('latitude', $value[0]);
-            $writer->writeElement('longitude', $value[1]);
-        } else {
-            parent::xmlSerializeValue($writer);
-        }
-    }
+			$writer->writeElement('latitude', $value[0]);
+			$writer->writeElement('longitude', $value[1]);
+		} else {
+			parent::xmlSerializeValue($writer);
+		}
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Parser/XML.php

Indentation +354 added lines, -354 removed lines

@@ -20,358 +20,358 @@
  */
 class XML extends Parser
 {
-    const XCAL_NAMESPACE = 'urn:ietf:params:xml:ns:icalendar-2.0';
-    const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
-
-    /**
-     * The input data.
-     *
-     * @var array
-     */
-    protected $input;
-
-    /**
-     * A pointer/reference to the input.
-     *
-     * @var array
-     */
-    private $pointer;
-
-    /**
-     * Document, root component.
-     *
-     * @var \Sabre\VObject\Document
-     */
-    protected $root;
-
-    /**
-     * Creates the parser.
-     *
-     * Optionally, it's possible to parse the input stream here.
-     *
-     * @param mixed $input
-     * @param int   $options any parser options (OPTION constants)
-     */
-    public function __construct($input = null, $options = 0)
-    {
-        if (0 === $options) {
-            $options = parent::OPTION_FORGIVING;
-        }
-
-        parent::__construct($input, $options);
-    }
-
-    /**
-     * Parse xCal or xCard.
-     *
-     * @param resource|string $input
-     * @param int             $options
-     *
-     * @throws \Exception
-     *
-     * @return \Sabre\VObject\Document
-     */
-    public function parse($input = null, $options = 0)
-    {
-        if (!is_null($input)) {
-            $this->setInput($input);
-        }
-
-        if (0 !== $options) {
-            $this->options = $options;
-        }
-
-        if (is_null($this->input)) {
-            throw new EofException('End of input stream, or no input supplied');
-        }
-
-        switch ($this->input['name']) {
-            case '{'.self::XCAL_NAMESPACE.'}icalendar':
-                $this->root = new VCalendar([], false);
-                $this->pointer = &$this->input['value'][0];
-                $this->parseVCalendarComponents($this->root);
-                break;
-
-            case '{'.self::XCARD_NAMESPACE.'}vcards':
-                foreach ($this->input['value'] as &$vCard) {
-                    $this->root = new VCard(['version' => '4.0'], false);
-                    $this->pointer = &$vCard;
-                    $this->parseVCardComponents($this->root);
-
-                    // We just parse the first <vcard /> element.
-                    break;
-                }
-                break;
-
-            default:
-                throw new ParseException('Unsupported XML standard');
-        }
-
-        return $this->root;
-    }
-
-    /**
-     * Parse a xCalendar component.
-     */
-    protected function parseVCalendarComponents(Component $parentComponent)
-    {
-        foreach ($this->pointer['value'] ?: [] as $children) {
-            switch (static::getTagName($children['name'])) {
-                case 'properties':
-                    $this->pointer = &$children['value'];
-                    $this->parseProperties($parentComponent);
-                    break;
-
-                case 'components':
-                    $this->pointer = &$children;
-                    $this->parseComponent($parentComponent);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Parse a xCard component.
-     */
-    protected function parseVCardComponents(Component $parentComponent)
-    {
-        $this->pointer = &$this->pointer['value'];
-        $this->parseProperties($parentComponent);
-    }
-
-    /**
-     * Parse xCalendar and xCard properties.
-     *
-     * @param string $propertyNamePrefix
-     */
-    protected function parseProperties(Component $parentComponent, $propertyNamePrefix = '')
-    {
-        foreach ($this->pointer ?: [] as $xmlProperty) {
-            list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
-
-            $propertyName = $tagName;
-            $propertyValue = [];
-            $propertyParameters = [];
-            $propertyType = 'text';
-
-            // A property which is not part of the standard.
-            if (self::XCAL_NAMESPACE !== $namespace
-                && self::XCARD_NAMESPACE !== $namespace) {
-                $propertyName = 'xml';
-                $value = '<'.$tagName.' xmlns="'.$namespace.'"';
-
-                foreach ($xmlProperty['attributes'] as $attributeName => $attributeValue) {
-                    $value .= ' '.$attributeName.'="'.str_replace('"', '\"', $attributeValue).'"';
-                }
-
-                $value .= '>'.$xmlProperty['value'].'</'.$tagName.'>';
-
-                $propertyValue = [$value];
-
-                $this->createProperty(
-                    $parentComponent,
-                    $propertyName,
-                    $propertyParameters,
-                    $propertyType,
-                    $propertyValue
-                );
-
-                continue;
-            }
-
-            // xCard group.
-            if ('group' === $propertyName) {
-                if (!isset($xmlProperty['attributes']['name'])) {
-                    continue;
-                }
-
-                $this->pointer = &$xmlProperty['value'];
-                $this->parseProperties(
-                    $parentComponent,
-                    strtoupper($xmlProperty['attributes']['name']).'.'
-                );
-
-                continue;
-            }
-
-            // Collect parameters.
-            foreach ($xmlProperty['value'] as $i => $xmlPropertyChild) {
-                if (!is_array($xmlPropertyChild)
-                    || 'parameters' !== static::getTagName($xmlPropertyChild['name'])) {
-                    continue;
-                }
-
-                $xmlParameters = $xmlPropertyChild['value'];
-
-                foreach ($xmlParameters as $xmlParameter) {
-                    $propertyParameterValues = [];
-
-                    foreach ($xmlParameter['value'] as $xmlParameterValues) {
-                        $propertyParameterValues[] = $xmlParameterValues['value'];
-                    }
-
-                    $propertyParameters[static::getTagName($xmlParameter['name'])]
-                        = implode(',', $propertyParameterValues);
-                }
-
-                array_splice($xmlProperty['value'], $i, 1);
-            }
-
-            $propertyNameExtended = ($this->root instanceof VCalendar
-                                      ? 'xcal'
-                                      : 'xcard').':'.$propertyName;
-
-            switch ($propertyNameExtended) {
-                case 'xcal:geo':
-                    $propertyType = 'float';
-                    $propertyValue['latitude'] = 0;
-                    $propertyValue['longitude'] = 0;
-
-                    foreach ($xmlProperty['value'] as $xmlRequestChild) {
-                        $propertyValue[static::getTagName($xmlRequestChild['name'])]
-                            = $xmlRequestChild['value'];
-                    }
-                    break;
-
-                case 'xcal:request-status':
-                    $propertyType = 'text';
-
-                    foreach ($xmlProperty['value'] as $xmlRequestChild) {
-                        $propertyValue[static::getTagName($xmlRequestChild['name'])]
-                            = $xmlRequestChild['value'];
-                    }
-                    break;
-
-                case 'xcal:freebusy':
-                    $propertyType = 'freebusy';
-                    // We don't break because we only want to set
-                    // another property type.
-
-                    // no break
-                case 'xcal:categories':
-                case 'xcal:resources':
-                case 'xcal:exdate':
-                    foreach ($xmlProperty['value'] as $specialChild) {
-                        $propertyValue[static::getTagName($specialChild['name'])]
-                            = $specialChild['value'];
-                    }
-                    break;
-
-                case 'xcal:rdate':
-                    $propertyType = 'date-time';
-
-                    foreach ($xmlProperty['value'] as $specialChild) {
-                        $tagName = static::getTagName($specialChild['name']);
-
-                        if ('period' === $tagName) {
-                            $propertyParameters['value'] = 'PERIOD';
-                            $propertyValue[] = implode('/', $specialChild['value']);
-                        } else {
-                            $propertyValue[] = $specialChild['value'];
-                        }
-                    }
-                    break;
-
-                default:
-                    $propertyType = static::getTagName($xmlProperty['value'][0]['name']);
-
-                    foreach ($xmlProperty['value'] as $value) {
-                        $propertyValue[] = $value['value'];
-                    }
-
-                    if ('date' === $propertyType) {
-                        $propertyParameters['value'] = 'DATE';
-                    }
-                    break;
-            }
-
-            $this->createProperty(
-                $parentComponent,
-                $propertyNamePrefix.$propertyName,
-                $propertyParameters,
-                $propertyType,
-                $propertyValue
-            );
-        }
-    }
-
-    /**
-     * Parse a component.
-     */
-    protected function parseComponent(Component $parentComponent)
-    {
-        $components = $this->pointer['value'] ?: [];
-
-        foreach ($components as $component) {
-            $componentName = static::getTagName($component['name']);
-            $currentComponent = $this->root->createComponent(
-                $componentName,
-                null,
-                false
-            );
-
-            $this->pointer = &$component;
-            $this->parseVCalendarComponents($currentComponent);
-
-            $parentComponent->add($currentComponent);
-        }
-    }
-
-    /**
-     * Create a property.
-     *
-     * @param string $name
-     * @param array  $parameters
-     * @param string $type
-     * @param mixed  $value
-     */
-    protected function createProperty(Component $parentComponent, $name, $parameters, $type, $value)
-    {
-        $property = $this->root->createProperty(
-            $name,
-            null,
-            $parameters,
-            $type
-        );
-        $parentComponent->add($property);
-        $property->setXmlValue($value);
-    }
-
-    /**
-     * Sets the input data.
-     *
-     * @param resource|string $input
-     */
-    public function setInput($input)
-    {
-        if (is_resource($input)) {
-            $input = stream_get_contents($input);
-        }
-
-        if (is_string($input)) {
-            $reader = new SabreXml\Reader();
-            $reader->elementMap['{'.self::XCAL_NAMESPACE.'}period']
-                = XML\Element\KeyValue::class;
-            $reader->elementMap['{'.self::XCAL_NAMESPACE.'}recur']
-                = XML\Element\KeyValue::class;
-            $reader->xml($input);
-            $input = $reader->parse();
-        }
-
-        $this->input = $input;
-    }
-
-    /**
-     * Get tag name from a Clark notation.
-     *
-     * @param string $clarkedTagName
-     *
-     * @return string
-     */
-    protected static function getTagName($clarkedTagName)
-    {
-        list(, $tagName) = SabreXml\Service::parseClarkNotation($clarkedTagName);
-
-        return $tagName;
-    }
+	const XCAL_NAMESPACE = 'urn:ietf:params:xml:ns:icalendar-2.0';
+	const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
+
+	/**
+	 * The input data.
+	 *
+	 * @var array
+	 */
+	protected $input;
+
+	/**
+	 * A pointer/reference to the input.
+	 *
+	 * @var array
+	 */
+	private $pointer;
+
+	/**
+	 * Document, root component.
+	 *
+	 * @var \Sabre\VObject\Document
+	 */
+	protected $root;
+
+	/**
+	 * Creates the parser.
+	 *
+	 * Optionally, it's possible to parse the input stream here.
+	 *
+	 * @param mixed $input
+	 * @param int   $options any parser options (OPTION constants)
+	 */
+	public function __construct($input = null, $options = 0)
+	{
+		if (0 === $options) {
+			$options = parent::OPTION_FORGIVING;
+		}
+
+		parent::__construct($input, $options);
+	}
+
+	/**
+	 * Parse xCal or xCard.
+	 *
+	 * @param resource|string $input
+	 * @param int             $options
+	 *
+	 * @throws \Exception
+	 *
+	 * @return \Sabre\VObject\Document
+	 */
+	public function parse($input = null, $options = 0)
+	{
+		if (!is_null($input)) {
+			$this->setInput($input);
+		}
+
+		if (0 !== $options) {
+			$this->options = $options;
+		}
+
+		if (is_null($this->input)) {
+			throw new EofException('End of input stream, or no input supplied');
+		}
+
+		switch ($this->input['name']) {
+			case '{'.self::XCAL_NAMESPACE.'}icalendar':
+				$this->root = new VCalendar([], false);
+				$this->pointer = &$this->input['value'][0];
+				$this->parseVCalendarComponents($this->root);
+				break;
+
+			case '{'.self::XCARD_NAMESPACE.'}vcards':
+				foreach ($this->input['value'] as &$vCard) {
+					$this->root = new VCard(['version' => '4.0'], false);
+					$this->pointer = &$vCard;
+					$this->parseVCardComponents($this->root);
+
+					// We just parse the first <vcard /> element.
+					break;
+				}
+				break;
+
+			default:
+				throw new ParseException('Unsupported XML standard');
+		}
+
+		return $this->root;
+	}
+
+	/**
+	 * Parse a xCalendar component.
+	 */
+	protected function parseVCalendarComponents(Component $parentComponent)
+	{
+		foreach ($this->pointer['value'] ?: [] as $children) {
+			switch (static::getTagName($children['name'])) {
+				case 'properties':
+					$this->pointer = &$children['value'];
+					$this->parseProperties($parentComponent);
+					break;
+
+				case 'components':
+					$this->pointer = &$children;
+					$this->parseComponent($parentComponent);
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Parse a xCard component.
+	 */
+	protected function parseVCardComponents(Component $parentComponent)
+	{
+		$this->pointer = &$this->pointer['value'];
+		$this->parseProperties($parentComponent);
+	}
+
+	/**
+	 * Parse xCalendar and xCard properties.
+	 *
+	 * @param string $propertyNamePrefix
+	 */
+	protected function parseProperties(Component $parentComponent, $propertyNamePrefix = '')
+	{
+		foreach ($this->pointer ?: [] as $xmlProperty) {
+			list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
+
+			$propertyName = $tagName;
+			$propertyValue = [];
+			$propertyParameters = [];
+			$propertyType = 'text';
+
+			// A property which is not part of the standard.
+			if (self::XCAL_NAMESPACE !== $namespace
+				&& self::XCARD_NAMESPACE !== $namespace) {
+				$propertyName = 'xml';
+				$value = '<'.$tagName.' xmlns="'.$namespace.'"';
+
+				foreach ($xmlProperty['attributes'] as $attributeName => $attributeValue) {
+					$value .= ' '.$attributeName.'="'.str_replace('"', '\"', $attributeValue).'"';
+				}
+
+				$value .= '>'.$xmlProperty['value'].'</'.$tagName.'>';
+
+				$propertyValue = [$value];
+
+				$this->createProperty(
+					$parentComponent,
+					$propertyName,
+					$propertyParameters,
+					$propertyType,
+					$propertyValue
+				);
+
+				continue;
+			}
+
+			// xCard group.
+			if ('group' === $propertyName) {
+				if (!isset($xmlProperty['attributes']['name'])) {
+					continue;
+				}
+
+				$this->pointer = &$xmlProperty['value'];
+				$this->parseProperties(
+					$parentComponent,
+					strtoupper($xmlProperty['attributes']['name']).'.'
+				);
+
+				continue;
+			}
+
+			// Collect parameters.
+			foreach ($xmlProperty['value'] as $i => $xmlPropertyChild) {
+				if (!is_array($xmlPropertyChild)
+					|| 'parameters' !== static::getTagName($xmlPropertyChild['name'])) {
+					continue;
+				}
+
+				$xmlParameters = $xmlPropertyChild['value'];
+
+				foreach ($xmlParameters as $xmlParameter) {
+					$propertyParameterValues = [];
+
+					foreach ($xmlParameter['value'] as $xmlParameterValues) {
+						$propertyParameterValues[] = $xmlParameterValues['value'];
+					}
+
+					$propertyParameters[static::getTagName($xmlParameter['name'])]
+						= implode(',', $propertyParameterValues);
+				}
+
+				array_splice($xmlProperty['value'], $i, 1);
+			}
+
+			$propertyNameExtended = ($this->root instanceof VCalendar
+									  ? 'xcal'
+									  : 'xcard').':'.$propertyName;
+
+			switch ($propertyNameExtended) {
+				case 'xcal:geo':
+					$propertyType = 'float';
+					$propertyValue['latitude'] = 0;
+					$propertyValue['longitude'] = 0;
+
+					foreach ($xmlProperty['value'] as $xmlRequestChild) {
+						$propertyValue[static::getTagName($xmlRequestChild['name'])]
+							= $xmlRequestChild['value'];
+					}
+					break;
+
+				case 'xcal:request-status':
+					$propertyType = 'text';
+
+					foreach ($xmlProperty['value'] as $xmlRequestChild) {
+						$propertyValue[static::getTagName($xmlRequestChild['name'])]
+							= $xmlRequestChild['value'];
+					}
+					break;
+
+				case 'xcal:freebusy':
+					$propertyType = 'freebusy';
+					// We don't break because we only want to set
+					// another property type.
+
+					// no break
+				case 'xcal:categories':
+				case 'xcal:resources':
+				case 'xcal:exdate':
+					foreach ($xmlProperty['value'] as $specialChild) {
+						$propertyValue[static::getTagName($specialChild['name'])]
+							= $specialChild['value'];
+					}
+					break;
+
+				case 'xcal:rdate':
+					$propertyType = 'date-time';
+
+					foreach ($xmlProperty['value'] as $specialChild) {
+						$tagName = static::getTagName($specialChild['name']);
+
+						if ('period' === $tagName) {
+							$propertyParameters['value'] = 'PERIOD';
+							$propertyValue[] = implode('/', $specialChild['value']);
+						} else {
+							$propertyValue[] = $specialChild['value'];
+						}
+					}
+					break;
+
+				default:
+					$propertyType = static::getTagName($xmlProperty['value'][0]['name']);
+
+					foreach ($xmlProperty['value'] as $value) {
+						$propertyValue[] = $value['value'];
+					}
+
+					if ('date' === $propertyType) {
+						$propertyParameters['value'] = 'DATE';
+					}
+					break;
+			}
+
+			$this->createProperty(
+				$parentComponent,
+				$propertyNamePrefix.$propertyName,
+				$propertyParameters,
+				$propertyType,
+				$propertyValue
+			);
+		}
+	}
+
+	/**
+	 * Parse a component.
+	 */
+	protected function parseComponent(Component $parentComponent)
+	{
+		$components = $this->pointer['value'] ?: [];
+
+		foreach ($components as $component) {
+			$componentName = static::getTagName($component['name']);
+			$currentComponent = $this->root->createComponent(
+				$componentName,
+				null,
+				false
+			);
+
+			$this->pointer = &$component;
+			$this->parseVCalendarComponents($currentComponent);
+
+			$parentComponent->add($currentComponent);
+		}
+	}
+
+	/**
+	 * Create a property.
+	 *
+	 * @param string $name
+	 * @param array  $parameters
+	 * @param string $type
+	 * @param mixed  $value
+	 */
+	protected function createProperty(Component $parentComponent, $name, $parameters, $type, $value)
+	{
+		$property = $this->root->createProperty(
+			$name,
+			null,
+			$parameters,
+			$type
+		);
+		$parentComponent->add($property);
+		$property->setXmlValue($value);
+	}
+
+	/**
+	 * Sets the input data.
+	 *
+	 * @param resource|string $input
+	 */
+	public function setInput($input)
+	{
+		if (is_resource($input)) {
+			$input = stream_get_contents($input);
+		}
+
+		if (is_string($input)) {
+			$reader = new SabreXml\Reader();
+			$reader->elementMap['{'.self::XCAL_NAMESPACE.'}period']
+				= XML\Element\KeyValue::class;
+			$reader->elementMap['{'.self::XCAL_NAMESPACE.'}recur']
+				= XML\Element\KeyValue::class;
+			$reader->xml($input);
+			$input = $reader->parse();
+		}
+
+		$this->input = $input;
+	}
+
+	/**
+	 * Get tag name from a Clark notation.
+	 *
+	 * @param string $clarkedTagName
+	 *
+	 * @return string
+	 */
+	protected static function getTagName($clarkedTagName)
+	{
+		list(, $tagName) = SabreXml\Service::parseClarkNotation($clarkedTagName);
+
+		return $tagName;
+	}
 }

htdocs/includes/sabre/sabre/vobject/lib/Parser/Json.php

Indentation +166 added lines, -166 removed lines

@@ -21,170 +21,170 @@
  */
 class Json extends Parser
 {
-    /**
-     * The input data.
-     *
-     * @var array
-     */
-    protected $input;
-
-    /**
-     * Root component.
-     *
-     * @var Document
-     */
-    protected $root;
-
-    /**
-     * This method starts the parsing process.
-     *
-     * If the input was not supplied during construction, it's possible to pass
-     * it here instead.
-     *
-     * If either input or options are not supplied, the defaults will be used.
-     *
-     * @param resource|string|array|null $input
-     * @param int                        $options
-     *
-     * @return \Sabre\VObject\Document
-     */
-    public function parse($input = null, $options = 0)
-    {
-        if (!is_null($input)) {
-            $this->setInput($input);
-        }
-        if (is_null($this->input)) {
-            throw new EofException('End of input stream, or no input supplied');
-        }
-
-        if (0 !== $options) {
-            $this->options = $options;
-        }
-
-        switch ($this->input[0]) {
-            case 'vcalendar':
-                $this->root = new VCalendar([], false);
-                break;
-            case 'vcard':
-                $this->root = new VCard([], false);
-                break;
-            default:
-                throw new ParseException('The root component must either be a vcalendar, or a vcard');
-        }
-        foreach ($this->input[1] as $prop) {
-            $this->root->add($this->parseProperty($prop));
-        }
-        if (isset($this->input[2])) {
-            foreach ($this->input[2] as $comp) {
-                $this->root->add($this->parseComponent($comp));
-            }
-        }
-
-        // Resetting the input so we can throw an feof exception the next time.
-        $this->input = null;
-
-        return $this->root;
-    }
-
-    /**
-     * Parses a component.
-     *
-     * @return \Sabre\VObject\Component
-     */
-    public function parseComponent(array $jComp)
-    {
-        // We can remove $self from PHP 5.4 onward.
-        $self = $this;
-
-        $properties = array_map(
-            function ($jProp) use ($self) {
-                return $self->parseProperty($jProp);
-            },
-            $jComp[1]
-        );
-
-        if (isset($jComp[2])) {
-            $components = array_map(
-                function ($jComp) use ($self) {
-                    return $self->parseComponent($jComp);
-                },
-                $jComp[2]
-            );
-        } else {
-            $components = [];
-        }
-
-        return $this->root->createComponent(
-            $jComp[0],
-            array_merge($properties, $components),
-            $defaults = false
-        );
-    }
-
-    /**
-     * Parses properties.
-     *
-     * @return \Sabre\VObject\Property
-     */
-    public function parseProperty(array $jProp)
-    {
-        list(
-            $propertyName,
-            $parameters,
-            $valueType
-        ) = $jProp;
-
-        $propertyName = strtoupper($propertyName);
-
-        // This is the default class we would be using if we didn't know the
-        // value type. We're using this value later in this function.
-        $defaultPropertyClass = $this->root->getClassNameForPropertyName($propertyName);
-
-        $parameters = (array) $parameters;
-
-        $value = array_slice($jProp, 3);
-
-        $valueType = strtoupper($valueType);
-
-        if (isset($parameters['group'])) {
-            $propertyName = $parameters['group'].'.'.$propertyName;
-            unset($parameters['group']);
-        }
-
-        $prop = $this->root->createProperty($propertyName, null, $parameters, $valueType);
-        $prop->setJsonValue($value);
-
-        // We have to do something awkward here. FlatText as well as Text
-        // represents TEXT values. We have to normalize these here. In the
-        // future we can get rid of FlatText once we're allowed to break BC
-        // again.
-        if (FlatText::class === $defaultPropertyClass) {
-            $defaultPropertyClass = Text::class;
-        }
-
-        // If the value type we received (e.g.: TEXT) was not the default value
-        // type for the given property (e.g.: BDAY), we need to add a VALUE=
-        // parameter.
-        if ($defaultPropertyClass !== get_class($prop)) {
-            $prop['VALUE'] = $valueType;
-        }
-
-        return $prop;
-    }
-
-    /**
-     * Sets the input data.
-     *
-     * @param resource|string|array $input
-     */
-    public function setInput($input)
-    {
-        if (is_resource($input)) {
-            $input = stream_get_contents($input);
-        }
-        if (is_string($input)) {
-            $input = json_decode($input);
-        }
-        $this->input = $input;
-    }
+	/**
+	 * The input data.
+	 *
+	 * @var array
+	 */
+	protected $input;
+
+	/**
+	 * Root component.
+	 *
+	 * @var Document
+	 */
+	protected $root;
+
+	/**
+	 * This method starts the parsing process.
+	 *
+	 * If the input was not supplied during construction, it's possible to pass
+	 * it here instead.
+	 *
+	 * If either input or options are not supplied, the defaults will be used.
+	 *
+	 * @param resource|string|array|null $input
+	 * @param int                        $options
+	 *
+	 * @return \Sabre\VObject\Document
+	 */
+	public function parse($input = null, $options = 0)
+	{
+		if (!is_null($input)) {
+			$this->setInput($input);
+		}
+		if (is_null($this->input)) {
+			throw new EofException('End of input stream, or no input supplied');
+		}
+
+		if (0 !== $options) {
+			$this->options = $options;
+		}
+
+		switch ($this->input[0]) {
+			case 'vcalendar':
+				$this->root = new VCalendar([], false);
+				break;
+			case 'vcard':
+				$this->root = new VCard([], false);
+				break;
+			default:
+				throw new ParseException('The root component must either be a vcalendar, or a vcard');
+		}
+		foreach ($this->input[1] as $prop) {
+			$this->root->add($this->parseProperty($prop));
+		}
+		if (isset($this->input[2])) {
+			foreach ($this->input[2] as $comp) {
+				$this->root->add($this->parseComponent($comp));
+			}
+		}
+
+		// Resetting the input so we can throw an feof exception the next time.
+		$this->input = null;
+
+		return $this->root;
+	}
+
+	/**
+	 * Parses a component.
+	 *
+	 * @return \Sabre\VObject\Component
+	 */
+	public function parseComponent(array $jComp)
+	{
+		// We can remove $self from PHP 5.4 onward.
+		$self = $this;
+
+		$properties = array_map(
+			function ($jProp) use ($self) {
+				return $self->parseProperty($jProp);
+			},
+			$jComp[1]
+		);
+
+		if (isset($jComp[2])) {
+			$components = array_map(
+				function ($jComp) use ($self) {
+					return $self->parseComponent($jComp);
+				},
+				$jComp[2]
+			);
+		} else {
+			$components = [];
+		}
+
+		return $this->root->createComponent(
+			$jComp[0],
+			array_merge($properties, $components),
+			$defaults = false
+		);
+	}
+
+	/**
+	 * Parses properties.
+	 *
+	 * @return \Sabre\VObject\Property
+	 */
+	public function parseProperty(array $jProp)
+	{
+		list(
+			$propertyName,
+			$parameters,
+			$valueType
+		) = $jProp;
+
+		$propertyName = strtoupper($propertyName);
+
+		// This is the default class we would be using if we didn't know the
+		// value type. We're using this value later in this function.
+		$defaultPropertyClass = $this->root->getClassNameForPropertyName($propertyName);
+
+		$parameters = (array) $parameters;
+
+		$value = array_slice($jProp, 3);
+
+		$valueType = strtoupper($valueType);
+
+		if (isset($parameters['group'])) {
+			$propertyName = $parameters['group'].'.'.$propertyName;
+			unset($parameters['group']);
+		}
+
+		$prop = $this->root->createProperty($propertyName, null, $parameters, $valueType);
+		$prop->setJsonValue($value);
+
+		// We have to do something awkward here. FlatText as well as Text
+		// represents TEXT values. We have to normalize these here. In the
+		// future we can get rid of FlatText once we're allowed to break BC
+		// again.
+		if (FlatText::class === $defaultPropertyClass) {
+			$defaultPropertyClass = Text::class;
+		}
+
+		// If the value type we received (e.g.: TEXT) was not the default value
+		// type for the given property (e.g.: BDAY), we need to add a VALUE=
+		// parameter.
+		if ($defaultPropertyClass !== get_class($prop)) {
+			$prop['VALUE'] = $valueType;
+		}
+
+		return $prop;
+	}
+
+	/**
+	 * Sets the input data.
+	 *
+	 * @param resource|string|array $input
+	 */
+	public function setInput($input)
+	{
+		if (is_resource($input)) {
+			$input = stream_get_contents($input);
+		}
+		if (is_string($input)) {
+			$input = json_decode($input);
+		}
+		$this->input = $input;
+	}
 }