Dolibarr / dolibarr

htdocs/includes/sabre/sabre/vobject/lib/Component/Available.php

Indentation +95 added lines, -95 removed lines

@@ -16,108 +16,108 @@
  */
 class Available extends VObject\Component
 {
-    /**
-     * Returns the 'effective start' and 'effective end' of this VAVAILABILITY
-     * component.
-     *
-     * We use the DTSTART and DTEND or DURATION to determine this.
-     *
-     * The returned value is an array containing DateTimeImmutable instances.
-     * If either the start or end is 'unbounded' its value will be null
-     * instead.
-     *
-     * @return array
-     */
-    public function getEffectiveStartEnd()
-    {
-        $effectiveStart = $this->DTSTART->getDateTime();
-        if (isset($this->DTEND)) {
-            $effectiveEnd = $this->DTEND->getDateTime();
-        } else {
-            $effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
-        }
+	/**
+	 * Returns the 'effective start' and 'effective end' of this VAVAILABILITY
+	 * component.
+	 *
+	 * We use the DTSTART and DTEND or DURATION to determine this.
+	 *
+	 * The returned value is an array containing DateTimeImmutable instances.
+	 * If either the start or end is 'unbounded' its value will be null
+	 * instead.
+	 *
+	 * @return array
+	 */
+	public function getEffectiveStartEnd()
+	{
+		$effectiveStart = $this->DTSTART->getDateTime();
+		if (isset($this->DTEND)) {
+			$effectiveEnd = $this->DTEND->getDateTime();
+		} else {
+			$effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
+		}
 
-        return [$effectiveStart, $effectiveEnd];
-    }
+		return [$effectiveStart, $effectiveEnd];
+	}
 
-    /**
-     * 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 [
-            'UID' => 1,
-            'DTSTART' => 1,
-            'DTSTAMP' => 1,
+	/**
+	 * 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 [
+			'UID' => 1,
+			'DTSTART' => 1,
+			'DTSTAMP' => 1,
 
-            'DTEND' => '?',
-            'DURATION' => '?',
+			'DTEND' => '?',
+			'DURATION' => '?',
 
-            'CREATED' => '?',
-            'DESCRIPTION' => '?',
-            'LAST-MODIFIED' => '?',
-            'RECURRENCE-ID' => '?',
-            'RRULE' => '?',
-            'SUMMARY' => '?',
+			'CREATED' => '?',
+			'DESCRIPTION' => '?',
+			'LAST-MODIFIED' => '?',
+			'RECURRENCE-ID' => '?',
+			'RRULE' => '?',
+			'SUMMARY' => '?',
 
-            'CATEGORIES' => '*',
-            'COMMENT' => '*',
-            'CONTACT' => '*',
-            'EXDATE' => '*',
-            'RDATE' => '*',
+			'CATEGORIES' => '*',
+			'COMMENT' => '*',
+			'CONTACT' => '*',
+			'EXDATE' => '*',
+			'RDATE' => '*',
 
-            'AVAILABLE' => '*',
-        ];
-    }
+			'AVAILABLE' => '*',
+		];
+	}
 
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   Node::REPAIR - May attempt to automatically repair the problem.
-     *   Node::PROFILE_CARDDAV - Validate the vCard for CardDAV purposes.
-     *   Node::PROFILE_CALDAV - Validate the iCalendar for CalDAV purposes.
-     *
-     * This method returns an array with detected problems.
-     * Every element has the following properties:
-     *
-     *  * level - problem level.
-     *  * message - A human-readable string describing the issue.
-     *  * node - A reference to the problematic node.
-     *
-     * The level means:
-     *   1 - The issue was repaired (only happens if REPAIR was turned on).
-     *   2 - A warning.
-     *   3 - An error.
-     *
-     * @param int $options
-     *
-     * @return array
-     */
-    public function validate($options = 0)
-    {
-        $result = parent::validate($options);
+	/**
+	 * Validates the node for correctness.
+	 *
+	 * The following options are supported:
+	 *   Node::REPAIR - May attempt to automatically repair the problem.
+	 *   Node::PROFILE_CARDDAV - Validate the vCard for CardDAV purposes.
+	 *   Node::PROFILE_CALDAV - Validate the iCalendar for CalDAV purposes.
+	 *
+	 * This method returns an array with detected problems.
+	 * Every element has the following properties:
+	 *
+	 *  * level - problem level.
+	 *  * message - A human-readable string describing the issue.
+	 *  * node - A reference to the problematic node.
+	 *
+	 * The level means:
+	 *   1 - The issue was repaired (only happens if REPAIR was turned on).
+	 *   2 - A warning.
+	 *   3 - An error.
+	 *
+	 * @param int $options
+	 *
+	 * @return array
+	 */
+	public function validate($options = 0)
+	{
+		$result = parent::validate($options);
 
-        if (isset($this->DTEND) && isset($this->DURATION)) {
-            $result[] = [
-                'level' => 3,
-                'message' => 'DTEND and DURATION cannot both be present',
-                'node' => $this,
-            ];
-        }
+		if (isset($this->DTEND) && isset($this->DURATION)) {
+			$result[] = [
+				'level' => 3,
+				'message' => 'DTEND and DURATION cannot both be present',
+				'node' => $this,
+			];
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

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

Indentation +42 added lines, -42 removed lines

@@ -15,52 +15,52 @@
  */
 class UUIDUtil
 {
-    /**
-     * Returns a pseudo-random v4 UUID.
-     *
-     * This function is based on a comment by Andrew Moore on php.net
-     *
-     * @see http://www.php.net/manual/en/function.uniqid.php#94959
-     *
-     * @return string
-     */
-    public static function getUUID()
-    {
-        return sprintf(
-            '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+	/**
+	 * Returns a pseudo-random v4 UUID.
+	 *
+	 * This function is based on a comment by Andrew Moore on php.net
+	 *
+	 * @see http://www.php.net/manual/en/function.uniqid.php#94959
+	 *
+	 * @return string
+	 */
+	public static function getUUID()
+	{
+		return sprintf(
+			'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
 
-            // 32 bits for "time_low"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+			// 32 bits for "time_low"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff),
 
-            // 16 bits for "time_mid"
-            mt_rand(0, 0xffff),
+			// 16 bits for "time_mid"
+			mt_rand(0, 0xffff),
 
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            mt_rand(0, 0x0fff) | 0x4000,
+			// 16 bits for "time_hi_and_version",
+			// four most significant bits holds version number 4
+			mt_rand(0, 0x0fff) | 0x4000,
 
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand(0, 0x3fff) | 0x8000,
+			// 16 bits, 8 bits for "clk_seq_hi_res",
+			// 8 bits for "clk_seq_low",
+			// two most significant bits holds zero and one for variant DCE1.1
+			mt_rand(0, 0x3fff) | 0x8000,
 
-            // 48 bits for "node"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
-        );
-    }
+			// 48 bits for "node"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+		);
+	}
 
-    /**
-     * Checks if a string is a valid UUID.
-     *
-     * @param string $uuid
-     *
-     * @return bool
-     */
-    public static function validateUUID($uuid)
-    {
-        return 0 !== preg_match(
-            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
-            $uuid
-        );
-    }
+	/**
+	 * Checks if a string is a valid UUID.
+	 *
+	 * @param string $uuid
+	 *
+	 * @return bool
+	 */
+	public static function validateUUID($uuid)
+	{
+		return 0 !== preg_match(
+			'/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
+			$uuid
+		);
+	}
 }

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

Indentation +403 added lines, -403 removed lines

@@ -11,411 +11,411 @@
  */
 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 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 = Document::VCARD40 === $targetVersion ? '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 int $targetVersion
-     */
-    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();
-        }
-        if (Document::VCARD30 !== $targetVersion && 'PHONE-NUMBER' === $valueType) {
-            $valueType = null;
-        }
-        $newProperty = $output->createProperty(
-            $property->name,
-            $property->getParts(),
-            [], // parameters will get added a bit later.
-            $valueType
-        );
-
-        if (Document::VCARD30 === $targetVersion) {
-            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 ('ANNIVERSARY' == $newProperty->name) {
-                    // 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 ('KIND' === $property->name) {
-                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 ('MEMBER' === $property->name) {
-                $newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-MEMBER', $property->getValue());
-            }
-        } elseif (Document::VCARD40 === $targetVersion) {
-            // 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 ('COMPANY' === strtoupper($property->getValue())) {
-                        $newProperty = $output->createProperty('KIND', 'ORG');
-                    }
-                    break;
-                case 'X-ADDRESSBOOKSERVER-KIND':
-                    if ('GROUP' === strtoupper($property->getValue())) {
-                        $newProperty = $output->createProperty('KIND', 'GROUP');
-                    }
-                    break;
-                case 'X-ADDRESSBOOKSERVER-MEMBER':
-                    $newProperty = $output->createProperty('MEMBER', $property->getValue());
-                    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 || '_$!<Anniversary>!$_' !== $label->getValue()) {
-                        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 ('_$!<Anniversary>!$_' === $newProperty->getValue()) {
-                        // We can safely remove these, as they are converted to
-                        // ANNIVERSARY properties.
-                        return;
-                    }
-                    break;
-            }
-        }
-
-        // set property group
-        $newProperty->group = $property->group;
-
-        if (Document::VCARD40 === $targetVersion) {
-            $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 instantiating 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 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 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 ('data:' !== substr($value, 0, 5)) {
-            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.
-     */
-    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 ('PREF' === strtoupper($paramPart)) {
-                            $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.
-     */
-    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 ('QUOTED-PRINTABLE' !== strtoupper($param->getValue())) {
-                        $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 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 = Document::VCARD40 === $targetVersion ? '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 int $targetVersion
+	 */
+	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();
+		}
+		if (Document::VCARD30 !== $targetVersion && 'PHONE-NUMBER' === $valueType) {
+			$valueType = null;
+		}
+		$newProperty = $output->createProperty(
+			$property->name,
+			$property->getParts(),
+			[], // parameters will get added a bit later.
+			$valueType
+		);
+
+		if (Document::VCARD30 === $targetVersion) {
+			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 ('ANNIVERSARY' == $newProperty->name) {
+					// 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 ('KIND' === $property->name) {
+				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 ('MEMBER' === $property->name) {
+				$newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-MEMBER', $property->getValue());
+			}
+		} elseif (Document::VCARD40 === $targetVersion) {
+			// 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 ('COMPANY' === strtoupper($property->getValue())) {
+						$newProperty = $output->createProperty('KIND', 'ORG');
+					}
+					break;
+				case 'X-ADDRESSBOOKSERVER-KIND':
+					if ('GROUP' === strtoupper($property->getValue())) {
+						$newProperty = $output->createProperty('KIND', 'GROUP');
+					}
+					break;
+				case 'X-ADDRESSBOOKSERVER-MEMBER':
+					$newProperty = $output->createProperty('MEMBER', $property->getValue());
+					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 || '_$!<Anniversary>!$_' !== $label->getValue()) {
+						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 ('_$!<Anniversary>!$_' === $newProperty->getValue()) {
+						// We can safely remove these, as they are converted to
+						// ANNIVERSARY properties.
+						return;
+					}
+					break;
+			}
+		}
+
+		// set property group
+		$newProperty->group = $property->group;
+
+		if (Document::VCARD40 === $targetVersion) {
+			$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 instantiating 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 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 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 ('data:' !== substr($value, 0, 5)) {
+			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.
+	 */
+	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 ('PREF' === strtoupper($paramPart)) {
+							$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.
+	 */
+	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 ('QUOTED-PRINTABLE' !== strtoupper($param->getValue())) {
+						$newProperty->add($param->name, $param->getParts());
+					}
+					break;
+
+				/*
                  * Converting PREF=1 to TYPE=PREF.
                  *
                  * Any other PREF numbers we'll drop.
                  */
-                case 'PREF':
-                    if ('1' == $param->getValue()) {
-                        $newProperty->add('TYPE', 'PREF');
-                    }
-                    break;
-
-                default:
-                    $newProperty->add($param->name, $param->getParts());
-                    break;
-            }
-        }
-    }
+				case 'PREF':
+					if ('1' == $param->getValue()) {
+						$newProperty->add('TYPE', 'PREF');
+					}
+					break;
+
+				default:
+					$newProperty->add($param->name, $param->getParts());
+					break;
+			}
+		}
+	}
 }

htdocs/includes/sabre/sabre/uri/lib/functions.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
     }
 
     $base = parse($basePath);
-    $pick = function ($part) use ($base, $delta) {
+    $pick = function($part) use ($base, $delta) {
         if ($delta[$part]) {
             return $delta[$part];
         } elseif ($base[$part]) {
@@ -187,7 +187,7 @@ 
     // uriencode them first.
     $uri = preg_replace_callback(
         '/[^[:ascii:]]/u',
-        function ($matches) {
+        function($matches) {
             return rawurlencode($matches[0]);
         },
         $uri
@@ -316,7 +316,7 @@ 
     // uriencode them first.
     $uri = preg_replace_callback(
         '/[^[:ascii:]]/u',
-        function ($matches) {
+        function($matches) {
             return rawurlencode($matches[0]);
         },
         $uri

Indentation +260 added lines, -260 removed lines

@@ -22,80 +22,80 @@ 
  */
 function resolve(string $basePath, string $newPath): string
 {
-    $delta = parse($newPath);
-
-    // If the new path defines a scheme, it's absolute and we can just return
-    // that.
-    if ($delta['scheme']) {
-        return build($delta);
-    }
-
-    $base = parse($basePath);
-    $pick = function ($part) use ($base, $delta) {
-        if ($delta[$part]) {
-            return $delta[$part];
-        } elseif ($base[$part]) {
-            return $base[$part];
-        }
-
-        return null;
-    };
-
-    $newParts = [];
-
-    $newParts['scheme'] = $pick('scheme');
-    $newParts['host'] = $pick('host');
-    $newParts['port'] = $pick('port');
-
-    $path = '';
-    if (is_string($delta['path']) and strlen($delta['path']) > 0) {
-        // If the path starts with a slash
-        if ('/' === $delta['path'][0]) {
-            $path = $delta['path'];
-        } else {
-            // Removing last component from base path.
-            $path = $base['path'];
-            $length = strrpos((string) $path, '/');
-            if (false !== $length) {
-                $path = substr($path, 0, $length);
-            }
-            $path .= '/'.$delta['path'];
-        }
-    } else {
-        $path = $base['path'] ?: '/';
-    }
-    // Removing .. and .
-    $pathParts = explode('/', $path);
-    $newPathParts = [];
-    foreach ($pathParts as $pathPart) {
-        switch ($pathPart) {
-            //case '' :
-            case '.':
-                break;
-            case '..':
-                array_pop($newPathParts);
-                break;
-            default:
-                $newPathParts[] = $pathPart;
-                break;
-        }
-    }
-
-    $path = implode('/', $newPathParts);
-
-    // If the source url ended with a /, we want to preserve that.
-    $newParts['path'] = 0 === strpos($path, '/') ? $path : '/'.$path;
-    if ($delta['query']) {
-        $newParts['query'] = $delta['query'];
-    } elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
-        // Keep the old query if host and path didn't change
-        $newParts['query'] = $base['query'];
-    }
-    if ($delta['fragment']) {
-        $newParts['fragment'] = $delta['fragment'];
-    }
-
-    return build($newParts);
+	$delta = parse($newPath);
+
+	// If the new path defines a scheme, it's absolute and we can just return
+	// that.
+	if ($delta['scheme']) {
+		return build($delta);
+	}
+
+	$base = parse($basePath);
+	$pick = function ($part) use ($base, $delta) {
+		if ($delta[$part]) {
+			return $delta[$part];
+		} elseif ($base[$part]) {
+			return $base[$part];
+		}
+
+		return null;
+	};
+
+	$newParts = [];
+
+	$newParts['scheme'] = $pick('scheme');
+	$newParts['host'] = $pick('host');
+	$newParts['port'] = $pick('port');
+
+	$path = '';
+	if (is_string($delta['path']) and strlen($delta['path']) > 0) {
+		// If the path starts with a slash
+		if ('/' === $delta['path'][0]) {
+			$path = $delta['path'];
+		} else {
+			// Removing last component from base path.
+			$path = $base['path'];
+			$length = strrpos((string) $path, '/');
+			if (false !== $length) {
+				$path = substr($path, 0, $length);
+			}
+			$path .= '/'.$delta['path'];
+		}
+	} else {
+		$path = $base['path'] ?: '/';
+	}
+	// Removing .. and .
+	$pathParts = explode('/', $path);
+	$newPathParts = [];
+	foreach ($pathParts as $pathPart) {
+		switch ($pathPart) {
+			//case '' :
+			case '.':
+				break;
+			case '..':
+				array_pop($newPathParts);
+				break;
+			default:
+				$newPathParts[] = $pathPart;
+				break;
+		}
+	}
+
+	$path = implode('/', $newPathParts);
+
+	// If the source url ended with a /, we want to preserve that.
+	$newParts['path'] = 0 === strpos($path, '/') ? $path : '/'.$path;
+	if ($delta['query']) {
+		$newParts['query'] = $delta['query'];
+	} elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
+		// Keep the old query if host and path didn't change
+		$newParts['query'] = $base['query'];
+	}
+	if ($delta['fragment']) {
+		$newParts['fragment'] = $delta['fragment'];
+	}
+
+	return build($newParts);
 }
 
 /**
@@ -111,57 +111,57 @@ 
  */
 function normalize(string $uri): string
 {
-    $parts = parse($uri);
-
-    if (!empty($parts['path'])) {
-        $pathParts = explode('/', ltrim($parts['path'], '/'));
-        $newPathParts = [];
-        foreach ($pathParts as $pathPart) {
-            switch ($pathPart) {
-                case '.':
-                    // skip
-                    break;
-                case '..':
-                    // One level up in the hierarchy
-                    array_pop($newPathParts);
-                    break;
-                default:
-                    // Ensuring that everything is correctly percent-encoded.
-                    $newPathParts[] = rawurlencode(rawurldecode($pathPart));
-                    break;
-            }
-        }
-        $parts['path'] = '/'.implode('/', $newPathParts);
-    }
-
-    if ($parts['scheme']) {
-        $parts['scheme'] = strtolower($parts['scheme']);
-        $defaultPorts = [
-            'http' => '80',
-            'https' => '443',
-        ];
-
-        if (!empty($parts['port']) && isset($defaultPorts[$parts['scheme']]) && $defaultPorts[$parts['scheme']] == $parts['port']) {
-            // Removing default ports.
-            unset($parts['port']);
-        }
-        // A few HTTP specific rules.
-        switch ($parts['scheme']) {
-            case 'http':
-            case 'https':
-                if (empty($parts['path'])) {
-                    // An empty path is equivalent to / in http.
-                    $parts['path'] = '/';
-                }
-                break;
-        }
-    }
-
-    if ($parts['host']) {
-        $parts['host'] = strtolower($parts['host']);
-    }
-
-    return build($parts);
+	$parts = parse($uri);
+
+	if (!empty($parts['path'])) {
+		$pathParts = explode('/', ltrim($parts['path'], '/'));
+		$newPathParts = [];
+		foreach ($pathParts as $pathPart) {
+			switch ($pathPart) {
+				case '.':
+					// skip
+					break;
+				case '..':
+					// One level up in the hierarchy
+					array_pop($newPathParts);
+					break;
+				default:
+					// Ensuring that everything is correctly percent-encoded.
+					$newPathParts[] = rawurlencode(rawurldecode($pathPart));
+					break;
+			}
+		}
+		$parts['path'] = '/'.implode('/', $newPathParts);
+	}
+
+	if ($parts['scheme']) {
+		$parts['scheme'] = strtolower($parts['scheme']);
+		$defaultPorts = [
+			'http' => '80',
+			'https' => '443',
+		];
+
+		if (!empty($parts['port']) && isset($defaultPorts[$parts['scheme']]) && $defaultPorts[$parts['scheme']] == $parts['port']) {
+			// Removing default ports.
+			unset($parts['port']);
+		}
+		// A few HTTP specific rules.
+		switch ($parts['scheme']) {
+			case 'http':
+			case 'https':
+				if (empty($parts['path'])) {
+					// An empty path is equivalent to / in http.
+					$parts['path'] = '/';
+				}
+				break;
+		}
+	}
+
+	if ($parts['host']) {
+		$parts['host'] = strtolower($parts['host']);
+	}
+
+	return build($parts);
 }
 
 /**
@@ -180,34 +180,34 @@ 
  */
 function parse(string $uri): array
 {
-    // Normally a URI must be ASCII, however. However, often it's not and
-    // parse_url might corrupt these strings.
-    //
-    // For that reason we take any non-ascii characters from the uri and
-    // uriencode them first.
-    $uri = preg_replace_callback(
-        '/[^[:ascii:]]/u',
-        function ($matches) {
-            return rawurlencode($matches[0]);
-        },
-        $uri
-    );
-
-    $result = parse_url($uri);
-    if (!$result) {
-        $result = _parse_fallback($uri);
-    }
-
-    return
-         $result + [
-            'scheme' => null,
-            'host' => null,
-            'path' => null,
-            'port' => null,
-            'user' => null,
-            'query' => null,
-            'fragment' => null,
-        ];
+	// Normally a URI must be ASCII, however. However, often it's not and
+	// parse_url might corrupt these strings.
+	//
+	// For that reason we take any non-ascii characters from the uri and
+	// uriencode them first.
+	$uri = preg_replace_callback(
+		'/[^[:ascii:]]/u',
+		function ($matches) {
+			return rawurlencode($matches[0]);
+		},
+		$uri
+	);
+
+	$result = parse_url($uri);
+	if (!$result) {
+		$result = _parse_fallback($uri);
+	}
+
+	return
+		 $result + [
+			'scheme' => null,
+			'host' => null,
+			'path' => null,
+			'port' => null,
+			'user' => null,
+			'query' => null,
+			'fragment' => null,
+		];
 }
 
 /**
@@ -218,39 +218,39 @@ 
  */
 function build(array $parts): string
 {
-    $uri = '';
-
-    $authority = '';
-    if (!empty($parts['host'])) {
-        $authority = $parts['host'];
-        if (!empty($parts['user'])) {
-            $authority = $parts['user'].'@'.$authority;
-        }
-        if (!empty($parts['port'])) {
-            $authority = $authority.':'.$parts['port'];
-        }
-    }
-
-    if (!empty($parts['scheme'])) {
-        // If there's a scheme, there's also a host.
-        $uri = $parts['scheme'].':';
-    }
-    if ($authority || (!empty($parts['scheme']) && 'file' === $parts['scheme'])) {
-        // No scheme, but there is a host.
-        $uri .= '//'.$authority;
-    }
-
-    if (!empty($parts['path'])) {
-        $uri .= $parts['path'];
-    }
-    if (!empty($parts['query'])) {
-        $uri .= '?'.$parts['query'];
-    }
-    if (!empty($parts['fragment'])) {
-        $uri .= '#'.$parts['fragment'];
-    }
-
-    return $uri;
+	$uri = '';
+
+	$authority = '';
+	if (!empty($parts['host'])) {
+		$authority = $parts['host'];
+		if (!empty($parts['user'])) {
+			$authority = $parts['user'].'@'.$authority;
+		}
+		if (!empty($parts['port'])) {
+			$authority = $authority.':'.$parts['port'];
+		}
+	}
+
+	if (!empty($parts['scheme'])) {
+		// If there's a scheme, there's also a host.
+		$uri = $parts['scheme'].':';
+	}
+	if ($authority || (!empty($parts['scheme']) && 'file' === $parts['scheme'])) {
+		// No scheme, but there is a host.
+		$uri .= '//'.$authority;
+	}
+
+	if (!empty($parts['path'])) {
+		$uri .= $parts['path'];
+	}
+	if (!empty($parts['query'])) {
+		$uri .= '?'.$parts['query'];
+	}
+	if (!empty($parts['fragment'])) {
+		$uri .= '#'.$parts['fragment'];
+	}
+
+	return $uri;
 }
 
 /**
@@ -272,12 +272,12 @@ 
  */
 function split(string $path): array
 {
-    $matches = [];
-    if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
-        return [$matches[1], $matches[2]];
-    }
+	$matches = [];
+	if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
+		return [$matches[1], $matches[2]];
+	}
 
-    return [null, null];
+	return [null, null];
 }
 
 /**
@@ -296,79 +296,79 @@ 
  */
 function _parse_fallback(string $uri): array
 {
-    // Normally a URI must be ASCII, however. However, often it's not and
-    // parse_url might corrupt these strings.
-    //
-    // For that reason we take any non-ascii characters from the uri and
-    // uriencode them first.
-    $uri = preg_replace_callback(
-        '/[^[:ascii:]]/u',
-        function ($matches) {
-            return rawurlencode($matches[0]);
-        },
-        $uri
-    );
-
-    $result = [
-        'scheme' => null,
-        'host' => null,
-        'port' => null,
-        'user' => null,
-        'path' => null,
-        'fragment' => null,
-        'query' => null,
-    ];
-
-    if (preg_match('% ^([A-Za-z][A-Za-z0-9+-\.]+): %x', $uri, $matches)) {
-        $result['scheme'] = $matches[1];
-        // Take what's left.
-        $uri = substr($uri, strlen($result['scheme']) + 1);
-    }
-
-    // Taking off a fragment part
-    if (false !== strpos($uri, '#')) {
-        list($uri, $result['fragment']) = explode('#', $uri, 2);
-    }
-    // Taking off the query part
-    if (false !== strpos($uri, '?')) {
-        list($uri, $result['query']) = explode('?', $uri, 2);
-    }
-
-    if ('///' === substr($uri, 0, 3)) {
-        // The triple slash uris are a bit unusual, but we have special handling
-        // for them.
-        $result['path'] = substr($uri, 2);
-        $result['host'] = '';
-    } elseif ('//' === substr($uri, 0, 2)) {
-        // Uris that have an authority part.
-        $regex = '%^
+	// Normally a URI must be ASCII, however. However, often it's not and
+	// parse_url might corrupt these strings.
+	//
+	// For that reason we take any non-ascii characters from the uri and
+	// uriencode them first.
+	$uri = preg_replace_callback(
+		'/[^[:ascii:]]/u',
+		function ($matches) {
+			return rawurlencode($matches[0]);
+		},
+		$uri
+	);
+
+	$result = [
+		'scheme' => null,
+		'host' => null,
+		'port' => null,
+		'user' => null,
+		'path' => null,
+		'fragment' => null,
+		'query' => null,
+	];
+
+	if (preg_match('% ^([A-Za-z][A-Za-z0-9+-\.]+): %x', $uri, $matches)) {
+		$result['scheme'] = $matches[1];
+		// Take what's left.
+		$uri = substr($uri, strlen($result['scheme']) + 1);
+	}
+
+	// Taking off a fragment part
+	if (false !== strpos($uri, '#')) {
+		list($uri, $result['fragment']) = explode('#', $uri, 2);
+	}
+	// Taking off the query part
+	if (false !== strpos($uri, '?')) {
+		list($uri, $result['query']) = explode('?', $uri, 2);
+	}
+
+	if ('///' === substr($uri, 0, 3)) {
+		// The triple slash uris are a bit unusual, but we have special handling
+		// for them.
+		$result['path'] = substr($uri, 2);
+		$result['host'] = '';
+	} elseif ('//' === substr($uri, 0, 2)) {
+		// Uris that have an authority part.
+		$regex = '%^
             //
             (?: (?<user> [^:@]+) (: (?<pass> [^@]+)) @)?
             (?<host> ( [^:/]* | \[ [^\]]+ \] ))
             (?: : (?<port> [0-9]+))?
             (?<path> / .*)?
           $%x';
-        if (!preg_match($regex, $uri, $matches)) {
-            throw new InvalidUriException('Invalid, or could not parse URI');
-        }
-        if ($matches['host']) {
-            $result['host'] = $matches['host'];
-        }
-        if (isset($matches['port'])) {
-            $result['port'] = (int) $matches['port'];
-        }
-        if (isset($matches['path'])) {
-            $result['path'] = $matches['path'];
-        }
-        if ($matches['user']) {
-            $result['user'] = $matches['user'];
-        }
-        if ($matches['pass']) {
-            $result['pass'] = $matches['pass'];
-        }
-    } else {
-        $result['path'] = $uri;
-    }
-
-    return $result;
+		if (!preg_match($regex, $uri, $matches)) {
+			throw new InvalidUriException('Invalid, or could not parse URI');
+		}
+		if ($matches['host']) {
+			$result['host'] = $matches['host'];
+		}
+		if (isset($matches['port'])) {
+			$result['port'] = (int) $matches['port'];
+		}
+		if (isset($matches['path'])) {
+			$result['path'] = $matches['path'];
+		}
+		if ($matches['user']) {
+			$result['user'] = $matches['user'];
+		}
+		if ($matches['pass']) {
+			$result['pass'] = $matches['pass'];
+		}
+	} else {
+		$result['path'] = $uri;
+	}
+
+	return $result;
 }

htdocs/includes/sabre/sabre/http/lib/ClientHttpException.php

Indentation +28 added lines, -28 removed lines

@@ -16,35 +16,35 @@
  */
 class ClientHttpException extends \Exception implements HttpException
 {
-    /**
-     * Response object.
-     *
-     * @var ResponseInterface
-     */
-    protected $response;
+	/**
+	 * Response object.
+	 *
+	 * @var ResponseInterface
+	 */
+	protected $response;
 
-    /**
-     * Constructor.
-     */
-    public function __construct(ResponseInterface $response)
-    {
-        $this->response = $response;
-        parent::__construct($response->getStatusText(), $response->getStatus());
-    }
+	/**
+	 * Constructor.
+	 */
+	public function __construct(ResponseInterface $response)
+	{
+		$this->response = $response;
+		parent::__construct($response->getStatusText(), $response->getStatus());
+	}
 
-    /**
-     * The http status code for the error.
-     */
-    public function getHttpStatus(): int
-    {
-        return $this->response->getStatus();
-    }
+	/**
+	 * The http status code for the error.
+	 */
+	public function getHttpStatus(): int
+	{
+		return $this->response->getStatus();
+	}
 
-    /**
-     * Returns the full response object.
-     */
-    public function getResponse(): ResponseInterface
-    {
-        return $this->response;
-    }
+	/**
+	 * Returns the full response object.
+	 */
+	public function getResponse(): ResponseInterface
+	{
+		return $this->response;
+	}
 }

htdocs/includes/sabre/sabre/http/lib/Auth/AWS.php

Indentation +200 added lines, -200 removed lines

@@ -17,204 +17,204 @@
  */
 class AWS extends AbstractAuth
 {
-    /**
-     * The signature supplied by the HTTP client.
-     *
-     * @var string
-     */
-    private $signature = null;
-
-    /**
-     * The accesskey supplied by the HTTP client.
-     *
-     * @var string
-     */
-    private $accessKey = null;
-
-    /**
-     * An error code, if any.
-     *
-     * This value will be filled with one of the ERR_* constants
-     *
-     * @var int
-     */
-    public $errorCode = 0;
-
-    const ERR_NOAWSHEADER = 1;
-    const ERR_MD5CHECKSUMWRONG = 2;
-    const ERR_INVALIDDATEFORMAT = 3;
-    const ERR_REQUESTTIMESKEWED = 4;
-    const ERR_INVALIDSIGNATURE = 5;
-
-    /**
-     * Gathers all information from the headers.
-     *
-     * This method needs to be called prior to anything else.
-     */
-    public function init(): bool
-    {
-        $authHeader = $this->request->getHeader('Authorization');
-
-        if (null === $authHeader) {
-            $this->errorCode = self::ERR_NOAWSHEADER;
-
-            return false;
-        }
-        $authHeader = explode(' ', $authHeader);
-
-        if ('AWS' !== $authHeader[0] || !isset($authHeader[1])) {
-            $this->errorCode = self::ERR_NOAWSHEADER;
-
-            return false;
-        }
-
-        list($this->accessKey, $this->signature) = explode(':', $authHeader[1]);
-
-        return true;
-    }
-
-    /**
-     * Returns the username for the request.
-     */
-    public function getAccessKey(): string
-    {
-        return $this->accessKey;
-    }
-
-    /**
-     * Validates the signature based on the secretKey.
-     */
-    public function validate(string $secretKey): bool
-    {
-        $contentMD5 = $this->request->getHeader('Content-MD5');
-
-        if ($contentMD5) {
-            // We need to validate the integrity of the request
-            $body = $this->request->getBody();
-            $this->request->setBody($body);
-
-            if ($contentMD5 !== base64_encode(md5((string) $body, true))) {
-                // content-md5 header did not match md5 signature of body
-                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
-
-                return false;
-            }
-        }
-
-        if (!$requestDate = $this->request->getHeader('x-amz-date')) {
-            $requestDate = $this->request->getHeader('Date');
-        }
-
-        if (!$this->validateRFC2616Date((string) $requestDate)) {
-            return false;
-        }
-
-        $amzHeaders = $this->getAmzHeaders();
-
-        $signature = base64_encode(
-            $this->hmacsha1($secretKey,
-                $this->request->getMethod()."\n".
-                $contentMD5."\n".
-                $this->request->getHeader('Content-type')."\n".
-                $requestDate."\n".
-                $amzHeaders.
-                $this->request->getUrl()
-            )
-        );
-
-        if ($this->signature !== $signature) {
-            $this->errorCode = self::ERR_INVALIDSIGNATURE;
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login.
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     */
-    public function requireLogin()
-    {
-        $this->response->addHeader('WWW-Authenticate', 'AWS');
-        $this->response->setStatus(401);
-    }
-
-    /**
-     * Makes sure the supplied value is a valid RFC2616 date.
-     *
-     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
-     * user just supplied the word 'now' for the date header.
-     *
-     * This function also makes sure the Date header is within 15 minutes of the operating
-     * system date, to prevent replay attacks.
-     */
-    protected function validateRFC2616Date(string $dateHeader): bool
-    {
-        $date = HTTP\parseDate($dateHeader);
-
-        // Unknown format
-        if (!$date) {
-            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
-
-            return false;
-        }
-
-        $min = new \DateTime('-15 minutes');
-        $max = new \DateTime('+15 minutes');
-
-        // We allow 15 minutes around the current date/time
-        if ($date > $max || $date < $min) {
-            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns a list of AMZ headers.
-     */
-    protected function getAmzHeaders(): string
-    {
-        $amzHeaders = [];
-        $headers = $this->request->getHeaders();
-        foreach ($headers as $headerName => $headerValue) {
-            if (0 === strpos(strtolower($headerName), 'x-amz-')) {
-                $amzHeaders[strtolower($headerName)] = str_replace(["\r\n"], [' '], $headerValue[0])."\n";
-            }
-        }
-        ksort($amzHeaders);
-
-        $headerStr = '';
-        foreach ($amzHeaders as $h => $v) {
-            $headerStr .= $h.':'.$v;
-        }
-
-        return $headerStr;
-    }
-
-    /**
-     * Generates an HMAC-SHA1 signature.
-     */
-    private function hmacsha1(string $key, string $message): string
-    {
-        if (function_exists('hash_hmac')) {
-            return hash_hmac('sha1', $message, $key, true);
-        }
-
-        $blocksize = 64;
-        if (strlen($key) > $blocksize) {
-            $key = pack('H*', sha1($key));
-        }
-        $key = str_pad($key, $blocksize, chr(0x00));
-        $ipad = str_repeat(chr(0x36), $blocksize);
-        $opad = str_repeat(chr(0x5c), $blocksize);
-        $hmac = pack('H*', sha1(($key ^ $opad).pack('H*', sha1(($key ^ $ipad).$message))));
-
-        return $hmac;
-    }
+	/**
+	 * The signature supplied by the HTTP client.
+	 *
+	 * @var string
+	 */
+	private $signature = null;
+
+	/**
+	 * The accesskey supplied by the HTTP client.
+	 *
+	 * @var string
+	 */
+	private $accessKey = null;
+
+	/**
+	 * An error code, if any.
+	 *
+	 * This value will be filled with one of the ERR_* constants
+	 *
+	 * @var int
+	 */
+	public $errorCode = 0;
+
+	const ERR_NOAWSHEADER = 1;
+	const ERR_MD5CHECKSUMWRONG = 2;
+	const ERR_INVALIDDATEFORMAT = 3;
+	const ERR_REQUESTTIMESKEWED = 4;
+	const ERR_INVALIDSIGNATURE = 5;
+
+	/**
+	 * Gathers all information from the headers.
+	 *
+	 * This method needs to be called prior to anything else.
+	 */
+	public function init(): bool
+	{
+		$authHeader = $this->request->getHeader('Authorization');
+
+		if (null === $authHeader) {
+			$this->errorCode = self::ERR_NOAWSHEADER;
+
+			return false;
+		}
+		$authHeader = explode(' ', $authHeader);
+
+		if ('AWS' !== $authHeader[0] || !isset($authHeader[1])) {
+			$this->errorCode = self::ERR_NOAWSHEADER;
+
+			return false;
+		}
+
+		list($this->accessKey, $this->signature) = explode(':', $authHeader[1]);
+
+		return true;
+	}
+
+	/**
+	 * Returns the username for the request.
+	 */
+	public function getAccessKey(): string
+	{
+		return $this->accessKey;
+	}
+
+	/**
+	 * Validates the signature based on the secretKey.
+	 */
+	public function validate(string $secretKey): bool
+	{
+		$contentMD5 = $this->request->getHeader('Content-MD5');
+
+		if ($contentMD5) {
+			// We need to validate the integrity of the request
+			$body = $this->request->getBody();
+			$this->request->setBody($body);
+
+			if ($contentMD5 !== base64_encode(md5((string) $body, true))) {
+				// content-md5 header did not match md5 signature of body
+				$this->errorCode = self::ERR_MD5CHECKSUMWRONG;
+
+				return false;
+			}
+		}
+
+		if (!$requestDate = $this->request->getHeader('x-amz-date')) {
+			$requestDate = $this->request->getHeader('Date');
+		}
+
+		if (!$this->validateRFC2616Date((string) $requestDate)) {
+			return false;
+		}
+
+		$amzHeaders = $this->getAmzHeaders();
+
+		$signature = base64_encode(
+			$this->hmacsha1($secretKey,
+				$this->request->getMethod()."\n".
+				$contentMD5."\n".
+				$this->request->getHeader('Content-type')."\n".
+				$requestDate."\n".
+				$amzHeaders.
+				$this->request->getUrl()
+			)
+		);
+
+		if ($this->signature !== $signature) {
+			$this->errorCode = self::ERR_INVALIDSIGNATURE;
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns an HTTP 401 header, forcing login.
+	 *
+	 * This should be called when username and password are incorrect, or not supplied at all
+	 */
+	public function requireLogin()
+	{
+		$this->response->addHeader('WWW-Authenticate', 'AWS');
+		$this->response->setStatus(401);
+	}
+
+	/**
+	 * Makes sure the supplied value is a valid RFC2616 date.
+	 *
+	 * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
+	 * user just supplied the word 'now' for the date header.
+	 *
+	 * This function also makes sure the Date header is within 15 minutes of the operating
+	 * system date, to prevent replay attacks.
+	 */
+	protected function validateRFC2616Date(string $dateHeader): bool
+	{
+		$date = HTTP\parseDate($dateHeader);
+
+		// Unknown format
+		if (!$date) {
+			$this->errorCode = self::ERR_INVALIDDATEFORMAT;
+
+			return false;
+		}
+
+		$min = new \DateTime('-15 minutes');
+		$max = new \DateTime('+15 minutes');
+
+		// We allow 15 minutes around the current date/time
+		if ($date > $max || $date < $min) {
+			$this->errorCode = self::ERR_REQUESTTIMESKEWED;
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns a list of AMZ headers.
+	 */
+	protected function getAmzHeaders(): string
+	{
+		$amzHeaders = [];
+		$headers = $this->request->getHeaders();
+		foreach ($headers as $headerName => $headerValue) {
+			if (0 === strpos(strtolower($headerName), 'x-amz-')) {
+				$amzHeaders[strtolower($headerName)] = str_replace(["\r\n"], [' '], $headerValue[0])."\n";
+			}
+		}
+		ksort($amzHeaders);
+
+		$headerStr = '';
+		foreach ($amzHeaders as $h => $v) {
+			$headerStr .= $h.':'.$v;
+		}
+
+		return $headerStr;
+	}
+
+	/**
+	 * Generates an HMAC-SHA1 signature.
+	 */
+	private function hmacsha1(string $key, string $message): string
+	{
+		if (function_exists('hash_hmac')) {
+			return hash_hmac('sha1', $message, $key, true);
+		}
+
+		$blocksize = 64;
+		if (strlen($key) > $blocksize) {
+			$key = pack('H*', sha1($key));
+		}
+		$key = str_pad($key, $blocksize, chr(0x00));
+		$ipad = str_repeat(chr(0x36), $blocksize);
+		$opad = str_repeat(chr(0x5c), $blocksize);
+		$hmac = pack('H*', sha1(($key ^ $opad).pack('H*', sha1(($key ^ $ipad).$message))));
+
+		return $hmac;
+	}
 }

htdocs/includes/sabre/sabre/http/lib/HttpException.php

Indentation +9 added lines, -9 removed lines

@@ -19,13 +19,13 @@
  */
 interface HttpException
 {
-    /**
-     * The http status code for the error.
-     *
-     * This may either be just the number, or a number and a human-readable
-     * message, separated by a space.
-     *
-     * @return string|null
-     */
-    public function getHttpStatus();
+	/**
+	 * The http status code for the error.
+	 *
+	 * This may either be just the number, or a number and a human-readable
+	 * message, separated by a space.
+	 *
+	 * @return string|null
+	 */
+	public function getHttpStatus();
 }

htdocs/includes/sabre/sabre/http/lib/functions.php

Spacing +2 added lines, -2 removed lines

@@ -386,7 +386,7 @@ 
  */
 function encodePath(string $path): string
 {
-    return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:@])/', function ($match) {
+    return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:@])/', function($match) {
         return '%'.sprintf('%02x', ord($match[0]));
     }, $path);
 }
@@ -398,7 +398,7 @@ 
  */
 function encodePathSegment(string $pathSegment): string
 {
-    return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):@])/', function ($match) {
+    return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):@])/', function($match) {
         return '%'.sprintf('%02x', ord($match[0]));
     }, $pathSegment);
 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 (?: \s* ; (?: .*))?   # Prefer parameters (ignored)
 $
 /x
-REGEX;
+regex;
 
     $output = [];
     foreach (getHeaderValues($input) as $value) {

Indentation +234 added lines, -234 removed lines

@@ -33,42 +33,42 @@ 
  */
 function parseDate(string $dateString)
 {
-    // Only the format is checked, valid ranges are checked by strtotime below
-    $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
-    $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
-    $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
-    $time = '([0-1]\d|2[0-3])(\:[0-5]\d){2}';
-    $date3 = $month.' ([12]\d|3[01]| [1-9])';
-    $date2 = '(0[1-9]|[12]\d|3[01])\-'.$month.'\-\d{2}';
-    // 4-digit year cannot begin with 0 - unix timestamp begins in 1970
-    $date1 = '(0[1-9]|[12]\d|3[01]) '.$month.' [1-9]\d{3}';
-
-    // ANSI C's asctime() format
-    // 4-digit year cannot begin with 0 - unix timestamp begins in 1970
-    $asctime_date = $wkday.' '.$date3.' '.$time.' [1-9]\d{3}';
-    // RFC 850, obsoleted by RFC 1036
-    $rfc850_date = $weekday.', '.$date2.' '.$time.' GMT';
-    // RFC 822, updated by RFC 1123
-    $rfc1123_date = $wkday.', '.$date1.' '.$time.' GMT';
-    // allowed date formats by RFC 2616
-    $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
-
-    // allow for space around the string and strip it
-    $dateString = trim($dateString, ' ');
-    if (!preg_match('/^'.$HTTP_date.'$/', $dateString)) {
-        return false;
-    }
-
-    // append implicit GMT timezone to ANSI C time format
-    if (false === strpos($dateString, ' GMT')) {
-        $dateString .= ' GMT';
-    }
-
-    try {
-        return new DateTime($dateString, new \DateTimeZone('UTC'));
-    } catch (\Exception $e) {
-        return false;
-    }
+	// Only the format is checked, valid ranges are checked by strtotime below
+	$month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
+	$weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
+	$wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
+	$time = '([0-1]\d|2[0-3])(\:[0-5]\d){2}';
+	$date3 = $month.' ([12]\d|3[01]| [1-9])';
+	$date2 = '(0[1-9]|[12]\d|3[01])\-'.$month.'\-\d{2}';
+	// 4-digit year cannot begin with 0 - unix timestamp begins in 1970
+	$date1 = '(0[1-9]|[12]\d|3[01]) '.$month.' [1-9]\d{3}';
+
+	// ANSI C's asctime() format
+	// 4-digit year cannot begin with 0 - unix timestamp begins in 1970
+	$asctime_date = $wkday.' '.$date3.' '.$time.' [1-9]\d{3}';
+	// RFC 850, obsoleted by RFC 1036
+	$rfc850_date = $weekday.', '.$date2.' '.$time.' GMT';
+	// RFC 822, updated by RFC 1123
+	$rfc1123_date = $wkday.', '.$date1.' '.$time.' GMT';
+	// allowed date formats by RFC 2616
+	$HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
+
+	// allow for space around the string and strip it
+	$dateString = trim($dateString, ' ');
+	if (!preg_match('/^'.$HTTP_date.'$/', $dateString)) {
+		return false;
+	}
+
+	// append implicit GMT timezone to ANSI C time format
+	if (false === strpos($dateString, ' GMT')) {
+		$dateString .= ' GMT';
+	}
+
+	try {
+		return new DateTime($dateString, new \DateTimeZone('UTC'));
+	} catch (\Exception $e) {
+		return false;
+	}
 }
 
 /**
@@ -76,12 +76,12 @@ 
  */
 function toDate(DateTime $dateTime): string
 {
-    // We need to clone it, as we don't want to affect the existing
-    // DateTime.
-    $dateTime = clone $dateTime;
-    $dateTime->setTimezone(new \DateTimeZone('GMT'));
+	// We need to clone it, as we don't want to affect the existing
+	// DateTime.
+	$dateTime = clone $dateTime;
+	$dateTime->setTimezone(new \DateTimeZone('GMT'));
 
-    return $dateTime->format('D, d M Y H:i:s \G\M\T');
+	return $dateTime->format('D, d M Y H:i:s \G\M\T');
 }
 
 /**
@@ -106,84 +106,84 @@ 
  */
 function negotiateContentType($acceptHeaderValue, array $availableOptions)
 {
-    if (!$acceptHeaderValue) {
-        // Grabbing the first in the list.
-        return reset($availableOptions);
-    }
-
-    $proposals = array_map(
-        'Sabre\HTTP\parseMimeType',
-        explode(',', $acceptHeaderValue)
-    );
-
-    // Ensuring array keys are reset.
-    $availableOptions = array_values($availableOptions);
-
-    $options = array_map(
-        'Sabre\HTTP\parseMimeType',
-        $availableOptions
-    );
-
-    $lastQuality = 0;
-    $lastSpecificity = 0;
-    $lastOptionIndex = 0;
-    $lastChoice = null;
-
-    foreach ($proposals as $proposal) {
-        // Ignoring broken values.
-        if (null === $proposal) {
-            continue;
-        }
-
-        // If the quality is lower we don't have to bother comparing.
-        if ($proposal['quality'] < $lastQuality) {
-            continue;
-        }
-
-        foreach ($options as $optionIndex => $option) {
-            if ('*' !== $proposal['type'] && $proposal['type'] !== $option['type']) {
-                // no match on type.
-                continue;
-            }
-            if ('*' !== $proposal['subType'] && $proposal['subType'] !== $option['subType']) {
-                // no match on subtype.
-                continue;
-            }
-
-            // Any parameters appearing on the options must appear on
-            // proposals.
-            foreach ($option['parameters'] as $paramName => $paramValue) {
-                if (!array_key_exists($paramName, $proposal['parameters'])) {
-                    continue 2;
-                }
-                if ($paramValue !== $proposal['parameters'][$paramName]) {
-                    continue 2;
-                }
-            }
-
-            // If we got here, we have a match on parameters, type and
-            // subtype. We need to calculate a score for how specific the
-            // match was.
-            $specificity =
-                ('*' !== $proposal['type'] ? 20 : 0) +
-                ('*' !== $proposal['subType'] ? 10 : 0) +
-                count($option['parameters']);
-
-            // Does this entry win?
-            if (
-                ($proposal['quality'] > $lastQuality) ||
-                ($proposal['quality'] === $lastQuality && $specificity > $lastSpecificity) ||
-                ($proposal['quality'] === $lastQuality && $specificity === $lastSpecificity && $optionIndex < $lastOptionIndex)
-            ) {
-                $lastQuality = $proposal['quality'];
-                $lastSpecificity = $specificity;
-                $lastOptionIndex = $optionIndex;
-                $lastChoice = $availableOptions[$optionIndex];
-            }
-        }
-    }
-
-    return $lastChoice;
+	if (!$acceptHeaderValue) {
+		// Grabbing the first in the list.
+		return reset($availableOptions);
+	}
+
+	$proposals = array_map(
+		'Sabre\HTTP\parseMimeType',
+		explode(',', $acceptHeaderValue)
+	);
+
+	// Ensuring array keys are reset.
+	$availableOptions = array_values($availableOptions);
+
+	$options = array_map(
+		'Sabre\HTTP\parseMimeType',
+		$availableOptions
+	);
+
+	$lastQuality = 0;
+	$lastSpecificity = 0;
+	$lastOptionIndex = 0;
+	$lastChoice = null;
+
+	foreach ($proposals as $proposal) {
+		// Ignoring broken values.
+		if (null === $proposal) {
+			continue;
+		}
+
+		// If the quality is lower we don't have to bother comparing.
+		if ($proposal['quality'] < $lastQuality) {
+			continue;
+		}
+
+		foreach ($options as $optionIndex => $option) {
+			if ('*' !== $proposal['type'] && $proposal['type'] !== $option['type']) {
+				// no match on type.
+				continue;
+			}
+			if ('*' !== $proposal['subType'] && $proposal['subType'] !== $option['subType']) {
+				// no match on subtype.
+				continue;
+			}
+
+			// Any parameters appearing on the options must appear on
+			// proposals.
+			foreach ($option['parameters'] as $paramName => $paramValue) {
+				if (!array_key_exists($paramName, $proposal['parameters'])) {
+					continue 2;
+				}
+				if ($paramValue !== $proposal['parameters'][$paramName]) {
+					continue 2;
+				}
+			}
+
+			// If we got here, we have a match on parameters, type and
+			// subtype. We need to calculate a score for how specific the
+			// match was.
+			$specificity =
+				('*' !== $proposal['type'] ? 20 : 0) +
+				('*' !== $proposal['subType'] ? 10 : 0) +
+				count($option['parameters']);
+
+			// Does this entry win?
+			if (
+				($proposal['quality'] > $lastQuality) ||
+				($proposal['quality'] === $lastQuality && $specificity > $lastSpecificity) ||
+				($proposal['quality'] === $lastQuality && $specificity === $lastSpecificity && $optionIndex < $lastOptionIndex)
+			) {
+				$lastQuality = $proposal['quality'];
+				$lastSpecificity = $specificity;
+				$lastOptionIndex = $optionIndex;
+				$lastChoice = $availableOptions[$optionIndex];
+			}
+		}
+	}
+
+	return $lastChoice;
 }
 
 /**
@@ -214,12 +214,12 @@ 
  */
 function parsePrefer($input): array
 {
-    $token = '[!#$%&\'*+\-.^_`~A-Za-z0-9]+';
+	$token = '[!#$%&\'*+\-.^_`~A-Za-z0-9]+';
 
-    // Work in progress
-    $word = '(?: [a-zA-Z0-9]+ | "[a-zA-Z0-9]*" )';
+	// Work in progress
+	$word = '(?: [a-zA-Z0-9]+ | "[a-zA-Z0-9]*" )';
 
-    $regex = <<<REGEX
+	$regex = <<<REGEX
 /
 ^
 (?<name> $token)      # Prefer property name
@@ -232,42 +232,42 @@ 
 /x
 REGEX;
 
-    $output = [];
-    foreach (getHeaderValues($input) as $value) {
-        if (!preg_match($regex, $value, $matches)) {
-            // Ignore
-            continue;
-        }
-
-        // Mapping old values to their new counterparts
-        switch ($matches['name']) {
-            case 'return-asynch':
-                $output['respond-async'] = true;
-                break;
-            case 'return-representation':
-                $output['return'] = 'representation';
-                break;
-            case 'return-minimal':
-                $output['return'] = 'minimal';
-                break;
-            case 'strict':
-                $output['handling'] = 'strict';
-                break;
-            case 'lenient':
-                $output['handling'] = 'lenient';
-                break;
-            default:
-                if (isset($matches['value'])) {
-                    $value = trim($matches['value'], '"');
-                } else {
-                    $value = true;
-                }
-                $output[strtolower($matches['name'])] = empty($value) ? true : $value;
-                break;
-        }
-    }
-
-    return $output;
+	$output = [];
+	foreach (getHeaderValues($input) as $value) {
+		if (!preg_match($regex, $value, $matches)) {
+			// Ignore
+			continue;
+		}
+
+		// Mapping old values to their new counterparts
+		switch ($matches['name']) {
+			case 'return-asynch':
+				$output['respond-async'] = true;
+				break;
+			case 'return-representation':
+				$output['return'] = 'representation';
+				break;
+			case 'return-minimal':
+				$output['return'] = 'minimal';
+				break;
+			case 'strict':
+				$output['handling'] = 'strict';
+				break;
+			case 'lenient':
+				$output['handling'] = 'lenient';
+				break;
+			default:
+				if (isset($matches['value'])) {
+					$value = trim($matches['value'], '"');
+				} else {
+					$value = true;
+				}
+				$output[strtolower($matches['name'])] = empty($value) ? true : $value;
+				break;
+		}
+	}
+
+	return $output;
 }
 
 /**
@@ -289,19 +289,19 @@ 
  */
 function getHeaderValues($values, $values2 = null): array
 {
-    $values = (array) $values;
-    if ($values2) {
-        $values = array_merge($values, (array) $values2);
-    }
-
-    $result = [];
-    foreach ($values as $l1) {
-        foreach (explode(',', $l1) as $l2) {
-            $result[] = trim($l2);
-        }
-    }
-
-    return $result;
+	$values = (array) $values;
+	if ($values2) {
+		$values = array_merge($values, (array) $values2);
+	}
+
+	$result = [];
+	foreach ($values as $l1) {
+		foreach (explode(',', $l1) as $l2) {
+			$result[] = trim($l2);
+		}
+	}
+
+	return $result;
 }
 
 /**
@@ -314,56 +314,56 @@ 
  */
 function parseMimeType(string $str): array
 {
-    $parameters = [];
-    // If no q= parameter appears, then quality = 1.
-    $quality = 1;
-
-    $parts = explode(';', $str);
-
-    // The first part is the mime-type.
-    $mimeType = trim(array_shift($parts));
-
-    if ('*' === $mimeType) {
-        $mimeType = '*/*';
-    }
-
-    $mimeType = explode('/', $mimeType);
-    if (2 !== count($mimeType)) {
-        // Illegal value
-        var_dump($mimeType);
-        exit();
-        // throw new InvalidArgumentException('Not a valid mime-type: '.$str);
-    }
-    list($type, $subType) = $mimeType;
-
-    foreach ($parts as $part) {
-        $part = trim($part);
-        if (strpos($part, '=')) {
-            list($partName, $partValue) =
-                explode('=', $part, 2);
-        } else {
-            $partName = $part;
-            $partValue = null;
-        }
-
-        // The quality parameter, if it appears, also marks the end of
-        // the parameter list. Anything after the q= counts as an
-        // 'accept extension' and could introduce new semantics in
-        // content-negotiation.
-        if ('q' !== $partName) {
-            $parameters[$partName] = $part;
-        } else {
-            $quality = (float) $partValue;
-            break; // Stop parsing parts
-        }
-    }
-
-    return [
-        'type' => $type,
-        'subType' => $subType,
-        'quality' => $quality,
-        'parameters' => $parameters,
-    ];
+	$parameters = [];
+	// If no q= parameter appears, then quality = 1.
+	$quality = 1;
+
+	$parts = explode(';', $str);
+
+	// The first part is the mime-type.
+	$mimeType = trim(array_shift($parts));
+
+	if ('*' === $mimeType) {
+		$mimeType = '*/*';
+	}
+
+	$mimeType = explode('/', $mimeType);
+	if (2 !== count($mimeType)) {
+		// Illegal value
+		var_dump($mimeType);
+		exit();
+		// throw new InvalidArgumentException('Not a valid mime-type: '.$str);
+	}
+	list($type, $subType) = $mimeType;
+
+	foreach ($parts as $part) {
+		$part = trim($part);
+		if (strpos($part, '=')) {
+			list($partName, $partValue) =
+				explode('=', $part, 2);
+		} else {
+			$partName = $part;
+			$partValue = null;
+		}
+
+		// The quality parameter, if it appears, also marks the end of
+		// the parameter list. Anything after the q= counts as an
+		// 'accept extension' and could introduce new semantics in
+		// content-negotiation.
+		if ('q' !== $partName) {
+			$parameters[$partName] = $part;
+		} else {
+			$quality = (float) $partValue;
+			break; // Stop parsing parts
+		}
+	}
+
+	return [
+		'type' => $type,
+		'subType' => $subType,
+		'quality' => $quality,
+		'parameters' => $parameters,
+	];
 }
 
 /**
@@ -373,9 +373,9 @@ 
  */
 function encodePath(string $path): string
 {
-    return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:@])/', function ($match) {
-        return '%'.sprintf('%02x', ord($match[0]));
-    }, $path);
+	return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:@])/', function ($match) {
+		return '%'.sprintf('%02x', ord($match[0]));
+	}, $path);
 }
 
 /**
@@ -385,9 +385,9 @@ 
  */
 function encodePathSegment(string $pathSegment): string
 {
-    return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):@])/', function ($match) {
-        return '%'.sprintf('%02x', ord($match[0]));
-    }, $pathSegment);
+	return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):@])/', function ($match) {
+		return '%'.sprintf('%02x', ord($match[0]));
+	}, $pathSegment);
 }
 
 /**
@@ -395,7 +395,7 @@ 
  */
 function decodePath(string $path): string
 {
-    return decodePathSegment($path);
+	return decodePathSegment($path);
 }
 
 /**
@@ -403,11 +403,11 @@ 
  */
 function decodePathSegment(string $path): string
 {
-    $path = rawurldecode($path);
+	$path = rawurldecode($path);
 
-    if (!mb_check_encoding($path, 'UTF-8') && mb_check_encoding($path, 'ISO-8859-1')) {
-        $path = mb_convert_encoding($path, 'UTF-8', 'ISO-8859-1');
-    }
+	if (!mb_check_encoding($path, 'UTF-8') && mb_check_encoding($path, 'ISO-8859-1')) {
+		$path = mb_convert_encoding($path, 'UTF-8', 'ISO-8859-1');
+	}
 
-    return $path;
+	return $path;
 }

htdocs/includes/sabre/sabre/xml/lib/Serializer/functions.php

Indentation +68 added lines, -68 removed lines

@@ -40,9 +40,9 @@ 
  */
 function enum(Writer $writer, array $values)
 {
-    foreach ($values as $value) {
-        $writer->writeElement($value);
-    }
+	foreach ($values as $value) {
+		$writer->writeElement($value);
+	}
 }
 
 /**
@@ -58,17 +58,17 @@ 
  */
 function valueObject(Writer $writer, $valueObject, string $namespace)
 {
-    foreach (get_object_vars($valueObject) as $key => $val) {
-        if (is_array($val)) {
-            // If $val is an array, it has a special meaning. We need to
-            // generate one child element for each item in $val
-            foreach ($val as $child) {
-                $writer->writeElement('{'.$namespace.'}'.$key, $child);
-            }
-        } elseif (null !== $val) {
-            $writer->writeElement('{'.$namespace.'}'.$key, $val);
-        }
-    }
+	foreach (get_object_vars($valueObject) as $key => $val) {
+		if (is_array($val)) {
+			// If $val is an array, it has a special meaning. We need to
+			// generate one child element for each item in $val
+			foreach ($val as $child) {
+				$writer->writeElement('{'.$namespace.'}'.$key, $child);
+			}
+		} elseif (null !== $val) {
+			$writer->writeElement('{'.$namespace.'}'.$key, $val);
+		}
+	}
 }
 
 /**
@@ -88,9 +88,9 @@ 
  */
 function repeatingElements(Writer $writer, array $items, string $childElementName)
 {
-    foreach ($items as $item) {
-        $writer->writeElement($childElementName, $item);
-    }
+	foreach ($items as $item) {
+		$writer->writeElement($childElementName, $item);
+	}
 }
 
 /**
@@ -152,57 +152,57 @@ 
  */
 function standardSerializer(Writer $writer, $value)
 {
-    if (is_scalar($value)) {
-        // String, integer, float, boolean
-        $writer->text((string) $value);
-    } elseif ($value instanceof XmlSerializable) {
-        // XmlSerializable classes or Element classes.
-        $value->xmlSerialize($writer);
-    } elseif (is_object($value) && isset($writer->classMap[get_class($value)])) {
-        // It's an object which class appears in the classmap.
-        $writer->classMap[get_class($value)]($writer, $value);
-    } elseif (is_callable($value)) {
-        // A callback
-        $value($writer);
-    } elseif (is_array($value) && array_key_exists('name', $value)) {
-        // if the array had a 'name' element, we assume that this array
-        // describes a 'name' and optionally 'attributes' and 'value'.
+	if (is_scalar($value)) {
+		// String, integer, float, boolean
+		$writer->text((string) $value);
+	} elseif ($value instanceof XmlSerializable) {
+		// XmlSerializable classes or Element classes.
+		$value->xmlSerialize($writer);
+	} elseif (is_object($value) && isset($writer->classMap[get_class($value)])) {
+		// It's an object which class appears in the classmap.
+		$writer->classMap[get_class($value)]($writer, $value);
+	} elseif (is_callable($value)) {
+		// A callback
+		$value($writer);
+	} elseif (is_array($value) && array_key_exists('name', $value)) {
+		// if the array had a 'name' element, we assume that this array
+		// describes a 'name' and optionally 'attributes' and 'value'.
 
-        $name = $value['name'];
-        $attributes = isset($value['attributes']) ? $value['attributes'] : [];
-        $value = isset($value['value']) ? $value['value'] : null;
+		$name = $value['name'];
+		$attributes = isset($value['attributes']) ? $value['attributes'] : [];
+		$value = isset($value['value']) ? $value['value'] : null;
 
-        $writer->startElement($name);
-        $writer->writeAttributes($attributes);
-        $writer->write($value);
-        $writer->endElement();
-    } elseif (is_array($value)) {
-        foreach ($value as $name => $item) {
-            if (is_int($name)) {
-                // This item has a numeric index. We just loop through the
-                // array and throw it back in the writer.
-                standardSerializer($writer, $item);
-            } elseif (is_string($name) && is_array($item) && isset($item['attributes'])) {
-                // The key is used for a name, but $item has 'attributes' and
-                // possibly 'value'
-                $writer->startElement($name);
-                $writer->writeAttributes($item['attributes']);
-                if (isset($item['value'])) {
-                    $writer->write($item['value']);
-                }
-                $writer->endElement();
-            } elseif (is_string($name)) {
-                // This was a plain key-value array.
-                $writer->startElement($name);
-                $writer->write($item);
-                $writer->endElement();
-            } else {
-                throw new InvalidArgumentException('The writer does not know how to serialize arrays with keys of type: '.gettype($name));
-            }
-        }
-    } elseif (is_object($value)) {
-        throw new InvalidArgumentException('The writer cannot serialize objects of class: '.get_class($value));
-    } elseif (!is_null($value)) {
-        throw new InvalidArgumentException('The writer cannot serialize values of type: '.gettype($value));
-    }
+		$writer->startElement($name);
+		$writer->writeAttributes($attributes);
+		$writer->write($value);
+		$writer->endElement();
+	} elseif (is_array($value)) {
+		foreach ($value as $name => $item) {
+			if (is_int($name)) {
+				// This item has a numeric index. We just loop through the
+				// array and throw it back in the writer.
+				standardSerializer($writer, $item);
+			} elseif (is_string($name) && is_array($item) && isset($item['attributes'])) {
+				// The key is used for a name, but $item has 'attributes' and
+				// possibly 'value'
+				$writer->startElement($name);
+				$writer->writeAttributes($item['attributes']);
+				if (isset($item['value'])) {
+					$writer->write($item['value']);
+				}
+				$writer->endElement();
+			} elseif (is_string($name)) {
+				// This was a plain key-value array.
+				$writer->startElement($name);
+				$writer->write($item);
+				$writer->endElement();
+			} else {
+				throw new InvalidArgumentException('The writer does not know how to serialize arrays with keys of type: '.gettype($name));
+			}
+		}
+	} elseif (is_object($value)) {
+		throw new InvalidArgumentException('The writer cannot serialize objects of class: '.get_class($value));
+	} elseif (!is_null($value)) {
+		throw new InvalidArgumentException('The writer cannot serialize values of type: '.gettype($value));
+	}
 }