Dolibarr / dolibarr

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));
+	}
 }

htdocs/includes/sabre/sabre/xml/lib/XmlDeserializable.php

Indentation +21 added lines, -21 removed lines

@@ -14,25 +14,25 @@
  */
 interface XmlDeserializable
 {
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statically, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader);
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Reader $reader);
 }

htdocs/includes/sabre/sabre/xml/lib/Service.php

Indentation +292 added lines, -292 removed lines

@@ -17,296 +17,296 @@
  */
 class Service
 {
-    /**
-     * This is the element map. It contains a list of XML elements (in clark
-     * notation) as keys and PHP class names as values.
-     *
-     * The PHP class names must implement Sabre\Xml\Element.
-     *
-     * Values may also be a callable. In that case the function will be called
-     * directly.
-     *
-     * @var array
-     */
-    public $elementMap = [];
-
-    /**
-     * This is a list of namespaces that you want to give default prefixes.
-     *
-     * You must make sure you create this entire list before starting to write.
-     * They should be registered on the root element.
-     *
-     * @var array
-     */
-    public $namespaceMap = [];
-
-    /**
-     * This is a list of custom serializers for specific classes.
-     *
-     * The writer may use this if you attempt to serialize an object with a
-     * class that does not implement XmlSerializable.
-     *
-     * Instead it will look at this classmap to see if there is a custom
-     * serializer here. This is useful if you don't want your value objects
-     * to be responsible for serializing themselves.
-     *
-     * The keys in this classmap need to be fully qualified PHP class names,
-     * the values must be callbacks. The callbacks take two arguments. The
-     * writer class, and the value that must be written.
-     *
-     * function (Writer $writer, object $value)
-     *
-     * @var array
-     */
-    public $classMap = [];
-
-    /**
-     * A bitmask of the LIBXML_* constants.
-     *
-     * @var int
-     */
-    public $options = 0;
-
-    /**
-     * Returns a fresh XML Reader.
-     */
-    public function getReader(): Reader
-    {
-        $r = new Reader();
-        $r->elementMap = $this->elementMap;
-
-        return $r;
-    }
-
-    /**
-     * Returns a fresh xml writer.
-     */
-    public function getWriter(): Writer
-    {
-        $w = new Writer();
-        $w->namespaceMap = $this->namespaceMap;
-        $w->classMap = $this->classMap;
-
-        return $w;
-    }
-
-    /**
-     * Parses a document in full.
-     *
-     * Input may be specified as a string or readable stream resource.
-     * The returned value is the value of the root document.
-     *
-     * Specifying the $contextUri allows the parser to figure out what the URI
-     * of the document was. This allows relative URIs within the document to be
-     * expanded easily.
-     *
-     * The $rootElementName is specified by reference and will be populated
-     * with the root element name of the document.
-     *
-     * @param string|resource $input
-     *
-     * @throws ParseException
-     *
-     * @return array|object|string
-     */
-    public function parse($input, string $contextUri = null, string &$rootElementName = null)
-    {
-        if (is_resource($input)) {
-            // Unfortunately the XMLReader doesn't support streams. When it
-            // does, we can optimize this.
-            $input = (string) stream_get_contents($input);
-        }
-
-        // If input is empty, then it's safe to throw an exception
-        if (empty($input)) {
-            throw new ParseException('The input element to parse is empty. Do not attempt to parse');
-        }
-
-        $r = $this->getReader();
-        $r->contextUri = $contextUri;
-        $r->XML($input, null, $this->options);
-
-        $result = $r->parse();
-        $rootElementName = $result['name'];
-
-        return $result['value'];
-    }
-
-    /**
-     * Parses a document in full, and specify what the expected root element
-     * name is.
-     *
-     * This function works similar to parse, but the difference is that the
-     * user can specify what the expected name of the root element should be,
-     * in clark notation.
-     *
-     * This is useful in cases where you expected a specific document to be
-     * passed, and reduces the amount of if statements.
-     *
-     * It's also possible to pass an array of expected rootElements if your
-     * code may expect more than one document type.
-     *
-     * @param string|string[] $rootElementName
-     * @param string|resource $input
-     *
-     * @throws ParseException
-     *
-     * @return array|object|string
-     */
-    public function expect($rootElementName, $input, string $contextUri = null)
-    {
-        if (is_resource($input)) {
-            // Unfortunately the XMLReader doesn't support streams. When it
-            // does, we can optimize this.
-            $input = (string) stream_get_contents($input);
-        }
-
-        // If input is empty, then it's safe to throw an exception
-        if (empty($input)) {
-            throw new ParseException('The input element to parse is empty. Do not attempt to parse');
-        }
-
-        $r = $this->getReader();
-        $r->contextUri = $contextUri;
-        $r->XML($input, null, $this->options);
-
-        $rootElementName = (array) $rootElementName;
-
-        foreach ($rootElementName as &$rEl) {
-            if ('{' !== $rEl[0]) {
-                $rEl = '{}'.$rEl;
-            }
-        }
-
-        $result = $r->parse();
-        if (!in_array($result['name'], $rootElementName, true)) {
-            throw new ParseException('Expected '.implode(' or ', $rootElementName).' but received '.$result['name'].' as the root element');
-        }
-
-        return $result['value'];
-    }
-
-    /**
-     * Generates an XML document in one go.
-     *
-     * The $rootElement must be specified in clark notation.
-     * The value must be a string, an array or an object implementing
-     * XmlSerializable. Basically, anything that's supported by the Writer
-     * object.
-     *
-     * $contextUri can be used to specify a sort of 'root' of the PHP application,
-     * in case the xml document is used as a http response.
-     *
-     * This allows an implementor to easily create URI's relative to the root
-     * of the domain.
-     *
-     * @param string|array|object|XmlSerializable $value
-     *
-     * @return string
-     */
-    public function write(string $rootElementName, $value, string $contextUri = null)
-    {
-        $w = $this->getWriter();
-        $w->openMemory();
-        $w->contextUri = $contextUri;
-        $w->setIndent(true);
-        $w->startDocument();
-        $w->writeElement($rootElementName, $value);
-
-        return $w->outputMemory();
-    }
-
-    /**
-     * Map an XML element to a PHP class.
-     *
-     * Calling this function will automatically set up the Reader and Writer
-     * classes to turn a specific XML element to a PHP class.
-     *
-     * For example, given a class such as :
-     *
-     * class Author {
-     *   public $firstName;
-     *   public $lastName;
-     * }
-     *
-     * and an XML element such as:
-     *
-     * <author xmlns="http://example.org/ns">
-     *   <firstName>...</firstName>
-     *   <lastName>...</lastName>
-     * </author>
-     *
-     * These can easily be mapped by calling:
-     *
-     * $service->mapValueObject('{http://example.org}author', 'Author');
-     */
-    public function mapValueObject(string $elementName, string $className)
-    {
-        list($namespace) = self::parseClarkNotation($elementName);
-
-        $this->elementMap[$elementName] = function (Reader $reader) use ($className, $namespace) {
-            return \Sabre\Xml\Deserializer\valueObject($reader, $className, $namespace);
-        };
-        $this->classMap[$className] = function (Writer $writer, $valueObject) use ($namespace) {
-            return \Sabre\Xml\Serializer\valueObject($writer, $valueObject, $namespace);
-        };
-        $this->valueObjectMap[$className] = $elementName;
-    }
-
-    /**
-     * Writes a value object.
-     *
-     * This function largely behaves similar to write(), except that it's
-     * intended specifically to serialize a Value Object into an XML document.
-     *
-     * The ValueObject must have been previously registered using
-     * mapValueObject().
-     *
-     * @param object $object
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function writeValueObject($object, string $contextUri = null)
-    {
-        if (!isset($this->valueObjectMap[get_class($object)])) {
-            throw new \InvalidArgumentException('"'.get_class($object).'" is not a registered value object class. Register your class with mapValueObject.');
-        }
-
-        return $this->write(
-            $this->valueObjectMap[get_class($object)],
-            $object,
-            $contextUri
-        );
-    }
-
-    /**
-     * Parses a clark-notation string, and returns the namespace and element
-     * name components.
-     *
-     * If the string was invalid, it will throw an InvalidArgumentException.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public static function parseClarkNotation(string $str): array
-    {
-        static $cache = [];
-
-        if (!isset($cache[$str])) {
-            if (!preg_match('/^{([^}]*)}(.*)$/', $str, $matches)) {
-                throw new \InvalidArgumentException('\''.$str.'\' is not a valid clark-notation formatted string');
-            }
-
-            $cache[$str] = [
-                $matches[1],
-                $matches[2],
-            ];
-        }
-
-        return $cache[$str];
-    }
-
-    /**
-     * A list of classes and which XML elements they map to.
-     */
-    protected $valueObjectMap = [];
+	/**
+	 * This is the element map. It contains a list of XML elements (in clark
+	 * notation) as keys and PHP class names as values.
+	 *
+	 * The PHP class names must implement Sabre\Xml\Element.
+	 *
+	 * Values may also be a callable. In that case the function will be called
+	 * directly.
+	 *
+	 * @var array
+	 */
+	public $elementMap = [];
+
+	/**
+	 * This is a list of namespaces that you want to give default prefixes.
+	 *
+	 * You must make sure you create this entire list before starting to write.
+	 * They should be registered on the root element.
+	 *
+	 * @var array
+	 */
+	public $namespaceMap = [];
+
+	/**
+	 * This is a list of custom serializers for specific classes.
+	 *
+	 * The writer may use this if you attempt to serialize an object with a
+	 * class that does not implement XmlSerializable.
+	 *
+	 * Instead it will look at this classmap to see if there is a custom
+	 * serializer here. This is useful if you don't want your value objects
+	 * to be responsible for serializing themselves.
+	 *
+	 * The keys in this classmap need to be fully qualified PHP class names,
+	 * the values must be callbacks. The callbacks take two arguments. The
+	 * writer class, and the value that must be written.
+	 *
+	 * function (Writer $writer, object $value)
+	 *
+	 * @var array
+	 */
+	public $classMap = [];
+
+	/**
+	 * A bitmask of the LIBXML_* constants.
+	 *
+	 * @var int
+	 */
+	public $options = 0;
+
+	/**
+	 * Returns a fresh XML Reader.
+	 */
+	public function getReader(): Reader
+	{
+		$r = new Reader();
+		$r->elementMap = $this->elementMap;
+
+		return $r;
+	}
+
+	/**
+	 * Returns a fresh xml writer.
+	 */
+	public function getWriter(): Writer
+	{
+		$w = new Writer();
+		$w->namespaceMap = $this->namespaceMap;
+		$w->classMap = $this->classMap;
+
+		return $w;
+	}
+
+	/**
+	 * Parses a document in full.
+	 *
+	 * Input may be specified as a string or readable stream resource.
+	 * The returned value is the value of the root document.
+	 *
+	 * Specifying the $contextUri allows the parser to figure out what the URI
+	 * of the document was. This allows relative URIs within the document to be
+	 * expanded easily.
+	 *
+	 * The $rootElementName is specified by reference and will be populated
+	 * with the root element name of the document.
+	 *
+	 * @param string|resource $input
+	 *
+	 * @throws ParseException
+	 *
+	 * @return array|object|string
+	 */
+	public function parse($input, string $contextUri = null, string &$rootElementName = null)
+	{
+		if (is_resource($input)) {
+			// Unfortunately the XMLReader doesn't support streams. When it
+			// does, we can optimize this.
+			$input = (string) stream_get_contents($input);
+		}
+
+		// If input is empty, then it's safe to throw an exception
+		if (empty($input)) {
+			throw new ParseException('The input element to parse is empty. Do not attempt to parse');
+		}
+
+		$r = $this->getReader();
+		$r->contextUri = $contextUri;
+		$r->XML($input, null, $this->options);
+
+		$result = $r->parse();
+		$rootElementName = $result['name'];
+
+		return $result['value'];
+	}
+
+	/**
+	 * Parses a document in full, and specify what the expected root element
+	 * name is.
+	 *
+	 * This function works similar to parse, but the difference is that the
+	 * user can specify what the expected name of the root element should be,
+	 * in clark notation.
+	 *
+	 * This is useful in cases where you expected a specific document to be
+	 * passed, and reduces the amount of if statements.
+	 *
+	 * It's also possible to pass an array of expected rootElements if your
+	 * code may expect more than one document type.
+	 *
+	 * @param string|string[] $rootElementName
+	 * @param string|resource $input
+	 *
+	 * @throws ParseException
+	 *
+	 * @return array|object|string
+	 */
+	public function expect($rootElementName, $input, string $contextUri = null)
+	{
+		if (is_resource($input)) {
+			// Unfortunately the XMLReader doesn't support streams. When it
+			// does, we can optimize this.
+			$input = (string) stream_get_contents($input);
+		}
+
+		// If input is empty, then it's safe to throw an exception
+		if (empty($input)) {
+			throw new ParseException('The input element to parse is empty. Do not attempt to parse');
+		}
+
+		$r = $this->getReader();
+		$r->contextUri = $contextUri;
+		$r->XML($input, null, $this->options);
+
+		$rootElementName = (array) $rootElementName;
+
+		foreach ($rootElementName as &$rEl) {
+			if ('{' !== $rEl[0]) {
+				$rEl = '{}'.$rEl;
+			}
+		}
+
+		$result = $r->parse();
+		if (!in_array($result['name'], $rootElementName, true)) {
+			throw new ParseException('Expected '.implode(' or ', $rootElementName).' but received '.$result['name'].' as the root element');
+		}
+
+		return $result['value'];
+	}
+
+	/**
+	 * Generates an XML document in one go.
+	 *
+	 * The $rootElement must be specified in clark notation.
+	 * The value must be a string, an array or an object implementing
+	 * XmlSerializable. Basically, anything that's supported by the Writer
+	 * object.
+	 *
+	 * $contextUri can be used to specify a sort of 'root' of the PHP application,
+	 * in case the xml document is used as a http response.
+	 *
+	 * This allows an implementor to easily create URI's relative to the root
+	 * of the domain.
+	 *
+	 * @param string|array|object|XmlSerializable $value
+	 *
+	 * @return string
+	 */
+	public function write(string $rootElementName, $value, string $contextUri = null)
+	{
+		$w = $this->getWriter();
+		$w->openMemory();
+		$w->contextUri = $contextUri;
+		$w->setIndent(true);
+		$w->startDocument();
+		$w->writeElement($rootElementName, $value);
+
+		return $w->outputMemory();
+	}
+
+	/**
+	 * Map an XML element to a PHP class.
+	 *
+	 * Calling this function will automatically set up the Reader and Writer
+	 * classes to turn a specific XML element to a PHP class.
+	 *
+	 * For example, given a class such as :
+	 *
+	 * class Author {
+	 *   public $firstName;
+	 *   public $lastName;
+	 * }
+	 *
+	 * and an XML element such as:
+	 *
+	 * <author xmlns="http://example.org/ns">
+	 *   <firstName>...</firstName>
+	 *   <lastName>...</lastName>
+	 * </author>
+	 *
+	 * These can easily be mapped by calling:
+	 *
+	 * $service->mapValueObject('{http://example.org}author', 'Author');
+	 */
+	public function mapValueObject(string $elementName, string $className)
+	{
+		list($namespace) = self::parseClarkNotation($elementName);
+
+		$this->elementMap[$elementName] = function (Reader $reader) use ($className, $namespace) {
+			return \Sabre\Xml\Deserializer\valueObject($reader, $className, $namespace);
+		};
+		$this->classMap[$className] = function (Writer $writer, $valueObject) use ($namespace) {
+			return \Sabre\Xml\Serializer\valueObject($writer, $valueObject, $namespace);
+		};
+		$this->valueObjectMap[$className] = $elementName;
+	}
+
+	/**
+	 * Writes a value object.
+	 *
+	 * This function largely behaves similar to write(), except that it's
+	 * intended specifically to serialize a Value Object into an XML document.
+	 *
+	 * The ValueObject must have been previously registered using
+	 * mapValueObject().
+	 *
+	 * @param object $object
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function writeValueObject($object, string $contextUri = null)
+	{
+		if (!isset($this->valueObjectMap[get_class($object)])) {
+			throw new \InvalidArgumentException('"'.get_class($object).'" is not a registered value object class. Register your class with mapValueObject.');
+		}
+
+		return $this->write(
+			$this->valueObjectMap[get_class($object)],
+			$object,
+			$contextUri
+		);
+	}
+
+	/**
+	 * Parses a clark-notation string, and returns the namespace and element
+	 * name components.
+	 *
+	 * If the string was invalid, it will throw an InvalidArgumentException.
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public static function parseClarkNotation(string $str): array
+	{
+		static $cache = [];
+
+		if (!isset($cache[$str])) {
+			if (!preg_match('/^{([^}]*)}(.*)$/', $str, $matches)) {
+				throw new \InvalidArgumentException('\''.$str.'\' is not a valid clark-notation formatted string');
+			}
+
+			$cache[$str] = [
+				$matches[1],
+				$matches[2],
+			];
+		}
+
+		return $cache[$str];
+	}
+
+	/**
+	 * A list of classes and which XML elements they map to.
+	 */
+	protected $valueObjectMap = [];
 }

Spacing +2 added lines, -2 removed lines

@@ -244,10 +244,10 @@
     {
         list($namespace) = self::parseClarkNotation($elementName);
 
-        $this->elementMap[$elementName] = function (Reader $reader) use ($className, $namespace) {
+        $this->elementMap[$elementName] = function(Reader $reader) use ($className, $namespace) {
             return \Sabre\Xml\Deserializer\valueObject($reader, $className, $namespace);
         };
-        $this->classMap[$className] = function (Writer $writer, $valueObject) use ($namespace) {
+        $this->classMap[$className] = function(Writer $writer, $valueObject) use ($namespace) {
             return \Sabre\Xml\Serializer\valueObject($writer, $valueObject, $namespace);
         };
         $this->valueObjectMap[$className] = $elementName;

htdocs/includes/sabre/sabre/xml/lib/Element/Elements.php

Indentation +57 added lines, -57 removed lines

@@ -37,64 +37,64 @@
  */
 class Elements implements Xml\Element
 {
-    /**
-     * Value to serialize.
-     *
-     * @var array
-     */
-    protected $value;
+	/**
+	 * Value to serialize.
+	 *
+	 * @var array
+	 */
+	protected $value;
 
-    /**
-     * Constructor.
-     */
-    public function __construct(array $value = [])
-    {
-        $this->value = $value;
-    }
+	/**
+	 * Constructor.
+	 */
+	public function __construct(array $value = [])
+	{
+		$this->value = $value;
+	}
 
-    /**
-     * The xmlSerialize method is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializable should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     */
-    public function xmlSerialize(Xml\Writer $writer)
-    {
-        Serializer\enum($writer, $this->value);
-    }
+	/**
+	 * The xmlSerialize method is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializable should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 */
+	public function xmlSerialize(Xml\Writer $writer)
+	{
+		Serializer\enum($writer, $this->value);
+	}
 
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statically, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * Important note 2: You are responsible for advancing the reader to the
-     * next element. Not doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseSubTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Xml\Reader $reader)
-    {
-        return Deserializer\enum($reader);
-    }
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * Important note 2: You are responsible for advancing the reader to the
+	 * next element. Not doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseSubTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Xml\Reader $reader)
+	{
+		return Deserializer\enum($reader);
+	}
 }