YetiForceCompany / YetiForceCRM

libraries/SabreDAV/HTTP/Auth/AWS.php

Braces +6 added lines, -4 removed lines

@@ -101,11 +101,13 @@
 
         }
 
-        if (!$requestDate = $this->request->getHeader('x-amz-date'))
-            $requestDate = $this->request->getHeader('Date');
+        if (!$requestDate = $this->request->getHeader('x-amz-date')) {
+                    $requestDate = $this->request->getHeader('Date');
+        }
 
-        if (!$this->validateRFC2616Date($requestDate))
-            return false;
+        if (!$this->validateRFC2616Date($requestDate)) {
+                    return false;
+        }
 
         $amzHeaders = $this->getAmzHeaders();
 

Indentation +215 added lines, -215 removed lines

@@ -15,220 +15,220 @@
  */
 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.
-     *
-     * @return bool
-     */
-    public function init() {
-
-        $authHeader = $this->request->getHeader('Authorization');
-        $authHeader = explode(' ', $authHeader);
-
-        if ($authHeader[0] != 'AWS' || !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
-     *
-     * @return string
-     */
-    public function getAccessKey() {
-
-        return $this->accessKey;
-
-    }
-
-    /**
-     * Validates the signature based on the secretKey
-     *
-     * @param string $secretKey
-     * @return bool
-     */
-    public function validate($secretKey) {
-
-        $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($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($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
-     *
-     * @return void
-     */
-    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.
-     *
-     * @param string $dateHeader
-     * @return bool
-     */
-    protected function validateRFC2616Date($dateHeader) {
-
-        $date = Util::parseHTTPDate($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 $date;
-
-    }
-
-    /**
-     * Returns a list of AMZ headers
-     *
-     * @return string
-     */
-    protected function getAmzHeaders() {
-
-        $amzHeaders = [];
-        $headers = $this->request->getHeaders();
-        foreach ($headers as $headerName => $headerValue) {
-            if (strpos(strtolower($headerName), 'x-amz-') === 0) {
-                $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
-     *
-     * @param string $key
-     * @param string $message
-     * @return string
-     */
-    private function hmacsha1($key, $message) {
-
-        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.
+	 *
+	 * @return bool
+	 */
+	public function init() {
+
+		$authHeader = $this->request->getHeader('Authorization');
+		$authHeader = explode(' ', $authHeader);
+
+		if ($authHeader[0] != 'AWS' || !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
+	 *
+	 * @return string
+	 */
+	public function getAccessKey() {
+
+		return $this->accessKey;
+
+	}
+
+	/**
+	 * Validates the signature based on the secretKey
+	 *
+	 * @param string $secretKey
+	 * @return bool
+	 */
+	public function validate($secretKey) {
+
+		$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($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($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
+	 *
+	 * @return void
+	 */
+	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.
+	 *
+	 * @param string $dateHeader
+	 * @return bool
+	 */
+	protected function validateRFC2616Date($dateHeader) {
+
+		$date = Util::parseHTTPDate($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 $date;
+
+	}
+
+	/**
+	 * Returns a list of AMZ headers
+	 *
+	 * @return string
+	 */
+	protected function getAmzHeaders() {
+
+		$amzHeaders = [];
+		$headers = $this->request->getHeaders();
+		foreach ($headers as $headerName => $headerValue) {
+			if (strpos(strtolower($headerName), 'x-amz-') === 0) {
+				$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
+	 *
+	 * @param string $key
+	 * @param string $message
+	 * @return string
+	 */
+	private function hmacsha1($key, $message) {
+
+		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;
+
+	}
 
 }

libraries/SabreDAV/HTTP/Auth/Digest.php

Braces +6 added lines, -2 removed lines

@@ -139,7 +139,9 @@ 
 
         if ($this->digestParts['qop'] == 'auth-int') {
             // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
+            if (!($this->qop & self::QOP_AUTHINT)) {
+            	return false;
+            }
             // We need to add an md5 of the entire request body to the A2 part of the hash
             $body = $this->request->getBody($asString = true);
             $this->request->setBody($body);
@@ -147,7 +149,9 @@ 
         } else {
 
             // We need to make sure we support this qop value
-            if (!($this->qop & self::QOP_AUTH)) return false;
+            if (!($this->qop & self::QOP_AUTH)) {
+            	return false;
+            }
         }
 
         $A2 = md5($A2);

Indentation +193 added lines, -193 removed lines

@@ -29,203 +29,203 @@
  */
 class Digest extends AbstractAuth {
 
-    /**
-     * These constants are used in setQOP();
-     */
-    const QOP_AUTH = 1;
-    const QOP_AUTHINT = 2;
-
-    protected $nonce;
-    protected $opaque;
-    protected $digestParts;
-    protected $A1;
-    protected $qop = self::QOP_AUTH;
-
-    /**
-     * Initializes the object
-     */
-    public function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
-
-        $this->nonce = uniqid();
-        $this->opaque = md5($realm);
-        parent::__construct($realm, $request, $response);
-
-    }
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return void
-     */
-    public function init() {
-
-        $digest = $this->getDigest();
-        $this->digestParts = $this->parseDigest($digest);
-
-    }
-
-    /**
-     * Sets the quality of protection value.
-     *
-     * Possible values are:
-     *   Sabre\HTTP\DigestAuth::QOP_AUTH
-     *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
-     *
-     * Multiple values can be specified using logical OR.
-     *
-     * QOP_AUTHINT ensures integrity of the request body, but this is not
-     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
-     * request body to be md5'ed, which can put strains on CPU and memory.
-     *
-     * @param int $qop
-     * @return void
-     */
-    public function setQOP($qop) {
-
-        $this->qop = $qop;
-
-    }
-
-    /**
-     * Validates the user.
-     *
-     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
-     *
-     * @param string $A1
-     * @return bool
-     */
-    public function validateA1($A1) {
-
-        $this->A1 = $A1;
-        return $this->validate();
-
-    }
-
-    /**
-     * Validates authentication through a password. The actual password must be provided here.
-     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
-     *
-     * @param string $password
-     * @return bool
-     */
-    public function validatePassword($password) {
-
-        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
-        return $this->validate();
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getUsername() {
-
-        return $this->digestParts['username'];
-
-    }
-
-    /**
-     * Validates the digest challenge
-     *
-     * @return bool
-     */
-    protected function validate() {
-
-        $A2 = $this->request->getMethod() . ':' . $this->digestParts['uri'];
-
-        if ($this->digestParts['qop'] == 'auth-int') {
-            // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
-            // We need to add an md5 of the entire request body to the A2 part of the hash
-            $body = $this->request->getBody($asString = true);
-            $this->request->setBody($body);
-            $A2 .= ':' . md5($body);
-        } else {
-
-            // We need to make sure we support this qop value
-            if (!($this->qop & self::QOP_AUTH)) return false;
-        }
-
-        $A2 = md5($A2);
-
-        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
-
-        return $this->digestParts['response'] == $validResponse;
-
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $qop = '';
-        switch ($this->qop) {
-            case self::QOP_AUTH    :
-                $qop = 'auth';
-                break;
-            case self::QOP_AUTHINT :
-                $qop = 'auth-int';
-                break;
-            case self::QOP_AUTH | self::QOP_AUTHINT :
-                $qop = 'auth,auth-int';
-                break;
-        }
-
-        $this->response->addHeader('WWW-Authenticate', 'Digest realm="' . $this->realm . '",qop="' . $qop . '",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
-        $this->response->setStatus(401);
-
-    }
-
-
-    /**
-     * This method returns the full digest string.
-     *
-     * It should be compatibile with mod_php format and other webservers.
-     *
-     * If the header could not be found, null will be returned
-     *
-     * @return mixed
-     */
-    public function getDigest() {
+	/**
+	 * These constants are used in setQOP();
+	 */
+	const QOP_AUTH = 1;
+	const QOP_AUTHINT = 2;
+
+	protected $nonce;
+	protected $opaque;
+	protected $digestParts;
+	protected $A1;
+	protected $qop = self::QOP_AUTH;
+
+	/**
+	 * Initializes the object
+	 */
+	public function __construct($realm = 'SabreTooth', RequestInterface $request, ResponseInterface $response) {
+
+		$this->nonce = uniqid();
+		$this->opaque = md5($realm);
+		parent::__construct($realm, $request, $response);
+
+	}
+
+	/**
+	 * Gathers all information from the headers
+	 *
+	 * This method needs to be called prior to anything else.
+	 *
+	 * @return void
+	 */
+	public function init() {
+
+		$digest = $this->getDigest();
+		$this->digestParts = $this->parseDigest($digest);
+
+	}
+
+	/**
+	 * Sets the quality of protection value.
+	 *
+	 * Possible values are:
+	 *   Sabre\HTTP\DigestAuth::QOP_AUTH
+	 *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
+	 *
+	 * Multiple values can be specified using logical OR.
+	 *
+	 * QOP_AUTHINT ensures integrity of the request body, but this is not
+	 * supported by most HTTP clients. QOP_AUTHINT also requires the entire
+	 * request body to be md5'ed, which can put strains on CPU and memory.
+	 *
+	 * @param int $qop
+	 * @return void
+	 */
+	public function setQOP($qop) {
+
+		$this->qop = $qop;
+
+	}
+
+	/**
+	 * Validates the user.
+	 *
+	 * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
+	 *
+	 * @param string $A1
+	 * @return bool
+	 */
+	public function validateA1($A1) {
+
+		$this->A1 = $A1;
+		return $this->validate();
+
+	}
+
+	/**
+	 * Validates authentication through a password. The actual password must be provided here.
+	 * It is strongly recommended not store the password in plain-text and use validateA1 instead.
+	 *
+	 * @param string $password
+	 * @return bool
+	 */
+	public function validatePassword($password) {
+
+		$this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
+		return $this->validate();
+
+	}
+
+	/**
+	 * Returns the username for the request
+	 *
+	 * @return string
+	 */
+	public function getUsername() {
+
+		return $this->digestParts['username'];
+
+	}
+
+	/**
+	 * Validates the digest challenge
+	 *
+	 * @return bool
+	 */
+	protected function validate() {
+
+		$A2 = $this->request->getMethod() . ':' . $this->digestParts['uri'];
+
+		if ($this->digestParts['qop'] == 'auth-int') {
+			// Making sure we support this qop value
+			if (!($this->qop & self::QOP_AUTHINT)) return false;
+			// We need to add an md5 of the entire request body to the A2 part of the hash
+			$body = $this->request->getBody($asString = true);
+			$this->request->setBody($body);
+			$A2 .= ':' . md5($body);
+		} else {
+
+			// We need to make sure we support this qop value
+			if (!($this->qop & self::QOP_AUTH)) return false;
+		}
+
+		$A2 = md5($A2);
+
+		$validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
+
+		return $this->digestParts['response'] == $validResponse;
+
+
+	}
+
+	/**
+	 * Returns an HTTP 401 header, forcing login
+	 *
+	 * This should be called when username and password are incorrect, or not supplied at all
+	 *
+	 * @return void
+	 */
+	public function requireLogin() {
+
+		$qop = '';
+		switch ($this->qop) {
+			case self::QOP_AUTH    :
+				$qop = 'auth';
+				break;
+			case self::QOP_AUTHINT :
+				$qop = 'auth-int';
+				break;
+			case self::QOP_AUTH | self::QOP_AUTHINT :
+				$qop = 'auth,auth-int';
+				break;
+		}
+
+		$this->response->addHeader('WWW-Authenticate', 'Digest realm="' . $this->realm . '",qop="' . $qop . '",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
+		$this->response->setStatus(401);
+
+	}
+
+
+	/**
+	 * This method returns the full digest string.
+	 *
+	 * It should be compatibile with mod_php format and other webservers.
+	 *
+	 * If the header could not be found, null will be returned
+	 *
+	 * @return mixed
+	 */
+	public function getDigest() {
 
-        return $this->request->getHeader('Authorization');
-
-    }
-
-
-    /**
-     * Parses the different pieces of the digest string into an array.
-     *
-     * This method returns false if an incomplete digest was supplied
-     *
-     * @param string $digest
-     * @return mixed
-     */
-    protected function parseDigest($digest) {
+		return $this->request->getHeader('Authorization');
+
+	}
+
+
+	/**
+	 * Parses the different pieces of the digest string into an array.
+	 *
+	 * This method returns false if an incomplete digest was supplied
+	 *
+	 * @param string $digest
+	 * @return mixed
+	 */
+	protected function parseDigest($digest) {
 
-        // protect against missing data
-        $needed_parts = ['nonce' => 1, 'nc' => 1, 'cnonce' => 1, 'qop' => 1, 'username' => 1, 'uri' => 1, 'response' => 1];
-        $data = [];
+		// protect against missing data
+		$needed_parts = ['nonce' => 1, 'nc' => 1, 'cnonce' => 1, 'qop' => 1, 'username' => 1, 'uri' => 1, 'response' => 1];
+		$data = [];
 
-        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $m) {
-            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
-            unset($needed_parts[$m[1]]);
-        }
+		preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
+
+		foreach ($matches as $m) {
+			$data[$m[1]] = $m[2] ? $m[2] : $m[3];
+			unset($needed_parts[$m[1]]);
+		}
 
-        return $needed_parts ? false : $data;
+		return $needed_parts ? false : $data;
 
-    }
+	}
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
      *
      * If the header could not be found, null will be returned
      *
-     * @return mixed
+     * @return string|null
      */
     public function getDigest() {
 

libraries/SabreDAV/HTTP/Version.php

Indentation +4 added lines, -4 removed lines

@@ -11,9 +11,9 @@
  */
 class Version {
 
-    /**
-     * Full version number
-     */
-    const VERSION = '4.2.1';
+	/**
+	 * Full version number
+	 */
+	const VERSION = '4.2.1';
 
 }

libraries/SabreDAV/HTTP/Request.php

Spacing +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
             foreach ($value as $v) {
                 if ($key === 'Authorization') {
                     list($v) = explode(' ', $v, 2);
-                    $v  .= ' REDACTED';
+                    $v .= ' REDACTED';
                 }
                 $out .= $key . ": " . $v . "\r\n";
             }

Braces +12 added lines, -4 removed lines

@@ -44,10 +44,18 @@
         if (is_array($method)) {
             throw new InvalidArgumentException('The first argument for this constructor should be a string or null, not an array. Did you upgrade from sabre/http 1.0 to 2.0?');
         }
-        if (!is_null($method))      $this->setMethod($method);
-        if (!is_null($url))         $this->setUrl($url);
-        if (!is_null($headers))     $this->setHeaders($headers);
-        if (!is_null($body))        $this->setBody($body);
+        if (!is_null($method)) {
+        	$this->setMethod($method);
+        }
+        if (!is_null($url)) {
+        	$this->setUrl($url);
+        }
+        if (!is_null($headers)) {
+        	$this->setHeaders($headers);
+        }
+        if (!is_null($body)) {
+        	$this->setBody($body);
+        }
 
     }
 

Indentation +295 added lines, -295 removed lines

@@ -17,300 +17,300 @@
  */
 class Request extends Message implements RequestInterface {
 
-    /**
-     * HTTP Method
-     *
-     * @var string
-     */
-    protected $method;
-
-    /**
-     * Request Url
-     *
-     * @var string
-     */
-    protected $url;
-
-    /**
-     * Creates the request object
-     *
-     * @param string $method
-     * @param string $url
-     * @param array $headers
-     * @param resource $body
-     */
-    public function __construct($method = null, $url = null, array $headers = null, $body = null) {
-
-        if (is_array($method)) {
-            throw new InvalidArgumentException('The first argument for this constructor should be a string or null, not an array. Did you upgrade from sabre/http 1.0 to 2.0?');
-        }
-        if (!is_null($method))      $this->setMethod($method);
-        if (!is_null($url))         $this->setUrl($url);
-        if (!is_null($headers))     $this->setHeaders($headers);
-        if (!is_null($body))        $this->setBody($body);
-
-    }
-
-    /**
-     * Returns the current HTTP method
-     *
-     * @return string
-     */
-    public function getMethod() {
-
-        return $this->method;
-
-    }
-
-    /**
-     * Sets the HTTP method
-     *
-     * @param string $method
-     * @return void
-     */
-    public function setMethod($method) {
-
-        $this->method = $method;
-
-    }
-
-    /**
-     * Returns the request url.
-     *
-     * @return string
-     */
-    public function getUrl() {
-
-        return $this->url;
-
-    }
-
-    /**
-     * Sets the request url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setUrl($url) {
-
-        $this->url = $url;
-
-    }
-
-    /**
-     * Returns the list of query parameters.
-     *
-     * This is equivalent to PHP's $_GET superglobal.
-     *
-     * @return array
-     */
-    public function getQueryParameters() {
-
-        $url = $this->getUrl();
-        if (($index = strpos($url, '?')) === false) {
-            return [];
-        } else {
-            parse_str(substr($url, $index + 1), $queryParams);
-            return $queryParams;
-        }
-
-    }
-
-    /**
-     * Sets the absolute url.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setAbsoluteUrl($url) {
-
-        $this->absoluteUrl = $url;
-
-    }
-
-    /**
-     * Returns the absolute url.
-     *
-     * @return string
-     */
-    public function getAbsoluteUrl() {
-
-        return $this->absoluteUrl;
-
-    }
-
-    /**
-     * Base url
-     *
-     * @var string
-     */
-    protected $baseUrl = '/';
-
-    /**
-     * Sets a base url.
-     *
-     * This url is used for relative path calculations.
-     *
-     * @param string $url
-     * @return void
-     */
-    public function setBaseUrl($url) {
-
-        $this->baseUrl = $url;
-
-    }
-
-    /**
-     * Returns the current base url.
-     *
-     * @return string
-     */
-    public function getBaseUrl() {
-
-        return $this->baseUrl;
-
-    }
-
-    /**
-     * Returns the relative path.
-     *
-     * This is being calculated using the base url. This path will not start
-     * with a slash, so it will always return something like
-     * 'example/path.html'.
-     *
-     * If the full path is equal to the base url, this method will return an
-     * empty string.
-     *
-     * This method will also urldecode the path, and if the url was incoded as
-     * ISO-8859-1, it will convert it to UTF-8.
-     *
-     * If the path is outside of the base url, a LogicException will be thrown.
-     *
-     * @return string
-     */
-    public function getPath() {
-
-        // Removing duplicated slashes.
-        $uri = str_replace('//', '/', $this->getUrl());
-
-        $uri = Uri\normalize($uri);
-        $baseUri = Uri\normalize($this->getBaseUrl());
-
-        if (strpos($uri, $baseUri) === 0) {
-
-            // We're not interested in the query part (everything after the ?).
-            list($uri) = explode('?', $uri);
-            return trim(URLUtil::decodePath(substr($uri, strlen($baseUri))), '/');
-
-        }
-        // A special case, if the baseUri was accessed without a trailing
-        // slash, we'll accept it as well.
-        elseif ($uri . '/' === $baseUri) {
-
-            return '';
-
-        }
-
-        throw new \LogicException('Requested uri (' . $this->getUrl() . ') is out of base uri (' . $this->getBaseUrl() . ')');
-    }
-
-    /**
-     * Equivalent of PHP's $_POST.
-     *
-     * @var array
-     */
-    protected $postData = [];
-
-    /**
-     * Sets the post data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * This would not have been needed, if POST data was accessible as
-     * php://input, but unfortunately we need to special case it.
-     *
-     * @param array $postData
-     * @return void
-     */
-    public function setPostData(array $postData) {
-
-        $this->postData = $postData;
-
-    }
-
-    /**
-     * Returns the POST data.
-     *
-     * This is equivalent to PHP's $_POST superglobal.
-     *
-     * @return array
-     */
-    public function getPostData() {
-
-        return $this->postData;
-
-    }
-
-    /**
-     * An array containing the raw _SERVER array.
-     *
-     * @var array
-     */
-    protected $rawServerData;
-
-    /**
-     * Returns an item from the _SERVER array.
-     *
-     * If the value does not exist in the array, null is returned.
-     *
-     * @param string $valueName
-     * @return string|null
-     */
-    public function getRawServerValue($valueName) {
-
-        if (isset($this->rawServerData[$valueName])) {
-            return $this->rawServerData[$valueName];
-        }
-
-    }
-
-    /**
-     * Sets the _SERVER array.
-     *
-     * @param array $data
-     * @return void
-     */
-    public function setRawServerData(array $data) {
-
-        $this->rawServerData = $data;
-
-    }
-
-    /**
-     * Serializes the request object as a string.
-     *
-     * This is useful for debugging purposes.
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        $out = $this->getMethod() . ' ' . $this->getUrl() . ' HTTP/' . $this->getHTTPVersion() . "\r\n";
-
-        foreach ($this->getHeaders() as $key => $value) {
-            foreach ($value as $v) {
-                if ($key === 'Authorization') {
-                    list($v) = explode(' ', $v, 2);
-                    $v  .= ' REDACTED';
-                }
-                $out .= $key . ": " . $v . "\r\n";
-            }
-        }
-        $out .= "\r\n";
-        $out .= $this->getBodyAsString();
-
-        return $out;
-
-    }
+	/**
+	 * HTTP Method
+	 *
+	 * @var string
+	 */
+	protected $method;
+
+	/**
+	 * Request Url
+	 *
+	 * @var string
+	 */
+	protected $url;
+
+	/**
+	 * Creates the request object
+	 *
+	 * @param string $method
+	 * @param string $url
+	 * @param array $headers
+	 * @param resource $body
+	 */
+	public function __construct($method = null, $url = null, array $headers = null, $body = null) {
+
+		if (is_array($method)) {
+			throw new InvalidArgumentException('The first argument for this constructor should be a string or null, not an array. Did you upgrade from sabre/http 1.0 to 2.0?');
+		}
+		if (!is_null($method))      $this->setMethod($method);
+		if (!is_null($url))         $this->setUrl($url);
+		if (!is_null($headers))     $this->setHeaders($headers);
+		if (!is_null($body))        $this->setBody($body);
+
+	}
+
+	/**
+	 * Returns the current HTTP method
+	 *
+	 * @return string
+	 */
+	public function getMethod() {
+
+		return $this->method;
+
+	}
+
+	/**
+	 * Sets the HTTP method
+	 *
+	 * @param string $method
+	 * @return void
+	 */
+	public function setMethod($method) {
+
+		$this->method = $method;
+
+	}
+
+	/**
+	 * Returns the request url.
+	 *
+	 * @return string
+	 */
+	public function getUrl() {
+
+		return $this->url;
+
+	}
+
+	/**
+	 * Sets the request url.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setUrl($url) {
+
+		$this->url = $url;
+
+	}
+
+	/**
+	 * Returns the list of query parameters.
+	 *
+	 * This is equivalent to PHP's $_GET superglobal.
+	 *
+	 * @return array
+	 */
+	public function getQueryParameters() {
+
+		$url = $this->getUrl();
+		if (($index = strpos($url, '?')) === false) {
+			return [];
+		} else {
+			parse_str(substr($url, $index + 1), $queryParams);
+			return $queryParams;
+		}
+
+	}
+
+	/**
+	 * Sets the absolute url.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setAbsoluteUrl($url) {
+
+		$this->absoluteUrl = $url;
+
+	}
+
+	/**
+	 * Returns the absolute url.
+	 *
+	 * @return string
+	 */
+	public function getAbsoluteUrl() {
+
+		return $this->absoluteUrl;
+
+	}
+
+	/**
+	 * Base url
+	 *
+	 * @var string
+	 */
+	protected $baseUrl = '/';
+
+	/**
+	 * Sets a base url.
+	 *
+	 * This url is used for relative path calculations.
+	 *
+	 * @param string $url
+	 * @return void
+	 */
+	public function setBaseUrl($url) {
+
+		$this->baseUrl = $url;
+
+	}
+
+	/**
+	 * Returns the current base url.
+	 *
+	 * @return string
+	 */
+	public function getBaseUrl() {
+
+		return $this->baseUrl;
+
+	}
+
+	/**
+	 * Returns the relative path.
+	 *
+	 * This is being calculated using the base url. This path will not start
+	 * with a slash, so it will always return something like
+	 * 'example/path.html'.
+	 *
+	 * If the full path is equal to the base url, this method will return an
+	 * empty string.
+	 *
+	 * This method will also urldecode the path, and if the url was incoded as
+	 * ISO-8859-1, it will convert it to UTF-8.
+	 *
+	 * If the path is outside of the base url, a LogicException will be thrown.
+	 *
+	 * @return string
+	 */
+	public function getPath() {
+
+		// Removing duplicated slashes.
+		$uri = str_replace('//', '/', $this->getUrl());
+
+		$uri = Uri\normalize($uri);
+		$baseUri = Uri\normalize($this->getBaseUrl());
+
+		if (strpos($uri, $baseUri) === 0) {
+
+			// We're not interested in the query part (everything after the ?).
+			list($uri) = explode('?', $uri);
+			return trim(URLUtil::decodePath(substr($uri, strlen($baseUri))), '/');
+
+		}
+		// A special case, if the baseUri was accessed without a trailing
+		// slash, we'll accept it as well.
+		elseif ($uri . '/' === $baseUri) {
+
+			return '';
+
+		}
+
+		throw new \LogicException('Requested uri (' . $this->getUrl() . ') is out of base uri (' . $this->getBaseUrl() . ')');
+	}
+
+	/**
+	 * Equivalent of PHP's $_POST.
+	 *
+	 * @var array
+	 */
+	protected $postData = [];
+
+	/**
+	 * Sets the post data.
+	 *
+	 * This is equivalent to PHP's $_POST superglobal.
+	 *
+	 * This would not have been needed, if POST data was accessible as
+	 * php://input, but unfortunately we need to special case it.
+	 *
+	 * @param array $postData
+	 * @return void
+	 */
+	public function setPostData(array $postData) {
+
+		$this->postData = $postData;
+
+	}
+
+	/**
+	 * Returns the POST data.
+	 *
+	 * This is equivalent to PHP's $_POST superglobal.
+	 *
+	 * @return array
+	 */
+	public function getPostData() {
+
+		return $this->postData;
+
+	}
+
+	/**
+	 * An array containing the raw _SERVER array.
+	 *
+	 * @var array
+	 */
+	protected $rawServerData;
+
+	/**
+	 * Returns an item from the _SERVER array.
+	 *
+	 * If the value does not exist in the array, null is returned.
+	 *
+	 * @param string $valueName
+	 * @return string|null
+	 */
+	public function getRawServerValue($valueName) {
+
+		if (isset($this->rawServerData[$valueName])) {
+			return $this->rawServerData[$valueName];
+		}
+
+	}
+
+	/**
+	 * Sets the _SERVER array.
+	 *
+	 * @param array $data
+	 * @return void
+	 */
+	public function setRawServerData(array $data) {
+
+		$this->rawServerData = $data;
+
+	}
+
+	/**
+	 * Serializes the request object as a string.
+	 *
+	 * This is useful for debugging purposes.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+
+		$out = $this->getMethod() . ' ' . $this->getUrl() . ' HTTP/' . $this->getHTTPVersion() . "\r\n";
+
+		foreach ($this->getHeaders() as $key => $value) {
+			foreach ($value as $v) {
+				if ($key === 'Authorization') {
+					list($v) = explode(' ', $v, 2);
+					$v  .= ' REDACTED';
+				}
+				$out .= $key . ": " . $v . "\r\n";
+			}
+		}
+		$out .= "\r\n";
+		$out .= $this->getBodyAsString();
+
+		return $out;
+
+	}
 
 }

libraries/SabreDAV/HTTP/Client.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
 
                 $response = $this->doRequest($request);
 
-                $code = (int)$response->getStatus();
+                $code = (int) $response->getStatus();
 
                 // We are doing in-PHP redirects, because curl's
                 // FOLLOW_LOCATION throws errors when PHP is configured with
@@ -422,7 +422,7 @@ 
                     // For security we cast this to a string. If somehow an array could
                     // be passed here, it would be possible for an attacker to use @ to
                     // post local files.
-                    $settings[CURLOPT_POSTFIELDS] = (string)$body;
+                    $settings[CURLOPT_POSTFIELDS] = (string) $body;
                 }
                 $settings[CURLOPT_CUSTOMREQUEST] = $request->getMethod();
                 break;

Indentation +519 added lines, -519 removed lines

@@ -43,557 +43,557 @@
  */
 class Client extends EventEmitter {
 
-    /**
-     * List of curl settings
-     *
-     * @var array
-     */
-    protected $curlSettings = [];
+	/**
+	 * List of curl settings
+	 *
+	 * @var array
+	 */
+	protected $curlSettings = [];
 
-    /**
-     * Wether or not exceptions should be thrown when a HTTP error is returned.
-     *
-     * @var bool
-     */
-    protected $throwExceptions = false;
+	/**
+	 * Wether or not exceptions should be thrown when a HTTP error is returned.
+	 *
+	 * @var bool
+	 */
+	protected $throwExceptions = false;
 
-    /**
-     * The maximum number of times we'll follow a redirect.
-     *
-     * @var int
-     */
-    protected $maxRedirects = 5;
+	/**
+	 * The maximum number of times we'll follow a redirect.
+	 *
+	 * @var int
+	 */
+	protected $maxRedirects = 5;
 
-    /**
-     * Initializes the client.
-     *
-     * @return void
-     */
-    public function __construct() {
+	/**
+	 * Initializes the client.
+	 *
+	 * @return void
+	 */
+	public function __construct() {
 
-        $this->curlSettings = [
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_HEADER         => true,
-            CURLOPT_NOBODY         => false,
-            CURLOPT_USERAGENT      => 'sabre-http/' . Version::VERSION . ' (http://sabre.io/)',
-        ];
+		$this->curlSettings = [
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_HEADER         => true,
+			CURLOPT_NOBODY         => false,
+			CURLOPT_USERAGENT      => 'sabre-http/' . Version::VERSION . ' (http://sabre.io/)',
+		];
 
-    }
+	}
 
-    /**
-     * Sends a request to a HTTP server, and returns a response.
-     *
-     * @param RequestInterface $request
-     * @return ResponseInterface
-     */
-    public function send(RequestInterface $request) {
+	/**
+	 * Sends a request to a HTTP server, and returns a response.
+	 *
+	 * @param RequestInterface $request
+	 * @return ResponseInterface
+	 */
+	public function send(RequestInterface $request) {
 
-        $this->emit('beforeRequest', [$request]);
+		$this->emit('beforeRequest', [$request]);
 
-        $retryCount = 0;
-        $redirects = 0;
+		$retryCount = 0;
+		$redirects = 0;
 
-        do {
-
-            $doRedirect = false;
-            $retry = false;
+		do {
+
+			$doRedirect = false;
+			$retry = false;
 
-            try {
-
-                $response = $this->doRequest($request);
-
-                $code = (int)$response->getStatus();
-
-                // We are doing in-PHP redirects, because curl's
-                // FOLLOW_LOCATION throws errors when PHP is configured with
-                // open_basedir.
-                //
-                // https://github.com/fruux/sabre-http/issues/12
-                if (in_array($code, [301, 302, 307, 308]) && $redirects < $this->maxRedirects) {
-
-                    $oldLocation = $request->getUrl();
-
-                    // Creating a new instance of the request object.
-                    $request = clone $request;
-
-                    // Setting the new location
-                    $request->setUrl(Uri\resolve(
-                        $oldLocation,
-                        $response->getHeader('Location')
-                    ));
+			try {
+
+				$response = $this->doRequest($request);
+
+				$code = (int)$response->getStatus();
+
+				// We are doing in-PHP redirects, because curl's
+				// FOLLOW_LOCATION throws errors when PHP is configured with
+				// open_basedir.
+				//
+				// https://github.com/fruux/sabre-http/issues/12
+				if (in_array($code, [301, 302, 307, 308]) && $redirects < $this->maxRedirects) {
+
+					$oldLocation = $request->getUrl();
+
+					// Creating a new instance of the request object.
+					$request = clone $request;
+
+					// Setting the new location
+					$request->setUrl(Uri\resolve(
+						$oldLocation,
+						$response->getHeader('Location')
+					));
 
-                    $doRedirect = true;
-                    $redirects++;
-
-                }
-
-                // This was a HTTP error
-                if ($code >= 400) {
-
-                    $this->emit('error', [$request, $response, &$retry, $retryCount]);
-                    $this->emit('error:' . $code, [$request, $response, &$retry, $retryCount]);
-
-                }
-
-            } catch (ClientException $e) {
-
-                $this->emit('exception', [$request, $e, &$retry, $retryCount]);
-
-                // If retry was still set to false, it means no event handler
-                // dealt with the problem. In this case we just re-throw the
-                // exception.
-                if (!$retry) {
-                    throw $e;
-                }
-
-            }
-
-            if ($retry) {
-                $retryCount++;
-            }
+					$doRedirect = true;
+					$redirects++;
+
+				}
+
+				// This was a HTTP error
+				if ($code >= 400) {
+
+					$this->emit('error', [$request, $response, &$retry, $retryCount]);
+					$this->emit('error:' . $code, [$request, $response, &$retry, $retryCount]);
+
+				}
+
+			} catch (ClientException $e) {
+
+				$this->emit('exception', [$request, $e, &$retry, $retryCount]);
+
+				// If retry was still set to false, it means no event handler
+				// dealt with the problem. In this case we just re-throw the
+				// exception.
+				if (!$retry) {
+					throw $e;
+				}
+
+			}
+
+			if ($retry) {
+				$retryCount++;
+			}
 
-        } while ($retry || $doRedirect);
+		} while ($retry || $doRedirect);
 
-        $this->emit('afterRequest', [$request, $response]);
+		$this->emit('afterRequest', [$request, $response]);
 
-        if ($this->throwExceptions && $code >= 400) {
-            throw new ClientHttpException($response);
-        }
+		if ($this->throwExceptions && $code >= 400) {
+			throw new ClientHttpException($response);
+		}
 
-        return $response;
+		return $response;
 
-    }
+	}
 
-    /**
-     * Sends a HTTP request asynchronously.
-     *
-     * Due to the nature of PHP, you must from time to time poll to see if any
-     * new responses came in.
-     *
-     * After calling sendAsync, you must therefore occasionally call the poll()
-     * method, or wait().
-     *
-     * @param RequestInterface $request
-     * @param callable $success
-     * @param callable $error
-     * @return void
-     */
-    public function sendAsync(RequestInterface $request, callable $success = null, callable $error = null) {
+	/**
+	 * Sends a HTTP request asynchronously.
+	 *
+	 * Due to the nature of PHP, you must from time to time poll to see if any
+	 * new responses came in.
+	 *
+	 * After calling sendAsync, you must therefore occasionally call the poll()
+	 * method, or wait().
+	 *
+	 * @param RequestInterface $request
+	 * @param callable $success
+	 * @param callable $error
+	 * @return void
+	 */
+	public function sendAsync(RequestInterface $request, callable $success = null, callable $error = null) {
 
-        $this->emit('beforeRequest', [$request]);
-        $this->sendAsyncInternal($request, $success, $error);
-        $this->poll();
+		$this->emit('beforeRequest', [$request]);
+		$this->sendAsyncInternal($request, $success, $error);
+		$this->poll();
 
-    }
+	}
 
 
-    /**
-     * This method checks if any http requests have gotten results, and if so,
-     * call the appropriate success or error handlers.
-     *
-     * This method will return true if there are still requests waiting to
-     * return, and false if all the work is done.
-     *
-     * @return bool
-     */
-    public function poll() {
+	/**
+	 * This method checks if any http requests have gotten results, and if so,
+	 * call the appropriate success or error handlers.
+	 *
+	 * This method will return true if there are still requests waiting to
+	 * return, and false if all the work is done.
+	 *
+	 * @return bool
+	 */
+	public function poll() {
 
-        // nothing to do?
-        if (!$this->curlMultiMap) {
-            return false;
-        }
+		// nothing to do?
+		if (!$this->curlMultiMap) {
+			return false;
+		}
 
-        do {
-            $r = curl_multi_exec(
-                $this->curlMultiHandle,
-                $stillRunning
-            );
-        } while ($r === CURLM_CALL_MULTI_PERFORM);
+		do {
+			$r = curl_multi_exec(
+				$this->curlMultiHandle,
+				$stillRunning
+			);
+		} while ($r === CURLM_CALL_MULTI_PERFORM);
 
-        do {
+		do {
 
-            messageQueue:
+			messageQueue:
 
-            $status = curl_multi_info_read(
-                $this->curlMultiHandle,
-                $messagesInQueue
-            );
+			$status = curl_multi_info_read(
+				$this->curlMultiHandle,
+				$messagesInQueue
+			);
 
-            if ($status && $status['msg'] === CURLMSG_DONE) {
+			if ($status && $status['msg'] === CURLMSG_DONE) {
 
-                $resourceId = intval($status['handle']);
-                list(
-                    $request,
-                    $successCallback,
-                    $errorCallback,
-                    $retryCount,
-                ) = $this->curlMultiMap[$resourceId];
-                unset($this->curlMultiMap[$resourceId]);
-                $curlResult = $this->parseCurlResult(curl_multi_getcontent($status['handle']), $status['handle']);
-                $retry = false;
+				$resourceId = intval($status['handle']);
+				list(
+					$request,
+					$successCallback,
+					$errorCallback,
+					$retryCount,
+				) = $this->curlMultiMap[$resourceId];
+				unset($this->curlMultiMap[$resourceId]);
+				$curlResult = $this->parseCurlResult(curl_multi_getcontent($status['handle']), $status['handle']);
+				$retry = false;
 
-                if ($curlResult['status'] === self::STATUS_CURLERROR) {
+				if ($curlResult['status'] === self::STATUS_CURLERROR) {
 
-                    $e = new ClientException($curlResult['curl_errmsg'], $curlResult['curl_errno']);
-                    $this->emit('exception', [$request, $e, &$retry, $retryCount]);
+					$e = new ClientException($curlResult['curl_errmsg'], $curlResult['curl_errno']);
+					$this->emit('exception', [$request, $e, &$retry, $retryCount]);
 
-                    if ($retry) {
-                        $retryCount++;
-                        $this->sendAsyncInternal($request, $successCallback, $errorCallback, $retryCount);
-                        goto messageQueue;
-                    }
-
-                    $curlResult['request'] = $request;
+					if ($retry) {
+						$retryCount++;
+						$this->sendAsyncInternal($request, $successCallback, $errorCallback, $retryCount);
+						goto messageQueue;
+					}
+
+					$curlResult['request'] = $request;
 
-                    if ($errorCallback) {
-                        $errorCallback($curlResult);
-                    }
-
-                } elseif ($curlResult['status'] === self::STATUS_HTTPERROR) {
-
-                    $this->emit('error', [$request, $curlResult['response'], &$retry, $retryCount]);
-                    $this->emit('error:' . $curlResult['http_code'], [$request, $curlResult['response'], &$retry, $retryCount]);
-
-                    if ($retry) {
-
-                        $retryCount++;
-                        $this->sendAsyncInternal($request, $successCallback, $errorCallback, $retryCount);
-                        goto messageQueue;
+					if ($errorCallback) {
+						$errorCallback($curlResult);
+					}
+
+				} elseif ($curlResult['status'] === self::STATUS_HTTPERROR) {
+
+					$this->emit('error', [$request, $curlResult['response'], &$retry, $retryCount]);
+					$this->emit('error:' . $curlResult['http_code'], [$request, $curlResult['response'], &$retry, $retryCount]);
+
+					if ($retry) {
+
+						$retryCount++;
+						$this->sendAsyncInternal($request, $successCallback, $errorCallback, $retryCount);
+						goto messageQueue;
 
-                    }
-
-                    $curlResult['request'] = $request;
-
-                    if ($errorCallback) {
-                        $errorCallback($curlResult);
-                    }
-
-                } else {
-
-                    $this->emit('afterRequest', [$request, $curlResult['response']]);
-
-                    if ($successCallback) {
-                        $successCallback($curlResult['response']);
-                    }
-
-                }
-            }
-
-        } while ($messagesInQueue > 0);
-
-        return count($this->curlMultiMap) > 0;
-
-    }
-
-    /**
-     * Processes every HTTP request in the queue, and waits till they are all
-     * completed.
-     *
-     * @return void
-     */
-    public function wait() {
-
-        do {
-            curl_multi_select($this->curlMultiHandle);
-            $stillRunning = $this->poll();
-        } while ($stillRunning);
-
-    }
-
-    /**
-     * If this is set to true, the Client will automatically throw exceptions
-     * upon HTTP errors.
-     *
-     * This means that if a response came back with a status code greater than
-     * or equal to 400, we will throw a ClientHttpException.
-     *
-     * This only works for the send() method. Throwing exceptions for
-     * sendAsync() is not supported.
-     *
-     * @param bool $throwExceptions
-     * @return void
-     */
-    public function setThrowExceptions($throwExceptions) {
-
-        $this->throwExceptions = $throwExceptions;
-
-    }
-
-    /**
-     * Adds a CURL setting.
-     *
-     * These settings will be included in every HTTP request.
-     *
-     * @param int $name
-     * @param mixed $value
-     * @return void
-     */
-    public function addCurlSetting($name, $value) {
-
-        $this->curlSettings[$name] = $value;
-
-    }
-
-    /**
-     * This method is responsible for performing a single request.
-     *
-     * @param RequestInterface $request
-     * @return ResponseInterface
-     */
-    protected function doRequest(RequestInterface $request) {
-
-        $settings = $this->createCurlSettingsArray($request);
-
-        if (!$this->curlHandle) {
-            $this->curlHandle = curl_init();
-        }
-
-        curl_setopt_array($this->curlHandle, $settings);
-        $response = $this->curlExec($this->curlHandle);
-        $response = $this->parseCurlResult($response, $this->curlHandle);
-
-        if ($response['status'] === self::STATUS_CURLERROR) {
-            throw new ClientException($response['curl_errmsg'], $response['curl_errno']);
-        }
-
-        return $response['response'];
-
-    }
-
-    /**
-     * Cached curl handle.
-     *
-     * By keeping this resource around for the lifetime of this object, things
-     * like persistent connections are possible.
-     *
-     * @var resource
-     */
-    private $curlHandle;
-
-    /**
-     * Handler for curl_multi requests.
-     *
-     * The first time sendAsync is used, this will be created.
-     *
-     * @var resource
-     */
-    private $curlMultiHandle;
-
-    /**
-     * Has a list of curl handles, as well as their associated success and
-     * error callbacks.
-     *
-     * @var array
-     */
-    private $curlMultiMap = [];
-
-    /**
-     * Turns a RequestInterface object into an array with settings that can be
-     * fed to curl_setopt
-     *
-     * @param RequestInterface $request
-     * @return array
-     */
-    protected function createCurlSettingsArray(RequestInterface $request) {
-
-        $settings = $this->curlSettings;
-
-        switch ($request->getMethod()) {
-            case 'HEAD' :
-                $settings[CURLOPT_NOBODY] = true;
-                $settings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
-                $settings[CURLOPT_POSTFIELDS] = '';
-                $settings[CURLOPT_PUT] = false;
-                break;
-            case 'GET' :
-                $settings[CURLOPT_CUSTOMREQUEST] = 'GET';
-                $settings[CURLOPT_POSTFIELDS] = '';
-                $settings[CURLOPT_PUT] = false;
-                break;
-            default :
-                $body = $request->getBody();
-                if (is_resource($body)) {
-                    // This needs to be set to PUT, regardless of the actual
-                    // method used. Without it, INFILE will be ignored for some
-                    // reason.
-                    $settings[CURLOPT_PUT] = true;
-                    $settings[CURLOPT_INFILE] = $request->getBody();
-                } else {
-                    // For security we cast this to a string. If somehow an array could
-                    // be passed here, it would be possible for an attacker to use @ to
-                    // post local files.
-                    $settings[CURLOPT_POSTFIELDS] = (string)$body;
-                }
-                $settings[CURLOPT_CUSTOMREQUEST] = $request->getMethod();
-                break;
-
-        }
-
-        $nHeaders = [];
-        foreach ($request->getHeaders() as $key => $values) {
-
-            foreach ($values as $value) {
-                $nHeaders[] = $key . ': ' . $value;
-            }
-
-        }
-        $settings[CURLOPT_HTTPHEADER] = $nHeaders;
-        $settings[CURLOPT_URL] = $request->getUrl();
-        if (defined('CURLOPT_PROTOCOLS')) {
-            $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-        if (defined('CURLOPT_REDIR_PROTOCOLS')) {
-            $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
-        return $settings;
-
-    }
-
-    const STATUS_SUCCESS = 0;
-    const STATUS_CURLERROR = 1;
-    const STATUS_HTTPERROR = 2;
-
-    /**
-     * Parses the result of a curl call in a format that's a bit more
-     * convenient to work with.
-     *
-     * The method returns an array with the following elements:
-     *   * status - one of the 3 STATUS constants.
-     *   * curl_errno - A curl error number. Only set if status is
-     *                  STATUS_CURLERROR.
-     *   * curl_errmsg - A current error message. Only set if status is
-     *                   STATUS_CURLERROR.
-     *   * response - Response object. Only set if status is STATUS_SUCCESS, or
-     *                STATUS_HTTPERROR.
-     *   * http_code - HTTP status code, as an int. Only set if Only set if
-     *                 status is STATUS_SUCCESS, or STATUS_HTTPERROR
-     *
-     * @param string $response
-     * @param resource $curlHandle
-     * @return Response
-     */
-    protected function parseCurlResult($response, $curlHandle) {
-
-        list(
-            $curlInfo,
-            $curlErrNo,
-            $curlErrMsg
-        ) = $this->curlStuff($curlHandle);
-
-        if ($curlErrNo) {
-            return [
-                'status'      => self::STATUS_CURLERROR,
-                'curl_errno'  => $curlErrNo,
-                'curl_errmsg' => $curlErrMsg,
-            ];
-        }
-
-        $headerBlob = substr($response, 0, $curlInfo['header_size']);
-        // In the case of 204 No Content, strlen($response) == $curlInfo['header_size].
-        // This will cause substr($response, $curlInfo['header_size']) return FALSE instead of NULL
-        // An exception will be thrown when calling getBodyAsString then
-        $responseBody = substr($response, $curlInfo['header_size']) ?: null;
-
-        unset($response);
-
-        // In the case of 100 Continue, or redirects we'll have multiple lists
-        // of headers for each separate HTTP response. We can easily split this
-        // because they are separated by \r\n\r\n
-        $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
-
-        // We only care about the last set of headers
-        $headerBlob = $headerBlob[count($headerBlob) - 1];
-
-        // Splitting headers
-        $headerBlob = explode("\r\n", $headerBlob);
-
-        $response = new Response();
-        $response->setStatus($curlInfo['http_code']);
-
-        foreach ($headerBlob as $header) {
-            $parts = explode(':', $header, 2);
-            if (count($parts) == 2) {
-                $response->addHeader(trim($parts[0]), trim($parts[1]));
-            }
-        }
-
-        $response->setBody($responseBody);
-
-        $httpCode = intval($response->getStatus());
-
-        return [
-            'status'    => $httpCode >= 400 ? self::STATUS_HTTPERROR : self::STATUS_SUCCESS,
-            'response'  => $response,
-            'http_code' => $httpCode,
-        ];
-
-    }
-
-    /**
-     * Sends an asynchronous HTTP request.
-     *
-     * We keep this in a separate method, so we can call it without triggering
-     * the beforeRequest event and don't do the poll().
-     *
-     * @param RequestInterface $request
-     * @param callable $success
-     * @param callable $error
-     * @param int $retryCount
-     */
-    protected function sendAsyncInternal(RequestInterface $request, callable $success, callable $error, $retryCount = 0) {
-
-        if (!$this->curlMultiHandle) {
-            $this->curlMultiHandle = curl_multi_init();
-        }
-        $curl = curl_init();
-        curl_setopt_array(
-            $curl,
-            $this->createCurlSettingsArray($request)
-        );
-        curl_multi_add_handle($this->curlMultiHandle, $curl);
-        $this->curlMultiMap[intval($curl)] = [
-            $request,
-            $success,
-            $error,
-            $retryCount
-        ];
-
-    }
-
-    // @codeCoverageIgnoreStart
-
-    /**
-     * Calls curl_exec
-     *
-     * This method exists so it can easily be overridden and mocked.
-     *
-     * @param resource $curlHandle
-     * @return string
-     */
-    protected function curlExec($curlHandle) {
-
-        return curl_exec($curlHandle);
-
-    }
-
-    /**
-     * Returns a bunch of information about a curl request.
-     *
-     * This method exists so it can easily be overridden and mocked.
-     *
-     * @param resource $curlHandle
-     * @return array
-     */
-    protected function curlStuff($curlHandle) {
-
-        return [
-            curl_getinfo($curlHandle),
-            curl_errno($curlHandle),
-            curl_error($curlHandle),
-        ];
-
-    }
-    // @codeCoverageIgnoreEnd
+					}
+
+					$curlResult['request'] = $request;
+
+					if ($errorCallback) {
+						$errorCallback($curlResult);
+					}
+
+				} else {
+
+					$this->emit('afterRequest', [$request, $curlResult['response']]);
+
+					if ($successCallback) {
+						$successCallback($curlResult['response']);
+					}
+
+				}
+			}
+
+		} while ($messagesInQueue > 0);
+
+		return count($this->curlMultiMap) > 0;
+
+	}
+
+	/**
+	 * Processes every HTTP request in the queue, and waits till they are all
+	 * completed.
+	 *
+	 * @return void
+	 */
+	public function wait() {
+
+		do {
+			curl_multi_select($this->curlMultiHandle);
+			$stillRunning = $this->poll();
+		} while ($stillRunning);
+
+	}
+
+	/**
+	 * If this is set to true, the Client will automatically throw exceptions
+	 * upon HTTP errors.
+	 *
+	 * This means that if a response came back with a status code greater than
+	 * or equal to 400, we will throw a ClientHttpException.
+	 *
+	 * This only works for the send() method. Throwing exceptions for
+	 * sendAsync() is not supported.
+	 *
+	 * @param bool $throwExceptions
+	 * @return void
+	 */
+	public function setThrowExceptions($throwExceptions) {
+
+		$this->throwExceptions = $throwExceptions;
+
+	}
+
+	/**
+	 * Adds a CURL setting.
+	 *
+	 * These settings will be included in every HTTP request.
+	 *
+	 * @param int $name
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function addCurlSetting($name, $value) {
+
+		$this->curlSettings[$name] = $value;
+
+	}
+
+	/**
+	 * This method is responsible for performing a single request.
+	 *
+	 * @param RequestInterface $request
+	 * @return ResponseInterface
+	 */
+	protected function doRequest(RequestInterface $request) {
+
+		$settings = $this->createCurlSettingsArray($request);
+
+		if (!$this->curlHandle) {
+			$this->curlHandle = curl_init();
+		}
+
+		curl_setopt_array($this->curlHandle, $settings);
+		$response = $this->curlExec($this->curlHandle);
+		$response = $this->parseCurlResult($response, $this->curlHandle);
+
+		if ($response['status'] === self::STATUS_CURLERROR) {
+			throw new ClientException($response['curl_errmsg'], $response['curl_errno']);
+		}
+
+		return $response['response'];
+
+	}
+
+	/**
+	 * Cached curl handle.
+	 *
+	 * By keeping this resource around for the lifetime of this object, things
+	 * like persistent connections are possible.
+	 *
+	 * @var resource
+	 */
+	private $curlHandle;
+
+	/**
+	 * Handler for curl_multi requests.
+	 *
+	 * The first time sendAsync is used, this will be created.
+	 *
+	 * @var resource
+	 */
+	private $curlMultiHandle;
+
+	/**
+	 * Has a list of curl handles, as well as their associated success and
+	 * error callbacks.
+	 *
+	 * @var array
+	 */
+	private $curlMultiMap = [];
+
+	/**
+	 * Turns a RequestInterface object into an array with settings that can be
+	 * fed to curl_setopt
+	 *
+	 * @param RequestInterface $request
+	 * @return array
+	 */
+	protected function createCurlSettingsArray(RequestInterface $request) {
+
+		$settings = $this->curlSettings;
+
+		switch ($request->getMethod()) {
+			case 'HEAD' :
+				$settings[CURLOPT_NOBODY] = true;
+				$settings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
+				$settings[CURLOPT_POSTFIELDS] = '';
+				$settings[CURLOPT_PUT] = false;
+				break;
+			case 'GET' :
+				$settings[CURLOPT_CUSTOMREQUEST] = 'GET';
+				$settings[CURLOPT_POSTFIELDS] = '';
+				$settings[CURLOPT_PUT] = false;
+				break;
+			default :
+				$body = $request->getBody();
+				if (is_resource($body)) {
+					// This needs to be set to PUT, regardless of the actual
+					// method used. Without it, INFILE will be ignored for some
+					// reason.
+					$settings[CURLOPT_PUT] = true;
+					$settings[CURLOPT_INFILE] = $request->getBody();
+				} else {
+					// For security we cast this to a string. If somehow an array could
+					// be passed here, it would be possible for an attacker to use @ to
+					// post local files.
+					$settings[CURLOPT_POSTFIELDS] = (string)$body;
+				}
+				$settings[CURLOPT_CUSTOMREQUEST] = $request->getMethod();
+				break;
+
+		}
+
+		$nHeaders = [];
+		foreach ($request->getHeaders() as $key => $values) {
+
+			foreach ($values as $value) {
+				$nHeaders[] = $key . ': ' . $value;
+			}
+
+		}
+		$settings[CURLOPT_HTTPHEADER] = $nHeaders;
+		$settings[CURLOPT_URL] = $request->getUrl();
+		if (defined('CURLOPT_PROTOCOLS')) {
+			$settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+		}
+		if (defined('CURLOPT_REDIR_PROTOCOLS')) {
+			$settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
+		}
+
+		return $settings;
+
+	}
+
+	const STATUS_SUCCESS = 0;
+	const STATUS_CURLERROR = 1;
+	const STATUS_HTTPERROR = 2;
+
+	/**
+	 * Parses the result of a curl call in a format that's a bit more
+	 * convenient to work with.
+	 *
+	 * The method returns an array with the following elements:
+	 *   * status - one of the 3 STATUS constants.
+	 *   * curl_errno - A curl error number. Only set if status is
+	 *                  STATUS_CURLERROR.
+	 *   * curl_errmsg - A current error message. Only set if status is
+	 *                   STATUS_CURLERROR.
+	 *   * response - Response object. Only set if status is STATUS_SUCCESS, or
+	 *                STATUS_HTTPERROR.
+	 *   * http_code - HTTP status code, as an int. Only set if Only set if
+	 *                 status is STATUS_SUCCESS, or STATUS_HTTPERROR
+	 *
+	 * @param string $response
+	 * @param resource $curlHandle
+	 * @return Response
+	 */
+	protected function parseCurlResult($response, $curlHandle) {
+
+		list(
+			$curlInfo,
+			$curlErrNo,
+			$curlErrMsg
+		) = $this->curlStuff($curlHandle);
+
+		if ($curlErrNo) {
+			return [
+				'status'      => self::STATUS_CURLERROR,
+				'curl_errno'  => $curlErrNo,
+				'curl_errmsg' => $curlErrMsg,
+			];
+		}
+
+		$headerBlob = substr($response, 0, $curlInfo['header_size']);
+		// In the case of 204 No Content, strlen($response) == $curlInfo['header_size].
+		// This will cause substr($response, $curlInfo['header_size']) return FALSE instead of NULL
+		// An exception will be thrown when calling getBodyAsString then
+		$responseBody = substr($response, $curlInfo['header_size']) ?: null;
+
+		unset($response);
+
+		// In the case of 100 Continue, or redirects we'll have multiple lists
+		// of headers for each separate HTTP response. We can easily split this
+		// because they are separated by \r\n\r\n
+		$headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
+
+		// We only care about the last set of headers
+		$headerBlob = $headerBlob[count($headerBlob) - 1];
+
+		// Splitting headers
+		$headerBlob = explode("\r\n", $headerBlob);
+
+		$response = new Response();
+		$response->setStatus($curlInfo['http_code']);
+
+		foreach ($headerBlob as $header) {
+			$parts = explode(':', $header, 2);
+			if (count($parts) == 2) {
+				$response->addHeader(trim($parts[0]), trim($parts[1]));
+			}
+		}
+
+		$response->setBody($responseBody);
+
+		$httpCode = intval($response->getStatus());
+
+		return [
+			'status'    => $httpCode >= 400 ? self::STATUS_HTTPERROR : self::STATUS_SUCCESS,
+			'response'  => $response,
+			'http_code' => $httpCode,
+		];
+
+	}
+
+	/**
+	 * Sends an asynchronous HTTP request.
+	 *
+	 * We keep this in a separate method, so we can call it without triggering
+	 * the beforeRequest event and don't do the poll().
+	 *
+	 * @param RequestInterface $request
+	 * @param callable $success
+	 * @param callable $error
+	 * @param int $retryCount
+	 */
+	protected function sendAsyncInternal(RequestInterface $request, callable $success, callable $error, $retryCount = 0) {
+
+		if (!$this->curlMultiHandle) {
+			$this->curlMultiHandle = curl_multi_init();
+		}
+		$curl = curl_init();
+		curl_setopt_array(
+			$curl,
+			$this->createCurlSettingsArray($request)
+		);
+		curl_multi_add_handle($this->curlMultiHandle, $curl);
+		$this->curlMultiMap[intval($curl)] = [
+			$request,
+			$success,
+			$error,
+			$retryCount
+		];
+
+	}
+
+	// @codeCoverageIgnoreStart
+
+	/**
+	 * Calls curl_exec
+	 *
+	 * This method exists so it can easily be overridden and mocked.
+	 *
+	 * @param resource $curlHandle
+	 * @return string
+	 */
+	protected function curlExec($curlHandle) {
+
+		return curl_exec($curlHandle);
+
+	}
+
+	/**
+	 * Returns a bunch of information about a curl request.
+	 *
+	 * This method exists so it can easily be overridden and mocked.
+	 *
+	 * @param resource $curlHandle
+	 * @return array
+	 */
+	protected function curlStuff($curlHandle) {
+
+		return [
+			curl_getinfo($curlHandle),
+			curl_errno($curlHandle),
+			curl_error($curlHandle),
+		];
+
+	}
+	// @codeCoverageIgnoreEnd
 
 }

libraries/SabreDAV/HTTP/Sapi.php

Indentation +160 added lines, -160 removed lines

@@ -30,165 +30,165 @@
  */
 class Sapi {
 
-    /**
-     * This static method will create a new Request object, based on the
-     * current PHP request.
-     *
-     * @return Request
-     */
-    static function getRequest() {
-
-        $r = self::createFromServerArray($_SERVER);
-        $r->setBody(fopen('php://input', 'r'));
-        $r->setPostData($_POST);
-        return $r;
-
-    }
-
-    /**
-     * Sends the HTTP response back to a HTTP client.
-     *
-     * This calls php's header() function and streams the body to php://output.
-     *
-     * @param ResponseInterface $response
-     * @return void
-     */
-    static function sendResponse(ResponseInterface $response) {
-
-        header('HTTP/' . $response->getHttpVersion() . ' ' . $response->getStatus() . ' ' . $response->getStatusText());
-        foreach ($response->getHeaders() as $key => $value) {
-
-            foreach ($value as $k => $v) {
-                if ($k === 0) {
-                    header($key . ': ' . $v);
-                } else {
-                    header($key . ': ' . $v, false);
-                }
-            }
-
-        }
-
-        $body = $response->getBody();
-        if (is_null($body)) return;
-
-        $contentLength = $response->getHeader('Content-Length');
-        if ($contentLength !== null) {
-            $output = fopen('php://output', 'wb');
-            if (is_resource($body) && get_resource_type($body) == 'stream') {
-                stream_copy_to_stream($body, $output, $contentLength);
-            } else {
-                fwrite($output, $body, $contentLength);
-            }
-        } else {
-            file_put_contents('php://output', $body);
-        }
-
-        if (is_resource($body)) {
-            fclose($body);
-        }
-
-    }
-
-    /**
-     * This static method will create a new Request object, based on a PHP
-     * $_SERVER array.
-     *
-     * @param array $serverArray
-     * @return Request
-     */
-    static function createFromServerArray(array $serverArray) {
-
-        $headers = [];
-        $method = null;
-        $url = null;
-        $httpVersion = '1.1';
-
-        $protocol = 'http';
-        $hostName = 'localhost';
-
-        foreach ($serverArray as $key => $value) {
-
-            switch ($key) {
-
-                case 'SERVER_PROTOCOL' :
-                    if ($value === 'HTTP/1.0') {
-                        $httpVersion = '1.0';
-                    }
-                    break;
-                case 'REQUEST_METHOD' :
-                    $method = $value;
-                    break;
-                case 'REQUEST_URI' :
-                    $url = $value;
-                    break;
-
-                // These sometimes show up without a HTTP_ prefix
-                case 'CONTENT_TYPE' :
-                    $headers['Content-Type'] = $value;
-                    break;
-                case 'CONTENT_LENGTH' :
-                    $headers['Content-Length'] = $value;
-                    break;
-
-                // mod_php on apache will put credentials in these variables.
-                // (fast)cgi does not usually do this, however.
-                case 'PHP_AUTH_USER' :
-                    if (isset($serverArray['PHP_AUTH_PW'])) {
-                        $headers['Authorization'] = 'Basic ' . base64_encode($value . ':' . $serverArray['PHP_AUTH_PW']);
-                    }
-                    break;
-
-                // Similarly, mod_php may also screw around with digest auth.
-                case 'PHP_AUTH_DIGEST' :
-                    $headers['Authorization'] = 'Digest ' . $value;
-                    break;
-
-                // Apache may prefix the HTTP_AUTHORIZATION header with
-                // REDIRECT_, if mod_rewrite was used.
-                case 'REDIRECT_HTTP_AUTHORIZATION' :
-                    $headers['Authorization'] = $value;
-                    break;
-
-                case 'HTTP_HOST' :
-                    $hostName = $value;
-                    $headers['Host'] = $value;
-                    break;
-
-                case 'HTTPS' :
-                    if (!empty($value) && $value !== 'off') {
-                        $protocol = 'https';
-                    }
-                    break;
-
-                default :
-                    if (substr($key, 0, 5) === 'HTTP_') {
-                        // It's a HTTP header
-
-                        // Normalizing it to be prettier
-                        $header = strtolower(substr($key, 5));
-
-                        // Transforming dashes into spaces, and uppercasing
-                        // every first letter.
-                        $header = ucwords(str_replace('_', ' ', $header));
-
-                        // Turning spaces into dashes.
-                        $header = str_replace(' ', '-', $header);
-                        $headers[$header] = $value;
-
-                    }
-                    break;
-
-
-            }
-
-        }
-
-        $r = new Request($method, $url, $headers);
-        $r->setHttpVersion($httpVersion);
-        $r->setRawServerData($serverArray);
-        $r->setAbsoluteUrl($protocol . '://' . $hostName . $url);
-        return $r;
-
-    }
+	/**
+	 * This static method will create a new Request object, based on the
+	 * current PHP request.
+	 *
+	 * @return Request
+	 */
+	static function getRequest() {
+
+		$r = self::createFromServerArray($_SERVER);
+		$r->setBody(fopen('php://input', 'r'));
+		$r->setPostData($_POST);
+		return $r;
+
+	}
+
+	/**
+	 * Sends the HTTP response back to a HTTP client.
+	 *
+	 * This calls php's header() function and streams the body to php://output.
+	 *
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	static function sendResponse(ResponseInterface $response) {
+
+		header('HTTP/' . $response->getHttpVersion() . ' ' . $response->getStatus() . ' ' . $response->getStatusText());
+		foreach ($response->getHeaders() as $key => $value) {
+
+			foreach ($value as $k => $v) {
+				if ($k === 0) {
+					header($key . ': ' . $v);
+				} else {
+					header($key . ': ' . $v, false);
+				}
+			}
+
+		}
+
+		$body = $response->getBody();
+		if (is_null($body)) return;
+
+		$contentLength = $response->getHeader('Content-Length');
+		if ($contentLength !== null) {
+			$output = fopen('php://output', 'wb');
+			if (is_resource($body) && get_resource_type($body) == 'stream') {
+				stream_copy_to_stream($body, $output, $contentLength);
+			} else {
+				fwrite($output, $body, $contentLength);
+			}
+		} else {
+			file_put_contents('php://output', $body);
+		}
+
+		if (is_resource($body)) {
+			fclose($body);
+		}
+
+	}
+
+	/**
+	 * This static method will create a new Request object, based on a PHP
+	 * $_SERVER array.
+	 *
+	 * @param array $serverArray
+	 * @return Request
+	 */
+	static function createFromServerArray(array $serverArray) {
+
+		$headers = [];
+		$method = null;
+		$url = null;
+		$httpVersion = '1.1';
+
+		$protocol = 'http';
+		$hostName = 'localhost';
+
+		foreach ($serverArray as $key => $value) {
+
+			switch ($key) {
+
+				case 'SERVER_PROTOCOL' :
+					if ($value === 'HTTP/1.0') {
+						$httpVersion = '1.0';
+					}
+					break;
+				case 'REQUEST_METHOD' :
+					$method = $value;
+					break;
+				case 'REQUEST_URI' :
+					$url = $value;
+					break;
+
+				// These sometimes show up without a HTTP_ prefix
+				case 'CONTENT_TYPE' :
+					$headers['Content-Type'] = $value;
+					break;
+				case 'CONTENT_LENGTH' :
+					$headers['Content-Length'] = $value;
+					break;
+
+				// mod_php on apache will put credentials in these variables.
+				// (fast)cgi does not usually do this, however.
+				case 'PHP_AUTH_USER' :
+					if (isset($serverArray['PHP_AUTH_PW'])) {
+						$headers['Authorization'] = 'Basic ' . base64_encode($value . ':' . $serverArray['PHP_AUTH_PW']);
+					}
+					break;
+
+				// Similarly, mod_php may also screw around with digest auth.
+				case 'PHP_AUTH_DIGEST' :
+					$headers['Authorization'] = 'Digest ' . $value;
+					break;
+
+				// Apache may prefix the HTTP_AUTHORIZATION header with
+				// REDIRECT_, if mod_rewrite was used.
+				case 'REDIRECT_HTTP_AUTHORIZATION' :
+					$headers['Authorization'] = $value;
+					break;
+
+				case 'HTTP_HOST' :
+					$hostName = $value;
+					$headers['Host'] = $value;
+					break;
+
+				case 'HTTPS' :
+					if (!empty($value) && $value !== 'off') {
+						$protocol = 'https';
+					}
+					break;
+
+				default :
+					if (substr($key, 0, 5) === 'HTTP_') {
+						// It's a HTTP header
+
+						// Normalizing it to be prettier
+						$header = strtolower(substr($key, 5));
+
+						// Transforming dashes into spaces, and uppercasing
+						// every first letter.
+						$header = ucwords(str_replace('_', ' ', $header));
+
+						// Turning spaces into dashes.
+						$header = str_replace(' ', '-', $header);
+						$headers[$header] = $value;
+
+					}
+					break;
+
+
+			}
+
+		}
+
+		$r = new Request($method, $url, $headers);
+		$r->setHttpVersion($httpVersion);
+		$r->setRawServerData($serverArray);
+		$r->setAbsoluteUrl($protocol . '://' . $hostName . $url);
+		return $r;
+
+	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -69,7 +69,9 @@
         }
 
         $body = $response->getBody();
-        if (is_null($body)) return;
+        if (is_null($body)) {
+        	return;
+        }
 
         $contentLength = $response->getHeader('Content-Length');
         if ($contentLength !== null) {

libraries/SabreDAV/composer/autoload_real.php

Indentation +33 added lines, -33 removed lines

@@ -4,56 +4,56 @@
 
 class ComposerAutoloaderInit15cab9ce9e53521bb4f9807a32118ed6
 {
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        spl_autoload_register(array('ComposerAutoloaderInit15cab9ce9e53521bb4f9807a32118ed6', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit15cab9ce9e53521bb4f9807a32118ed6', 'loadClassLoader'));
+	private static $loader;
+
+	public static function loadClassLoader($class)
+	{
+		if ('Composer\Autoload\ClassLoader' === $class) {
+			require __DIR__ . '/ClassLoader.php';
+		}
+	}
+
+	public static function getLoader()
+	{
+		if (null !== self::$loader) {
+			return self::$loader;
+		}
+
+		spl_autoload_register(array('ComposerAutoloaderInit15cab9ce9e53521bb4f9807a32118ed6', 'loadClassLoader'), true, true);
+		self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+		spl_autoload_unregister(array('ComposerAutoloaderInit15cab9ce9e53521bb4f9807a32118ed6', 'loadClassLoader'));
 /*
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
             $loader->set($namespace, $path);
         }
 */
-        $map = require __DIR__ . '/autoload_psr4.php';
-        foreach ($map as $namespace => $path) {
-            $loader->setPsr4($namespace, $path);
-        }
+		$map = require __DIR__ . '/autoload_psr4.php';
+		foreach ($map as $namespace => $path) {
+			$loader->setPsr4($namespace, $path);
+		}
 /*
         $classMap = require __DIR__ . '/autoload_classmap.php';
         if ($classMap) {
             $loader->addClassMap($classMap);
         }
 */
-        $loader->register(true);
+		$loader->register(true);
 
-        $includeFiles = require __DIR__ . '/autoload_files.php';
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire15cab9ce9e53521bb4f9807a32118ed6($fileIdentifier, $file);
-        }
+		$includeFiles = require __DIR__ . '/autoload_files.php';
+		foreach ($includeFiles as $fileIdentifier => $file) {
+			composerRequire15cab9ce9e53521bb4f9807a32118ed6($fileIdentifier, $file);
+		}
 
-        return $loader;
-    }
+		return $loader;
+	}
 }
 
 function composerRequire15cab9ce9e53521bb4f9807a32118ed6($fileIdentifier, $file)
 {
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
+	if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+		require $file;
 
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
+		$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+	}
 }

libraries/SabreDAV/Yeti/CalDAV_Schedule.php

Braces +6 added lines, -4 removed lines

@@ -42,11 +42,13 @@
 
 		$summary = $iTipMessage->message->VEVENT->SUMMARY;
 
-		if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto')
-			return;
+		if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto') {
+					return;
+		}
 
-		if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto')
-			return;
+		if (parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
+					return;
+		}
 
 		$sender = substr($iTipMessage->sender, 7);
 		$recipient = substr($iTipMessage->recipient, 7);

libraries/SabreDAV/CardDAV/Backend/PDO.php

Spacing +2 added lines, -2 removed lines

@@ -461,7 +461,7 @@ 
 
         // Current synctoken
         $stmt = $this->pdo->prepare(sprintf('SELECT synctoken FROM %s WHERE id = ?', $this->addressBooksTableName));
-        $stmt->execute([ $addressBookId ]);
+        $stmt->execute([$addressBookId]);
         $currentToken = $stmt->fetchColumn(0);
 
         if (is_null($currentToken)) return null;
@@ -476,7 +476,7 @@ 
         if ($syncToken) {
 
             $query = sprintf("SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && addressbookid = ? ORDER BY synctoken", $this->addressBookChangesTableName);
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+            if ($limit > 0) $query .= " LIMIT " . (int) $limit;
 
             // Fetching all changes
             $stmt = $this->pdo->prepare($query);

Braces +9 added lines, -3 removed lines

@@ -255,7 +255,9 @@ 
 
         $result = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-        if (!$result) return false;
+        if (!$result) {
+        	return false;
+        }
 
         $result['etag'] = '"' . $result['etag'] . '"';
         return $result;
@@ -464,7 +466,9 @@ 
         $stmt->execute([ $addressBookId ]);
         $currentToken = $stmt->fetchColumn(0);
 
-        if (is_null($currentToken)) return null;
+        if (is_null($currentToken)) {
+        	return null;
+        }
 
         $result = [
             'syncToken' => $currentToken,
@@ -476,7 +480,9 @@ 
         if ($syncToken) {
 
             $query = sprintf("SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && addressbookid = ? ORDER BY synctoken", $this->addressBookChangesTableName);
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+            if ($limit > 0) {
+            	$query .= " LIMIT " . (int)$limit;
+            }
 
             // Fetching all changes
             $stmt = $this->pdo->prepare($query);

Indentation +526 added lines, -526 removed lines

@@ -16,530 +16,530 @@
  */
 class PDO extends AbstractBackend implements SyncSupport {
 
-    /**
-     * PDO connection
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * The PDO table name used to store addressbooks
-     */
-    public $addressBooksTableName = 'addressbooks';
-
-    /**
-     * The PDO table name used to store cards
-     */
-    public $cardsTableName = 'cards';
-
-    /**
-     * The table name that will be used for tracking changes in address books.
-     *
-     * @var string
-     */
-    public $addressBookChangesTableName = 'addressbookchanges';
-
-    /**
-     * Sets up the object
-     *
-     * @param \PDO $pdo
-     */
-    public function __construct(\PDO $pdo) {
-
-        $this->pdo = $pdo;
-
-    }
-
-    /**
-     * Returns the list of addressbooks for a specific user.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getAddressBooksForUser($principalUri) {
-
-        $stmt = $this->pdo->prepare(sprintf('SELECT id, uri, displayname, principaluri, description, synctoken FROM %s WHERE principaluri = ?', $this->addressBooksTableName));
-        $stmt->execute([$principalUri]);
-
-        $addressBooks = [];
-
-        foreach ($stmt->fetchAll() as $row) {
-
-            $addressBooks[] = [
-                'id'                                                          => $row['id'],
-                'uri'                                                         => $row['uri'],
-                'principaluri'                                                => $row['principaluri'],
-                '{DAV:}displayname'                                           => $row['displayname'],
-                '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-                '{http://calendarserver.org/ns/}getctag'                      => $row['synctoken'],
-                '{http://sabredav.org/ns}sync-token'                          => $row['synctoken'] ? $row['synctoken'] : '0',
-            ];
-
-        }
-
-        return $addressBooks;
-
-    }
-
-
-    /**
-     * Updates properties for an address book.
-     *
-     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-     * To do the actual updates, you must tell this object which properties
-     * you're going to process with the handle() method.
-     *
-     * Calling the handle method is like telling the PropPatch object "I
-     * promise I can handle updating this property".
-     *
-     * Read the PropPatch documenation for more info and examples.
-     *
-     * @param string $addressBookId
-     * @param \Sabre\DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
-
-        $supportedProperties = [
-            '{DAV:}displayname',
-            '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description',
-        ];
-
-        $propPatch->handle($supportedProperties, function($mutations) use ($addressBookId) {
-
-            $updates = [];
-            foreach ($mutations as $property => $newValue) {
-
-                switch ($property) {
-                    case '{DAV:}displayname' :
-                        $updates['displayname'] = $newValue;
-                        break;
-                    case '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' :
-                        $updates['description'] = $newValue;
-                        break;
-                }
-            }
-            $query = sprintf('UPDATE %s SET ', $this->addressBooksTableName);
-            $first = true;
-            foreach ($updates as $key => $value) {
-                if ($first) {
-                    $first = false;
-                } else {
-                    $query .= ', ';
-                }
-                $query .= ' `' . $key . '` = :' . $key . ' ';
-            }
-            $query .= ' WHERE id = :addressbookid';
-
-            $stmt = $this->pdo->prepare($query);
-            $updates['addressbookid'] = $addressBookId;
-
-            $stmt->execute($updates);
-
-            $this->addChange($addressBookId, "", 2);
-
-            return true;
-
-        });
-
-    }
-
-    /**
-     * Creates a new address book
-     *
-     * @param string $principalUri
-     * @param string $url Just the 'basename' of the url.
-     * @param array $properties
-     * @return int Last insert id
-     */
-    public function createAddressBook($principalUri, $url, array $properties) {
-
-        $values = [
-            'displayname'  => null,
-            'description'  => null,
-            'principaluri' => $principalUri,
-            'uri'          => $url,
-        ];
-
-        foreach ($properties as $property => $newValue) {
-
-            switch ($property) {
-                case '{DAV:}displayname' :
-                    $values['displayname'] = $newValue;
-                    break;
-                case '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' :
-                    $values['description'] = $newValue;
-                    break;
-                default :
-                    throw new DAV\Exception\BadRequest('Unknown property: ' . $property);
-            }
-
-        }
-
-        $query = 'INSERT INTO ' . $this->addressBooksTableName . ' (uri, displayname, description, principaluri, synctoken) VALUES (:uri, :displayname, :description, :principaluri, 1)';
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-        return $this->pdo->lastInsertId();
-
-    }
-
-    /**
-     * Deletes an entire addressbook and all its contents
-     *
-     * @param int $addressBookId
-     * @return void
-     */
-    public function deleteAddressBook($addressBookId) {
-
-        $stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE addressbookid = ?', $this->cardsTableName));
-        $stmt->execute([$addressBookId]);
-
-        $stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE id = ?', $this->addressBooksTableName));
-        $stmt->execute([$addressBookId]);
-
-        $stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE addressbookid = ?', $this->addressBookChangesTableName));
-        $stmt->execute([$addressBookId]);
-
-    }
-
-    /**
-     * Returns all cards for a specific addressbook id.
-     *
-     * This method should return the following properties for each card:
-     *   * carddata - raw vcard data
-     *   * uri - Some unique url
-     *   * lastmodified - A unix timestamp
-     *
-     * It's recommended to also return the following properties:
-     *   * etag - A unique etag. This must change every time the card changes.
-     *   * size - The size of the card in bytes.
-     *
-     * If these last two properties are provided, less time will be spent
-     * calculating them. If they are specified, you can also ommit carddata.
-     * This may speed up certain requests, especially with large cards.
-     *
-     * @param mixed $addressbookId
-     * @return array
-     */
-    public function getCards($addressbookId) {
-
-        $stmt = $this->pdo->prepare(sprintf('SELECT id, uri, lastmodified, etag, size FROM %s WHERE addressbookid = ?', $this->cardsTableName));
-        $stmt->execute([$addressbookId]);
-
-        $result = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            $row['etag'] = '"' . $row['etag'] . '"';
-            $result[] = $row;
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns a specfic card.
-     *
-     * The same set of properties must be returned as with getCards. The only
-     * exception is that 'carddata' is absolutely required.
-     *
-     * If the card does not exist, you must return false.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return array
-     */
-    public function getCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare(sprintf('SELECT id, carddata, uri, lastmodified, etag, size FROM %s WHERE addressbookid = ? && uri = ? LIMIT 1', $this->cardsTableName));
-        $stmt->execute([$addressBookId, $cardUri]);
-
-        $result = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-        if (!$result) return false;
-
-        $result['etag'] = '"' . $result['etag'] . '"';
-        return $result;
-
-    }
-
-    /**
-     * Returns a list of cards.
-     *
-     * This method should work identical to getCard, but instead return all the
-     * cards in the list as an array.
-     *
-     * If the backend supports this, it may allow for some speed-ups.
-     *
-     * @param mixed $addressBookId
-     * @param array $uris
-     * @return array
-     */
-    public function getMultipleCards($addressBookId, array $uris) {
-
-        $query = sprintf('SELECT id, uri, lastmodified, etag, size, carddata FROM %s WHERE addressbookid = ? && uri IN (', $this->cardsTableName);
-        // Inserting a whole bunch of question marks
-        $query .= implode(',', array_fill(0, count($uris), '?'));
-        $query .= ')';
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute(array_merge([$addressBookId], $uris));
-        $result = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            $row['etag'] = '"' . $row['etag'] . '"';
-            $result[] = $row;
-        }
-        return $result;
-
-    }
-
-    /**
-     * Creates a new card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressBooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag is for the
-     * newly created resource, and must be enclosed with double quotes (that
-     * is, the string itself must contain the double quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function createCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->cardsTableName . ' (carddata, uri, lastmodified, addressbookid, size, etag) VALUES (?, ?, ?, ?, ?, ?)');
-
-        $etag = md5($cardData);
-
-        $stmt->execute([
-            $cardData,
-            $cardUri,
-            time(),
-            $addressBookId,
-            strlen($cardData),
-            $etag,
-        ]);
-
-        $this->addChange($addressBookId, $cardUri, 1);
-
-        return '"' . $etag . '"';
-
-    }
-
-    /**
-     * Updates a card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressBooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag should
-     * match that of the updated resource, and must be enclosed with double
-     * quotes (that is: the string itself must contain the actual quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function updateCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare(sprintf('UPDATE %s SET carddata = ?, lastmodified = ?, size = ?, etag = ? WHERE uri = ? && addressbookid =?', $this->cardsTableName));
-
-        $etag = md5($cardData);
-        $stmt->execute([
-            $cardData,
-            time(),
-            strlen($cardData),
-            $etag,
-            $cardUri,
-            $addressBookId
-        ]);
-
-        $this->addChange($addressBookId, $cardUri, 2);
-
-        return '"' . $etag . '"';
-
-    }
-
-    /**
-     * Deletes a card
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return bool
-     */
-    public function deleteCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE addressbookid = ? && uri = ?', $this->cardsTableName));
-        $stmt->execute([$addressBookId, $cardUri]);
-
-        $this->addChange($addressBookId, $cardUri, 3);
-
-        return $stmt->rowCount() === 1;
-
-    }
-
-    /**
-     * The getChanges method returns all the changes that have happened, since
-     * the specified syncToken in the specified address book.
-     *
-     * This function should return an array, such as the following:
-     *
-     * [
-     *   'syncToken' => 'The current synctoken',
-     *   'added'   => [
-     *      'new.txt',
-     *   ],
-     *   'modified'   => [
-     *      'updated.txt',
-     *   ],
-     *   'deleted' => [
-     *      'foo.php.bak',
-     *      'old.txt'
-     *   ]
-     * ];
-     *
-     * The returned syncToken property should reflect the *current* syncToken
-     * of the addressbook, as reported in the {http://sabredav.org/ns}sync-token
-     * property. This is needed here too, to ensure the operation is atomic.
-     *
-     * If the $syncToken argument is specified as null, this is an initial
-     * sync, and all members should be reported.
-     *
-     * The modified property is an array of nodenames that have changed since
-     * the last token.
-     *
-     * The deleted property is an array with nodenames, that have been deleted
-     * from collection.
-     *
-     * The $syncLevel argument is basically the 'depth' of the report. If it's
-     * 1, you only have to report changes that happened only directly in
-     * immediate descendants. If it's 2, it should also include changes from
-     * the nodes below the child collections. (grandchildren)
-     *
-     * The $limit argument allows a client to specify how many results should
-     * be returned at most. If the limit is not specified, it should be treated
-     * as infinite.
-     *
-     * If the limit (infinite or not) is higher than you're willing to return,
-     * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
-     *
-     * If the syncToken is expired (due to data cleanup) or unknown, you must
-     * return null.
-     *
-     * The limit is 'suggestive'. You are free to ignore it.
-     *
-     * @param string $addressBookId
-     * @param string $syncToken
-     * @param int $syncLevel
-     * @param int $limit
-     * @return array
-     */
-    public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
-
-        // Current synctoken
-        $stmt = $this->pdo->prepare(sprintf('SELECT synctoken FROM %s WHERE id = ?', $this->addressBooksTableName));
-        $stmt->execute([ $addressBookId ]);
-        $currentToken = $stmt->fetchColumn(0);
-
-        if (is_null($currentToken)) return null;
-
-        $result = [
-            'syncToken' => $currentToken,
-            'added'     => [],
-            'modified'  => [],
-            'deleted'   => [],
-        ];
-
-        if ($syncToken) {
-
-            $query = sprintf("SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && addressbookid = ? ORDER BY synctoken", $this->addressBookChangesTableName);
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
-
-            // Fetching all changes
-            $stmt = $this->pdo->prepare($query);
-            $stmt->execute([$syncToken, $currentToken, $addressBookId]);
-
-            $changes = [];
-
-            // This loop ensures that any duplicates are overwritten, only the
-            // last change on a node is relevant.
-            while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-                $changes[$row['uri']] = $row['operation'];
-
-            }
-
-            foreach ($changes as $uri => $operation) {
-
-                switch ($operation) {
-                    case 1:
-                        $result['added'][] = $uri;
-                        break;
-                    case 2:
-                        $result['modified'][] = $uri;
-                        break;
-                    case 3:
-                        $result['deleted'][] = $uri;
-                        break;
-                }
-
-            }
-        } else {
-            // No synctoken supplied, this is the initial sync.
-            $query = sprintf("SELECT uri FROM %s WHERE addressbookid = ?", $this->cardsTableName);
-            $stmt = $this->pdo->prepare($query);
-            $stmt->execute([$addressBookId]);
-
-            $result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
-        }
-        return $result;
-
-    }
-
-    /**
-     * Adds a change record to the addressbookchanges table.
-     *
-     * @param mixed $addressBookId
-     * @param string $objectUri
-     * @param int $operation 1 = add, 2 = modify, 3 = delete
-     * @return void
-     */
-    protected function addChange($addressBookId, $objectUri, $operation) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->addressBookChangesTableName . ' (uri, synctoken, addressbookid, operation) SELECT ?, synctoken, ?, ? FROM ' . $this->addressBooksTableName . ' WHERE id = ?');
-        $stmt->execute([
-            $objectUri,
-            $addressBookId,
-            $operation,
-            $addressBookId
-        ]);
-        $stmt = $this->pdo->prepare(sprintf('UPDATE %s SET synctoken = synctoken + 1 WHERE id = ?', $this->addressBooksTableName));
-        $stmt->execute([
-            $addressBookId
-        ]);
-
-    }
+	/**
+	 * PDO connection
+	 *
+	 * @var PDO
+	 */
+	protected $pdo;
+
+	/**
+	 * The PDO table name used to store addressbooks
+	 */
+	public $addressBooksTableName = 'addressbooks';
+
+	/**
+	 * The PDO table name used to store cards
+	 */
+	public $cardsTableName = 'cards';
+
+	/**
+	 * The table name that will be used for tracking changes in address books.
+	 *
+	 * @var string
+	 */
+	public $addressBookChangesTableName = 'addressbookchanges';
+
+	/**
+	 * Sets up the object
+	 *
+	 * @param \PDO $pdo
+	 */
+	public function __construct(\PDO $pdo) {
+
+		$this->pdo = $pdo;
+
+	}
+
+	/**
+	 * Returns the list of addressbooks for a specific user.
+	 *
+	 * @param string $principalUri
+	 * @return array
+	 */
+	public function getAddressBooksForUser($principalUri) {
+
+		$stmt = $this->pdo->prepare(sprintf('SELECT id, uri, displayname, principaluri, description, synctoken FROM %s WHERE principaluri = ?', $this->addressBooksTableName));
+		$stmt->execute([$principalUri]);
+
+		$addressBooks = [];
+
+		foreach ($stmt->fetchAll() as $row) {
+
+			$addressBooks[] = [
+				'id'                                                          => $row['id'],
+				'uri'                                                         => $row['uri'],
+				'principaluri'                                                => $row['principaluri'],
+				'{DAV:}displayname'                                           => $row['displayname'],
+				'{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
+				'{http://calendarserver.org/ns/}getctag'                      => $row['synctoken'],
+				'{http://sabredav.org/ns}sync-token'                          => $row['synctoken'] ? $row['synctoken'] : '0',
+			];
+
+		}
+
+		return $addressBooks;
+
+	}
+
+
+	/**
+	 * Updates properties for an address book.
+	 *
+	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+	 * To do the actual updates, you must tell this object which properties
+	 * you're going to process with the handle() method.
+	 *
+	 * Calling the handle method is like telling the PropPatch object "I
+	 * promise I can handle updating this property".
+	 *
+	 * Read the PropPatch documenation for more info and examples.
+	 *
+	 * @param string $addressBookId
+	 * @param \Sabre\DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
+
+		$supportedProperties = [
+			'{DAV:}displayname',
+			'{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description',
+		];
+
+		$propPatch->handle($supportedProperties, function($mutations) use ($addressBookId) {
+
+			$updates = [];
+			foreach ($mutations as $property => $newValue) {
+
+				switch ($property) {
+					case '{DAV:}displayname' :
+						$updates['displayname'] = $newValue;
+						break;
+					case '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' :
+						$updates['description'] = $newValue;
+						break;
+				}
+			}
+			$query = sprintf('UPDATE %s SET ', $this->addressBooksTableName);
+			$first = true;
+			foreach ($updates as $key => $value) {
+				if ($first) {
+					$first = false;
+				} else {
+					$query .= ', ';
+				}
+				$query .= ' `' . $key . '` = :' . $key . ' ';
+			}
+			$query .= ' WHERE id = :addressbookid';
+
+			$stmt = $this->pdo->prepare($query);
+			$updates['addressbookid'] = $addressBookId;
+
+			$stmt->execute($updates);
+
+			$this->addChange($addressBookId, "", 2);
+
+			return true;
+
+		});
+
+	}
+
+	/**
+	 * Creates a new address book
+	 *
+	 * @param string $principalUri
+	 * @param string $url Just the 'basename' of the url.
+	 * @param array $properties
+	 * @return int Last insert id
+	 */
+	public function createAddressBook($principalUri, $url, array $properties) {
+
+		$values = [
+			'displayname'  => null,
+			'description'  => null,
+			'principaluri' => $principalUri,
+			'uri'          => $url,
+		];
+
+		foreach ($properties as $property => $newValue) {
+
+			switch ($property) {
+				case '{DAV:}displayname' :
+					$values['displayname'] = $newValue;
+					break;
+				case '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' :
+					$values['description'] = $newValue;
+					break;
+				default :
+					throw new DAV\Exception\BadRequest('Unknown property: ' . $property);
+			}
+
+		}
+
+		$query = 'INSERT INTO ' . $this->addressBooksTableName . ' (uri, displayname, description, principaluri, synctoken) VALUES (:uri, :displayname, :description, :principaluri, 1)';
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute($values);
+		return $this->pdo->lastInsertId();
+
+	}
+
+	/**
+	 * Deletes an entire addressbook and all its contents
+	 *
+	 * @param int $addressBookId
+	 * @return void
+	 */
+	public function deleteAddressBook($addressBookId) {
+
+		$stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE addressbookid = ?', $this->cardsTableName));
+		$stmt->execute([$addressBookId]);
+
+		$stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE id = ?', $this->addressBooksTableName));
+		$stmt->execute([$addressBookId]);
+
+		$stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE addressbookid = ?', $this->addressBookChangesTableName));
+		$stmt->execute([$addressBookId]);
+
+	}
+
+	/**
+	 * Returns all cards for a specific addressbook id.
+	 *
+	 * This method should return the following properties for each card:
+	 *   * carddata - raw vcard data
+	 *   * uri - Some unique url
+	 *   * lastmodified - A unix timestamp
+	 *
+	 * It's recommended to also return the following properties:
+	 *   * etag - A unique etag. This must change every time the card changes.
+	 *   * size - The size of the card in bytes.
+	 *
+	 * If these last two properties are provided, less time will be spent
+	 * calculating them. If they are specified, you can also ommit carddata.
+	 * This may speed up certain requests, especially with large cards.
+	 *
+	 * @param mixed $addressbookId
+	 * @return array
+	 */
+	public function getCards($addressbookId) {
+
+		$stmt = $this->pdo->prepare(sprintf('SELECT id, uri, lastmodified, etag, size FROM %s WHERE addressbookid = ?', $this->cardsTableName));
+		$stmt->execute([$addressbookId]);
+
+		$result = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			$row['etag'] = '"' . $row['etag'] . '"';
+			$result[] = $row;
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Returns a specfic card.
+	 *
+	 * The same set of properties must be returned as with getCards. The only
+	 * exception is that 'carddata' is absolutely required.
+	 *
+	 * If the card does not exist, you must return false.
+	 *
+	 * @param mixed $addressBookId
+	 * @param string $cardUri
+	 * @return array
+	 */
+	public function getCard($addressBookId, $cardUri) {
+
+		$stmt = $this->pdo->prepare(sprintf('SELECT id, carddata, uri, lastmodified, etag, size FROM %s WHERE addressbookid = ? && uri = ? LIMIT 1', $this->cardsTableName));
+		$stmt->execute([$addressBookId, $cardUri]);
+
+		$result = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+		if (!$result) return false;
+
+		$result['etag'] = '"' . $result['etag'] . '"';
+		return $result;
+
+	}
+
+	/**
+	 * Returns a list of cards.
+	 *
+	 * This method should work identical to getCard, but instead return all the
+	 * cards in the list as an array.
+	 *
+	 * If the backend supports this, it may allow for some speed-ups.
+	 *
+	 * @param mixed $addressBookId
+	 * @param array $uris
+	 * @return array
+	 */
+	public function getMultipleCards($addressBookId, array $uris) {
+
+		$query = sprintf('SELECT id, uri, lastmodified, etag, size, carddata FROM %s WHERE addressbookid = ? && uri IN (', $this->cardsTableName);
+		// Inserting a whole bunch of question marks
+		$query .= implode(',', array_fill(0, count($uris), '?'));
+		$query .= ')';
+
+		$stmt = $this->pdo->prepare($query);
+		$stmt->execute(array_merge([$addressBookId], $uris));
+		$result = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			$row['etag'] = '"' . $row['etag'] . '"';
+			$result[] = $row;
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Creates a new card.
+	 *
+	 * The addressbook id will be passed as the first argument. This is the
+	 * same id as it is returned from the getAddressBooksForUser method.
+	 *
+	 * The cardUri is a base uri, and doesn't include the full path. The
+	 * cardData argument is the vcard body, and is passed as a string.
+	 *
+	 * It is possible to return an ETag from this method. This ETag is for the
+	 * newly created resource, and must be enclosed with double quotes (that
+	 * is, the string itself must contain the double quotes).
+	 *
+	 * You should only return the ETag if you store the carddata as-is. If a
+	 * subsequent GET request on the same card does not have the same body,
+	 * byte-by-byte and you did return an ETag here, clients tend to get
+	 * confused.
+	 *
+	 * If you don't return an ETag, you can just return null.
+	 *
+	 * @param mixed $addressBookId
+	 * @param string $cardUri
+	 * @param string $cardData
+	 * @return string|null
+	 */
+	public function createCard($addressBookId, $cardUri, $cardData) {
+
+		$stmt = $this->pdo->prepare('INSERT INTO ' . $this->cardsTableName . ' (carddata, uri, lastmodified, addressbookid, size, etag) VALUES (?, ?, ?, ?, ?, ?)');
+
+		$etag = md5($cardData);
+
+		$stmt->execute([
+			$cardData,
+			$cardUri,
+			time(),
+			$addressBookId,
+			strlen($cardData),
+			$etag,
+		]);
+
+		$this->addChange($addressBookId, $cardUri, 1);
+
+		return '"' . $etag . '"';
+
+	}
+
+	/**
+	 * Updates a card.
+	 *
+	 * The addressbook id will be passed as the first argument. This is the
+	 * same id as it is returned from the getAddressBooksForUser method.
+	 *
+	 * The cardUri is a base uri, and doesn't include the full path. The
+	 * cardData argument is the vcard body, and is passed as a string.
+	 *
+	 * It is possible to return an ETag from this method. This ETag should
+	 * match that of the updated resource, and must be enclosed with double
+	 * quotes (that is: the string itself must contain the actual quotes).
+	 *
+	 * You should only return the ETag if you store the carddata as-is. If a
+	 * subsequent GET request on the same card does not have the same body,
+	 * byte-by-byte and you did return an ETag here, clients tend to get
+	 * confused.
+	 *
+	 * If you don't return an ETag, you can just return null.
+	 *
+	 * @param mixed $addressBookId
+	 * @param string $cardUri
+	 * @param string $cardData
+	 * @return string|null
+	 */
+	public function updateCard($addressBookId, $cardUri, $cardData) {
+
+		$stmt = $this->pdo->prepare(sprintf('UPDATE %s SET carddata = ?, lastmodified = ?, size = ?, etag = ? WHERE uri = ? && addressbookid =?', $this->cardsTableName));
+
+		$etag = md5($cardData);
+		$stmt->execute([
+			$cardData,
+			time(),
+			strlen($cardData),
+			$etag,
+			$cardUri,
+			$addressBookId
+		]);
+
+		$this->addChange($addressBookId, $cardUri, 2);
+
+		return '"' . $etag . '"';
+
+	}
+
+	/**
+	 * Deletes a card
+	 *
+	 * @param mixed $addressBookId
+	 * @param string $cardUri
+	 * @return bool
+	 */
+	public function deleteCard($addressBookId, $cardUri) {
+
+		$stmt = $this->pdo->prepare(sprintf('DELETE FROM %s WHERE addressbookid = ? && uri = ?', $this->cardsTableName));
+		$stmt->execute([$addressBookId, $cardUri]);
+
+		$this->addChange($addressBookId, $cardUri, 3);
+
+		return $stmt->rowCount() === 1;
+
+	}
+
+	/**
+	 * The getChanges method returns all the changes that have happened, since
+	 * the specified syncToken in the specified address book.
+	 *
+	 * This function should return an array, such as the following:
+	 *
+	 * [
+	 *   'syncToken' => 'The current synctoken',
+	 *   'added'   => [
+	 *      'new.txt',
+	 *   ],
+	 *   'modified'   => [
+	 *      'updated.txt',
+	 *   ],
+	 *   'deleted' => [
+	 *      'foo.php.bak',
+	 *      'old.txt'
+	 *   ]
+	 * ];
+	 *
+	 * The returned syncToken property should reflect the *current* syncToken
+	 * of the addressbook, as reported in the {http://sabredav.org/ns}sync-token
+	 * property. This is needed here too, to ensure the operation is atomic.
+	 *
+	 * If the $syncToken argument is specified as null, this is an initial
+	 * sync, and all members should be reported.
+	 *
+	 * The modified property is an array of nodenames that have changed since
+	 * the last token.
+	 *
+	 * The deleted property is an array with nodenames, that have been deleted
+	 * from collection.
+	 *
+	 * The $syncLevel argument is basically the 'depth' of the report. If it's
+	 * 1, you only have to report changes that happened only directly in
+	 * immediate descendants. If it's 2, it should also include changes from
+	 * the nodes below the child collections. (grandchildren)
+	 *
+	 * The $limit argument allows a client to specify how many results should
+	 * be returned at most. If the limit is not specified, it should be treated
+	 * as infinite.
+	 *
+	 * If the limit (infinite or not) is higher than you're willing to return,
+	 * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
+	 *
+	 * If the syncToken is expired (due to data cleanup) or unknown, you must
+	 * return null.
+	 *
+	 * The limit is 'suggestive'. You are free to ignore it.
+	 *
+	 * @param string $addressBookId
+	 * @param string $syncToken
+	 * @param int $syncLevel
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getChangesForAddressBook($addressBookId, $syncToken, $syncLevel, $limit = null) {
+
+		// Current synctoken
+		$stmt = $this->pdo->prepare(sprintf('SELECT synctoken FROM %s WHERE id = ?', $this->addressBooksTableName));
+		$stmt->execute([ $addressBookId ]);
+		$currentToken = $stmt->fetchColumn(0);
+
+		if (is_null($currentToken)) return null;
+
+		$result = [
+			'syncToken' => $currentToken,
+			'added'     => [],
+			'modified'  => [],
+			'deleted'   => [],
+		];
+
+		if ($syncToken) {
+
+			$query = sprintf("SELECT uri, operation FROM %s WHERE synctoken >= ? && synctoken < ? && addressbookid = ? ORDER BY synctoken", $this->addressBookChangesTableName);
+			if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+
+			// Fetching all changes
+			$stmt = $this->pdo->prepare($query);
+			$stmt->execute([$syncToken, $currentToken, $addressBookId]);
+
+			$changes = [];
+
+			// This loop ensures that any duplicates are overwritten, only the
+			// last change on a node is relevant.
+			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+				$changes[$row['uri']] = $row['operation'];
+
+			}
+
+			foreach ($changes as $uri => $operation) {
+
+				switch ($operation) {
+					case 1:
+						$result['added'][] = $uri;
+						break;
+					case 2:
+						$result['modified'][] = $uri;
+						break;
+					case 3:
+						$result['deleted'][] = $uri;
+						break;
+				}
+
+			}
+		} else {
+			// No synctoken supplied, this is the initial sync.
+			$query = sprintf("SELECT uri FROM %s WHERE addressbookid = ?", $this->cardsTableName);
+			$stmt = $this->pdo->prepare($query);
+			$stmt->execute([$addressBookId]);
+
+			$result['added'] = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+		}
+		return $result;
+
+	}
+
+	/**
+	 * Adds a change record to the addressbookchanges table.
+	 *
+	 * @param mixed $addressBookId
+	 * @param string $objectUri
+	 * @param int $operation 1 = add, 2 = modify, 3 = delete
+	 * @return void
+	 */
+	protected function addChange($addressBookId, $objectUri, $operation) {
+
+		$stmt = $this->pdo->prepare('INSERT INTO ' . $this->addressBookChangesTableName . ' (uri, synctoken, addressbookid, operation) SELECT ?, synctoken, ?, ? FROM ' . $this->addressBooksTableName . ' WHERE id = ?');
+		$stmt->execute([
+			$objectUri,
+			$addressBookId,
+			$operation,
+			$addressBookId
+		]);
+		$stmt = $this->pdo->prepare(sprintf('UPDATE %s SET synctoken = synctoken + 1 WHERE id = ?', $this->addressBooksTableName));
+		$stmt->execute([
+			$addressBookId
+		]);
+
+	}
 }