YetiForceCompany / YetiForceCRM

libraries/SabreDAV/VObject/Property/VCard/DateTime.php

Indentation +11 added lines, -11 removed lines

@@ -13,18 +13,18 @@
  */
 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() {
+	/**
+	 * 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';
+		return 'DATE-TIME';
 
-    }
+	}
 
 }

libraries/SabreDAV/VObject/Property/Time.php

Indentation +125 added lines, -125 removed lines

@@ -15,130 +15,130 @@
  */
 class Time extends Text {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = null;
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'TIME';
-
-    }
-
-    /**
-     * Sets the JSON value, as it would appear in a jCard or jCal object.
-     *
-     * The value must always be an array.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setJsonValue(array $value) {
-
-        // Removing colons from value.
-        $value = str_replace(
-            ':',
-            '',
-            $value
-        );
-
-        if (count($value) === 1) {
-            $this->setValue(reset($value));
-        } else {
-            $this->setValue($value);
-        }
-
-    }
-
-    /**
-     * 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::parseVCardTime($this->getValue());
-        $timeStr = '';
-
-        // Hour
-        if (!is_null($parts['hour'])) {
-            $timeStr .= $parts['hour'];
-
-            if (!is_null($parts['minute'])) {
-                $timeStr .= ':';
-            }
-        } else {
-            // We know either minute or second _must_ be set, so we insert a
-            // dash for an empty value.
-            $timeStr .= '-';
-        }
-
-        // Minute
-        if (!is_null($parts['minute'])) {
-            $timeStr .= $parts['minute'];
-
-            if (!is_null($parts['second'])) {
-                $timeStr .= ':';
-            }
-        } else {
-            if (isset($parts['second'])) {
-                // Dash for empty minute
-                $timeStr .= '-';
-            }
-        }
-
-        // Second
-        if (!is_null($parts['second'])) {
-            $timeStr .= $parts['second'];
-        }
-
-        // Timezone
-        if (!is_null($parts['timezone'])) {
-            if ($parts['timezone'] === 'Z') {
-                $timeStr .= 'Z';
-            } else {
-                $timeStr .=
-                    preg_replace('/([0-9]{2})([0-9]{2})$/', '$1:$2', $parts['timezone']);
-            }
-        }
-
-        return [$timeStr];
-
-    }
-
-    /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
-     * object.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    public function setXmlValue(array $value) {
-
-        $value = array_map(
-            public function($value) {
-                return str_replace(':', '', $value);
-            },
-            $value
-        );
-        parent::setXmlValue($value);
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = null;
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'TIME';
+
+	}
+
+	/**
+	 * Sets the JSON value, as it would appear in a jCard or jCal object.
+	 *
+	 * The value must always be an array.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setJsonValue(array $value) {
+
+		// Removing colons from value.
+		$value = str_replace(
+			':',
+			'',
+			$value
+		);
+
+		if (count($value) === 1) {
+			$this->setValue(reset($value));
+		} else {
+			$this->setValue($value);
+		}
+
+	}
+
+	/**
+	 * 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::parseVCardTime($this->getValue());
+		$timeStr = '';
+
+		// Hour
+		if (!is_null($parts['hour'])) {
+			$timeStr .= $parts['hour'];
+
+			if (!is_null($parts['minute'])) {
+				$timeStr .= ':';
+			}
+		} else {
+			// We know either minute or second _must_ be set, so we insert a
+			// dash for an empty value.
+			$timeStr .= '-';
+		}
+
+		// Minute
+		if (!is_null($parts['minute'])) {
+			$timeStr .= $parts['minute'];
+
+			if (!is_null($parts['second'])) {
+				$timeStr .= ':';
+			}
+		} else {
+			if (isset($parts['second'])) {
+				// Dash for empty minute
+				$timeStr .= '-';
+			}
+		}
+
+		// Second
+		if (!is_null($parts['second'])) {
+			$timeStr .= $parts['second'];
+		}
+
+		// Timezone
+		if (!is_null($parts['timezone'])) {
+			if ($parts['timezone'] === 'Z') {
+				$timeStr .= 'Z';
+			} else {
+				$timeStr .=
+					preg_replace('/([0-9]{2})([0-9]{2})$/', '$1:$2', $parts['timezone']);
+			}
+		}
+
+		return [$timeStr];
+
+	}
+
+	/**
+	 * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+	 * object.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	public function setXmlValue(array $value) {
+
+		$value = array_map(
+			public function($value) {
+				return str_replace(':', '', $value);
+			},
+			$value
+		);
+		parent::setXmlValue($value);
+
+	}
 
 }

libraries/SabreDAV/VObject/Property/Uri.php

Indentation +102 added lines, -102 removed lines

@@ -16,107 +16,107 @@
  */
 class Uri extends Text {
 
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = null;
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return 'URI';
-
-    }
-
-    /**
-     * Returns an iterable list of children.
-     *
-     * @return array
-     */
-    public function parameters() {
-
-        $parameters = parent::parameters();
-        if (!isset($parameters['VALUE']) && in_array($this->name, ['URL', 'PHOTO'])) {
-            // If we are encoding a URI value, and this URI value has no
-            // VALUE=URI parameter, we add it anyway.
-            //
-            // This is not required by any spec, but both Apple iCal and Apple
-            // AddressBook (at least in version 10.8) will trip over this if
-            // this is not set, and so it improves compatibility.
-            //
-            // See Issue #227 and #235
-            $parameters['VALUE'] = new Parameter($this->root, 'VALUE', 'URI');
-        }
-        return $parameters;
-
-    }
-
-    /**
-     * 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
-     *
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        // Normally we don't need to do any type of unescaping for these
-        // properties, however.. we've noticed that Google Contacts
-        // specifically escapes the colon (:) with a blackslash. While I have
-        // no clue why they thought that was a good idea, I'm unescaping it
-        // anyway.
-        //
-        // Good thing backslashes are not allowed in urls. Makes it easy to
-        // assume that a backslash is always intended as an escape character.
-        if ($this->name === 'URL') {
-            $regex = '#  (?: (\\\\ (?: \\\\ | : ) ) ) #x';
-            $matches = preg_split($regex, $val, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-            $newVal = '';
-            foreach ($matches as $match) {
-                switch ($match) {
-                    case '\:' :
-                        $newVal .= ':';
-                        break;
-                    default :
-                        $newVal .= $match;
-                        break;
-                }
-            }
-            $this->value = $newVal;
-        } else {
-            $this->value = strtr($val, ['\,' => ',']);
-        }
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        if (is_array($this->value)) {
-            $value = $this->value[0];
-        } else {
-            $value = $this->value;
-        }
-
-        return strtr($value, [',' => '\,']);
-
-    }
+	/**
+	 * In case this is a multi-value property. This string will be used as a
+	 * delimiter.
+	 *
+	 * @var string|null
+	 */
+	public $delimiter = null;
+
+	/**
+	 * Returns the type of value.
+	 *
+	 * This corresponds to the VALUE= parameter. Every property also has a
+	 * 'default' valueType.
+	 *
+	 * @return string
+	 */
+	public function getValueType() {
+
+		return 'URI';
+
+	}
+
+	/**
+	 * Returns an iterable list of children.
+	 *
+	 * @return array
+	 */
+	public function parameters() {
+
+		$parameters = parent::parameters();
+		if (!isset($parameters['VALUE']) && in_array($this->name, ['URL', 'PHOTO'])) {
+			// If we are encoding a URI value, and this URI value has no
+			// VALUE=URI parameter, we add it anyway.
+			//
+			// This is not required by any spec, but both Apple iCal and Apple
+			// AddressBook (at least in version 10.8) will trip over this if
+			// this is not set, and so it improves compatibility.
+			//
+			// See Issue #227 and #235
+			$parameters['VALUE'] = new Parameter($this->root, 'VALUE', 'URI');
+		}
+		return $parameters;
+
+	}
+
+	/**
+	 * 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
+	 *
+	 * @return void
+	 */
+	public function setRawMimeDirValue($val) {
+
+		// Normally we don't need to do any type of unescaping for these
+		// properties, however.. we've noticed that Google Contacts
+		// specifically escapes the colon (:) with a blackslash. While I have
+		// no clue why they thought that was a good idea, I'm unescaping it
+		// anyway.
+		//
+		// Good thing backslashes are not allowed in urls. Makes it easy to
+		// assume that a backslash is always intended as an escape character.
+		if ($this->name === 'URL') {
+			$regex = '#  (?: (\\\\ (?: \\\\ | : ) ) ) #x';
+			$matches = preg_split($regex, $val, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+			$newVal = '';
+			foreach ($matches as $match) {
+				switch ($match) {
+					case '\:' :
+						$newVal .= ':';
+						break;
+					default :
+						$newVal .= $match;
+						break;
+				}
+			}
+			$this->value = $newVal;
+		} else {
+			$this->value = strtr($val, ['\,' => ',']);
+		}
+
+	}
+
+	/**
+	 * Returns a raw mime-dir representation of the value.
+	 *
+	 * @return string
+	 */
+	public function getRawMimeDirValue() {
+
+		if (is_array($this->value)) {
+			$value = $this->value[0];
+		} else {
+			$value = $this->value;
+		}
+
+		return strtr($value, [',' => '\,']);
+
+	}
 
 }

libraries/SabreDAV/VObject/FreeBusyData.php

Indentation +178 added lines, -178 removed lines

@@ -11,183 +11,183 @@
  */
 class FreeBusyData {
 
-    /**
-     * Start timestamp
-     *
-     * @var int
-     */
-    protected $start;
-
-    /**
-     * End timestamp
-     *
-     * @var int
-     */
-    protected $end;
-
-    /**
-     * A list of free-busy times.
-     *
-     * @var array
-     */
-    protected $data;
-
-    public function __construct($start, $end) {
-
-        $this->start = $start;
-        $this->end = $end;
-        $this->data = [];
-
-        $this->data[] = [
-            'start' => $this->start,
-            'end'   => $this->end,
-            'type'  => 'FREE',
-        ];
-
-    }
-
-    /**
-     * Adds free or busytime to the data.
-     *
-     * @param int $start
-     * @param int $end
-     * @param string $type FREE, BUSY, BUSY-UNAVAILABLE or BUSY-TENTATIVE
-     * @return void
-     */
-    public function add($start, $end, $type) {
-
-        if ($start > $this->end || $end < $this->start) {
-
-            // This new data is outside our timerange.
-            return;
-
-        }
-
-        if ($start < $this->start) {
-            // The item starts before our requested time range
-            $start = $this->start;
-        }
-        if ($end > $this->end) {
-            // The item ends after our requested time range
-            $end = $this->end;
-        }
-
-        // Finding out where we need to insert the new item.
-        $currentIndex = 0;
-        while ($start > $this->data[$currentIndex]['end']) {
-            $currentIndex++;
-        }
-
-        // The standard insertion point will be one _after_ the first
-        // overlapping item.
-        $insertStartIndex = $currentIndex + 1;
-
-        $newItem = [
-            'start' => $start,
-            'end'   => $end,
-            'type'  => $type,
-        ];
-
-        $preceedingItem = $this->data[$insertStartIndex - 1];
-        if ($this->data[$insertStartIndex - 1]['start'] === $start) {
-            // The old item starts at the exact same point as the new item.
-            $insertStartIndex--;
-        }
-
-        // Now we know where to insert the item, we need to know where it
-        // starts overlapping with items on the tail end. We need to start
-        // looking one item before the insertStartIndex, because it's possible
-        // that the new item 'sits inside' the previous old item.
-        if ($insertStartIndex > 0) {
-            $currentIndex = $insertStartIndex - 1;
-        } else {
-            $currentIndex = 0;
-        }
-
-        while ($end > $this->data[$currentIndex]['end']) {
-
-            $currentIndex++;
-
-        }
-
-        // What we are about to insert into the array
-        $newItems = [
-            $newItem
-        ];
-
-        // This is the amount of items that are completely overwritten by the
-        // new item.
-        $itemsToDelete = $currentIndex - $insertStartIndex;
-        if ($this->data[$currentIndex]['end'] <= $end) $itemsToDelete++;
-
-        // If itemsToDelete was -1, it means that the newly inserted item is
-        // actually sitting inside an existing one. This means we need to split
-        // the item at the current position in two and insert the new item in
-        // between.
-        if ($itemsToDelete === -1) {
-            $itemsToDelete = 0;
-            if ($newItem['end'] < $preceedingItem['end']) {
-                $newItems[] = [
-                    'start' => $newItem['end'] + 1,
-                    'end'   => $preceedingItem['end'],
-                    'type'  => $preceedingItem['type']
-                ];
-            }
-        }
-
-        array_splice(
-            $this->data,
-            $insertStartIndex,
-            $itemsToDelete,
-            $newItems
-        );
-
-        $doMerge = false;
-        $mergeOffset = $insertStartIndex;
-        $mergeItem = $newItem;
-        $mergeDelete = 1;
-
-        if (isset($this->data[$insertStartIndex - 1])) {
-            // Updating the start time of the previous item.
-            $this->data[$insertStartIndex - 1]['end'] = $start;
-
-            // If the previous and the current are of the same type, we can
-            // merge them into one item.
-            if ($this->data[$insertStartIndex - 1]['type'] === $this->data[$insertStartIndex]['type']) {
-                $doMerge = true;
-                $mergeOffset--;
-                $mergeDelete++;
-                $mergeItem['start'] = $this->data[$insertStartIndex - 1]['start'];
-            }
-        }
-        if (isset($this->data[$insertStartIndex + 1])) {
-            // Updating the start time of the next item.
-            $this->data[$insertStartIndex + 1]['start'] = $end;
-
-            // If the next and the current are of the same type, we can
-            // merge them into one item.
-            if ($this->data[$insertStartIndex + 1]['type'] === $this->data[$insertStartIndex]['type']) {
-                $doMerge = true;
-                $mergeDelete++;
-                $mergeItem['end'] = $this->data[$insertStartIndex + 1]['end'];
-            }
-
-        }
-        if ($doMerge) {
-            array_splice(
-                $this->data,
-                $mergeOffset,
-                $mergeDelete,
-                [$mergeItem]
-            );
-        }
-
-    }
-
-    public function getData() {
-
-        return $this->data;
-
-    }
+	/**
+	 * Start timestamp
+	 *
+	 * @var int
+	 */
+	protected $start;
+
+	/**
+	 * End timestamp
+	 *
+	 * @var int
+	 */
+	protected $end;
+
+	/**
+	 * A list of free-busy times.
+	 *
+	 * @var array
+	 */
+	protected $data;
+
+	public function __construct($start, $end) {
+
+		$this->start = $start;
+		$this->end = $end;
+		$this->data = [];
+
+		$this->data[] = [
+			'start' => $this->start,
+			'end'   => $this->end,
+			'type'  => 'FREE',
+		];
+
+	}
+
+	/**
+	 * Adds free or busytime to the data.
+	 *
+	 * @param int $start
+	 * @param int $end
+	 * @param string $type FREE, BUSY, BUSY-UNAVAILABLE or BUSY-TENTATIVE
+	 * @return void
+	 */
+	public function add($start, $end, $type) {
+
+		if ($start > $this->end || $end < $this->start) {
+
+			// This new data is outside our timerange.
+			return;
+
+		}
+
+		if ($start < $this->start) {
+			// The item starts before our requested time range
+			$start = $this->start;
+		}
+		if ($end > $this->end) {
+			// The item ends after our requested time range
+			$end = $this->end;
+		}
+
+		// Finding out where we need to insert the new item.
+		$currentIndex = 0;
+		while ($start > $this->data[$currentIndex]['end']) {
+			$currentIndex++;
+		}
+
+		// The standard insertion point will be one _after_ the first
+		// overlapping item.
+		$insertStartIndex = $currentIndex + 1;
+
+		$newItem = [
+			'start' => $start,
+			'end'   => $end,
+			'type'  => $type,
+		];
+
+		$preceedingItem = $this->data[$insertStartIndex - 1];
+		if ($this->data[$insertStartIndex - 1]['start'] === $start) {
+			// The old item starts at the exact same point as the new item.
+			$insertStartIndex--;
+		}
+
+		// Now we know where to insert the item, we need to know where it
+		// starts overlapping with items on the tail end. We need to start
+		// looking one item before the insertStartIndex, because it's possible
+		// that the new item 'sits inside' the previous old item.
+		if ($insertStartIndex > 0) {
+			$currentIndex = $insertStartIndex - 1;
+		} else {
+			$currentIndex = 0;
+		}
+
+		while ($end > $this->data[$currentIndex]['end']) {
+
+			$currentIndex++;
+
+		}
+
+		// What we are about to insert into the array
+		$newItems = [
+			$newItem
+		];
+
+		// This is the amount of items that are completely overwritten by the
+		// new item.
+		$itemsToDelete = $currentIndex - $insertStartIndex;
+		if ($this->data[$currentIndex]['end'] <= $end) $itemsToDelete++;
+
+		// If itemsToDelete was -1, it means that the newly inserted item is
+		// actually sitting inside an existing one. This means we need to split
+		// the item at the current position in two and insert the new item in
+		// between.
+		if ($itemsToDelete === -1) {
+			$itemsToDelete = 0;
+			if ($newItem['end'] < $preceedingItem['end']) {
+				$newItems[] = [
+					'start' => $newItem['end'] + 1,
+					'end'   => $preceedingItem['end'],
+					'type'  => $preceedingItem['type']
+				];
+			}
+		}
+
+		array_splice(
+			$this->data,
+			$insertStartIndex,
+			$itemsToDelete,
+			$newItems
+		);
+
+		$doMerge = false;
+		$mergeOffset = $insertStartIndex;
+		$mergeItem = $newItem;
+		$mergeDelete = 1;
+
+		if (isset($this->data[$insertStartIndex - 1])) {
+			// Updating the start time of the previous item.
+			$this->data[$insertStartIndex - 1]['end'] = $start;
+
+			// If the previous and the current are of the same type, we can
+			// merge them into one item.
+			if ($this->data[$insertStartIndex - 1]['type'] === $this->data[$insertStartIndex]['type']) {
+				$doMerge = true;
+				$mergeOffset--;
+				$mergeDelete++;
+				$mergeItem['start'] = $this->data[$insertStartIndex - 1]['start'];
+			}
+		}
+		if (isset($this->data[$insertStartIndex + 1])) {
+			// Updating the start time of the next item.
+			$this->data[$insertStartIndex + 1]['start'] = $end;
+
+			// If the next and the current are of the same type, we can
+			// merge them into one item.
+			if ($this->data[$insertStartIndex + 1]['type'] === $this->data[$insertStartIndex]['type']) {
+				$doMerge = true;
+				$mergeDelete++;
+				$mergeItem['end'] = $this->data[$insertStartIndex + 1]['end'];
+			}
+
+		}
+		if ($doMerge) {
+			array_splice(
+				$this->data,
+				$mergeOffset,
+				$mergeDelete,
+				[$mergeItem]
+			);
+		}
+
+	}
+
+	public function getData() {
+
+		return $this->data;
+
+	}
 
 }

libraries/SabreDAV/VObject/Parameter.php

Indentation +371 added lines, -371 removed lines

@@ -19,376 +19,376 @@
  */
 class Parameter extends Node {
 
-    /**
-     * 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 it's value.
-     *
-     * @var bool
-     */
-    public $noName = false;
-
-    /**
-     * 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->name = strtoupper($name);
-        $this->root = $root;
-        if (is_null($name)) {
-            $this->noName = true;
-            $this->name = static::guessParameterNameByValue($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
-     */
-    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;
-
-            // Value types
-            case 'INLINE' :
-            case 'URL' :
-            case 'CONTENT-ID' :
-            case 'CID' :
-                $name = 'VALUE';
-                break;
-
-            default:
-                $name = '';
-        }
-
-        return $name;
-    }
-
-    /**
-     * Updates the current value.
-     *
-     * This may be either a single, or multiple strings in an array.
-     *
-     * @param string|array $value
-     *
-     * @return void
-     */
-    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;
-        }
-
-    }
-
-    /**
-     * Sets multiple values for this parameter.
-     *
-     * @param array $value
-     *
-     * @return void
-     */
-    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];
-        }
-
-    }
-
-    /**
-     * 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
-     *
-     * @return void
-     */
-    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)
-        );
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        $value = $this->getParts();
-
-        if (count($value) === 0) {
-            return $this->name . '=';
-        }
-
-        if ($this->root->getDocumentType() === Document::VCARD21 && $this->noName) {
-
-            return implode(';', $value);
-
-        }
-
-        return $this->name . '=' . array_reduce(
-            $value,
-            public 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)
-                // severaly 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;
-                }
-
-            }
-        );
-
-    }
-
-    /**
-     * 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
-     */
-    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.
-     *
-     * @return void
-     */
-    public function xmlSerialize(Xml\Writer $writer) {
-
-        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();
-
-    }
-
-    /**
-     * Returns the iterator for this object.
-     *
-     * @return ElementList
-     */
-    public function getIterator() {
-
-        if (!is_null($this->iterator))
-            return $this->iterator;
-
-        return $this->iterator = new ArrayIterator((array)$this->value);
-
-    }
+	/**
+	 * 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 it's value.
+	 *
+	 * @var bool
+	 */
+	public $noName = false;
+
+	/**
+	 * 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->name = strtoupper($name);
+		$this->root = $root;
+		if (is_null($name)) {
+			$this->noName = true;
+			$this->name = static::guessParameterNameByValue($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
+	 */
+	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;
+
+			// Value types
+			case 'INLINE' :
+			case 'URL' :
+			case 'CONTENT-ID' :
+			case 'CID' :
+				$name = 'VALUE';
+				break;
+
+			default:
+				$name = '';
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Updates the current value.
+	 *
+	 * This may be either a single, or multiple strings in an array.
+	 *
+	 * @param string|array $value
+	 *
+	 * @return void
+	 */
+	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;
+		}
+
+	}
+
+	/**
+	 * Sets multiple values for this parameter.
+	 *
+	 * @param array $value
+	 *
+	 * @return void
+	 */
+	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];
+		}
+
+	}
+
+	/**
+	 * 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
+	 *
+	 * @return void
+	 */
+	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)
+		);
+
+	}
+
+	/**
+	 * Turns the object back into a serialized blob.
+	 *
+	 * @return string
+	 */
+	public function serialize() {
+
+		$value = $this->getParts();
+
+		if (count($value) === 0) {
+			return $this->name . '=';
+		}
+
+		if ($this->root->getDocumentType() === Document::VCARD21 && $this->noName) {
+
+			return implode(';', $value);
+
+		}
+
+		return $this->name . '=' . array_reduce(
+			$value,
+			public 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)
+				// severaly 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;
+				}
+
+			}
+		);
+
+	}
+
+	/**
+	 * 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
+	 */
+	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.
+	 *
+	 * @return void
+	 */
+	public function xmlSerialize(Xml\Writer $writer) {
+
+		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();
+
+	}
+
+	/**
+	 * Returns the iterator for this object.
+	 *
+	 * @return ElementList
+	 */
+	public function getIterator() {
+
+		if (!is_null($this->iterator))
+			return $this->iterator;
+
+		return $this->iterator = new ArrayIterator((array)$this->value);
+
+	}
 
 }

libraries/SabreDAV/VObject/Cli.php

Indentation +748 added lines, -748 removed lines

@@ -3,7 +3,7 @@ 
 namespace Sabre\VObject;
 
 use
-    InvalidArgumentException;
+	InvalidArgumentException;
 
 /**
  * This is the CLI interface for sabre-vobject.
@@ -14,758 +14,758 @@ 
  */
 class Cli {
 
-    /**
-     * No output.
-     *
-     * @var bool
-     */
-    protected $quiet = false;
-
-    /**
-     * Help display.
-     *
-     * @var bool
-     */
-    protected $showHelp = false;
-
-    /**
-     * Wether to spit out 'mimedir' or 'json' format.
-     *
-     * @var string
-     */
-    protected $format;
-
-    /**
-     * JSON pretty print.
-     *
-     * @var bool
-     */
-    protected $pretty;
-
-    /**
-     * Source file.
-     *
-     * @var string
-     */
-    protected $inputPath;
-
-    /**
-     * Destination file.
-     *
-     * @var string
-     */
-    protected $outputPath;
-
-    /**
-     * output stream.
-     *
-     * @var resource
-     */
-    protected $stdout;
-
-    /**
-     * stdin.
-     *
-     * @var resource
-     */
-    protected $stdin;
-
-    /**
-     * stderr.
-     *
-     * @var resource
-     */
-    protected $stderr;
-
-    /**
-     * Input format (one of json or mimedir).
-     *
-     * @var string
-     */
-    protected $inputFormat;
-
-    /**
-     * Makes the parser less strict.
-     *
-     * @var bool
-     */
-    protected $forgiving = false;
-
-    /**
-     * Main function.
-     *
-     * @return int
-     */
-    public function main(array $argv) {
-
-        // @codeCoverageIgnoreStart
-        // We cannot easily test this, so we'll skip it. Pretty basic anyway.
-
-        if (!$this->stderr) {
-            $this->stderr = fopen('php://stderr', 'w');
-        }
-        if (!$this->stdout) {
-            $this->stdout = fopen('php://stdout', 'w');
-        }
-        if (!$this->stdin) {
-            $this->stdin = fopen('php://stdin', 'r');
-        }
-
-        // @codeCoverageIgnoreEnd
-
-
-        try {
-
-            list($options, $positional) = $this->parseArguments($argv);
-
-            if (isset($options['q'])) {
-                $this->quiet = true;
-            }
-            $this->log($this->colorize('green', "sabre/vobject ") . $this->colorize('yellow', Version::VERSION));
-
-            foreach ($options as $name => $value) {
-
-                switch ($name) {
-
-                    case 'q' :
-                        // Already handled earlier.
-                        break;
-                    case 'h' :
-                    case 'help' :
-                        $this->showHelp();
-                        return 0;
-                        break;
-                    case 'format' :
-                        switch ($value) {
-
-                            // jcard/jcal documents
-                            case 'jcard' :
-                            case 'jcal' :
-
-                            // specific document versions
-                            case 'vcard21' :
-                            case 'vcard30' :
-                            case 'vcard40' :
-                            case 'icalendar20' :
-
-                            // specific formats
-                            case 'json' :
-                            case 'mimedir' :
-
-                            // icalendar/vcad
-                            case 'icalendar' :
-                            case 'vcard' :
-                                $this->format = $value;
-                                break;
-
-                            default :
-                                throw new InvalidArgumentException('Unknown format: ' . $value);
-
-                        }
-                        break;
-                    case 'pretty' :
-                        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-                            $this->pretty = true;
-                        }
-                        break;
-                    case 'forgiving' :
-                        $this->forgiving = true;
-                        break;
-                    case 'inputformat' :
-                        switch ($value) {
-                            // json formats
-                            case 'jcard' :
-                            case 'jcal' :
-                            case 'json' :
-                                $this->inputFormat = 'json';
-                                break;
-
-                            // mimedir formats
-                            case 'mimedir' :
-                            case 'icalendar' :
-                            case 'vcard' :
-                            case 'vcard21' :
-                            case 'vcard30' :
-                            case 'vcard40' :
-                            case 'icalendar20' :
-
-                                $this->inputFormat = 'mimedir';
-                                break;
-
-                            default :
-                                throw new InvalidArgumentException('Unknown format: ' . $value);
-
-                        }
-                        break;
-                    default :
-                        throw new InvalidArgumentException('Unknown option: ' . $name);
-
-                }
-
-            }
-
-            if (count($positional) === 0) {
-                $this->showHelp();
-                return 1;
-            }
-
-            if (count($positional) === 1) {
-                throw new InvalidArgumentException('Inputfile is a required argument');
-            }
-
-            if (count($positional) > 3) {
-                throw new InvalidArgumentException('Too many arguments');
-            }
-
-            if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
-                throw new InvalidArgumentException('Uknown command: ' . $positional[0]);
-            }
-
-        } catch (InvalidArgumentException $e) {
-            $this->showHelp();
-            $this->log('Error: ' . $e->getMessage(), 'red');
-            return 1;
-        }
-
-        $command = $positional[0];
-
-        $this->inputPath = $positional[1];
-        $this->outputPath = isset($positional[2]) ? $positional[2] : '-';
-
-        if ($this->outputPath !== '-') {
-            $this->stdout = fopen($this->outputPath, 'w');
-        }
-
-        if (!$this->inputFormat) {
-            if (substr($this->inputPath, -5) === '.json') {
-                $this->inputFormat = 'json';
-            } else {
-                $this->inputFormat = 'mimedir';
-            }
-        }
-        if (!$this->format) {
-            if (substr($this->outputPath, -5) === '.json') {
-                $this->format = 'json';
-            } else {
-                $this->format = 'mimedir';
-            }
-        }
-
-
-        $realCode = 0;
-
-        try {
-
-            while ($input = $this->readInput()) {
-
-                $returnCode = $this->$command($input);
-                if ($returnCode !== 0) $realCode = $returnCode;
-
-            }
-
-        } catch (EofException $e) {
-            // end of file
-        } catch (\Exception $e) {
-            $this->log('Error: ' . $e->getMessage(), 'red');
-            return 2;
-        }
-
-        return $realCode;
-
-    }
-
-    /**
-     * Shows the help message.
-     *
-     * @return void
-     */
-    protected function showHelp() {
-
-        $this->log('Usage:', 'yellow');
-        $this->log("  vobject [options] command [arguments]");
-        $this->log('');
-        $this->log('Options:', 'yellow');
-        $this->log($this->colorize('green', '  -q            ') . "Don't output anything.");
-        $this->log($this->colorize('green', '  -help -h      ') . "Display this help message.");
-        $this->log($this->colorize('green', '  --format      ') . "Convert to a specific format. Must be one of: vcard, vcard21,");
-        $this->log($this->colorize('green', '  --forgiving   ') . "Makes the parser less strict.");
-        $this->log("                vcard30, vcard40, icalendar20, jcal, jcard, json, mimedir.");
-        $this->log($this->colorize('green', '  --inputformat ') . "If the input format cannot be guessed from the extension, it");
-        $this->log("                must be specified here.");
-        // Only PHP 5.4 and up
-        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-            $this->log($this->colorize('green', '  --pretty      ') . "json pretty-print.");
-        }
-        $this->log('');
-        $this->log('Commands:', 'yellow');
-        $this->log($this->colorize('green', '  validate') . ' source_file              Validates a file for correctness.');
-        $this->log($this->colorize('green', '  repair') . ' source_file [output_file]  Repairs a file.');
-        $this->log($this->colorize('green', '  convert') . ' source_file [output_file] Converts a file.');
-        $this->log($this->colorize('green', '  color') . ' source_file                 Colorize a file, useful for debbugging.');
-        $this->log(
-        <<<HELP
+	/**
+	 * No output.
+	 *
+	 * @var bool
+	 */
+	protected $quiet = false;
+
+	/**
+	 * Help display.
+	 *
+	 * @var bool
+	 */
+	protected $showHelp = false;
+
+	/**
+	 * Wether to spit out 'mimedir' or 'json' format.
+	 *
+	 * @var string
+	 */
+	protected $format;
+
+	/**
+	 * JSON pretty print.
+	 *
+	 * @var bool
+	 */
+	protected $pretty;
+
+	/**
+	 * Source file.
+	 *
+	 * @var string
+	 */
+	protected $inputPath;
+
+	/**
+	 * Destination file.
+	 *
+	 * @var string
+	 */
+	protected $outputPath;
+
+	/**
+	 * output stream.
+	 *
+	 * @var resource
+	 */
+	protected $stdout;
+
+	/**
+	 * stdin.
+	 *
+	 * @var resource
+	 */
+	protected $stdin;
+
+	/**
+	 * stderr.
+	 *
+	 * @var resource
+	 */
+	protected $stderr;
+
+	/**
+	 * Input format (one of json or mimedir).
+	 *
+	 * @var string
+	 */
+	protected $inputFormat;
+
+	/**
+	 * Makes the parser less strict.
+	 *
+	 * @var bool
+	 */
+	protected $forgiving = false;
+
+	/**
+	 * Main function.
+	 *
+	 * @return int
+	 */
+	public function main(array $argv) {
+
+		// @codeCoverageIgnoreStart
+		// We cannot easily test this, so we'll skip it. Pretty basic anyway.
+
+		if (!$this->stderr) {
+			$this->stderr = fopen('php://stderr', 'w');
+		}
+		if (!$this->stdout) {
+			$this->stdout = fopen('php://stdout', 'w');
+		}
+		if (!$this->stdin) {
+			$this->stdin = fopen('php://stdin', 'r');
+		}
+
+		// @codeCoverageIgnoreEnd
+
+
+		try {
+
+			list($options, $positional) = $this->parseArguments($argv);
+
+			if (isset($options['q'])) {
+				$this->quiet = true;
+			}
+			$this->log($this->colorize('green', "sabre/vobject ") . $this->colorize('yellow', Version::VERSION));
+
+			foreach ($options as $name => $value) {
+
+				switch ($name) {
+
+					case 'q' :
+						// Already handled earlier.
+						break;
+					case 'h' :
+					case 'help' :
+						$this->showHelp();
+						return 0;
+						break;
+					case 'format' :
+						switch ($value) {
+
+							// jcard/jcal documents
+							case 'jcard' :
+							case 'jcal' :
+
+							// specific document versions
+							case 'vcard21' :
+							case 'vcard30' :
+							case 'vcard40' :
+							case 'icalendar20' :
+
+							// specific formats
+							case 'json' :
+							case 'mimedir' :
+
+							// icalendar/vcad
+							case 'icalendar' :
+							case 'vcard' :
+								$this->format = $value;
+								break;
+
+							default :
+								throw new InvalidArgumentException('Unknown format: ' . $value);
+
+						}
+						break;
+					case 'pretty' :
+						if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+							$this->pretty = true;
+						}
+						break;
+					case 'forgiving' :
+						$this->forgiving = true;
+						break;
+					case 'inputformat' :
+						switch ($value) {
+							// json formats
+							case 'jcard' :
+							case 'jcal' :
+							case 'json' :
+								$this->inputFormat = 'json';
+								break;
+
+							// mimedir formats
+							case 'mimedir' :
+							case 'icalendar' :
+							case 'vcard' :
+							case 'vcard21' :
+							case 'vcard30' :
+							case 'vcard40' :
+							case 'icalendar20' :
+
+								$this->inputFormat = 'mimedir';
+								break;
+
+							default :
+								throw new InvalidArgumentException('Unknown format: ' . $value);
+
+						}
+						break;
+					default :
+						throw new InvalidArgumentException('Unknown option: ' . $name);
+
+				}
+
+			}
+
+			if (count($positional) === 0) {
+				$this->showHelp();
+				return 1;
+			}
+
+			if (count($positional) === 1) {
+				throw new InvalidArgumentException('Inputfile is a required argument');
+			}
+
+			if (count($positional) > 3) {
+				throw new InvalidArgumentException('Too many arguments');
+			}
+
+			if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
+				throw new InvalidArgumentException('Uknown command: ' . $positional[0]);
+			}
+
+		} catch (InvalidArgumentException $e) {
+			$this->showHelp();
+			$this->log('Error: ' . $e->getMessage(), 'red');
+			return 1;
+		}
+
+		$command = $positional[0];
+
+		$this->inputPath = $positional[1];
+		$this->outputPath = isset($positional[2]) ? $positional[2] : '-';
+
+		if ($this->outputPath !== '-') {
+			$this->stdout = fopen($this->outputPath, 'w');
+		}
+
+		if (!$this->inputFormat) {
+			if (substr($this->inputPath, -5) === '.json') {
+				$this->inputFormat = 'json';
+			} else {
+				$this->inputFormat = 'mimedir';
+			}
+		}
+		if (!$this->format) {
+			if (substr($this->outputPath, -5) === '.json') {
+				$this->format = 'json';
+			} else {
+				$this->format = 'mimedir';
+			}
+		}
+
+
+		$realCode = 0;
+
+		try {
+
+			while ($input = $this->readInput()) {
+
+				$returnCode = $this->$command($input);
+				if ($returnCode !== 0) $realCode = $returnCode;
+
+			}
+
+		} catch (EofException $e) {
+			// end of file
+		} catch (\Exception $e) {
+			$this->log('Error: ' . $e->getMessage(), 'red');
+			return 2;
+		}
+
+		return $realCode;
+
+	}
+
+	/**
+	 * Shows the help message.
+	 *
+	 * @return void
+	 */
+	protected function showHelp() {
+
+		$this->log('Usage:', 'yellow');
+		$this->log("  vobject [options] command [arguments]");
+		$this->log('');
+		$this->log('Options:', 'yellow');
+		$this->log($this->colorize('green', '  -q            ') . "Don't output anything.");
+		$this->log($this->colorize('green', '  -help -h      ') . "Display this help message.");
+		$this->log($this->colorize('green', '  --format      ') . "Convert to a specific format. Must be one of: vcard, vcard21,");
+		$this->log($this->colorize('green', '  --forgiving   ') . "Makes the parser less strict.");
+		$this->log("                vcard30, vcard40, icalendar20, jcal, jcard, json, mimedir.");
+		$this->log($this->colorize('green', '  --inputformat ') . "If the input format cannot be guessed from the extension, it");
+		$this->log("                must be specified here.");
+		// Only PHP 5.4 and up
+		if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+			$this->log($this->colorize('green', '  --pretty      ') . "json pretty-print.");
+		}
+		$this->log('');
+		$this->log('Commands:', 'yellow');
+		$this->log($this->colorize('green', '  validate') . ' source_file              Validates a file for correctness.');
+		$this->log($this->colorize('green', '  repair') . ' source_file [output_file]  Repairs a file.');
+		$this->log($this->colorize('green', '  convert') . ' source_file [output_file] Converts a file.');
+		$this->log($this->colorize('green', '  color') . ' source_file                 Colorize a file, useful for debbugging.');
+		$this->log(
+		<<<HELP
 
 If source_file is set as '-', STDIN will be used.
 If output_file is omitted, STDOUT will be used.
 All other output is sent to STDERR.
 
 HELP
-        );
-
-        $this->log('Examples:', 'yellow');
-        $this->log('   vobject convert contact.vcf contact.json');
-        $this->log('   vobject convert --format=vcard40 old.vcf new.vcf');
-        $this->log('   vobject convert --inputformat=json --format=mimedir - -');
-        $this->log('   vobject color calendar.ics');
-        $this->log('');
-        $this->log('https://github.com/fruux/sabre-vobject', 'purple');
-
-    }
-
-    /**
-     * Validates a VObject file.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function validate(Component $vObj) {
-
-        $returnCode = 0;
-
-        switch ($vObj->name) {
-            case 'VCALENDAR' :
-                $this->log("iCalendar: " . (string)$vObj->VERSION);
-                break;
-            case 'VCARD' :
-                $this->log("vCard: " . (string)$vObj->VERSION);
-                break;
-        }
-
-        $warnings = $vObj->validate();
-        if (!count($warnings)) {
-            $this->log("  No warnings!");
-        } else {
-
-            $levels = [
-                1 => 'REPAIRED',
-                2 => 'WARNING',
-                3 => 'ERROR',
-            ];
-            $returnCode = 2;
-            foreach ($warnings as $warn) {
-
-                $extra = '';
-                if ($warn['node'] instanceof Property) {
-                    $extra = ' (property: "' . $warn['node']->name . '")';
-                }
-                $this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
-
-            }
-
-        }
-
-        return $returnCode;
-
-    }
-
-    /**
-     * Repairs a VObject file.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function repair(Component $vObj) {
-
-        $returnCode = 0;
-
-        switch ($vObj->name) {
-            case 'VCALENDAR' :
-                $this->log("iCalendar: " . (string)$vObj->VERSION);
-                break;
-            case 'VCARD' :
-                $this->log("vCard: " . (string)$vObj->VERSION);
-                break;
-        }
-
-        $warnings = $vObj->validate(Node::REPAIR);
-        if (!count($warnings)) {
-            $this->log("  No warnings!");
-        } else {
-
-            $levels = [
-                1 => 'REPAIRED',
-                2 => 'WARNING',
-                3 => 'ERROR',
-            ];
-            $returnCode = 2;
-            foreach ($warnings as $warn) {
-
-                $extra = '';
-                if ($warn['node'] instanceof Property) {
-                    $extra = ' (property: "' . $warn['node']->name . '")';
-                }
-                $this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
-
-            }
-
-        }
-        fwrite($this->stdout, $vObj->serialize());
-
-        return $returnCode;
-
-    }
-
-    /**
-     * Converts a vObject file to a new format.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function convert($vObj) {
-
-        $json = false;
-        $convertVersion = null;
-        $forceInput = null;
-
-        switch ($this->format) {
-            case 'json' :
-                $json = true;
-                if ($vObj->name === 'VCARD') {
-                    $convertVersion = Document::VCARD40;
-                }
-                break;
-            case 'jcard' :
-                $json = true;
-                $forceInput = 'VCARD';
-                $convertVersion = Document::VCARD40;
-                break;
-            case 'jcal' :
-                $json = true;
-                $forceInput = 'VCALENDAR';
-                break;
-            case 'mimedir' :
-            case 'icalendar' :
-            case 'icalendar20' :
-            case 'vcard' :
-                break;
-            case 'vcard21' :
-                $convertVersion = Document::VCARD21;
-                break;
-            case 'vcard30' :
-                $convertVersion = Document::VCARD30;
-                break;
-            case 'vcard40' :
-                $convertVersion = Document::VCARD40;
-                break;
-
-        }
-
-        if ($forceInput && $vObj->name !== $forceInput) {
-            throw new \Exception('You cannot convert a ' . strtolower($vObj->name) . ' to ' . $this->format);
-        }
-        if ($convertVersion) {
-            $vObj = $vObj->convert($convertVersion);
-        }
-        if ($json) {
-            $jsonOptions = 0;
-            if ($this->pretty) {
-                $jsonOptions = JSON_PRETTY_PRINT;
-            }
-            fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
-        } else {
-            fwrite($this->stdout, $vObj->serialize());
-        }
-
-        return 0;
-
-    }
-
-    /**
-     * Colorizes a file.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function color($vObj) {
-
-        fwrite($this->stdout, $this->serializeComponent($vObj));
-
-    }
-
-    /**
-     * Returns an ansi color string for a color name.
-     *
-     * @param string $color
-     *
-     * @return string
-     */
-    protected function colorize($color, $str, $resetTo = 'default') {
-
-        $colors = [
-            'cyan'    => '1;36',
-            'red'     => '1;31',
-            'yellow'  => '1;33',
-            'blue'    => '0;34',
-            'green'   => '0;32',
-            'default' => '0',
-            'purple'  => '0;35',
-        ];
-        return "\033[" . $colors[$color] . 'm' . $str . "\033[" . $colors[$resetTo] . "m";
-
-    }
-
-    /**
-     * Writes out a string in specific color.
-     *
-     * @param string $color
-     * @param string $str
-     *
-     * @return void
-     */
-    protected function cWrite($color, $str) {
-
-        fwrite($this->stdout, $this->colorize($color, $str));
-
-    }
-
-    protected function serializeComponent(Component $vObj) {
-
-        $this->cWrite('cyan', 'BEGIN');
-        $this->cWrite('red', ':');
-        $this->cWrite('yellow', $vObj->name . "\n");
-
-        /**
-         * Gives a component a 'score' for sorting purposes.
-         *
-         * This is solely used by the childrenSort method.
-         *
-         * A higher score means the item will be lower in the list.
-         * To avoid score collisions, each "score category" has a reasonable
-         * space to accomodate elements. The $key is added to the $score to
-         * preserve the original relative order of elements.
-         *
-         * @param int $key
-         * @param array $array
-         *
-         * @return int
-         */
-        $sortScore = function($key, $array) {
-
-            if ($array[$key] instanceof Component) {
-
-                // We want to encode VTIMEZONE first, this is a personal
-                // preference.
-                if ($array[$key]->name === 'VTIMEZONE') {
-                    $score = 300000000;
-                    return $score + $key;
-                } else {
-                    $score = 400000000;
-                    return $score + $key;
-                }
-            } else {
-                // Properties get encoded first
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($array[$key] instanceof Property) {
-                    if ($array[$key]->name === 'VERSION') {
-                        $score = 100000000;
-                        return $score + $key;
-                    } else {
-                        // All other properties
-                        $score = 200000000;
-                        return $score + $key;
-                    }
-                }
-            }
-
-        };
-
-        $children = $vObj->children();
-        $tmp = $children;
-        uksort(
-            $children,
-            public function($a, $b) use ($sortScore, $tmp) {
-
-                $sA = $sortScore($a, $tmp);
-                $sB = $sortScore($b, $tmp);
-
-                return $sA - $sB;
-
-            }
-        );
-
-        foreach ($children as $child) {
-            if ($child instanceof Component) {
-                $this->serializeComponent($child);
-            } else {
-                $this->serializeProperty($child);
-            }
-        }
-
-        $this->cWrite('cyan', 'END');
-        $this->cWrite('red', ':');
-        $this->cWrite('yellow', $vObj->name . "\n");
-
-    }
-
-    /**
-     * Colorizes a property.
-     *
-     * @param Property $property
-     *
-     * @return void
-     */
-    protected function serializeProperty(Property $property) {
-
-        if ($property->group) {
-            $this->cWrite('default', $property->group);
-            $this->cWrite('red', '.');
-        }
-
-        $this->cWrite('yellow', $property->name);
-
-        foreach ($property->parameters as $param) {
-
-            $this->cWrite('red', ';');
-            $this->cWrite('blue', $param->serialize());
-
-        }
-        $this->cWrite('red', ':');
-
-        if ($property instanceof Property\Binary) {
-
-            $this->cWrite('default', 'embedded binary stripped. (' . strlen($property->getValue()) . ' bytes)');
-
-        } else {
-
-            $parts = $property->getParts();
-            $first1 = true;
-            // Looping through property values
-            foreach ($parts as $part) {
-                if ($first1) {
-                    $first1 = false;
-                } else {
-                    $this->cWrite('red', $property->delimiter);
-                }
-                $first2 = true;
-                // Looping through property sub-values
-                foreach ((array)$part as $subPart) {
-                    if ($first2) {
-                        $first2 = false;
-                    } else {
-                        // The sub-value delimiter is always comma
-                        $this->cWrite('red', ',');
-                    }
-
-                    $subPart = strtr(
-                        $subPart,
-                        [
-                            '\\' => $this->colorize('purple', '\\\\', 'green'),
-                            ';'  => $this->colorize('purple', '\;', 'green'),
-                            ','  => $this->colorize('purple', '\,', 'green'),
-                            "\n" => $this->colorize('purple', "\\n\n\t", 'green'),
-                            "\r" => "",
-                        ]
-                    );
-
-                    $this->cWrite('green', $subPart);
-                }
-            }
-
-        }
-        $this->cWrite("default", "\n");
-
-    }
-
-    /**
-     * Parses the list of arguments.
-     *
-     * @param array $argv
-     *
-     * @return void
-     */
-    protected function parseArguments(array $argv) {
-
-        $positional = [];
-        $options = [];
-
-        for ($ii = 0; $ii < count($argv); $ii++) {
-
-            // Skipping the first argument.
-            if ($ii === 0) continue;
-
-            $v = $argv[$ii];
-
-            if (substr($v, 0, 2) === '--') {
-                // This is a long-form option.
-                $optionName = substr($v, 2);
-                $optionValue = true;
-                if (strpos($optionName, '=')) {
-                    list($optionName, $optionValue) = explode('=', $optionName);
-                }
-                $options[$optionName] = $optionValue;
-            } elseif (substr($v, 0, 1) === '-' && strlen($v) > 1) {
-                // This is a short-form option.
-                foreach (str_split(substr($v, 1)) as $option) {
-                    $options[$option] = true;
-                }
-
-            } else {
-
-                $positional[] = $v;
-
-            }
-
-        }
-
-        return [$options, $positional];
-
-    }
-
-    protected $parser;
-
-    /**
-     * Reads the input file.
-     *
-     * @return Component
-     */
-    protected function readInput() {
-
-        if (!$this->parser) {
-            if ($this->inputPath !== '-') {
-                $this->stdin = fopen($this->inputPath, 'r');
-            }
-
-            if ($this->inputFormat === 'mimedir') {
-                $this->parser = new Parser\MimeDir($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
-            } else {
-                $this->parser = new Parser\Json($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
-            }
-        }
-
-        return $this->parser->parse();
-
-    }
-
-    /**
-     * Sends a message to STDERR.
-     *
-     * @param string $msg
-     *
-     * @return void
-     */
-    protected function log($msg, $color = 'default') {
-
-        if (!$this->quiet) {
-            if ($color !== 'default') {
-                $msg = $this->colorize($color, $msg);
-            }
-            fwrite($this->stderr, $msg . "\n");
-        }
-
-    }
+		);
+
+		$this->log('Examples:', 'yellow');
+		$this->log('   vobject convert contact.vcf contact.json');
+		$this->log('   vobject convert --format=vcard40 old.vcf new.vcf');
+		$this->log('   vobject convert --inputformat=json --format=mimedir - -');
+		$this->log('   vobject color calendar.ics');
+		$this->log('');
+		$this->log('https://github.com/fruux/sabre-vobject', 'purple');
+
+	}
+
+	/**
+	 * Validates a VObject file.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function validate(Component $vObj) {
+
+		$returnCode = 0;
+
+		switch ($vObj->name) {
+			case 'VCALENDAR' :
+				$this->log("iCalendar: " . (string)$vObj->VERSION);
+				break;
+			case 'VCARD' :
+				$this->log("vCard: " . (string)$vObj->VERSION);
+				break;
+		}
+
+		$warnings = $vObj->validate();
+		if (!count($warnings)) {
+			$this->log("  No warnings!");
+		} else {
+
+			$levels = [
+				1 => 'REPAIRED',
+				2 => 'WARNING',
+				3 => 'ERROR',
+			];
+			$returnCode = 2;
+			foreach ($warnings as $warn) {
+
+				$extra = '';
+				if ($warn['node'] instanceof Property) {
+					$extra = ' (property: "' . $warn['node']->name . '")';
+				}
+				$this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
+
+			}
+
+		}
+
+		return $returnCode;
+
+	}
+
+	/**
+	 * Repairs a VObject file.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function repair(Component $vObj) {
+
+		$returnCode = 0;
+
+		switch ($vObj->name) {
+			case 'VCALENDAR' :
+				$this->log("iCalendar: " . (string)$vObj->VERSION);
+				break;
+			case 'VCARD' :
+				$this->log("vCard: " . (string)$vObj->VERSION);
+				break;
+		}
+
+		$warnings = $vObj->validate(Node::REPAIR);
+		if (!count($warnings)) {
+			$this->log("  No warnings!");
+		} else {
+
+			$levels = [
+				1 => 'REPAIRED',
+				2 => 'WARNING',
+				3 => 'ERROR',
+			];
+			$returnCode = 2;
+			foreach ($warnings as $warn) {
+
+				$extra = '';
+				if ($warn['node'] instanceof Property) {
+					$extra = ' (property: "' . $warn['node']->name . '")';
+				}
+				$this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
+
+			}
+
+		}
+		fwrite($this->stdout, $vObj->serialize());
+
+		return $returnCode;
+
+	}
+
+	/**
+	 * Converts a vObject file to a new format.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function convert($vObj) {
+
+		$json = false;
+		$convertVersion = null;
+		$forceInput = null;
+
+		switch ($this->format) {
+			case 'json' :
+				$json = true;
+				if ($vObj->name === 'VCARD') {
+					$convertVersion = Document::VCARD40;
+				}
+				break;
+			case 'jcard' :
+				$json = true;
+				$forceInput = 'VCARD';
+				$convertVersion = Document::VCARD40;
+				break;
+			case 'jcal' :
+				$json = true;
+				$forceInput = 'VCALENDAR';
+				break;
+			case 'mimedir' :
+			case 'icalendar' :
+			case 'icalendar20' :
+			case 'vcard' :
+				break;
+			case 'vcard21' :
+				$convertVersion = Document::VCARD21;
+				break;
+			case 'vcard30' :
+				$convertVersion = Document::VCARD30;
+				break;
+			case 'vcard40' :
+				$convertVersion = Document::VCARD40;
+				break;
+
+		}
+
+		if ($forceInput && $vObj->name !== $forceInput) {
+			throw new \Exception('You cannot convert a ' . strtolower($vObj->name) . ' to ' . $this->format);
+		}
+		if ($convertVersion) {
+			$vObj = $vObj->convert($convertVersion);
+		}
+		if ($json) {
+			$jsonOptions = 0;
+			if ($this->pretty) {
+				$jsonOptions = JSON_PRETTY_PRINT;
+			}
+			fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
+		} else {
+			fwrite($this->stdout, $vObj->serialize());
+		}
+
+		return 0;
+
+	}
+
+	/**
+	 * Colorizes a file.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function color($vObj) {
+
+		fwrite($this->stdout, $this->serializeComponent($vObj));
+
+	}
+
+	/**
+	 * Returns an ansi color string for a color name.
+	 *
+	 * @param string $color
+	 *
+	 * @return string
+	 */
+	protected function colorize($color, $str, $resetTo = 'default') {
+
+		$colors = [
+			'cyan'    => '1;36',
+			'red'     => '1;31',
+			'yellow'  => '1;33',
+			'blue'    => '0;34',
+			'green'   => '0;32',
+			'default' => '0',
+			'purple'  => '0;35',
+		];
+		return "\033[" . $colors[$color] . 'm' . $str . "\033[" . $colors[$resetTo] . "m";
+
+	}
+
+	/**
+	 * Writes out a string in specific color.
+	 *
+	 * @param string $color
+	 * @param string $str
+	 *
+	 * @return void
+	 */
+	protected function cWrite($color, $str) {
+
+		fwrite($this->stdout, $this->colorize($color, $str));
+
+	}
+
+	protected function serializeComponent(Component $vObj) {
+
+		$this->cWrite('cyan', 'BEGIN');
+		$this->cWrite('red', ':');
+		$this->cWrite('yellow', $vObj->name . "\n");
+
+		/**
+		 * Gives a component a 'score' for sorting purposes.
+		 *
+		 * This is solely used by the childrenSort method.
+		 *
+		 * A higher score means the item will be lower in the list.
+		 * To avoid score collisions, each "score category" has a reasonable
+		 * space to accomodate elements. The $key is added to the $score to
+		 * preserve the original relative order of elements.
+		 *
+		 * @param int $key
+		 * @param array $array
+		 *
+		 * @return int
+		 */
+		$sortScore = function($key, $array) {
+
+			if ($array[$key] instanceof Component) {
+
+				// We want to encode VTIMEZONE first, this is a personal
+				// preference.
+				if ($array[$key]->name === 'VTIMEZONE') {
+					$score = 300000000;
+					return $score + $key;
+				} else {
+					$score = 400000000;
+					return $score + $key;
+				}
+			} else {
+				// Properties get encoded first
+				// VCARD version 4.0 wants the VERSION property to appear first
+				if ($array[$key] instanceof Property) {
+					if ($array[$key]->name === 'VERSION') {
+						$score = 100000000;
+						return $score + $key;
+					} else {
+						// All other properties
+						$score = 200000000;
+						return $score + $key;
+					}
+				}
+			}
+
+		};
+
+		$children = $vObj->children();
+		$tmp = $children;
+		uksort(
+			$children,
+			public function($a, $b) use ($sortScore, $tmp) {
+
+				$sA = $sortScore($a, $tmp);
+				$sB = $sortScore($b, $tmp);
+
+				return $sA - $sB;
+
+			}
+		);
+
+		foreach ($children as $child) {
+			if ($child instanceof Component) {
+				$this->serializeComponent($child);
+			} else {
+				$this->serializeProperty($child);
+			}
+		}
+
+		$this->cWrite('cyan', 'END');
+		$this->cWrite('red', ':');
+		$this->cWrite('yellow', $vObj->name . "\n");
+
+	}
+
+	/**
+	 * Colorizes a property.
+	 *
+	 * @param Property $property
+	 *
+	 * @return void
+	 */
+	protected function serializeProperty(Property $property) {
+
+		if ($property->group) {
+			$this->cWrite('default', $property->group);
+			$this->cWrite('red', '.');
+		}
+
+		$this->cWrite('yellow', $property->name);
+
+		foreach ($property->parameters as $param) {
+
+			$this->cWrite('red', ';');
+			$this->cWrite('blue', $param->serialize());
+
+		}
+		$this->cWrite('red', ':');
+
+		if ($property instanceof Property\Binary) {
+
+			$this->cWrite('default', 'embedded binary stripped. (' . strlen($property->getValue()) . ' bytes)');
+
+		} else {
+
+			$parts = $property->getParts();
+			$first1 = true;
+			// Looping through property values
+			foreach ($parts as $part) {
+				if ($first1) {
+					$first1 = false;
+				} else {
+					$this->cWrite('red', $property->delimiter);
+				}
+				$first2 = true;
+				// Looping through property sub-values
+				foreach ((array)$part as $subPart) {
+					if ($first2) {
+						$first2 = false;
+					} else {
+						// The sub-value delimiter is always comma
+						$this->cWrite('red', ',');
+					}
+
+					$subPart = strtr(
+						$subPart,
+						[
+							'\\' => $this->colorize('purple', '\\\\', 'green'),
+							';'  => $this->colorize('purple', '\;', 'green'),
+							','  => $this->colorize('purple', '\,', 'green'),
+							"\n" => $this->colorize('purple', "\\n\n\t", 'green'),
+							"\r" => "",
+						]
+					);
+
+					$this->cWrite('green', $subPart);
+				}
+			}
+
+		}
+		$this->cWrite("default", "\n");
+
+	}
+
+	/**
+	 * Parses the list of arguments.
+	 *
+	 * @param array $argv
+	 *
+	 * @return void
+	 */
+	protected function parseArguments(array $argv) {
+
+		$positional = [];
+		$options = [];
+
+		for ($ii = 0; $ii < count($argv); $ii++) {
+
+			// Skipping the first argument.
+			if ($ii === 0) continue;
+
+			$v = $argv[$ii];
+
+			if (substr($v, 0, 2) === '--') {
+				// This is a long-form option.
+				$optionName = substr($v, 2);
+				$optionValue = true;
+				if (strpos($optionName, '=')) {
+					list($optionName, $optionValue) = explode('=', $optionName);
+				}
+				$options[$optionName] = $optionValue;
+			} elseif (substr($v, 0, 1) === '-' && strlen($v) > 1) {
+				// This is a short-form option.
+				foreach (str_split(substr($v, 1)) as $option) {
+					$options[$option] = true;
+				}
+
+			} else {
+
+				$positional[] = $v;
+
+			}
+
+		}
+
+		return [$options, $positional];
+
+	}
+
+	protected $parser;
+
+	/**
+	 * Reads the input file.
+	 *
+	 * @return Component
+	 */
+	protected function readInput() {
+
+		if (!$this->parser) {
+			if ($this->inputPath !== '-') {
+				$this->stdin = fopen($this->inputPath, 'r');
+			}
+
+			if ($this->inputFormat === 'mimedir') {
+				$this->parser = new Parser\MimeDir($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+			} else {
+				$this->parser = new Parser\Json($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+			}
+		}
+
+		return $this->parser->parse();
+
+	}
+
+	/**
+	 * Sends a message to STDERR.
+	 *
+	 * @param string $msg
+	 *
+	 * @return void
+	 */
+	protected function log($msg, $color = 'default') {
+
+		if (!$this->quiet) {
+			if ($color !== 'default') {
+				$msg = $this->colorize($color, $msg);
+			}
+			fwrite($this->stderr, $msg . "\n");
+		}
+
+	}
 
 }

libraries/SabreDAV/VObject/ElementList.php

Indentation +32 added lines, -32 removed lines

@@ -18,37 +18,37 @@
 class ElementList extends ArrayIterator {
 
 
-    /* {{{ ArrayAccess Interface */
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * @param int $offset
-     * @param mixed $value
-     *
-     * @return void
-     */
-    public function offsetSet($offset, $value) {
-
-        throw new LogicException('You can not add new objects to an ElementList');
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     *
-     * @return void
-     */
-    public function offsetUnset($offset) {
-
-        throw new LogicException('You can not remove objects from an ElementList');
-
-    }
-
-    /* }}} */
+	/* {{{ ArrayAccess Interface */
+
+	/**
+	 * Sets an item through ArrayAccess.
+	 *
+	 * @param int $offset
+	 * @param mixed $value
+	 *
+	 * @return void
+	 */
+	public function offsetSet($offset, $value) {
+
+		throw new LogicException('You can not add new objects to an ElementList');
+
+	}
+
+	/**
+	 * Sets an item through ArrayAccess.
+	 *
+	 * This method just forwards the request to the inner iterator
+	 *
+	 * @param int $offset
+	 *
+	 * @return void
+	 */
+	public function offsetUnset($offset) {
+
+		throw new LogicException('You can not remove objects from an ElementList');
+
+	}
+
+	/* }}} */
 
 }

libraries/SabreDAV/VObject/VCardConverter.php

Indentation +445 added lines, -445 removed lines

@@ -11,457 +11,457 @@
  */
 class VCardConverter {
 
-    /**
-     * Converts a vCard object to a new version.
-     *
-     * targetVersion must be one of:
-     *   Document::VCARD21
-     *   Document::VCARD30
-     *   Document::VCARD40
-     *
-     * Currently only 3.0 and 4.0 as input and output versions.
-     *
-     * 2.1 has some minor support for the input version, it's incomplete at the
-     * moment though.
-     *
-     * If input and output version are identical, a clone is returned.
-     *
-     * @param Component\VCard $input
-     * @param int $targetVersion
-     */
-    public function convert(Component\VCard $input, $targetVersion) {
-
-        $inputVersion = $input->getDocumentType();
-        if ($inputVersion === $targetVersion) {
-            return clone $input;
-        }
-
-        if (!in_array($inputVersion, [Document::VCARD21, Document::VCARD30, Document::VCARD40])) {
-            throw new \InvalidArgumentException('Only vCard 2.1, 3.0 and 4.0 are supported for the input data');
-        }
-        if (!in_array($targetVersion, [Document::VCARD30, Document::VCARD40])) {
-            throw new \InvalidArgumentException('You can only use vCard 3.0 or 4.0 for the target version');
-        }
-
-        $newVersion = $targetVersion === Document::VCARD40 ? '4.0' : '3.0';
-
-        $output = new Component\VCard([
-            'VERSION' => $newVersion,
-        ]);
-
-        // We might have generated a default UID. Remove it!
-        unset($output->UID);
-
-        foreach ($input->children() as $property) {
-
-            $this->convertProperty($input, $output, $property, $targetVersion);
-
-        }
-
-        return $output;
-
-    }
-
-    /**
-     * Handles conversion of a single property.
-     *
-     * @param Component\VCard $input
-     * @param Component\VCard $output
-     * @param Property $property
-     * @param int $targetVersion
-     *
-     * @return void
-     */
-    protected function convertProperty(Component\VCard $input, Component\VCard $output, Property $property, $targetVersion) {
-
-        // Skipping these, those are automatically added.
-        if (in_array($property->name, ['VERSION', 'PRODID'])) {
-            return;
-        }
-
-        $parameters = $property->parameters();
-        $valueType = null;
-        if (isset($parameters['VALUE'])) {
-            $valueType = $parameters['VALUE']->getValue();
-            unset($parameters['VALUE']);
-        }
-        if (!$valueType) {
-            $valueType = $property->getValueType();
-        }
-        $newProperty = $output->createProperty(
-            $property->name,
-            $property->getParts(),
-            [], // parameters will get added a bit later.
-            $valueType
-        );
-
-
-        if ($targetVersion === Document::VCARD30) {
-
-            if ($property instanceof Property\Uri && in_array($property->name, ['PHOTO', 'LOGO', 'SOUND'])) {
-
-                $newProperty = $this->convertUriToBinary($output, $newProperty);
-
-            } elseif ($property instanceof Property\VCard\DateAndOrTime) {
-
-                // In vCard 4, the birth year may be optional. This is not the
-                // case for vCard 3. Apple has a workaround for this that
-                // allows applications that support Apple's extension still
-                // omit birthyears in vCard 3, but applications that do not
-                // support this, will just use a random birthyear. We're
-                // choosing 1604 for the birthyear, because that's what apple
-                // uses.
-                $parts = DateTimeParser::parseVCardDateTime($property->getValue());
-                if (is_null($parts['year'])) {
-                    $newValue = '1604-' . $parts['month'] . '-' . $parts['date'];
-                    $newProperty->setValue($newValue);
-                    $newProperty['X-APPLE-OMIT-YEAR'] = '1604';
-                }
-
-                if ($newProperty->name == 'ANNIVERSARY') {
-                    // Microsoft non-standard anniversary
-                    $newProperty->name = 'X-ANNIVERSARY';
-
-                    // We also need to add a new apple property for the same
-                    // purpose. This apple property needs a 'label' in the same
-                    // group, so we first need to find a groupname that doesn't
-                    // exist yet.
-                    $x = 1;
-                    while ($output->select('ITEM' . $x . '.')) {
-                        $x++;
-                    }
-                    $output->add('ITEM' . $x . '.X-ABDATE', $newProperty->getValue(), ['VALUE' => 'DATE-AND-OR-TIME']);
-                    $output->add('ITEM' . $x . '.X-ABLABEL', '_$!<Anniversary>!$_');
-                }
-
-            } elseif ($property->name === 'KIND') {
-
-                switch (strtolower($property->getValue())) {
-                    case 'org' :
-                        // vCard 3.0 does not have an equivalent to KIND:ORG,
-                        // but apple has an extension that means the same
-                        // thing.
-                        $newProperty = $output->createProperty('X-ABSHOWAS', 'COMPANY');
-                        break;
-
-                    case 'individual' :
-                        // Individual is implicit, so we skip it.
-                        return;
-
-                    case 'group' :
-                        // OS X addressbook property
-                        $newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-KIND', 'GROUP');
-                        break;
-                }
-
-
-            }
-
-        } elseif ($targetVersion === Document::VCARD40) {
-
-            // These properties were removed in vCard 4.0
-            if (in_array($property->name, ['NAME', 'MAILER', 'LABEL', 'CLASS'])) {
-                return;
-            }
-
-            if ($property instanceof Property\Binary) {
-
-                $newProperty = $this->convertBinaryToUri($output, $newProperty, $parameters);
-
-            } elseif ($property instanceof Property\VCard\DateAndOrTime && isset($parameters['X-APPLE-OMIT-YEAR'])) {
-
-                // If a property such as BDAY contained 'X-APPLE-OMIT-YEAR',
-                // then we're stripping the year from the vcard 4 value.
-                $parts = DateTimeParser::parseVCardDateTime($property->getValue());
-                if ($parts['year'] === $property['X-APPLE-OMIT-YEAR']->getValue()) {
-                    $newValue = '--' . $parts['month'] . '-' . $parts['date'];
-                    $newProperty->setValue($newValue);
-                }
-
-                // Regardless if the year matched or not, we do need to strip
-                // X-APPLE-OMIT-YEAR.
-                unset($parameters['X-APPLE-OMIT-YEAR']);
-
-            }
-            switch ($property->name) {
-                case 'X-ABSHOWAS' :
-                    if (strtoupper($property->getValue()) === 'COMPANY') {
-                        $newProperty = $output->createProperty('KIND', 'ORG');
-                    }
-                    break;
-                case 'X-ADDRESSBOOKSERVER-KIND' :
-                    if (strtoupper($property->getValue()) === 'GROUP') {
-                        $newProperty = $output->createProperty('KIND', 'GROUP');
-                    }
-                    break;
-                case 'X-ANNIVERSARY' :
-                    $newProperty->name = 'ANNIVERSARY';
-                    // If we already have an anniversary property with the same
-                    // value, ignore.
-                    foreach ($output->select('ANNIVERSARY') as $anniversary) {
-                        if ($anniversary->getValue() === $newProperty->getValue()) {
-                            return;
-                        }
-                    }
-                    break;
-                case 'X-ABDATE' :
-                    // Find out what the label was, if it exists.
-                    if (!$property->group) {
-                        break;
-                    }
-                    $label = $input->{$property->group . '.X-ABLABEL'};
-
-                    // We only support converting anniversaries.
-                    if (!$label || $label->getValue() !== '_$!<Anniversary>!$_') {
-                        break;
-                    }
-
-                    // If we already have an anniversary property with the same
-                    // value, ignore.
-                    foreach ($output->select('ANNIVERSARY') as $anniversary) {
-                        if ($anniversary->getValue() === $newProperty->getValue()) {
-                            return;
-                        }
-                    }
-                    $newProperty->name = 'ANNIVERSARY';
-                    break;
-                // Apple's per-property label system.
-                case 'X-ABLABEL' :
-                    if ($newProperty->getValue() === '_$!<Anniversary>!$_') {
-                        // We can safely remove these, as they are converted to
-                        // ANNIVERSARY properties.
-                        return;
-                    }
-                    break;
-
-            }
-
-        }
-
-        // set property group
-        $newProperty->group = $property->group;
-
-        if ($targetVersion === Document::VCARD40) {
-            $this->convertParameters40($newProperty, $parameters);
-        } else {
-            $this->convertParameters30($newProperty, $parameters);
-        }
-
-        // Lastly, we need to see if there's a need for a VALUE parameter.
-        //
-        // We can do that by instantating a empty property with that name, and
-        // seeing if the default valueType is identical to the current one.
-        $tempProperty = $output->createProperty($newProperty->name);
-        if ($tempProperty->getValueType() !== $newProperty->getValueType()) {
-            $newProperty['VALUE'] = $newProperty->getValueType();
-        }
-
-        $output->add($newProperty);
-
-
-    }
-
-    /**
-     * Converts a BINARY property to a URI property.
-     *
-     * vCard 4.0 no longer supports BINARY properties.
-     *
-     * @param Component\VCard $output
-     * @param Property\Uri $property The input property.
-     * @param $parameters List of parameters that will eventually be added to
-     *                    the new property.
-     *
-     * @return Property\Uri
-     */
-    protected function convertBinaryToUri(Component\VCard $output, Property\Binary $newProperty, array &$parameters) {
-
-        $value = $newProperty->getValue();
-        $newProperty = $output->createProperty(
-            $newProperty->name,
-            null, // no value
-            [], // no parameters yet
-            'URI' // Forcing the BINARY type
-        );
-
-        $mimeType = 'application/octet-stream';
-
-        // See if we can find a better mimetype.
-        if (isset($parameters['TYPE'])) {
-
-            $newTypes = [];
-            foreach ($parameters['TYPE']->getParts() as $typePart) {
-                if (in_array(
-                    strtoupper($typePart),
-                    ['JPEG', 'PNG', 'GIF']
-                )) {
-                    $mimeType = 'image/' . strtolower($typePart);
-                } else {
-                    $newTypes[] = $typePart;
-                }
-            }
-
-            // If there were any parameters we're not converting to a
-            // mime-type, we need to keep them.
-            if ($newTypes) {
-                $parameters['TYPE']->setParts($newTypes);
-            } else {
-                unset($parameters['TYPE']);
-            }
-
-        }
-
-        $newProperty->setValue('data:' . $mimeType . ';base64,' . base64_encode($value));
-        return $newProperty;
-
-    }
-
-    /**
-     * Converts a URI property to a BINARY property.
-     *
-     * In vCard 4.0 attachments are encoded as data: uri. Even though these may
-     * be valid in vCard 3.0 as well, we should convert those to BINARY if
-     * possible, to improve compatibility.
-     *
-     * @param Component\VCard $output
-     * @param Property\Uri $property The input property.
-     *
-     * @return Property\Binary|null
-     */
-    protected function convertUriToBinary(Component\VCard $output, Property\Uri $newProperty) {
-
-        $value = $newProperty->getValue();
-
-        // Only converting data: uris
-        if (substr($value, 0, 5) !== 'data:') {
-            return $newProperty;
-        }
-
-        $newProperty = $output->createProperty(
-            $newProperty->name,
-            null, // no value
-            [], // no parameters yet
-            'BINARY'
-        );
-
-        $mimeType = substr($value, 5, strpos($value, ',') - 5);
-        if (strpos($mimeType, ';')) {
-            $mimeType = substr($mimeType, 0, strpos($mimeType, ';'));
-            $newProperty->setValue(base64_decode(substr($value, strpos($value, ',') + 1)));
-        } else {
-            $newProperty->setValue(substr($value, strpos($value, ',') + 1));
-        }
-        unset($value);
-
-        $newProperty['ENCODING'] = 'b';
-        switch ($mimeType) {
-
-            case 'image/jpeg' :
-                $newProperty['TYPE'] = 'JPEG';
-                break;
-            case 'image/png' :
-                $newProperty['TYPE'] = 'PNG';
-                break;
-            case 'image/gif' :
-                $newProperty['TYPE'] = 'GIF';
-                break;
-
-        }
-
-
-        return $newProperty;
-
-    }
-
-    /**
-     * Adds parameters to a new property for vCard 4.0.
-     *
-     * @param Property $newProperty
-     * @param array $parameters
-     *
-     * @return void
-     */
-    protected function convertParameters40(Property $newProperty, array $parameters) {
-
-        // Adding all parameters.
-        foreach ($parameters as $param) {
-
-            // vCard 2.1 allowed parameters with no name
-            if ($param->noName) $param->noName = false;
-
-            switch ($param->name) {
-
-                // We need to see if there's any TYPE=PREF, because in vCard 4
-                // that's now PREF=1.
-                case 'TYPE' :
-                    foreach ($param->getParts() as $paramPart) {
-
-                        if (strtoupper($paramPart) === 'PREF') {
-                            $newProperty->add('PREF', '1');
-                        } else {
-                            $newProperty->add($param->name, $paramPart);
-                        }
-
-                    }
-                    break;
-                // These no longer exist in vCard 4
-                case 'ENCODING' :
-                case 'CHARSET' :
-                    break;
-
-                default :
-                    $newProperty->add($param->name, $param->getParts());
-                    break;
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Adds parameters to a new property for vCard 3.0.
-     *
-     * @param Property $newProperty
-     * @param array $parameters
-     *
-     * @return void
-     */
-    protected function convertParameters30(Property $newProperty, array $parameters) {
-
-        // Adding all parameters.
-        foreach ($parameters as $param) {
-
-            // vCard 2.1 allowed parameters with no name
-            if ($param->noName) $param->noName = false;
-
-            switch ($param->name) {
-
-                case 'ENCODING' :
-                    // This value only existed in vCard 2.1, and should be
-                    // removed for anything else.
-                    if (strtoupper($param->getValue()) !== 'QUOTED-PRINTABLE') {
-                        $newProperty->add($param->name, $param->getParts());
-                    }
-                    break;
-
-                /*
+	/**
+	 * Converts a vCard object to a new version.
+	 *
+	 * targetVersion must be one of:
+	 *   Document::VCARD21
+	 *   Document::VCARD30
+	 *   Document::VCARD40
+	 *
+	 * Currently only 3.0 and 4.0 as input and output versions.
+	 *
+	 * 2.1 has some minor support for the input version, it's incomplete at the
+	 * moment though.
+	 *
+	 * If input and output version are identical, a clone is returned.
+	 *
+	 * @param Component\VCard $input
+	 * @param int $targetVersion
+	 */
+	public function convert(Component\VCard $input, $targetVersion) {
+
+		$inputVersion = $input->getDocumentType();
+		if ($inputVersion === $targetVersion) {
+			return clone $input;
+		}
+
+		if (!in_array($inputVersion, [Document::VCARD21, Document::VCARD30, Document::VCARD40])) {
+			throw new \InvalidArgumentException('Only vCard 2.1, 3.0 and 4.0 are supported for the input data');
+		}
+		if (!in_array($targetVersion, [Document::VCARD30, Document::VCARD40])) {
+			throw new \InvalidArgumentException('You can only use vCard 3.0 or 4.0 for the target version');
+		}
+
+		$newVersion = $targetVersion === Document::VCARD40 ? '4.0' : '3.0';
+
+		$output = new Component\VCard([
+			'VERSION' => $newVersion,
+		]);
+
+		// We might have generated a default UID. Remove it!
+		unset($output->UID);
+
+		foreach ($input->children() as $property) {
+
+			$this->convertProperty($input, $output, $property, $targetVersion);
+
+		}
+
+		return $output;
+
+	}
+
+	/**
+	 * Handles conversion of a single property.
+	 *
+	 * @param Component\VCard $input
+	 * @param Component\VCard $output
+	 * @param Property $property
+	 * @param int $targetVersion
+	 *
+	 * @return void
+	 */
+	protected function convertProperty(Component\VCard $input, Component\VCard $output, Property $property, $targetVersion) {
+
+		// Skipping these, those are automatically added.
+		if (in_array($property->name, ['VERSION', 'PRODID'])) {
+			return;
+		}
+
+		$parameters = $property->parameters();
+		$valueType = null;
+		if (isset($parameters['VALUE'])) {
+			$valueType = $parameters['VALUE']->getValue();
+			unset($parameters['VALUE']);
+		}
+		if (!$valueType) {
+			$valueType = $property->getValueType();
+		}
+		$newProperty = $output->createProperty(
+			$property->name,
+			$property->getParts(),
+			[], // parameters will get added a bit later.
+			$valueType
+		);
+
+
+		if ($targetVersion === Document::VCARD30) {
+
+			if ($property instanceof Property\Uri && in_array($property->name, ['PHOTO', 'LOGO', 'SOUND'])) {
+
+				$newProperty = $this->convertUriToBinary($output, $newProperty);
+
+			} elseif ($property instanceof Property\VCard\DateAndOrTime) {
+
+				// In vCard 4, the birth year may be optional. This is not the
+				// case for vCard 3. Apple has a workaround for this that
+				// allows applications that support Apple's extension still
+				// omit birthyears in vCard 3, but applications that do not
+				// support this, will just use a random birthyear. We're
+				// choosing 1604 for the birthyear, because that's what apple
+				// uses.
+				$parts = DateTimeParser::parseVCardDateTime($property->getValue());
+				if (is_null($parts['year'])) {
+					$newValue = '1604-' . $parts['month'] . '-' . $parts['date'];
+					$newProperty->setValue($newValue);
+					$newProperty['X-APPLE-OMIT-YEAR'] = '1604';
+				}
+
+				if ($newProperty->name == 'ANNIVERSARY') {
+					// Microsoft non-standard anniversary
+					$newProperty->name = 'X-ANNIVERSARY';
+
+					// We also need to add a new apple property for the same
+					// purpose. This apple property needs a 'label' in the same
+					// group, so we first need to find a groupname that doesn't
+					// exist yet.
+					$x = 1;
+					while ($output->select('ITEM' . $x . '.')) {
+						$x++;
+					}
+					$output->add('ITEM' . $x . '.X-ABDATE', $newProperty->getValue(), ['VALUE' => 'DATE-AND-OR-TIME']);
+					$output->add('ITEM' . $x . '.X-ABLABEL', '_$!<Anniversary>!$_');
+				}
+
+			} elseif ($property->name === 'KIND') {
+
+				switch (strtolower($property->getValue())) {
+					case 'org' :
+						// vCard 3.0 does not have an equivalent to KIND:ORG,
+						// but apple has an extension that means the same
+						// thing.
+						$newProperty = $output->createProperty('X-ABSHOWAS', 'COMPANY');
+						break;
+
+					case 'individual' :
+						// Individual is implicit, so we skip it.
+						return;
+
+					case 'group' :
+						// OS X addressbook property
+						$newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-KIND', 'GROUP');
+						break;
+				}
+
+
+			}
+
+		} elseif ($targetVersion === Document::VCARD40) {
+
+			// These properties were removed in vCard 4.0
+			if (in_array($property->name, ['NAME', 'MAILER', 'LABEL', 'CLASS'])) {
+				return;
+			}
+
+			if ($property instanceof Property\Binary) {
+
+				$newProperty = $this->convertBinaryToUri($output, $newProperty, $parameters);
+
+			} elseif ($property instanceof Property\VCard\DateAndOrTime && isset($parameters['X-APPLE-OMIT-YEAR'])) {
+
+				// If a property such as BDAY contained 'X-APPLE-OMIT-YEAR',
+				// then we're stripping the year from the vcard 4 value.
+				$parts = DateTimeParser::parseVCardDateTime($property->getValue());
+				if ($parts['year'] === $property['X-APPLE-OMIT-YEAR']->getValue()) {
+					$newValue = '--' . $parts['month'] . '-' . $parts['date'];
+					$newProperty->setValue($newValue);
+				}
+
+				// Regardless if the year matched or not, we do need to strip
+				// X-APPLE-OMIT-YEAR.
+				unset($parameters['X-APPLE-OMIT-YEAR']);
+
+			}
+			switch ($property->name) {
+				case 'X-ABSHOWAS' :
+					if (strtoupper($property->getValue()) === 'COMPANY') {
+						$newProperty = $output->createProperty('KIND', 'ORG');
+					}
+					break;
+				case 'X-ADDRESSBOOKSERVER-KIND' :
+					if (strtoupper($property->getValue()) === 'GROUP') {
+						$newProperty = $output->createProperty('KIND', 'GROUP');
+					}
+					break;
+				case 'X-ANNIVERSARY' :
+					$newProperty->name = 'ANNIVERSARY';
+					// If we already have an anniversary property with the same
+					// value, ignore.
+					foreach ($output->select('ANNIVERSARY') as $anniversary) {
+						if ($anniversary->getValue() === $newProperty->getValue()) {
+							return;
+						}
+					}
+					break;
+				case 'X-ABDATE' :
+					// Find out what the label was, if it exists.
+					if (!$property->group) {
+						break;
+					}
+					$label = $input->{$property->group . '.X-ABLABEL'};
+
+					// We only support converting anniversaries.
+					if (!$label || $label->getValue() !== '_$!<Anniversary>!$_') {
+						break;
+					}
+
+					// If we already have an anniversary property with the same
+					// value, ignore.
+					foreach ($output->select('ANNIVERSARY') as $anniversary) {
+						if ($anniversary->getValue() === $newProperty->getValue()) {
+							return;
+						}
+					}
+					$newProperty->name = 'ANNIVERSARY';
+					break;
+				// Apple's per-property label system.
+				case 'X-ABLABEL' :
+					if ($newProperty->getValue() === '_$!<Anniversary>!$_') {
+						// We can safely remove these, as they are converted to
+						// ANNIVERSARY properties.
+						return;
+					}
+					break;
+
+			}
+
+		}
+
+		// set property group
+		$newProperty->group = $property->group;
+
+		if ($targetVersion === Document::VCARD40) {
+			$this->convertParameters40($newProperty, $parameters);
+		} else {
+			$this->convertParameters30($newProperty, $parameters);
+		}
+
+		// Lastly, we need to see if there's a need for a VALUE parameter.
+		//
+		// We can do that by instantating a empty property with that name, and
+		// seeing if the default valueType is identical to the current one.
+		$tempProperty = $output->createProperty($newProperty->name);
+		if ($tempProperty->getValueType() !== $newProperty->getValueType()) {
+			$newProperty['VALUE'] = $newProperty->getValueType();
+		}
+
+		$output->add($newProperty);
+
+
+	}
+
+	/**
+	 * Converts a BINARY property to a URI property.
+	 *
+	 * vCard 4.0 no longer supports BINARY properties.
+	 *
+	 * @param Component\VCard $output
+	 * @param Property\Uri $property The input property.
+	 * @param $parameters List of parameters that will eventually be added to
+	 *                    the new property.
+	 *
+	 * @return Property\Uri
+	 */
+	protected function convertBinaryToUri(Component\VCard $output, Property\Binary $newProperty, array &$parameters) {
+
+		$value = $newProperty->getValue();
+		$newProperty = $output->createProperty(
+			$newProperty->name,
+			null, // no value
+			[], // no parameters yet
+			'URI' // Forcing the BINARY type
+		);
+
+		$mimeType = 'application/octet-stream';
+
+		// See if we can find a better mimetype.
+		if (isset($parameters['TYPE'])) {
+
+			$newTypes = [];
+			foreach ($parameters['TYPE']->getParts() as $typePart) {
+				if (in_array(
+					strtoupper($typePart),
+					['JPEG', 'PNG', 'GIF']
+				)) {
+					$mimeType = 'image/' . strtolower($typePart);
+				} else {
+					$newTypes[] = $typePart;
+				}
+			}
+
+			// If there were any parameters we're not converting to a
+			// mime-type, we need to keep them.
+			if ($newTypes) {
+				$parameters['TYPE']->setParts($newTypes);
+			} else {
+				unset($parameters['TYPE']);
+			}
+
+		}
+
+		$newProperty->setValue('data:' . $mimeType . ';base64,' . base64_encode($value));
+		return $newProperty;
+
+	}
+
+	/**
+	 * Converts a URI property to a BINARY property.
+	 *
+	 * In vCard 4.0 attachments are encoded as data: uri. Even though these may
+	 * be valid in vCard 3.0 as well, we should convert those to BINARY if
+	 * possible, to improve compatibility.
+	 *
+	 * @param Component\VCard $output
+	 * @param Property\Uri $property The input property.
+	 *
+	 * @return Property\Binary|null
+	 */
+	protected function convertUriToBinary(Component\VCard $output, Property\Uri $newProperty) {
+
+		$value = $newProperty->getValue();
+
+		// Only converting data: uris
+		if (substr($value, 0, 5) !== 'data:') {
+			return $newProperty;
+		}
+
+		$newProperty = $output->createProperty(
+			$newProperty->name,
+			null, // no value
+			[], // no parameters yet
+			'BINARY'
+		);
+
+		$mimeType = substr($value, 5, strpos($value, ',') - 5);
+		if (strpos($mimeType, ';')) {
+			$mimeType = substr($mimeType, 0, strpos($mimeType, ';'));
+			$newProperty->setValue(base64_decode(substr($value, strpos($value, ',') + 1)));
+		} else {
+			$newProperty->setValue(substr($value, strpos($value, ',') + 1));
+		}
+		unset($value);
+
+		$newProperty['ENCODING'] = 'b';
+		switch ($mimeType) {
+
+			case 'image/jpeg' :
+				$newProperty['TYPE'] = 'JPEG';
+				break;
+			case 'image/png' :
+				$newProperty['TYPE'] = 'PNG';
+				break;
+			case 'image/gif' :
+				$newProperty['TYPE'] = 'GIF';
+				break;
+
+		}
+
+
+		return $newProperty;
+
+	}
+
+	/**
+	 * Adds parameters to a new property for vCard 4.0.
+	 *
+	 * @param Property $newProperty
+	 * @param array $parameters
+	 *
+	 * @return void
+	 */
+	protected function convertParameters40(Property $newProperty, array $parameters) {
+
+		// Adding all parameters.
+		foreach ($parameters as $param) {
+
+			// vCard 2.1 allowed parameters with no name
+			if ($param->noName) $param->noName = false;
+
+			switch ($param->name) {
+
+				// We need to see if there's any TYPE=PREF, because in vCard 4
+				// that's now PREF=1.
+				case 'TYPE' :
+					foreach ($param->getParts() as $paramPart) {
+
+						if (strtoupper($paramPart) === 'PREF') {
+							$newProperty->add('PREF', '1');
+						} else {
+							$newProperty->add($param->name, $paramPart);
+						}
+
+					}
+					break;
+				// These no longer exist in vCard 4
+				case 'ENCODING' :
+				case 'CHARSET' :
+					break;
+
+				default :
+					$newProperty->add($param->name, $param->getParts());
+					break;
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * Adds parameters to a new property for vCard 3.0.
+	 *
+	 * @param Property $newProperty
+	 * @param array $parameters
+	 *
+	 * @return void
+	 */
+	protected function convertParameters30(Property $newProperty, array $parameters) {
+
+		// Adding all parameters.
+		foreach ($parameters as $param) {
+
+			// vCard 2.1 allowed parameters with no name
+			if ($param->noName) $param->noName = false;
+
+			switch ($param->name) {
+
+				case 'ENCODING' :
+					// This value only existed in vCard 2.1, and should be
+					// removed for anything else.
+					if (strtoupper($param->getValue()) !== 'QUOTED-PRINTABLE') {
+						$newProperty->add($param->name, $param->getParts());
+					}
+					break;
+
+				/*
                  * Converting PREF=1 to TYPE=PREF.
                  *
                  * Any other PREF numbers we'll drop.
                  */
-                case 'PREF' :
-                    if ($param->getValue() == '1') {
-                        $newProperty->add('TYPE', 'PREF');
-                    }
-                    break;
+				case 'PREF' :
+					if ($param->getValue() == '1') {
+						$newProperty->add('TYPE', 'PREF');
+					}
+					break;
 
-                default :
-                    $newProperty->add($param->name, $param->getParts());
-                    break;
+				default :
+					$newProperty->add($param->name, $param->getParts());
+					break;
 
-            }
+			}
 
-        }
+		}
 
-    }
+	}
 }

libraries/SabreDAV/VObject/Component/VAlarm.php

Indentation +120 added lines, -120 removed lines

@@ -18,125 +18,125 @@
  */
 class VAlarm extends VObject\Component {
 
-    /**
-     * Returns a DateTime object when this alarm is going to trigger.
-     *
-     * This ignores repeated alarm, only the first trigger is returned.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getEffectiveTriggerTime() {
-
-        $trigger = $this->TRIGGER;
-        if (!isset($trigger['VALUE']) || strtoupper($trigger['VALUE']) === 'DURATION') {
-            $triggerDuration = VObject\DateTimeParser::parseDuration($this->TRIGGER);
-            $related = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'END' : 'START';
-
-            $parentComponent = $this->parent;
-            if ($related === 'START') {
-
-                if ($parentComponent->name === 'VTODO') {
-                    $propName = 'DUE';
-                } else {
-                    $propName = 'DTSTART';
-                }
-
-                $effectiveTrigger = $parentComponent->$propName->getDateTime();
-                $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
-            } else {
-                if ($parentComponent->name === 'VTODO') {
-                    $endProp = 'DUE';
-                } elseif ($parentComponent->name === 'VEVENT') {
-                    $endProp = 'DTEND';
-                } else {
-                    throw new InvalidDataException('time-range filters on VALARM components are only supported when they are a child of VTODO or VEVENT');
-                }
-
-                if (isset($parentComponent->$endProp)) {
-                    $effectiveTrigger = $parentComponent->$endProp->getDateTime();
-                    $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
-                } elseif (isset($parentComponent->DURATION)) {
-                    $effectiveTrigger = $parentComponent->DTSTART->getDateTime();
-                    $duration = VObject\DateTimeParser::parseDuration($parentComponent->DURATION);
-                    $effectiveTrigger = $effectiveTrigger->add($duration);
-                    $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
-                } else {
-                    $effectiveTrigger = $parentComponent->DTSTART->getDateTime();
-                    $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
-                }
-            }
-        } else {
-            $effectiveTrigger = $trigger->getDateTime();
-        }
-        return $effectiveTrigger;
-
-    }
-
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     *
-     * @return bool
-     */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
-
-        $effectiveTrigger = $this->getEffectiveTriggerTime();
-
-        if (isset($this->DURATION)) {
-            $duration = VObject\DateTimeParser::parseDuration($this->DURATION);
-            $repeat = (string)$this->REPEAT;
-            if (!$repeat) {
-                $repeat = 1;
-            }
-
-            $period = new \DatePeriod($effectiveTrigger, $duration, (int)$repeat);
-
-            foreach ($period as $occurrence) {
-
-                if ($start <= $occurrence && $end > $occurrence) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return ($start <= $effectiveTrigger && $end > $effectiveTrigger);
-        }
-
-    }
-
-    /**
-     * A simple list of validation rules.
-     *
-     * This is simply a list of properties, and how many times they either
-     * must or must not appear.
-     *
-     * Possible values per property:
-     *   * 0 - Must not appear.
-     *   * 1 - Must appear exactly once.
-     *   * + - Must appear at least once.
-     *   * * - Can appear any number of times.
-     *   * ? - May appear, but not more than once.
-     *
-     * @var array
-     */
-    public function getValidationRules() {
-
-        return [
-            'ACTION'  => 1,
-            'TRIGGER' => 1,
-
-            'DURATION' => '?',
-            'REPEAT'   => '?',
-
-            'ATTACH' => '?',
-        ];
-
-    }
+	/**
+	 * Returns a DateTime object when this alarm is going to trigger.
+	 *
+	 * This ignores repeated alarm, only the first trigger is returned.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getEffectiveTriggerTime() {
+
+		$trigger = $this->TRIGGER;
+		if (!isset($trigger['VALUE']) || strtoupper($trigger['VALUE']) === 'DURATION') {
+			$triggerDuration = VObject\DateTimeParser::parseDuration($this->TRIGGER);
+			$related = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'END' : 'START';
+
+			$parentComponent = $this->parent;
+			if ($related === 'START') {
+
+				if ($parentComponent->name === 'VTODO') {
+					$propName = 'DUE';
+				} else {
+					$propName = 'DTSTART';
+				}
+
+				$effectiveTrigger = $parentComponent->$propName->getDateTime();
+				$effectiveTrigger = $effectiveTrigger->add($triggerDuration);
+			} else {
+				if ($parentComponent->name === 'VTODO') {
+					$endProp = 'DUE';
+				} elseif ($parentComponent->name === 'VEVENT') {
+					$endProp = 'DTEND';
+				} else {
+					throw new InvalidDataException('time-range filters on VALARM components are only supported when they are a child of VTODO or VEVENT');
+				}
+
+				if (isset($parentComponent->$endProp)) {
+					$effectiveTrigger = $parentComponent->$endProp->getDateTime();
+					$effectiveTrigger = $effectiveTrigger->add($triggerDuration);
+				} elseif (isset($parentComponent->DURATION)) {
+					$effectiveTrigger = $parentComponent->DTSTART->getDateTime();
+					$duration = VObject\DateTimeParser::parseDuration($parentComponent->DURATION);
+					$effectiveTrigger = $effectiveTrigger->add($duration);
+					$effectiveTrigger = $effectiveTrigger->add($triggerDuration);
+				} else {
+					$effectiveTrigger = $parentComponent->DTSTART->getDateTime();
+					$effectiveTrigger = $effectiveTrigger->add($triggerDuration);
+				}
+			}
+		} else {
+			$effectiveTrigger = $trigger->getDateTime();
+		}
+		return $effectiveTrigger;
+
+	}
+
+	/**
+	 * Returns true or false depending on if the event falls in the specified
+	 * time-range. This is used for filtering purposes.
+	 *
+	 * The rules used to determine if an event falls within the specified
+	 * time-range is based on the CalDAV specification.
+	 *
+	 * @param DateTime $start
+	 * @param DateTime $end
+	 *
+	 * @return bool
+	 */
+	public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end) {
+
+		$effectiveTrigger = $this->getEffectiveTriggerTime();
+
+		if (isset($this->DURATION)) {
+			$duration = VObject\DateTimeParser::parseDuration($this->DURATION);
+			$repeat = (string)$this->REPEAT;
+			if (!$repeat) {
+				$repeat = 1;
+			}
+
+			$period = new \DatePeriod($effectiveTrigger, $duration, (int)$repeat);
+
+			foreach ($period as $occurrence) {
+
+				if ($start <= $occurrence && $end > $occurrence) {
+					return true;
+				}
+			}
+			return false;
+		} else {
+			return ($start <= $effectiveTrigger && $end > $effectiveTrigger);
+		}
+
+	}
+
+	/**
+	 * A simple list of validation rules.
+	 *
+	 * This is simply a list of properties, and how many times they either
+	 * must or must not appear.
+	 *
+	 * Possible values per property:
+	 *   * 0 - Must not appear.
+	 *   * 1 - Must appear exactly once.
+	 *   * + - Must appear at least once.
+	 *   * * - Can appear any number of times.
+	 *   * ? - May appear, but not more than once.
+	 *
+	 * @var array
+	 */
+	public function getValidationRules() {
+
+		return [
+			'ACTION'  => 1,
+			'TRIGGER' => 1,
+
+			'DURATION' => '?',
+			'REPEAT'   => '?',
+
+			'ATTACH' => '?',
+		];
+
+	}
 
 }