Zwartpet / php-certificate-toolbox

exampleHTTP.php

Spacing +7 added lines, -7 removed lines

@@ -16,19 +16,19 @@ 
 // Initiating the order instance. The keys and certificate will be stored in /example.org/ (argument 1) and the domains in the array (argument 2) will be on the certificate.
 $order = $client->getOrCreateOrder($basename, $domains);
 // Check whether there are any authorizations pending. If that is the case, try to verify the pending authorizations.
-if(!$order->allAuthorizationsValid())
+if (!$order->allAuthorizationsValid())
 {
 	// Get the HTTP challenges from the pending authorizations.
 	$pending = $order->getPendingAuthorizations(LEOrder::CHALLENGE_TYPE_HTTP);
 	// Walk the list of pending authorization HTTP challenges.
-	if(!empty($pending))
+	if (!empty($pending))
 	{
-		foreach($pending as $challenge)
+		foreach ($pending as $challenge)
 		{
 			// Define the folder in which to store the challenge. For the purpose of this example, a fictitious path is set.
 			$folder = '/path/to/' . $challenge['identifier'] . '/.well-known/acme-challenge/';
 			// Check if that directory yet exists. If not, create it.
-			if(!file_exists($folder)) mkdir($folder, 0777, true);
+			if (!file_exists($folder)) mkdir($folder, 0777, true);
 			// Store the challenge file for this domain.
 			file_put_contents($folder . $challenge['filename'], $challenge['content']);
 			// Let LetsEncrypt verify this challenge.
@@ -37,11 +37,11 @@ 
 	}
 }
 // Check once more whether all authorizations are valid before we can finalize the order.
-if($order->allAuthorizationsValid())
+if ($order->allAuthorizationsValid())
 {
 	// Finalize the order first, if that is not yet done.
-	if(!$order->isFinalized()) $order->finalizeOrder();
+	if (!$order->isFinalized()) $order->finalizeOrder();
 	// Check whether the order has been finalized before we can get the certificate. If finalized, get the certificate.
-	if($order->isFinalized()) $order->getCertificate();
+	if ($order->isFinalized()) $order->getCertificate();
 }
 ?>
\ No newline at end of file

Braces +10 added lines, -4 removed lines

@@ -28,7 +28,9 @@ 
 			// Define the folder in which to store the challenge. For the purpose of this example, a fictitious path is set.
 			$folder = '/path/to/' . $challenge['identifier'] . '/.well-known/acme-challenge/';
 			// Check if that directory yet exists. If not, create it.
-			if(!file_exists($folder)) mkdir($folder, 0777, true);
+			if(!file_exists($folder)) {
+				mkdir($folder, 0777, true);
+			}
 			// Store the challenge file for this domain.
 			file_put_contents($folder . $challenge['filename'], $challenge['content']);
 			// Let LetsEncrypt verify this challenge.
@@ -40,8 +42,12 @@ 
 if($order->allAuthorizationsValid())
 {
 	// Finalize the order first, if that is not yet done.
-	if(!$order->isFinalized()) $order->finalizeOrder();
+	if(!$order->isFinalized()) {
+		$order->finalizeOrder();
+	}
 	// Check whether the order has been finalized before we can get the certificate. If finalized, get the certificate.
-	if($order->isFinalized()) $order->getCertificate();
-}
+	if($order->isFinalized()) {
+		$order->getCertificate();
+	}
+	}
 ?>
\ No newline at end of file

LEClient/LEClient.php

Indentation +25 added lines, -25 removed lines

@@ -60,17 +60,17 @@ 
 	const LOG_STATUS = 1;	// Logs only messages and faults.
 	const LOG_DEBUG = 2;	// Logs messages, faults and raw responses from HTTP requests.
 
-    /**
-     * Initiates the LetsEncrypt main client.
-     *
-     * @param array		$email	 		The array of strings containing e-mail addresses. Only used in this function when creating a new account.
-     * @param boolean	$acmeURL		ACME URL, can be string or one of predefined values: LE_STAGING or LE_PRODUCTION. Defaults to LE_STAGING.
-     * @param int 		$log			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted. Defaults to LOG_OFF. (optional)
-     * @param string 	$certificateKeys 		The main directory in which all keys (and certificates), including account keys, are stored. Defaults to 'keys/'. (optional)
-		 * @param array 	$certificateKeys 		Optional array containing location of all certificate files. Required paths are public_key, private_key, order and certificate/fullchain_certificate (you can use both or only one of them)
-     * @param string 	$accountKeys The directory in which the account keys are stored. Is a subdir inside $certificateKeys. Defaults to '__account/'.(optional)
-		 * @param array 	$accountKeys Optional array containing location of account private and public keys. Required paths are private_key, public_key.
-     */
+	/**
+	 * Initiates the LetsEncrypt main client.
+	 *
+	 * @param array		$email	 		The array of strings containing e-mail addresses. Only used in this function when creating a new account.
+	 * @param boolean	$acmeURL		ACME URL, can be string or one of predefined values: LE_STAGING or LE_PRODUCTION. Defaults to LE_STAGING.
+	 * @param int 		$log			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted. Defaults to LOG_OFF. (optional)
+	 * @param string 	$certificateKeys 		The main directory in which all keys (and certificates), including account keys, are stored. Defaults to 'keys/'. (optional)
+	 * @param array 	$certificateKeys 		Optional array containing location of all certificate files. Required paths are public_key, private_key, order and certificate/fullchain_certificate (you can use both or only one of them)
+	 * @param string 	$accountKeys The directory in which the account keys are stored. Is a subdir inside $certificateKeys. Defaults to '__account/'.(optional)
+	 * @param array 	$accountKeys Optional array containing location of account private and public keys. Required paths are private_key, public_key.
+	 */
 	public function __construct($email, $acmeURL = LEClient::LE_STAGING, $log = LEClient::LOG_OFF, $certificateKeys = 'keys/', $accountKeys = '__account/')
 	{
 
@@ -171,27 +171,27 @@ 
 	}
 
 
-    /**
-     * Returns the LetsEncrypt account used in the current client.
+	/**
+	 * Returns the LetsEncrypt account used in the current client.
 	 *
 	 * @return LEAccount	The LetsEncrypt Account instance used by the client.
-     */
+	 */
 	public function getAccount()
 	{
 		return $this->account;
 	}
 
-    /**
-     * Returns a LetsEncrypt order. If an order exists, this one is returned. If not, a new order is created and returned.
-     *
-     * @param string	$basename	The base name for the order. Preferable the top domain (example.org). Will be the directory in which the keys are stored. Used for the CommonName in the certificate as well.
-     * @param array 	$domains 	The array of strings containing the domain names on the certificate.
-     * @param string 		$keyType 	Type of the key we want to use for certificate. Can be provided in ALGO-SIZE format (ex. rsa-4096 or ec-256) or simple "rsa" and "ec" (using default sizes)
-     * @param string 	$notBefore	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid. Defaults to the moment the order is finalized. (optional)
-     * @param string 	$notAfter  	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid. Defaults to 90 days past the moment the order is finalized. (optional)
-     *
-     * @return LEOrder	The LetsEncrypt Order instance which is either retrieved or created.
-     */
+	/**
+	 * Returns a LetsEncrypt order. If an order exists, this one is returned. If not, a new order is created and returned.
+	 *
+	 * @param string	$basename	The base name for the order. Preferable the top domain (example.org). Will be the directory in which the keys are stored. Used for the CommonName in the certificate as well.
+	 * @param array 	$domains 	The array of strings containing the domain names on the certificate.
+	 * @param string 		$keyType 	Type of the key we want to use for certificate. Can be provided in ALGO-SIZE format (ex. rsa-4096 or ec-256) or simple "rsa" and "ec" (using default sizes)
+	 * @param string 	$notBefore	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid. Defaults to the moment the order is finalized. (optional)
+	 * @param string 	$notAfter  	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid. Defaults to 90 days past the moment the order is finalized. (optional)
+	 *
+	 * @return LEOrder	The LetsEncrypt Order instance which is either retrieved or created.
+	 */
 	public function getOrCreateOrder($basename, $domains, $keyType = 'rsa-4096', $notBefore = '', $notAfter = '')
 	{
 		return new LEOrder($this->connector, $this->log, $this->certificateKeys, $basename, $domains, $keyType, $notBefore, $notAfter);

Spacing +18 added lines, -18 removed lines

@@ -56,9 +56,9 @@ 
 
 	private $log;
 
-	const LOG_OFF = 0;		// Logs no messages or faults, except Runtime Exceptions.
-	const LOG_STATUS = 1;	// Logs only messages and faults.
-	const LOG_DEBUG = 2;	// Logs messages, faults and raw responses from HTTP requests.
+	const LOG_OFF = 0; // Logs no messages or faults, except Runtime Exceptions.
+	const LOG_STATUS = 1; // Logs only messages and faults.
+	const LOG_DEBUG = 2; // Logs messages, faults and raw responses from HTTP requests.
 
     /**
      * Initiates the LetsEncrypt main client.
@@ -95,18 +95,18 @@ 
 
 			$certificateKeysDir = $certificateKeys;
 
-			if(!file_exists($certificateKeys))
+			if (!file_exists($certificateKeys))
 			{
 				mkdir($certificateKeys, 0777, true);
 				LEFunctions::createhtaccess($certificateKeys);
 			}
 
 			$this->certificateKeys = array(
-				"public_key" => $certificateKeys.'/public.pem',
-				"private_key" => $certificateKeys.'/private.pem',
-				"certificate" => $certificateKeys.'/certificate.crt',
-				"fullchain_certificate" => $certificateKeys.'/fullchain.crt',
-				"order" => $certificateKeys.'/order'
+				"public_key" => $certificateKeys . '/public.pem',
+				"private_key" => $certificateKeys . '/private.pem',
+				"certificate" => $certificateKeys . '/certificate.crt',
+				"fullchain_certificate" => $certificateKeys . '/fullchain.crt',
+				"order" => $certificateKeys . '/order'
 			);
 
 		}
@@ -115,12 +115,12 @@ 
 
 			if (!isset($certificateKeys['certificate']) && !isset($certificateKeys['fullchain_certificate'])) throw new \RuntimeException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] file path must be set');
 			if (!isset($certificateKeys['private_key'])) throw new \RuntimeException('certificateKeys[private_key] file path must be set');
-			if (!isset($certificateKeys['order'])) $certificateKeys['order'] = dirname($certificateKeys['private_key']).'/order';
-			if (!isset($certificateKeys['public_key'])) $certificateKeys['public_key'] = dirname($certificateKeys['private_key']).'/public.pem';
+			if (!isset($certificateKeys['order'])) $certificateKeys['order'] = dirname($certificateKeys['private_key']) . '/order';
+			if (!isset($certificateKeys['public_key'])) $certificateKeys['public_key'] = dirname($certificateKeys['private_key']) . '/public.pem';
 
 			foreach ($certificateKeys as $param => $file) {
 				$parentDir = dirname($file);
-				if (!is_dir($parentDir)) throw new \RuntimeException($parentDir.' directory not found');
+				if (!is_dir($parentDir)) throw new \RuntimeException($parentDir . ' directory not found');
 			}
 
 			$this->certificateKeys = $certificateKeys;
@@ -134,17 +134,17 @@ 
 		if (is_string($accountKeys))
 		{
 
-			$accountKeys = $certificateKeysDir.'/'.$accountKeys;
+			$accountKeys = $certificateKeysDir . '/' . $accountKeys;
 
-			if(!file_exists($accountKeys))
+			if (!file_exists($accountKeys))
 			{
 				mkdir($accountKeys, 0777, true);
 				LEFunctions::createhtaccess($accountKeys);
 			}
 
 			$this->accountKeys = array(
-				"private_key" => $accountKeys.'/private.pem',
-				"public_key" => $accountKeys.'/public.pem'
+				"private_key" => $accountKeys . '/private.pem',
+				"public_key" => $accountKeys . '/public.pem'
 			);
 		}
 		elseif (is_array($accountKeys))
@@ -154,7 +154,7 @@ 
 
 			foreach ($accountKeys as $param => $file) {
 				$parentDir = dirname($file);
-				if (!is_dir($parentDir)) throw new \RuntimeException($parentDir.' directory not found');
+				if (!is_dir($parentDir)) throw new \RuntimeException($parentDir . ' directory not found');
 			}
 
 			$this->accountKeys = $accountKeys;
@@ -167,7 +167,7 @@ 
 
 		$this->connector = new LEConnector($this->log, $this->baseURL, $this->accountKeys);
 		$this->account = new LEAccount($this->connector, $this->log, $email, $this->accountKeys);
-		if($this->log) LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
+		if ($this->log) LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
 	}
 
 

Braces +44 added lines, -24 removed lines

@@ -78,17 +78,23 @@ 
 
 		if (is_bool($acmeURL))
 		{
-			if ($acmeURL === true) $this->baseURL = LEClient::LE_STAGING;
-			elseif ($acmeURL === false) $this->baseURL = LEClient::LE_PRODUCTION;
-		}
-		elseif (is_string($acmeURL))
+			if ($acmeURL === true) {
+				$this->baseURL = LEClient::LE_STAGING;
+			} elseif ($acmeURL === false) {
+				$this->baseURL = LEClient::LE_PRODUCTION;
+			}
+		} elseif (is_string($acmeURL))
 		{
 			$this->baseURL = $acmeURL;
+		} else {
+			throw new \RuntimeException('acmeURL must be set to string or bool (legacy)');
 		}
-		else throw new \RuntimeException('acmeURL must be set to string or bool (legacy)');
 
-		if (is_array($certificateKeys) && is_string($accountKeys)) throw new \RuntimeException('when certificateKeys is array, accountKeys must be array also');
-		elseif (is_array($accountKeys) && is_string($certificateKeys)) throw new \RuntimeException('when accountKeys is array, certificateKeys must be array also');
+		if (is_array($certificateKeys) && is_string($accountKeys)) {
+			throw new \RuntimeException('when certificateKeys is array, accountKeys must be array also');
+		} elseif (is_array($accountKeys) && is_string($certificateKeys)) {
+			throw new \RuntimeException('when accountKeys is array, certificateKeys must be array also');
+		}
 
 		if (is_string($certificateKeys))
 		{
@@ -109,24 +115,32 @@ 
 				"order" => $certificateKeys.'/order'
 			);
 
-		}
-		elseif (is_array($certificateKeys))
+		} elseif (is_array($certificateKeys))
 		{
 
-			if (!isset($certificateKeys['certificate']) && !isset($certificateKeys['fullchain_certificate'])) throw new \RuntimeException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] file path must be set');
-			if (!isset($certificateKeys['private_key'])) throw new \RuntimeException('certificateKeys[private_key] file path must be set');
-			if (!isset($certificateKeys['order'])) $certificateKeys['order'] = dirname($certificateKeys['private_key']).'/order';
-			if (!isset($certificateKeys['public_key'])) $certificateKeys['public_key'] = dirname($certificateKeys['private_key']).'/public.pem';
+			if (!isset($certificateKeys['certificate']) && !isset($certificateKeys['fullchain_certificate'])) {
+				throw new \RuntimeException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] file path must be set');
+			}
+			if (!isset($certificateKeys['private_key'])) {
+				throw new \RuntimeException('certificateKeys[private_key] file path must be set');
+			}
+			if (!isset($certificateKeys['order'])) {
+				$certificateKeys['order'] = dirname($certificateKeys['private_key']).'/order';
+			}
+			if (!isset($certificateKeys['public_key'])) {
+				$certificateKeys['public_key'] = dirname($certificateKeys['private_key']).'/public.pem';
+			}
 
 			foreach ($certificateKeys as $param => $file) {
 				$parentDir = dirname($file);
-				if (!is_dir($parentDir)) throw new \RuntimeException($parentDir.' directory not found');
+				if (!is_dir($parentDir)) {
+					throw new \RuntimeException($parentDir.' directory not found');
+				}
 			}
 
 			$this->certificateKeys = $certificateKeys;
 
-		}
-		else
+		} else
 		{
 			throw new \RuntimeException('certificateKeys must be string or array');
 		}
@@ -146,20 +160,24 @@ 
 				"private_key" => $accountKeys.'/private.pem',
 				"public_key" => $accountKeys.'/public.pem'
 			);
-		}
-		elseif (is_array($accountKeys))
+		} elseif (is_array($accountKeys))
 		{
-			if (!isset($accountKeys['private_key'])) throw new \RuntimeException('accountKeys[private_key] file path must be set');
-			if (!isset($accountKeys['public_key'])) throw new \RuntimeException('accountKeys[public_key] file path must be set');
+			if (!isset($accountKeys['private_key'])) {
+				throw new \RuntimeException('accountKeys[private_key] file path must be set');
+			}
+			if (!isset($accountKeys['public_key'])) {
+				throw new \RuntimeException('accountKeys[public_key] file path must be set');
+			}
 
 			foreach ($accountKeys as $param => $file) {
 				$parentDir = dirname($file);
-				if (!is_dir($parentDir)) throw new \RuntimeException($parentDir.' directory not found');
+				if (!is_dir($parentDir)) {
+					throw new \RuntimeException($parentDir.' directory not found');
+				}
 			}
 
 			$this->accountKeys = $accountKeys;
-		}
-		else
+		} else
 		{
 			throw new \RuntimeException('accountKeys must be string or array');
 		}
@@ -167,7 +185,9 @@ 
 
 		$this->connector = new LEConnector($this->log, $this->baseURL, $this->accountKeys);
 		$this->account = new LEAccount($this->connector, $this->log, $email, $this->accountKeys);
-		if($this->log) LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
+		if($this->log) {
+			LEFunctions::log('LEClient finished constructing', 'function LEClient __construct');
+		}
 	}
 
 

LEClient/src/LEOrder.php

Indentation +88 added lines, -88 removed lines

@@ -58,18 +58,18 @@ 
 	const CHALLENGE_TYPE_HTTP = 'http-01';
 	const CHALLENGE_TYPE_DNS = 'dns-01';
 
-    /**
-     * Initiates the LetsEncrypt Order class. If the base name is found in the $keysDir directory, the order data is requested. If no order was found locally, if the request is invalid or when there is a change in domain names, a new order is created.
-     *
-     * @param LEConnector	$connector	The LetsEncrypt Connector instance to use for HTTP requests.
-     * @param int 			$log 		The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
-     * @param array 		$certificateKeys 	Array containing location of certificate keys files.
-     * @param string 		$basename 	The base name for the order. Preferable the top domain (example.org). Will be the directory in which the keys are stored. Used for the CommonName in the certificate as well.
-     * @param array 		$domains 	The array of strings containing the domain names on the certificate.
-     * @param string 		$keyType 	Type of the key we want to use for certificate. Can be provided in ALGO-SIZE format (ex. rsa-4096 or ec-256) or simple "rsa" and "ec" (using default sizes)
-     * @param string 		$notBefore 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid.
-     * @param string 		$notAfter 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid.
-     */
+	/**
+	 * Initiates the LetsEncrypt Order class. If the base name is found in the $keysDir directory, the order data is requested. If no order was found locally, if the request is invalid or when there is a change in domain names, a new order is created.
+	 *
+	 * @param LEConnector	$connector	The LetsEncrypt Connector instance to use for HTTP requests.
+	 * @param int 			$log 		The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
+	 * @param array 		$certificateKeys 	Array containing location of certificate keys files.
+	 * @param string 		$basename 	The base name for the order. Preferable the top domain (example.org). Will be the directory in which the keys are stored. Used for the CommonName in the certificate as well.
+	 * @param array 		$domains 	The array of strings containing the domain names on the certificate.
+	 * @param string 		$keyType 	Type of the key we want to use for certificate. Can be provided in ALGO-SIZE format (ex. rsa-4096 or ec-256) or simple "rsa" and "ec" (using default sizes)
+	 * @param string 		$notBefore 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid.
+	 * @param string 		$notAfter 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid.
+	 */
 	public function __construct($connector, $log, $certificateKeys, $basename, $domains, $keyType = 'rsa-4096', $notBefore, $notAfter)
 	{
 		$this->connector = $connector;
@@ -159,13 +159,13 @@ 
 		}
 	}
 
-    /**
-     * Creates a new LetsEncrypt order and fills this instance with its data. Subsequently creates a new RSA keypair for the certificate.
-     *
-     * @param array		$domains 	The array of strings containing the domain names on the certificate.
-     * @param string 	$notBefore 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid.
-     * @param string 	$notAfter 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid.
-     */
+	/**
+	 * Creates a new LetsEncrypt order and fills this instance with its data. Subsequently creates a new RSA keypair for the certificate.
+	 *
+	 * @param array		$domains 	The array of strings containing the domain names on the certificate.
+	 * @param string 	$notBefore 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) at which the certificate becomes valid.
+	 * @param string 	$notAfter 	A date string formatted like 0000-00-00T00:00:00Z (yyyy-mm-dd hh:mm:ss) until which the certificate is valid.
+	 */
 	private function createOrder($domains, $notBefore, $notAfter)
 	{
 		if(preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notBefore) AND preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notAfter))
@@ -226,9 +226,9 @@ 
 		}
 	}
 
-    /**
-     * Fetches the latest data concerning this LetsEncrypt Order instance and fills this instance with the new data.
-     */
+	/**
+	 * Fetches the latest data concerning this LetsEncrypt Order instance and fills this instance with the new data.
+	 */
 	private function updateOrderData()
 	{
 		$get = $this->connector->get($this->orderURL);
@@ -249,8 +249,8 @@ 
 	}
 
 	/**
-     * Fetches the latest data concerning all authorizations connected to this LetsEncrypt Order instance and creates and stores a new LetsEncrypt Authorization instance for each one.
-     */
+	 * Fetches the latest data concerning all authorizations connected to this LetsEncrypt Order instance and creates and stores a new LetsEncrypt Authorization instance for each one.
+	 */
 	private function updateAuthorizations()
 	{
 		$this->authorizations = array();
@@ -264,11 +264,11 @@ 
 		}
 	}
 
-    /**
-     * Walks all LetsEncrypt Authorization instances and returns whether they are all valid (verified).
-     *
-     * @return boolean	Returns true if all authorizations are valid (verified), returns false if not.
-     */
+	/**
+	 * Walks all LetsEncrypt Authorization instances and returns whether they are all valid (verified).
+	 *
+	 * @return boolean	Returns true if all authorizations are valid (verified), returns false if not.
+	 */
 	public function allAuthorizationsValid()
 	{
 		if(count($this->authorizations) > 0)
@@ -282,16 +282,16 @@ 
 		return false;
 	}
 
-    /**
-     * Get all pending LetsEncrypt Authorization instances and return the necessary data for verification. The data in the return object depends on the $type.
-     *
-     * @param int	$type	The type of verification to get. Supporting http-01 and dns-01. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS. Throws
+	/**
+	 * Get all pending LetsEncrypt Authorization instances and return the necessary data for verification. The data in the return object depends on the $type.
+	 *
+	 * @param int	$type	The type of verification to get. Supporting http-01 and dns-01. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS. Throws
 	 *						a Runtime Exception when requesting an unknown $type. Keep in mind a wildcard domain authorization only accepts LEOrder::CHALLENGE_TYPE_DNS.
-     *
-     * @return object	Returns an array with verification data if successful, false if not pending LetsEncrypt Authorization instances were found. The return array always
+	 *
+	 * @return object	Returns an array with verification data if successful, false if not pending LetsEncrypt Authorization instances were found. The return array always
 	 *					contains 'type' and 'identifier'. For LEOrder::CHALLENGE_TYPE_HTTP, the array contains 'filename' and 'content' for necessary the authorization file.
 	 *					For LEOrder::CHALLENGE_TYPE_DNS, the array contains 'DNSDigest', which is the content for the necessary DNS TXT entry.
-     */
+	 */
 
 	public function getPendingAuthorizations($type)
 	{
@@ -333,15 +333,15 @@ 
 		return count($authorizations) > 0 ? $authorizations : false;
 	}
 
-    /**
-     * Sends a verification request for a given $identifier and $type. The function itself checks whether the verification is valid before making the request.
+	/**
+	 * Sends a verification request for a given $identifier and $type. The function itself checks whether the verification is valid before making the request.
 	 * Updates the LetsEncrypt Authorization instances after a successful verification.
-     *
-     * @param string	$identifier	The domain name to verify.
-     * @param int 		$type 		The type of verification. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS.
-     *
-     * @return boolean	Returns true when the verification request was successful, false if not.
-     */
+	 *
+	 * @param string	$identifier	The domain name to verify.
+	 * @param int 		$type 		The type of verification. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS.
+	 *
+	 * @return boolean	Returns true when the verification request was successful, false if not.
+	 */
 	public function verifyPendingOrderAuthorization($identifier, $type)
 	{
 		$privateKey = openssl_pkey_get_private(file_get_contents($this->connector->accountKeys['private_key']));
@@ -418,13 +418,13 @@ 
 		return false;
 	}
 
-    /**
-     * Deactivate an LetsEncrypt Authorization instance.
-     *
-     * @param string	$identifier The domain name for which the verification should be deactivated.
-     *
-     * @return boolean	Returns true is the deactivation request was successful, false if not.
-     */
+	/**
+	 * Deactivate an LetsEncrypt Authorization instance.
+	 *
+	 * @param string	$identifier The domain name for which the verification should be deactivated.
+	 *
+	 * @return boolean	Returns true is the deactivation request was successful, false if not.
+	 */
 	public function deactivateOrderAuthorization($identifier)
 	{
 		foreach($this->authorizations as $auth)
@@ -445,12 +445,12 @@ 
 		return false;
 	}
 
-    /**
-     * Generates a Certificate Signing Request for the identifiers in the current LetsEncrypt Order instance. If possible, the base name will be the certificate
+	/**
+	 * Generates a Certificate Signing Request for the identifiers in the current LetsEncrypt Order instance. If possible, the base name will be the certificate
 	 * common name and all domain names in this LetsEncrypt Order instance will be added to the Subject Alternative Names entry.
-     *
-     * @return string	Returns the generated CSR as string, unprepared for LetsEncrypt. Preparation for the request happens in finalizeOrder()
-     */
+	 *
+	 * @return string	Returns the generated CSR as string, unprepared for LetsEncrypt. Preparation for the request happens in finalizeOrder()
+	 */
 	public function generateCSR()
 	{
 		$domains = array_map(function ($dns) { return $dns['value']; }, $this->identifiers);
@@ -472,14 +472,14 @@ 
 		);
 
 		$san = implode(",", array_map(function ($dns) {
-            return "DNS:" . $dns;
-        }, $domains));
-        $tmpConf = tmpfile();
-        $tmpConfMeta = stream_get_meta_data($tmpConf);
-        $tmpConfPath = $tmpConfMeta["uri"];
-
-        fwrite($tmpConf,
-            'HOME = .
+			return "DNS:" . $dns;
+		}, $domains));
+		$tmpConf = tmpfile();
+		$tmpConfMeta = stream_get_meta_data($tmpConf);
+		$tmpConfPath = $tmpConfMeta["uri"];
+
+		fwrite($tmpConf,
+			'HOME = .
 			RANDFILE = $ENV::HOME/.rnd
 			[ req ]
 			default_bits = 4096
@@ -499,13 +499,13 @@ 
 		return $csr;
 	}
 
-    /**
-     * Checks, for redundancy, whether all authorizations are valid, and finalizes the order. Updates this LetsEncrypt Order instance with the new data.
-     *
-     * @param string	$csr	The Certificate Signing Request as a string. Can be a custom CSR. If empty, a CSR will be generated with the generateCSR() function.
-     *
-     * @return boolean	Returns true if the finalize request was successful, false if not.
-     */
+	/**
+	 * Checks, for redundancy, whether all authorizations are valid, and finalizes the order. Updates this LetsEncrypt Order instance with the new data.
+	 *
+	 * @param string	$csr	The Certificate Signing Request as a string. Can be a custom CSR. If empty, a CSR will be generated with the generateCSR() function.
+	 *
+	 * @return boolean	Returns true if the finalize request was successful, false if not.
+	 */
 	public function finalizeOrder($csr = '')
 	{
 		if($this->status == 'pending')
@@ -542,22 +542,22 @@ 
 		return false;
 	}
 
-    /**
-     * Gets whether the LetsEncrypt Order is finalized by checking whether the status is processing or valid. Keep in mind, a certificate is not yet available when the status still is processing.
-     *
-     * @return boolean	Returns true if finalized, false if not.
-     */
+	/**
+	 * Gets whether the LetsEncrypt Order is finalized by checking whether the status is processing or valid. Keep in mind, a certificate is not yet available when the status still is processing.
+	 *
+	 * @return boolean	Returns true if finalized, false if not.
+	 */
 	public function isFinalized()
 	{
 		return ($this->status == 'processing' || $this->status == 'valid');
 	}
 
-    /**
-     * Requests the certificate for this LetsEncrypt Order instance, after finalization. When the order status is still 'processing', the order will be polled max
+	/**
+	 * Requests the certificate for this LetsEncrypt Order instance, after finalization. When the order status is still 'processing', the order will be polled max
 	 * four times with five seconds in between. If the status becomes 'valid' in the meantime, the certificate will be requested. Else, the function returns false.
-     *
-     * @return boolean	Returns true if the certificate is stored successfully, false if the certificate could not be retrieved or the status remained 'processing'.
-     */
+	 *
+	 * @return boolean	Returns true if the certificate is stored successfully, false if the certificate could not be retrieved or the status remained 'processing'.
+	 */
 	public function getCertificate()
 	{
 		$polling = 0;
@@ -607,14 +607,14 @@ 
 		return false;
 	}
 
-    /**
-     * Revokes the certificate in the current LetsEncrypt Order instance, if existent. Unlike stated in the ACME draft, the certificate revoke request cannot be signed
+	/**
+	 * Revokes the certificate in the current LetsEncrypt Order instance, if existent. Unlike stated in the ACME draft, the certificate revoke request cannot be signed
 	 * with the account private key, and will be signed with the certificate private key.
-     *
-     * @param int	$reason   The reason to revoke the LetsEncrypt Order instance certificate. Possible reasons can be found in section 5.3.1 of RFC5280.
-     *
-     * @return boolean	Returns true if the certificate was successfully revoked, false if not.
-     */
+	 *
+	 * @param int	$reason   The reason to revoke the LetsEncrypt Order instance certificate. Possible reasons can be found in section 5.3.1 of RFC5280.
+	 *
+	 * @return boolean	Returns true if the certificate was successfully revoked, false if not.
+	 */
 	public function revokeCertificate($reason = 0)
 	{
 		if($this->status == 'valid')

Spacing +83 added lines, -83 removed lines

@@ -100,23 +100,23 @@ 
 
 		$this->certificateKeys = $certificateKeys;
 
-		if(file_exists($this->certificateKeys['private_key']) AND file_exists($this->certificateKeys['order']) AND file_exists($this->certificateKeys['public_key']))
+		if (file_exists($this->certificateKeys['private_key']) AND file_exists($this->certificateKeys['order']) AND file_exists($this->certificateKeys['public_key']))
 		{
 			$this->orderURL = file_get_contents($this->certificateKeys['order']);
 			if (filter_var($this->orderURL, FILTER_VALIDATE_URL))
 			{
 				$get = $this->connector->get($this->orderURL);
-				if(strpos($get['header'], "200 OK") !== false)
+				if (strpos($get['header'], "200 OK") !== false)
 				{
 					$orderdomains = array_map(function($ident) { return $ident['value']; }, $get['body']['identifiers']);
 					$diff = array_merge(array_diff($orderdomains, $domains), array_diff($domains, $orderdomains));
-					if(!empty($diff))
+					if (!empty($diff))
 					{
 						foreach ($this->certificateKeys as $file)
 						{
-							if (is_file($file)) rename($file, $file.'.old');
+							if (is_file($file)) rename($file, $file . '.old');
 						}
-						if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Domains do not match order data. Renaming current files and creating new order.', 'function LEOrder __construct');
+						if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Domains do not match order data. Renaming current files and creating new order.', 'function LEOrder __construct');
 						$this->createOrder($domains, $notBefore, $notAfter, $keyType);
 					}
 					else
@@ -126,7 +126,7 @@ 
 						$this->identifiers = $get['body']['identifiers'];
 						$this->authorizationURLs = $get['body']['authorizations'];
 						$this->finalizeURL = $get['body']['finalize'];
-						if(array_key_exists('certificate', $get['body'])) $this->certificateURL = $get['body']['certificate'];
+						if (array_key_exists('certificate', $get['body'])) $this->certificateURL = $get['body']['certificate'];
 						$this->updateAuthorizations();
 					}
 				}
@@ -136,7 +136,7 @@ 
 					{
 						if (is_file($file)) unlink($file);
 					}
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
+					if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 					$this->createOrder($domains, $notBefore, $notAfter);
 				}
 			}
@@ -147,14 +147,14 @@ 
 				{
 					if (is_file($file)) unlink($file);
 				}
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
+				if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 
 				$this->createOrder($domains, $notBefore, $notAfter);
 			}
 		}
 		else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
 			$this->createOrder($domains, $notBefore, $notAfter);
 		}
 	}
@@ -168,22 +168,22 @@ 
      */
 	private function createOrder($domains, $notBefore, $notAfter)
 	{
-		if(preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notBefore) AND preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notAfter))
+		if (preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notBefore) AND preg_match('~(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z|^$)~', $notAfter))
 		{
 
 			$dns = array();
-			foreach($domains as $domain)
+			foreach ($domains as $domain)
 			{
-				if(preg_match_all('~(\*\.)~', $domain) > 1) throw new \RuntimeException('Cannot create orders with multiple wildcards in one domain.');
+				if (preg_match_all('~(\*\.)~', $domain) > 1) throw new \RuntimeException('Cannot create orders with multiple wildcards in one domain.');
 				$dns[] = array('type' => 'dns', 'value' => $domain);
 			}
 			$payload = array("identifiers" => $dns, 'notBefore' => $notBefore, 'notAfter' => $notAfter);
 			$sign = $this->connector->signRequestKid($payload, $this->connector->accountURL, $this->connector->newOrder);
 			$post = $this->connector->post($this->connector->newOrder, $sign);
 
-			if(strpos($post['header'], "201 Created") !== false)
+			if (strpos($post['header'], "201 Created") !== false)
 			{
-				if(preg_match('~Location: (\S+)~i', $post['header'], $matches))
+				if (preg_match('~Location: (\S+)~i', $post['header'], $matches))
 				{
 					$this->orderURL = trim($matches[1]);
 					file_put_contents($this->certificateKeys['order'], $this->orderURL);
@@ -205,10 +205,10 @@ 
 					$this->identifiers = $post['body']['identifiers'];
 					$this->authorizationURLs = $post['body']['authorizations'];
 					$this->finalizeURL = $post['body']['finalize'];
-					if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+					if (array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
 					$this->updateAuthorizations();
 
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
+					if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
 				}
 				else
 				{
@@ -232,19 +232,19 @@ 
 	private function updateOrderData()
 	{
 		$get = $this->connector->get($this->orderURL);
-		if(strpos($get['header'], "200 OK") !== false)
+		if (strpos($get['header'], "200 OK") !== false)
 		{
 			$this->status = $get['body']['status'];
 			$this->expires = $get['body']['expires'];
 			$this->identifiers = $get['body']['identifiers'];
 			$this->authorizationURLs = $get['body']['authorizations'];
 			$this->finalizeURL = $get['body']['finalize'];
-			if(array_key_exists('certificate', $get['body'])) $this->certificateURL = $get['body']['certificate'];
+			if (array_key_exists('certificate', $get['body'])) $this->certificateURL = $get['body']['certificate'];
 			$this->updateAuthorizations();
 		}
 		else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
 		}
 	}
 
@@ -254,12 +254,12 @@ 
 	private function updateAuthorizations()
 	{
 		$this->authorizations = array();
-		foreach($this->authorizationURLs as $authURL)
+		foreach ($this->authorizationURLs as $authURL)
 		{
 			if (filter_var($authURL, FILTER_VALIDATE_URL))
 			{
 				$auth = new LEAuthorization($this->connector, $this->log, $authURL);
-				if($auth != false) $this->authorizations[] = $auth;
+				if ($auth != false) $this->authorizations[] = $auth;
 			}
 		}
 	}
@@ -271,11 +271,11 @@ 
      */
 	public function allAuthorizationsValid()
 	{
-		if(count($this->authorizations) > 0)
+		if (count($this->authorizations) > 0)
 		{
-			foreach($this->authorizations as $auth)
+			foreach ($this->authorizations as $auth)
 			{
-				if($auth->status != 'valid') return false;
+				if ($auth->status != 'valid') return false;
 			}
 			return true;
 		}
@@ -308,15 +308,15 @@ 
 		);
 		$digest = LEFunctions::Base64UrlSafeEncode(hash('sha256', json_encode($header), true));
 
-		foreach($this->authorizations as $auth)
+		foreach ($this->authorizations as $auth)
 		{
-			if($auth->status == 'pending')
+			if ($auth->status == 'pending')
 			{
 				$challenge = $auth->getChallenge($type);
-				if($challenge['status'] == 'pending')
+				if ($challenge['status'] == 'pending')
 				{
 					$keyAuthorization = $challenge['token'] . '.' . $digest;
-					switch(strtolower($type))
+					switch (strtolower($type))
 					{
 						case LEOrder::CHALLENGE_TYPE_HTTP:
 							$authorizations[] = array('type' => LEOrder::CHALLENGE_TYPE_HTTP, 'identifier' => $auth->identifier['value'], 'filename' => $challenge['token'], 'content' => $keyAuthorization);
@@ -355,27 +355,27 @@ 
 		);
 		$digest = LEFunctions::Base64UrlSafeEncode(hash('sha256', json_encode($header), true));
 
-		foreach($this->authorizations as $auth)
+		foreach ($this->authorizations as $auth)
 		{
-			if($auth->identifier['value'] == $identifier)
+			if ($auth->identifier['value'] == $identifier)
 			{
-				if($auth->status == 'pending')
+				if ($auth->status == 'pending')
 				{
 					$challenge = $auth->getChallenge($type);
-					if($challenge['status'] == 'pending')
+					if ($challenge['status'] == 'pending')
 					{
 						$keyAuthorization = $challenge['token'] . '.' . $digest;
-						switch($type)
+						switch ($type)
 						{
 							case LEOrder::CHALLENGE_TYPE_HTTP:
-								if(LEFunctions::checkHTTPChallenge($identifier, $challenge['token'], $keyAuthorization))
+								if (LEFunctions::checkHTTPChallenge($identifier, $challenge['token'], $keyAuthorization))
 								{
 									$sign = $this->connector->signRequestKid(array('keyAuthorization' => $keyAuthorization), $this->connector->accountURL, $challenge['url']);
 									$post = $this->connector->post($challenge['url'], $sign);
-									if(strpos($post['header'], "200 OK") !== false)
+									if (strpos($post['header'], "200 OK") !== false)
 									{
-										if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
-										while($auth->status == 'pending')
+										if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										while ($auth->status == 'pending')
 										{
 											sleep(1);
 											$auth->updateData();
@@ -385,19 +385,19 @@ 
 								}
 								else
 								{
-									if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
 								}
 								break;
 							case LEOrder::CHALLENGE_TYPE_DNS:
 								$DNSDigest = LEFunctions::Base64UrlSafeEncode(hash('sha256', $keyAuthorization, true));
-								if(LEFunctions::checkDNSChallenge($identifier, $DNSDigest))
+								if (LEFunctions::checkDNSChallenge($identifier, $DNSDigest))
 								{
 									$sign = $this->connector->signRequestKid(array('keyAuthorization' => $keyAuthorization), $this->connector->accountURL, $challenge['url']);
 									$post = $this->connector->post($challenge['url'], $sign);
-									if(strpos($post['header'], "200 OK") !== false)
+									if (strpos($post['header'], "200 OK") !== false)
 									{
-										if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
-										while($auth->status == 'pending')
+										if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										while ($auth->status == 'pending')
 										{
 											sleep(1);
 											$auth->updateData();
@@ -407,7 +407,7 @@ 
 								}
 								else
 								{
-									if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
 								}
 								break;
 						}
@@ -427,21 +427,21 @@ 
      */
 	public function deactivateOrderAuthorization($identifier)
 	{
-		foreach($this->authorizations as $auth)
+		foreach ($this->authorizations as $auth)
 		{
-			if($auth->identifier['value'] == $identifier)
+			if ($auth->identifier['value'] == $identifier)
 			{
 				$sign = $this->connector->signRequestKid(array('status' => 'deactivated'), $this->connector->accountURL, $auth->authorizationURL);
 				$post = $this->connector->post($auth->authorizationURL, $sign);
-				if(strpos($post['header'], "200 OK") !== false)
+				if (strpos($post['header'], "200 OK") !== false)
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
+					if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
 					$this->updateAuthorizations();
 					return true;
 				}
 			}
 		}
-		if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
+		if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
 		return false;
 	}
 
@@ -453,12 +453,12 @@ 
      */
 	public function generateCSR()
 	{
-		$domains = array_map(function ($dns) { return $dns['value']; }, $this->identifiers);
-		if(in_array($this->basename, $domains))
+		$domains = array_map(function($dns) { return $dns['value']; }, $this->identifiers);
+		if (in_array($this->basename, $domains))
 		{
 			$CN = $this->basename;
 		}
-		elseif(in_array('*.' . $this->basename, $domains))
+		elseif (in_array('*.' . $this->basename, $domains))
 		{
 			$CN = '*.' . $this->basename;
 		}
@@ -471,7 +471,7 @@ 
 			"commonName" => $CN
 		);
 
-		$san = implode(",", array_map(function ($dns) {
+		$san = implode(",", array_map(function($dns) {
             return "DNS:" . $dns;
         }, $domains));
         $tmpConf = tmpfile();
@@ -495,7 +495,7 @@ 
 
 		$privateKey = openssl_pkey_get_private(file_get_contents($this->certificateKeys['private_key']));
 		$csr = openssl_csr_new($dn, $privateKey, array('config' => $tmpConfPath, 'digest_alg' => 'sha256'));
-		openssl_csr_export ($csr, $csr);
+		openssl_csr_export($csr, $csr);
 		return $csr;
 	}
 
@@ -508,36 +508,36 @@ 
      */
 	public function finalizeOrder($csr = '')
 	{
-		if($this->status == 'pending')
+		if ($this->status == 'pending')
 		{
-			if($this->allAuthorizationsValid())
+			if ($this->allAuthorizationsValid())
 			{
-				if(empty($csr)) $csr = $this->generateCSR();
-				if(preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches)) $csr = $matches[1];
+				if (empty($csr)) $csr = $this->generateCSR();
+				if (preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches)) $csr = $matches[1];
 				$csr = trim(LEFunctions::Base64UrlSafeEncode(base64_decode($csr)));
 				$sign = $this->connector->signRequestKid(array('csr' => $csr), $this->connector->accountURL, $this->finalizeURL);
 				$post = $this->connector->post($this->finalizeURL, $sign);
-				if(strpos($post['header'], "200 OK") !== false)
+				if (strpos($post['header'], "200 OK") !== false)
 				{
 					$this->status = $post['body']['status'];
 					$this->expires = $post['body']['expires'];
 					$this->identifiers = $post['body']['identifiers'];
 					$this->authorizationURLs = $post['body']['authorizations'];
 					$this->finalizeURL = $post['body']['finalize'];
-					if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+					if (array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
 					$this->updateAuthorizations();
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
+					if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
 					return true;
 				}
 			}
 			else
 			{
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.', 'function finalizeOrder');
+				if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.', 'function finalizeOrder');
 			}
 		}
 		else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
 		}
 		return false;
 	}
@@ -561,48 +561,48 @@ 
 	public function getCertificate()
 	{
 		$polling = 0;
-		while($this->status == 'processing' && $polling < 4)
+		while ($this->status == 'processing' && $polling < 4)
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
 			sleep(5);
 			$this->updateOrderData();
 			$polling++;
 		}
-		if($this->status == 'valid' && !empty($this->certificateURL))
+		if ($this->status == 'valid' && !empty($this->certificateURL))
 		{
 			$get = $this->connector->get($this->certificateURL);
-			if(strpos($get['header'], "200 OK") !== false)
+			if (strpos($get['header'], "200 OK") !== false)
 			{
-				if(preg_match_all('~(-----BEGIN\sCERTIFICATE-----[\s\S]+?-----END\sCERTIFICATE-----)~i', $get['body'], $matches))
+				if (preg_match_all('~(-----BEGIN\sCERTIFICATE-----[\s\S]+?-----END\sCERTIFICATE-----)~i', $get['body'], $matches))
 				{
-					if (isset($this->certificateKeys['certificate'])) file_put_contents($this->certificateKeys['certificate'],  $matches[0][0]);
+					if (isset($this->certificateKeys['certificate'])) file_put_contents($this->certificateKeys['certificate'], $matches[0][0]);
 
-					if(count($matches[0]) > 1 && isset($this->certificateKeys['fullchain_certificate']))
+					if (count($matches[0]) > 1 && isset($this->certificateKeys['fullchain_certificate']))
 					{
-						$fullchain = $matches[0][0]."\n";
-						for($i=1;$i<count($matches[0]);$i++)
+						$fullchain = $matches[0][0] . "\n";
+						for ($i = 1; $i < count($matches[0]); $i++)
 						{
-							$fullchain .= $matches[0][$i]."\n";
+							$fullchain .= $matches[0][$i] . "\n";
 
 						}
 						file_put_contents(trim($this->certificateKeys['fullchain_certificate']), $fullchain);
 					}
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
+					if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
 					return true;
 				}
 				else
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+					if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
 				}
 			}
 			else
 			{
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+				if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
 			}
 		}
 		else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
 		}
 		return false;
 	}
@@ -617,13 +617,13 @@ 
      */
 	public function revokeCertificate($reason = 0)
 	{
-		if($this->status == 'valid')
+		if ($this->status == 'valid')
 		{
 			if (isset($this->certificateKeys['certificate'])) $certFile = $this->certificateKeys['certificate'];
 			elseif (isset($this->certificateKeys['fullchain_certificate']))  $certFile = $this->certificateKeys['fullchain_certificate'];
 			else throw new \RuntimeException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] required');
 
-			if(file_exists($certFile) && file_exists($this->certificateKeys['private_key']))
+			if (file_exists($certFile) && file_exists($this->certificateKeys['private_key']))
 			{
 				$certificate = file_get_contents($this->certificateKeys['certificate']);
 				preg_match('~-----BEGIN\sCERTIFICATE-----(.*)-----END\sCERTIFICATE-----~s', $certificate, $matches);
@@ -631,24 +631,24 @@ 
 
 				$sign = $this->connector->signRequestJWK(array('certificate' => $certificate, 'reason' => $reason), $this->connector->revokeCert);
 				$post = $this->connector->post($this->connector->revokeCert, $sign);
-				if(strpos($post['header'], "200 OK") !== false)
+				if (strpos($post['header'], "200 OK") !== false)
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
+					if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
 					return true;
 				}
 				else
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
+					if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
 				}
 			}
 			else
 			{
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
+				if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
 			}
 		}
 		else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
 		}
 		return false;
 	}

Braces +144 added lines, -89 removed lines

@@ -80,13 +80,11 @@ 
 		{
 			$this->keyType = 'rsa';
 			$this->keySize = 4096;
-		}
-		elseif ($keyType == 'ec')
+		} elseif ($keyType == 'ec')
 		{
 			$this->keyType = 'ec';
 			$this->keySize = 256;
-		}
-		else
+		} else
 		{
 			preg_match_all('/^(rsa|ec)\-([0-9]{3,4})$/', $keyType, $keyTypeParts, PREG_SET_ORDER, 0);
 
@@ -94,8 +92,9 @@ 
 			{
 				$this->keyType = $keyTypeParts[0][1];
 				$this->keySize = intval($keyTypeParts[0][2]);
+			} else {
+				throw new \RuntimeException('Key type \'' . $keyType . '\' not supported.');
 			}
-			else throw new \RuntimeException('Key type \'' . $keyType . '\' not supported.');
 		}
 
 		$this->certificateKeys = $certificateKeys;
@@ -114,47 +113,59 @@ 
 					{
 						foreach ($this->certificateKeys as $file)
 						{
-							if (is_file($file)) rename($file, $file.'.old');
+							if (is_file($file)) {
+								rename($file, $file.'.old');
+							}
+						}
+						if($this->log >= LECLient::LOG_STATUS) {
+							LEFunctions::log('Domains do not match order data. Renaming current files and creating new order.', 'function LEOrder __construct');
 						}
-						if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Domains do not match order data. Renaming current files and creating new order.', 'function LEOrder __construct');
 						$this->createOrder($domains, $notBefore, $notAfter, $keyType);
-					}
-					else
+					} else
 					{
 						$this->status = $get['body']['status'];
 						$this->expires = $get['body']['expires'];
 						$this->identifiers = $get['body']['identifiers'];
 						$this->authorizationURLs = $get['body']['authorizations'];
 						$this->finalizeURL = $get['body']['finalize'];
-						if(array_key_exists('certificate', $get['body'])) $this->certificateURL = $get['body']['certificate'];
+						if(array_key_exists('certificate', $get['body'])) {
+							$this->certificateURL = $get['body']['certificate'];
+						}
 						$this->updateAuthorizations();
 					}
-				}
-				else
+				} else
 				{
 					foreach ($this->certificateKeys as $file)
 					{
-						if (is_file($file)) unlink($file);
+						if (is_file($file)) {
+							unlink($file);
+						}
+					}
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 					}
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 					$this->createOrder($domains, $notBefore, $notAfter);
 				}
-			}
-			else
+			} else
 			{
 
 				foreach ($this->certificateKeys as $file)
 				{
-					if (is_file($file)) unlink($file);
+					if (is_file($file)) {
+						unlink($file);
+					}
+				}
+				if($this->log >= LECLient::LOG_STATUS) {
+					LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 				}
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order data for \'' . $this->basename . '\' invalid. Deleting order data and creating new order.', 'function LEOrder __construct');
 
 				$this->createOrder($domains, $notBefore, $notAfter);
 			}
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('No order found for \'' . $this->basename . '\'. Creating new order.', 'function LEOrder __construct');
+			}
 			$this->createOrder($domains, $notBefore, $notAfter);
 		}
 	}
@@ -174,7 +185,9 @@ 
 			$dns = array();
 			foreach($domains as $domain)
 			{
-				if(preg_match_all('~(\*\.)~', $domain) > 1) throw new \RuntimeException('Cannot create orders with multiple wildcards in one domain.');
+				if(preg_match_all('~(\*\.)~', $domain) > 1) {
+					throw new \RuntimeException('Cannot create orders with multiple wildcards in one domain.');
+				}
 				$dns[] = array('type' => 'dns', 'value' => $domain);
 			}
 			$payload = array("identifiers" => $dns, 'notBefore' => $notBefore, 'notAfter' => $notAfter);
@@ -190,12 +203,10 @@ 
 					if ($this->keyType == "rsa")
 					{
 						LEFunctions::RSAgenerateKeys(null, $this->certificateKeys['private_key'], $this->certificateKeys['public_key'], $this->keySize);
-					}
-					elseif ($this->keyType == "ec")
+					} elseif ($this->keyType == "ec")
 					{
 						LEFunctions::ECgenerateKeys(null, $this->certificateKeys['private_key'], $this->certificateKeys['public_key'], $this->keySize);
-					}
-					else
+					} else
 					{
 						throw new \RuntimeException('Key type \'' . $this->keyType . '\' not supported.');
 					}
@@ -205,22 +216,23 @@ 
 					$this->identifiers = $post['body']['identifiers'];
 					$this->authorizationURLs = $post['body']['authorizations'];
 					$this->finalizeURL = $post['body']['finalize'];
-					if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+					if(array_key_exists('certificate', $post['body'])) {
+						$this->certificateURL = $post['body']['certificate'];
+					}
 					$this->updateAuthorizations();
 
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
-				}
-				else
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Created order for \'' . $this->basename . '\'.', 'function createOrder (function LEOrder __construct)');
+					}
+				} else
 				{
 					throw new \RuntimeException('New-order returned invalid response.');
 				}
-			}
-			else
+			} else
 			{
 				throw new \RuntimeException('Creating new order failed.');
 			}
-		}
-		else
+		} else
 		{
 			throw new \RuntimeException('notBefore and notAfter fields must be empty or be a string similar to 0000-00-00T00:00:00Z');
 		}
@@ -239,12 +251,15 @@ 
 			$this->identifiers = $get['body']['identifiers'];
 			$this->authorizationURLs = $get['body']['authorizations'];
 			$this->finalizeURL = $get['body']['finalize'];
-			if(array_key_exists('certificate', $get['body'])) $this->certificateURL = $get['body']['certificate'];
+			if(array_key_exists('certificate', $get['body'])) {
+				$this->certificateURL = $get['body']['certificate'];
+			}
 			$this->updateAuthorizations();
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Cannot update data for order \'' . $this->basename . '\'.', 'function updateOrderData');
+			}
 		}
 	}
 
@@ -259,7 +274,9 @@ 
 			if (filter_var($authURL, FILTER_VALIDATE_URL))
 			{
 				$auth = new LEAuthorization($this->connector, $this->log, $authURL);
-				if($auth != false) $this->authorizations[] = $auth;
+				if($auth != false) {
+					$this->authorizations[] = $auth;
+				}
 			}
 		}
 	}
@@ -275,7 +292,9 @@ 
 		{
 			foreach($this->authorizations as $auth)
 			{
-				if($auth->status != 'valid') return false;
+				if($auth->status != 'valid') {
+					return false;
+				}
 			}
 			return true;
 		}
@@ -374,7 +393,9 @@ 
 									$post = $this->connector->post($challenge['url'], $sign);
 									if(strpos($post['header'], "200 OK") !== false)
 									{
-										if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										if($this->log >= LECLient::LOG_STATUS) {
+											LEFunctions::log('HTTP challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										}
 										while($auth->status == 'pending')
 										{
 											sleep(1);
@@ -382,10 +403,11 @@ 
 										}
 										return true;
 									}
-								}
-								else
+								} else
 								{
-									if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									if($this->log >= LECLient::LOG_STATUS) {
+										LEFunctions::log('HTTP challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									}
 								}
 								break;
 							case LEOrder::CHALLENGE_TYPE_DNS:
@@ -396,7 +418,9 @@ 
 									$post = $this->connector->post($challenge['url'], $sign);
 									if(strpos($post['header'], "200 OK") !== false)
 									{
-										if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										if($this->log >= LECLient::LOG_STATUS) {
+											LEFunctions::log('DNS challenge for \'' . $identifier . '\' valid.', 'function verifyPendingOrderAuthorization');
+										}
 										while($auth->status == 'pending')
 										{
 											sleep(1);
@@ -404,10 +428,11 @@ 
 										}
 										return true;
 									}
-								}
-								else
+								} else
 								{
-									if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									if($this->log >= LECLient::LOG_STATUS) {
+										LEFunctions::log('DNS challenge for \'' . $identifier . '\' tested, found invalid.', 'function verifyPendingOrderAuthorization');
+									}
 								}
 								break;
 						}
@@ -435,13 +460,17 @@ 
 				$post = $this->connector->post($auth->authorizationURL, $sign);
 				if(strpos($post['header'], "200 OK") !== false)
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Authorization for \'' . $identifier . '\' deactivated.', 'function deactivateOrderAuthorization');
+					}
 					$this->updateAuthorizations();
 					return true;
 				}
 			}
 		}
-		if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
+		if($this->log >= LECLient::LOG_STATUS) {
+			LEFunctions::log('No authorization found for \'' . $identifier . '\', cannot deactivate.', 'function deactivateOrderAuthorization');
+		}
 		return false;
 	}
 
@@ -457,12 +486,10 @@ 
 		if(in_array($this->basename, $domains))
 		{
 			$CN = $this->basename;
-		}
-		elseif(in_array('*.' . $this->basename, $domains))
+		} elseif(in_array('*.' . $this->basename, $domains))
 		{
 			$CN = '*.' . $this->basename;
-		}
-		else
+		} else
 		{
 			$CN = $domains[0];
 		}
@@ -512,8 +539,12 @@ 
 		{
 			if($this->allAuthorizationsValid())
 			{
-				if(empty($csr)) $csr = $this->generateCSR();
-				if(preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches)) $csr = $matches[1];
+				if(empty($csr)) {
+					$csr = $this->generateCSR();
+				}
+				if(preg_match('~-----BEGIN\sCERTIFICATE\sREQUEST-----(.*)-----END\sCERTIFICATE\sREQUEST-----~s', $csr, $matches)) {
+					$csr = $matches[1];
+				}
 				$csr = trim(LEFunctions::Base64UrlSafeEncode(base64_decode($csr)));
 				$sign = $this->connector->signRequestKid(array('csr' => $csr), $this->connector->accountURL, $this->finalizeURL);
 				$post = $this->connector->post($this->finalizeURL, $sign);
@@ -524,20 +555,26 @@ 
 					$this->identifiers = $post['body']['identifiers'];
 					$this->authorizationURLs = $post['body']['authorizations'];
 					$this->finalizeURL = $post['body']['finalize'];
-					if(array_key_exists('certificate', $post['body'])) $this->certificateURL = $post['body']['certificate'];
+					if(array_key_exists('certificate', $post['body'])) {
+						$this->certificateURL = $post['body']['certificate'];
+					}
 					$this->updateAuthorizations();
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Order for \'' . $this->basename . '\' finalized.', 'function finalizeOrder');
+					}
 					return true;
 				}
-			}
-			else
+			} else
 			{
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.', 'function finalizeOrder');
+				if($this->log >= LECLient::LOG_STATUS) {
+					LEFunctions::log('Not all authorizations are valid for \'' . $this->basename . '\'. Cannot finalize order.', 'function finalizeOrder');
+				}
 			}
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Order status for \'' . $this->basename . '\' is \'' . $this->status . '\'. Cannot finalize order.', 'function finalizeOrder');
+			}
 		}
 		return false;
 	}
@@ -563,7 +600,9 @@ 
 		$polling = 0;
 		while($this->status == 'processing' && $polling < 4)
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Certificate for \'' . $this->basename . '\' being processed. Retrying in 5 seconds...', 'function getCertificate');
+			}
 			sleep(5);
 			$this->updateOrderData();
 			$polling++;
@@ -575,7 +614,9 @@ 
 			{
 				if(preg_match_all('~(-----BEGIN\sCERTIFICATE-----[\s\S]+?-----END\sCERTIFICATE-----)~i', $get['body'], $matches))
 				{
-					if (isset($this->certificateKeys['certificate'])) file_put_contents($this->certificateKeys['certificate'],  $matches[0][0]);
+					if (isset($this->certificateKeys['certificate'])) {
+						file_put_contents($this->certificateKeys['certificate'],  $matches[0][0]);
+					}
 
 					if(count($matches[0]) > 1 && isset($this->certificateKeys['fullchain_certificate']))
 					{
@@ -587,22 +628,27 @@ 
 						}
 						file_put_contents(trim($this->certificateKeys['fullchain_certificate']), $fullchain);
 					}
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Certificate for \'' . $this->basename . '\' saved', 'function getCertificate');
+					}
 					return true;
-				}
-				else
+				} else
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Received invalid certificate for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+					}
 				}
-			}
-			else
+			} else
 			{
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+				if($this->log >= LECLient::LOG_STATUS) {
+					LEFunctions::log('Invalid response for certificate request for \'' . $this->basename . '\'. Cannot save certificate.', 'function getCertificate');
+				}
 			}
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot retrieve certificate.', 'function getCertificate');
+			}
 		}
 		return false;
 	}
@@ -619,9 +665,13 @@ 
 	{
 		if($this->status == 'valid')
 		{
-			if (isset($this->certificateKeys['certificate'])) $certFile = $this->certificateKeys['certificate'];
-			elseif (isset($this->certificateKeys['fullchain_certificate']))  $certFile = $this->certificateKeys['fullchain_certificate'];
-			else throw new \RuntimeException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] required');
+			if (isset($this->certificateKeys['certificate'])) {
+				$certFile = $this->certificateKeys['certificate'];
+			} elseif (isset($this->certificateKeys['fullchain_certificate'])) {
+				$certFile = $this->certificateKeys['fullchain_certificate'];
+			} else {
+				throw new \RuntimeException('certificateKeys[certificate] or certificateKeys[fullchain_certificate] required');
+			}
 
 			if(file_exists($certFile) && file_exists($this->certificateKeys['private_key']))
 			{
@@ -633,22 +683,27 @@ 
 				$post = $this->connector->post($this->connector->revokeCert, $sign);
 				if(strpos($post['header'], "200 OK") !== false)
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Certificate for order \'' . $this->basename . '\' revoked.', 'function revokeCertificate');
+					}
 					return true;
-				}
-				else
+				} else
 				{
-					if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
+					if($this->log >= LECLient::LOG_STATUS) {
+						LEFunctions::log('Certificate for order \'' . $this->basename . '\' cannot be revoked.', 'function revokeCertificate');
+					}
 				}
-			}
-			else
+			} else
 			{
-				if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
+				if($this->log >= LECLient::LOG_STATUS) {
+					LEFunctions::log('Certificate for order \'' . $this->basename . '\' not found. Cannot revoke certificate.', 'function revokeCertificate');
+				}
 			}
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Order for \'' . $this->basename . '\' not valid. Cannot revoke certificate.', 'function revokeCertificate');
+			}
 		}
 		return false;
 	}

LEClient/src/LEAccount.php

Indentation +41 added lines, -41 removed lines

@@ -49,14 +49,14 @@ 
 
 	private $log;
 
-    /**
-     * Initiates the LetsEncrypt Account class.
-     *
-     * @param LEConnector	$connector 		The LetsEncrypt Connector instance to use for HTTP requests.
-     * @param int 			$log 			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
-     * @param array 		$email	 		The array of strings containing e-mail addresses. Only used when creating a new account.
-     * @param array 		$accountKeys Array containing location of account keys files.
-     */
+	/**
+	 * Initiates the LetsEncrypt Account class.
+	 *
+	 * @param LEConnector	$connector 		The LetsEncrypt Connector instance to use for HTTP requests.
+	 * @param int 			$log 			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
+	 * @param array 		$email	 		The array of strings containing e-mail addresses. Only used when creating a new account.
+	 * @param array 		$accountKeys Array containing location of account keys files.
+	 */
 	public function __construct($connector, $log, $email, $accountKeys)
 	{
 		$this->connector = $connector;
@@ -77,13 +77,13 @@ 
 		$this->getLEAccountData();
 	}
 
-    /**
-     * Creates a new LetsEncrypt account.
-     *
-     * @param array 	$email 	The array of strings containing e-mail addresses.
-     *
-     * @return object	Returns the new account URL when the account was successfully created, false if not.
-     */
+	/**
+	 * Creates a new LetsEncrypt account.
+	 *
+	 * @param array 	$email 	The array of strings containing e-mail addresses.
+	 *
+	 * @return object	Returns the new account URL when the account was successfully created, false if not.
+	 */
 	private function createLEAccount($email)
 	{
 		$contact = array_map(function($addr) { return empty($addr) ? '' : (strpos($addr, 'mailto') === false ? 'mailto:' . $addr : $addr); }, $email);
@@ -97,11 +97,11 @@ 
 		return false;
 	}
 
-    /**
-     * Gets the LetsEncrypt account URL associated with the stored account keys.
-     *
-     * @return object	Returns the account URL if it is found, or false when none is found.
-     */
+	/**
+	 * Gets the LetsEncrypt account URL associated with the stored account keys.
+	 *
+	 * @return object	Returns the account URL if it is found, or false when none is found.
+	 */
 	private function getLEAccount()
 	{
 		$sign = $this->connector->signRequestJWK(array('onlyReturnExisting' => true), $this->connector->newAccount);
@@ -114,9 +114,9 @@ 
 		return false;
 	}
 
-    /**
-     * Gets the LetsEncrypt account data from the account URL.
-     */
+	/**
+	 * Gets the LetsEncrypt account data from the account URL.
+	 */
 	private function getLEAccountData()
 	{
 		$sign = $this->connector->signRequestKid(array('' => ''), $this->connector->accountURL, $this->connector->accountURL);
@@ -137,13 +137,13 @@ 
 		}
 	}
 
-    /**
-     * Updates account data. Now just supporting new contact information.
-     *
-     * @param array 	$email	The array of strings containing e-mail adresses.
-     *
-     * @return boolean	Returns true if the update is successful, false if not.
-     */
+	/**
+	 * Updates account data. Now just supporting new contact information.
+	 *
+	 * @param array 	$email	The array of strings containing e-mail adresses.
+	 *
+	 * @return boolean	Returns true if the update is successful, false if not.
+	 */
 	public function updateAccount($email)
 	{
 		$contact = array_map(function($addr) { return empty($addr) ? '' : (strpos($addr, 'mailto') === false ? 'mailto:' . $addr : $addr); }, $email);
@@ -168,17 +168,17 @@ 
 		}
 	}
 
-    /**
-     * Creates new RSA account keys and updates the keys with LetsEncrypt.
-     *
-     * @return boolean	Returns true if the update is successful, false if not.
-     */
+	/**
+	 * Creates new RSA account keys and updates the keys with LetsEncrypt.
+	 *
+	 * @return boolean	Returns true if the update is successful, false if not.
+	 */
 	public function changeAccountKeys()
 	{
 		LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'].'.new', $this->accountKeys['public_key'].'.new');
 		$privateKey = openssl_pkey_get_private(file_get_contents($this->accountKeys['private_key'].'.new'));
 		$details = openssl_pkey_get_details($privateKey);
-    $innerPayload = array('account' => $this->connector->accountURL, 'newKey' => array(
+	$innerPayload = array('account' => $this->connector->accountURL, 'newKey' => array(
 			"kty" => "RSA",
 			"n" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["n"]),
 			"e" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["e"])
@@ -204,11 +204,11 @@ 
 		}
 	}
 
-    /**
-     * Deactivates the LetsEncrypt account.
-     *
-     * @return boolean	Returns true if the deactivation is successful, false if not.
-     */
+	/**
+	 * Deactivates the LetsEncrypt account.
+	 *
+	 * @return boolean	Returns true if the deactivation is successful, false if not.
+	 */
 	public function deactivateAccount()
 	{
 		$sign = $this->connector->signRequestKid(array('status' => 'deactivated'), $this->connector->accountURL, $this->connector->accountURL);

Spacing +19 added lines, -19 removed lines

@@ -63,9 +63,9 @@ 
 		$this->accountKeys = $accountKeys;
 		$this->log = $log;
 
-		if(!file_exists($this->accountKeys['private_key']) OR !file_exists($this->accountKeys['public_key']))
+		if (!file_exists($this->accountKeys['private_key']) OR !file_exists($this->accountKeys['public_key']))
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No account found, attempting to create account.', 'function LEAccount __construct');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No account found, attempting to create account.', 'function LEAccount __construct');
 			LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'], $this->accountKeys['public_key']);
 			$this->connector->accountURL = $this->createLEAccount($email);
 		}
@@ -73,7 +73,7 @@ 
 		{
 			$this->connector->accountURL = $this->getLEAccount();
 		}
-		if($this->connector->accountURL == false) throw new \RuntimeException('Account not found or deactivated.');
+		if ($this->connector->accountURL == false) throw new \RuntimeException('Account not found or deactivated.');
 		$this->getLEAccountData();
 	}
 
@@ -90,9 +90,9 @@ 
 
 		$sign = $this->connector->signRequestJWK(array('contact' => $contact, 'termsOfServiceAgreed' => true), $this->connector->newAccount);
 		$post = $this->connector->post($this->connector->newAccount, $sign);
-		if(strpos($post['header'], "201 Created") !== false)
+		if (strpos($post['header'], "201 Created") !== false)
 		{
-			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
+			if (preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
 		}
 		return false;
 	}
@@ -107,9 +107,9 @@ 
 		$sign = $this->connector->signRequestJWK(array('onlyReturnExisting' => true), $this->connector->newAccount);
 		$post = $this->connector->post($this->connector->newAccount, $sign);
 
-		if(strpos($post['header'], "200 OK") !== false)
+		if (strpos($post['header'], "200 OK") !== false)
 		{
-			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
+			if (preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
 		}
 		return false;
 	}
@@ -121,7 +121,7 @@ 
 	{
 		$sign = $this->connector->signRequestKid(array('' => ''), $this->connector->accountURL, $this->connector->accountURL);
 		$post = $this->connector->post($this->connector->accountURL, $sign);
-		if(strpos($post['header'], "200 OK") !== false)
+		if (strpos($post['header'], "200 OK") !== false)
 		{
 			$this->id = $post['body']['id'];
 			$this->key = $post['body']['key'];
@@ -150,7 +150,7 @@ 
 
 		$sign = $this->connector->signRequestKid(array('contact' => $contact), $this->connector->accountURL, $this->connector->accountURL);
 		$post = $this->connector->post($this->connector->accountURL, $sign);
-		if(strpos($post['header'], "200 OK") !== false)
+		if (strpos($post['header'], "200 OK") !== false)
 		{
 			$this->id = $post['body']['id'];
 			$this->key = $post['body']['key'];
@@ -159,7 +159,7 @@ 
 			$this->initialIp = $post['body']['initialIp'];
 			$this->createdAt = $post['body']['createdAt'];
 			$this->status = $post['body']['status'];
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account data updated.', 'function updateAccount');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account data updated.', 'function updateAccount');
 			return true;
 		}
 		else
@@ -175,27 +175,27 @@ 
      */
 	public function changeAccountKeys()
 	{
-		LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'].'.new', $this->accountKeys['public_key'].'.new');
-		$privateKey = openssl_pkey_get_private(file_get_contents($this->accountKeys['private_key'].'.new'));
+		LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'] . '.new', $this->accountKeys['public_key'] . '.new');
+		$privateKey = openssl_pkey_get_private(file_get_contents($this->accountKeys['private_key'] . '.new'));
 		$details = openssl_pkey_get_details($privateKey);
     $innerPayload = array('account' => $this->connector->accountURL, 'newKey' => array(
 			"kty" => "RSA",
 			"n" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["n"]),
 			"e" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["e"])
 		));
-		$outerPayload = $this->connector->signRequestJWK($innerPayload, $this->connector->keyChange, $this->accountKeys['private_key'].'.new');
+		$outerPayload = $this->connector->signRequestJWK($innerPayload, $this->connector->keyChange, $this->accountKeys['private_key'] . '.new');
 		$sign = $this->connector->signRequestKid($outerPayload, $this->connector->accountURL, $this->connector->keyChange);
 		$post = $this->connector->post($this->connector->keyChange, $sign);
-		if(strpos($post['header'], "200 OK") !== false)
+		if (strpos($post['header'], "200 OK") !== false)
 		{
 			$this->getLEAccountData();
 
 			unlink($this->accountKeys['private_key']);
 			unlink($this->accountKeys['public_key']);
-			rename($this->accountKeys['private_key'].'.new', $this->accountKeys['private_key']);
-			rename($this->accountKeys['public_key'].'.new', $this->accountKeys['public_key']);
+			rename($this->accountKeys['private_key'] . '.new', $this->accountKeys['private_key']);
+			rename($this->accountKeys['public_key'] . '.new', $this->accountKeys['public_key']);
 
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account keys changed.', 'function changeAccountKey');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account keys changed.', 'function changeAccountKey');
 			return true;
 		}
 		else
@@ -213,10 +213,10 @@ 
 	{
 		$sign = $this->connector->signRequestKid(array('status' => 'deactivated'), $this->connector->accountURL, $this->connector->accountURL);
 		$post = $this->connector->post($this->connector->accountURL, $sign);
-		if(strpos($post['header'], "200 OK") !== false)
+		if (strpos($post['header'], "200 OK") !== false)
 		{
 			$this->connector->accountDeactivated = true;
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account deactivated.', 'function deactivateAccount');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account deactivated.', 'function deactivateAccount');
 		}
 		else
 		{

Braces +26 added lines, -17 removed lines

@@ -65,15 +65,18 @@ 
 
 		if(!file_exists($this->accountKeys['private_key']) OR !file_exists($this->accountKeys['public_key']))
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('No account found, attempting to create account.', 'function LEAccount __construct');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('No account found, attempting to create account.', 'function LEAccount __construct');
+			}
 			LEFunctions::RSAgenerateKeys(null, $this->accountKeys['private_key'], $this->accountKeys['public_key']);
 			$this->connector->accountURL = $this->createLEAccount($email);
-		}
-		else
+		} else
 		{
 			$this->connector->accountURL = $this->getLEAccount();
 		}
-		if($this->connector->accountURL == false) throw new \RuntimeException('Account not found or deactivated.');
+		if($this->connector->accountURL == false) {
+			throw new \RuntimeException('Account not found or deactivated.');
+		}
 		$this->getLEAccountData();
 	}
 
@@ -92,7 +95,9 @@ 
 		$post = $this->connector->post($this->connector->newAccount, $sign);
 		if(strpos($post['header'], "201 Created") !== false)
 		{
-			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
+			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) {
+				return trim($matches[1]);
+			}
 		}
 		return false;
 	}
@@ -109,7 +114,9 @@ 
 
 		if(strpos($post['header'], "200 OK") !== false)
 		{
-			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) return trim($matches[1]);
+			if(preg_match('~Location: (\S+)~i', $post['header'], $matches)) {
+				return trim($matches[1]);
+			}
 		}
 		return false;
 	}
@@ -130,8 +137,7 @@ 
 			$this->initialIp = $post['body']['initialIp'];
 			$this->createdAt = $post['body']['createdAt'];
 			$this->status = $post['body']['status'];
-		}
-		else
+		} else
 		{
 			throw new \RuntimeException('Account data cannot be found.');
 		}
@@ -159,10 +165,11 @@ 
 			$this->initialIp = $post['body']['initialIp'];
 			$this->createdAt = $post['body']['createdAt'];
 			$this->status = $post['body']['status'];
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account data updated.', 'function updateAccount');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Account data updated.', 'function updateAccount');
+			}
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -195,10 +202,11 @@ 
 			rename($this->accountKeys['private_key'].'.new', $this->accountKeys['private_key']);
 			rename($this->accountKeys['public_key'].'.new', $this->accountKeys['public_key']);
 
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account keys changed.', 'function changeAccountKey');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Account keys changed.', 'function changeAccountKey');
+			}
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -216,9 +224,10 @@ 
 		if(strpos($post['header'], "200 OK") !== false)
 		{
 			$this->connector->accountDeactivated = true;
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Account deactivated.', 'function deactivateAccount');
-		}
-		else
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Account deactivated.', 'function deactivateAccount');
+			}
+		} else
 		{
 			return false;
 		}

LEClient/src/LEFunctions.php

Indentation +78 added lines, -78 removed lines

@@ -36,14 +36,14 @@ 
  */
 class LEFunctions
 {
-    /**
-     * Generates a new RSA keypair and saves both keys to a new file.
-     *
-     * @param string	$directory		The directory in which to store the new keys. If set to null or empty string - privateKeyFile and publicKeyFile will be treated as absolute paths.
-     * @param string	$privateKeyFile	The filename for the private key file.
-     * @param string	$publicKeyFile  The filename for the public key file.
-     * @param string	$keySize 	RSA key size, must be between 2048 and 4096 (default is 4096)
-     */
+	/**
+	 * Generates a new RSA keypair and saves both keys to a new file.
+	 *
+	 * @param string	$directory		The directory in which to store the new keys. If set to null or empty string - privateKeyFile and publicKeyFile will be treated as absolute paths.
+	 * @param string	$privateKeyFile	The filename for the private key file.
+	 * @param string	$publicKeyFile  The filename for the public key file.
+	 * @param string	$keySize 	RSA key size, must be between 2048 and 4096 (default is 4096)
+	 */
 	public static function RSAGenerateKeys($directory, $privateKeyFile = 'private.pem', $publicKeyFile = 'public.pem', $keySize = 4096)
 	{
 
@@ -72,14 +72,14 @@ 
 
 
 
-    /**
-     * Generates a new EC prime256v1 keypair and saves both keys to a new file.
-     *
-     * @param string	$directory		The directory in which to store the new keys. If set to null or empty string - privateKeyFile and publicKeyFile will be treated as absolute paths.
-     * @param string	$privateKeyFile	The filename for the private key file.
-     * @param string	$publicKeyFile  The filename for the public key file.
-     * @param string	$keysize  EC key size, possible values are 256 (prime256v1) or 384 (secp384r1), default is 256
-     */
+	/**
+	 * Generates a new EC prime256v1 keypair and saves both keys to a new file.
+	 *
+	 * @param string	$directory		The directory in which to store the new keys. If set to null or empty string - privateKeyFile and publicKeyFile will be treated as absolute paths.
+	 * @param string	$privateKeyFile	The filename for the private key file.
+	 * @param string	$publicKeyFile  The filename for the public key file.
+	 * @param string	$keysize  EC key size, possible values are 256 (prime256v1) or 384 (secp384r1), default is 256
+	 */
 	public static function ECGenerateKeys($directory, $privateKeyFile = 'private.pem', $publicKeyFile = 'public.pem', $keySize = 256)
 	{
 		if (version_compare(PHP_VERSION, '7.1.0') == -1) throw new \RuntimeException("PHP 7.1+ required for EC keys");
@@ -120,43 +120,43 @@ 
 
 
 
-    /**
-     * Encodes a string input to a base64 encoded string which is URL safe.
-     *
-     * @param string	$input 	The input string to encode.
-     *
-     * @return string	Returns a URL safe base64 encoded string.
-     */
+	/**
+	 * Encodes a string input to a base64 encoded string which is URL safe.
+	 *
+	 * @param string	$input 	The input string to encode.
+	 *
+	 * @return string	Returns a URL safe base64 encoded string.
+	 */
 	public static function Base64UrlSafeEncode($input)
-    {
-        return str_replace('=', '', strtr(base64_encode($input), '+/', '-_'));
-    }
-
-    /**
-     * Decodes a string that is URL safe base64 encoded.
-     *
-     * @param string	$input	The encoded input string to decode.
-     *
-     * @return string	Returns the decoded input string.
-     */
-    public static function Base64UrlSafeDecode($input)
-    {
-        $remainder = strlen($input) % 4;
-        if ($remainder) {
-            $padlen = 4 - $remainder;
-            $input .= str_repeat('=', $padlen);
-        }
-        return base64_decode(strtr($input, '-_', '+/'));
-    }
-
-
-
-    /**
-     * Outputs a log message.
-     *
-     * @param object	$data		The data to print.
-     * @param string	$function	The function name to print above. Defaults to the calling function's name from the stacktrace. (optional)
-     */
+	{
+		return str_replace('=', '', strtr(base64_encode($input), '+/', '-_'));
+	}
+
+	/**
+	 * Decodes a string that is URL safe base64 encoded.
+	 *
+	 * @param string	$input	The encoded input string to decode.
+	 *
+	 * @return string	Returns the decoded input string.
+	 */
+	public static function Base64UrlSafeDecode($input)
+	{
+		$remainder = strlen($input) % 4;
+		if ($remainder) {
+			$padlen = 4 - $remainder;
+			$input .= str_repeat('=', $padlen);
+		}
+		return base64_decode(strtr($input, '-_', '+/'));
+	}
+
+
+
+	/**
+	 * Outputs a log message.
+	 *
+	 * @param object	$data		The data to print.
+	 * @param string	$function	The function name to print above. Defaults to the calling function's name from the stacktrace. (optional)
+	 */
 	public static function log($data, $function = '')
 	{
 		$e = new Exception();
@@ -178,34 +178,34 @@ 
 
 
 
-    /**
-     * Makes a request to the HTTP challenge URL and checks whether the authorization is valid for the given $domain.
-     *
-     * @param string	$domain 			The domain to check the authorization for.
-     * @param string 	$token 				The token (filename) to request.
-     * @param string 	$keyAuthorization 	the keyAuthorization (file content) to compare.
-     *
-     * @return boolean	Returns true if the challenge is valid, false if not.
-     */
+	/**
+	 * Makes a request to the HTTP challenge URL and checks whether the authorization is valid for the given $domain.
+	 *
+	 * @param string	$domain 			The domain to check the authorization for.
+	 * @param string 	$token 				The token (filename) to request.
+	 * @param string 	$keyAuthorization 	the keyAuthorization (file content) to compare.
+	 *
+	 * @return boolean	Returns true if the challenge is valid, false if not.
+	 */
 	public static function checkHTTPChallenge($domain, $token, $keyAuthorization)
 	{
 		$requestURL = $domain . '/.well-known/acme-challenge/' . $token;
 		$handle = curl_init();
-        curl_setopt($handle, CURLOPT_URL, $requestURL);
-        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($handle, CURLOPT_FOLLOWLOCATION, true);
-        $response = curl_exec($handle);
+		curl_setopt($handle, CURLOPT_URL, $requestURL);
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($handle, CURLOPT_FOLLOWLOCATION, true);
+		$response = curl_exec($handle);
 		return (!empty($response) && $response == $keyAuthorization);
 	}
 
-    /**
-     * Checks whether the applicable DNS TXT record is a valid authorization for the given $domain.
-     *
-     * @param string	$domain 	The domain to check the authorization for.
-     * @param string	$DNSDigest	The digest to compare the DNS record to.
-     *
-     * @return boolean	Returns true if the challenge is valid, false if not.
-     */
+	/**
+	 * Checks whether the applicable DNS TXT record is a valid authorization for the given $domain.
+	 *
+	 * @param string	$domain 	The domain to check the authorization for.
+	 * @param string	$DNSDigest	The digest to compare the DNS record to.
+	 *
+	 * @return boolean	Returns true if the challenge is valid, false if not.
+	 */
 	public static function checkDNSChallenge($domain, $DNSDigest)
 	{
 		$DNS = '_acme-challenge.' . str_replace('*.', '', $domain);
@@ -219,11 +219,11 @@ 
 
 
 
-    /**
-     * Creates a simple .htaccess file in $directory which denies from all.
-     *
-     * @param string	$directory	The directory in which to put the .htaccess file.
-     */
+	/**
+	 * Creates a simple .htaccess file in $directory which denies from all.
+	 *
+	 * @param string	$directory	The directory in which to put the .htaccess file.
+	 */
 	public static function createhtaccess($directory)
 	{
 		file_put_contents($directory . '.htaccess', "order deny,allow\ndeny from all");

Spacing +9 added lines, -9 removed lines

@@ -54,14 +54,14 @@ 
 			"private_key_bits" => intval($keySize),
 		));
 
-		if(!openssl_pkey_export($res, $privateKey)) throw new \RuntimeException("RSA keypair export failed!");
+		if (!openssl_pkey_export($res, $privateKey)) throw new \RuntimeException("RSA keypair export failed!");
 
 		$details = openssl_pkey_get_details($res);
 
 		if ($directory !== null && $directory !== '')
 		{
-			$privateKeyFile = $directory.$privateKeyFile;
-			$publicKeyFile = $directory.$publicKeyFile;
+			$privateKeyFile = $directory . $privateKeyFile;
+			$publicKeyFile = $directory . $publicKeyFile;
 		}
 
 		file_put_contents($privateKeyFile, $privateKey);
@@ -102,14 +102,14 @@ 
 		else throw new \RuntimeException("EC key size must be 256 or 384");
 
 
-		if(!openssl_pkey_export($res, $privateKey)) throw new \RuntimeException("EC keypair export failed!");
+		if (!openssl_pkey_export($res, $privateKey)) throw new \RuntimeException("EC keypair export failed!");
 
 		$details = openssl_pkey_get_details($res);
 
 		if ($directory !== null && $directory !== '')
 		{
-			$privateKeyFile = $directory.$privateKeyFile;
-			$publicKeyFile = $directory.$publicKeyFile;
+			$privateKeyFile = $directory . $privateKeyFile;
+			$publicKeyFile = $directory . $publicKeyFile;
 		}
 
 		file_put_contents($privateKeyFile, $privateKey);
@@ -161,7 +161,7 @@ 
 	{
 		$e = new Exception();
 		$trace = $e->getTrace();
-		$function = $function == '' ? 'function ' .  $trace[3]['function'] . ' (function ' . $trace[2]['function'] . ')' : $function;
+		$function = $function == '' ? 'function ' . $trace[3]['function'] . ' (function ' . $trace[2]['function'] . ')' : $function;
 		if (PHP_SAPI == "cli")
 		{
 			echo '[' . date('d-m-Y H:i:s') . '] ' . $function . ":\n";
@@ -210,9 +210,9 @@ 
 	{
 		$DNS = '_acme-challenge.' . str_replace('*.', '', $domain);
 		$records = dns_get_record($DNS, DNS_TXT);
-		foreach($records as $record)
+		foreach ($records as $record)
 		{
-			if($record['host'] == $DNS && $record['type'] == 'TXT' && $record['txt'] == $DNSDigest) return true;
+			if ($record['host'] == $DNS && $record['type'] == 'TXT' && $record['txt'] == $DNSDigest) return true;
 		}
 		return false;
 	}

Braces +19 added lines, -10 removed lines

@@ -47,14 +47,18 @@ 
 	public static function RSAGenerateKeys($directory, $privateKeyFile = 'private.pem', $publicKeyFile = 'public.pem', $keySize = 4096)
 	{
 
-		if ($keySize < 2048 || $keySize > 4096)  throw new \RuntimeException("RSA key size must be between 2048 and 4096");
+		if ($keySize < 2048 || $keySize > 4096) {
+			throw new \RuntimeException("RSA key size must be between 2048 and 4096");
+		}
 
 		$res = openssl_pkey_new(array(
 			"private_key_type" => OPENSSL_KEYTYPE_RSA,
 			"private_key_bits" => intval($keySize),
 		));
 
-		if(!openssl_pkey_export($res, $privateKey)) throw new \RuntimeException("RSA keypair export failed!");
+		if(!openssl_pkey_export($res, $privateKey)) {
+			throw new \RuntimeException("RSA keypair export failed!");
+		}
 
 		$details = openssl_pkey_get_details($res);
 
@@ -82,7 +86,9 @@ 
      */
 	public static function ECGenerateKeys($directory, $privateKeyFile = 'private.pem', $publicKeyFile = 'public.pem', $keySize = 256)
 	{
-		if (version_compare(PHP_VERSION, '7.1.0') == -1) throw new \RuntimeException("PHP 7.1+ required for EC keys");
+		if (version_compare(PHP_VERSION, '7.1.0') == -1) {
+			throw new \RuntimeException("PHP 7.1+ required for EC keys");
+		}
 
 
 		if ($keySize == 256)
@@ -91,18 +97,20 @@ 
 						"private_key_type" => OPENSSL_KEYTYPE_EC,
 						"curve_name" => "prime256v1",
 				));
-		}
-		elseif ($keySize == 384)
+		} elseif ($keySize == 384)
 		{
 				$res = openssl_pkey_new(array(
 						"private_key_type" => OPENSSL_KEYTYPE_EC,
 						"curve_name" => "secp384r1",
 				));
+		} else {
+			throw new \RuntimeException("EC key size must be 256 or 384");
 		}
-		else throw new \RuntimeException("EC key size must be 256 or 384");
 
 
-		if(!openssl_pkey_export($res, $privateKey)) throw new \RuntimeException("EC keypair export failed!");
+		if(!openssl_pkey_export($res, $privateKey)) {
+			throw new \RuntimeException("EC keypair export failed!");
+		}
 
 		$details = openssl_pkey_get_details($res);
 
@@ -167,8 +175,7 @@ 
 			echo '[' . date('d-m-Y H:i:s') . '] ' . $function . ":\n";
 			print_r($data);
 			echo "\n\n";
-		}
-		else
+		} else
 		{
 			echo '<b>' . date('d-m-Y H:i:s') . ', ' . $function . ':</b><br>';
 			print_r($data);
@@ -212,7 +219,9 @@ 
 		$records = dns_get_record($DNS, DNS_TXT);
 		foreach($records as $record)
 		{
-			if($record['host'] == $DNS && $record['type'] == 'TXT' && $record['txt'] == $DNSDigest) return true;
+			if($record['host'] == $DNS && $record['type'] == 'TXT' && $record['txt'] == $DNSDigest) {
+				return true;
+			}
 		}
 		return false;
 	}

LEClient/src/LEConnector.php

Indentation +121 added lines, -121 removed lines

@@ -43,7 +43,7 @@ 
 
 	public $keyChange;
 	public $newAccount;
-    public $newNonce;
+	public $newNonce;
 	public $newOrder;
 	public $revokeCert;
 
@@ -52,13 +52,13 @@ 
 
 	private $log;
 
-    /**
-     * Initiates the LetsEncrypt Connector class.
-     *
-     * @param int 		$log			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
-     * @param string	$baseURL 		The LetsEncrypt server URL to make requests to.
-     * @param array	$accountKeys Array containing location of account keys files.
-     */
+	/**
+	 * Initiates the LetsEncrypt Connector class.
+	 *
+	 * @param int 		$log			The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
+	 * @param string	$baseURL 		The LetsEncrypt server URL to make requests to.
+	 * @param array	$accountKeys Array containing location of account keys files.
+	 */
 	public function __construct($log, $baseURL, $accountKeys)
 	{
 		$this->baseURL = $baseURL;
@@ -68,9 +68,9 @@ 
 		$this->getNewNonce();
 	}
 
-    /**
-     * Requests the LetsEncrypt Directory and stores the necessary URLs in this LetsEncrypt Connector instance.
-     */
+	/**
+	 * Requests the LetsEncrypt Directory and stores the necessary URLs in this LetsEncrypt Connector instance.
+	 */
 	private function getLEDirectory()
 	{
 		$req = $this->get('/directory');
@@ -81,42 +81,42 @@ 
 		$this->revokeCert = $req['body']['revokeCert'];
 	}
 
-    /**
-     * Requests a new nonce from the LetsEncrypt server and stores it in this LetsEncrypt Connector instance.
-     */
+	/**
+	 * Requests a new nonce from the LetsEncrypt server and stores it in this LetsEncrypt Connector instance.
+	 */
 	private function getNewNonce()
 	{
 		if(strpos($this->head($this->newNonce)['header'], "204 No Content") == false) throw new \RuntimeException('No new nonce.');
 	}
 
-    /**
-     * Makes a Curl request.
-     *
-     * @param string	$method	The HTTP method to use. Accepting GET, POST and HEAD requests.
-     * @param string 	$URL 	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
-     * @param object 	$data  	The body to attach to a POST request. Expected as a JSON encoded string.
-     *
-     * @return array 	Returns an array with the keys 'request', 'header' and 'body'.
-     */
+	/**
+	 * Makes a Curl request.
+	 *
+	 * @param string	$method	The HTTP method to use. Accepting GET, POST and HEAD requests.
+	 * @param string 	$URL 	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
+	 * @param object 	$data  	The body to attach to a POST request. Expected as a JSON encoded string.
+	 *
+	 * @return array 	Returns an array with the keys 'request', 'header' and 'body'.
+	 */
 	private function request($method, $URL, $data = null)
 	{
 		if($this->accountDeactivated) throw new \RuntimeException('The account was deactivated. No further requests can be made.');
 
 		$headers = array('Accept: application/json', 'Content-Type: application/json');
 		$requestURL = preg_match('~^http~', $URL) ? $URL : $this->baseURL . $URL;
-        $handle = curl_init();
-        curl_setopt($handle, CURLOPT_URL, $requestURL);
-        curl_setopt($handle, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($handle, CURLOPT_HEADER, true);
-
-        switch ($method) {
-            case 'GET':
-                break;
-            case 'POST':
-                curl_setopt($handle, CURLOPT_POST, true);
-                curl_setopt($handle, CURLOPT_POSTFIELDS, $data);
-                break;
+		$handle = curl_init();
+		curl_setopt($handle, CURLOPT_URL, $requestURL);
+		curl_setopt($handle, CURLOPT_HTTPHEADER, $headers);
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($handle, CURLOPT_HEADER, true);
+
+		switch ($method) {
+			case 'GET':
+				break;
+			case 'POST':
+				curl_setopt($handle, CURLOPT_POST, true);
+				curl_setopt($handle, CURLOPT_POSTFIELDS, $data);
+				break;
 			case 'HEAD':
 				curl_setopt($handle, CURLOPT_CUSTOMREQUEST, 'HEAD');
 				curl_setopt($handle, CURLOPT_NOBODY, true);
@@ -124,17 +124,17 @@ 
 			default:
 				throw new \RuntimeException('HTTP request ' . $method . ' not supported.');
 				break;
-        }
-        $response = curl_exec($handle);
+		}
+		$response = curl_exec($handle);
 
-        if(curl_errno($handle)) {
-            throw new \RuntimeException('Curl: ' . curl_error($handle));
-        }
+		if(curl_errno($handle)) {
+			throw new \RuntimeException('Curl: ' . curl_error($handle));
+		}
 
-        $header_size = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
+		$header_size = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
 
-        $header = substr($response, 0, $header_size);
-        $body = substr($response, $header_size);
+		$header = substr($response, 0, $header_size);
+		$body = substr($response, $header_size);
 		$jsonbody = json_decode($body, true);
 		$jsonresponse = array('request' => $method . ' ' . $requestURL, 'header' => $header, 'body' => $jsonbody === null ? $body : $jsonbody);
 		if($this->log >= LECLient::LOG_DEBUG) LEFunctions::log($jsonresponse);
@@ -154,124 +154,124 @@ 
 			if($method == 'POST') $this->getNewNonce(); // Not expecting a new nonce with GET and HEAD requests.
 		}
 
-        return $jsonresponse;
+		return $jsonresponse;
 	}
 
-    /**
-     * Makes a GET request.
-     *
-     * @param string	$url 	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
-     *
-     * @return array 	Returns an array with the keys 'request', 'header' and 'body'.
-     */
+	/**
+	 * Makes a GET request.
+	 *
+	 * @param string	$url 	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
+	 *
+	 * @return array 	Returns an array with the keys 'request', 'header' and 'body'.
+	 */
 	public function get($url)
 	{
 		return $this->request('GET', $url);
 	}
 
 	/**
-     * Makes a POST request.
-     *
-     * @param string 	$url	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
+	 * Makes a POST request.
+	 *
+	 * @param string 	$url	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
 	 * @param object 	$data	The body to attach to a POST request. Expected as a json string.
-     *
-     * @return array 	Returns an array with the keys 'request', 'header' and 'body'.
-     */
+	 *
+	 * @return array 	Returns an array with the keys 'request', 'header' and 'body'.
+	 */
 	public function post($url, $data = null)
 	{
 		return $this->request('POST', $url, $data);
 	}
 
 	/**
-     * Makes a HEAD request.
-     *
-     * @param string 	$url	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
-     *
-     * @return array	Returns an array with the keys 'request', 'header' and 'body'.
-     */
+	 * Makes a HEAD request.
+	 *
+	 * @param string 	$url	The URL or partial URL to make the request to. If it is partial, the baseURL will be prepended.
+	 *
+	 * @return array	Returns an array with the keys 'request', 'header' and 'body'.
+	 */
 	public function head($url)
 	{
 		return $this->request('HEAD', $url);
 	}
 
-    /**
-     * Generates a JSON Web Key signature to attach to the request.
-     *
-     * @param array 	$payload		The payload to add to the signature.
-     * @param string	$url 			The URL to use in the signature.
-     * @param string 	$privateKeyFile The private key to sign the request with. Defaults to 'private.pem'. Defaults to accountKeys[private_key].
-     *
-     * @return string	Returns a JSON encoded string containing the signature.
-     */
+	/**
+	 * Generates a JSON Web Key signature to attach to the request.
+	 *
+	 * @param array 	$payload		The payload to add to the signature.
+	 * @param string	$url 			The URL to use in the signature.
+	 * @param string 	$privateKeyFile The private key to sign the request with. Defaults to 'private.pem'. Defaults to accountKeys[private_key].
+	 *
+	 * @return string	Returns a JSON encoded string containing the signature.
+	 */
 	public function signRequestJWK($payload, $url, $privateKeyFile = '')
-    {
+	{
 		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
 		$privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
-        $details = openssl_pkey_get_details($privateKey);
-
-        $protected = array(
-            "alg" => "RS256",
-            "jwk" => array(
-                "kty" => "RSA",
-                "n" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["n"]),
-                "e" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["e"]),
-            ),
+		$details = openssl_pkey_get_details($privateKey);
+
+		$protected = array(
+			"alg" => "RS256",
+			"jwk" => array(
+				"kty" => "RSA",
+				"n" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["n"]),
+				"e" => LEFunctions::Base64UrlSafeEncode($details["rsa"]["e"]),
+			),
 			"nonce" => $this->nonce,
 			"url" => $url
-        );
+		);
 
-        $payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
-        $protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
+		$payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
+		$protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
-        $signed64 = LEFunctions::Base64UrlSafeEncode($signed);
+		openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+		$signed64 = LEFunctions::Base64UrlSafeEncode($signed);
 
-        $data = array(
-            'protected' => $protected64,
-            'payload' => $payload64,
-            'signature' => $signed64
-        );
+		$data = array(
+			'protected' => $protected64,
+			'payload' => $payload64,
+			'signature' => $signed64
+		);
 
-        return json_encode($data);
-    }
+		return json_encode($data);
+	}
 
 	/**
-     * Generates a Key ID signature to attach to the request.
-     *
-     * @param array 	$payload		The payload to add to the signature.
+	 * Generates a Key ID signature to attach to the request.
+	 *
+	 * @param array 	$payload		The payload to add to the signature.
 	 * @param string	$kid			The Key ID to use in the signature.
-     * @param string	$url 			The URL to use in the signature.
-     * @param string 	$privateKeyFile The private key to sign the request with. Defaults to 'private.pem'. Defaults to accountKeys[private_key].
-     *
-     * @return string	Returns a JSON encoded string containing the signature.
-     */
+	 * @param string	$url 			The URL to use in the signature.
+	 * @param string 	$privateKeyFile The private key to sign the request with. Defaults to 'private.pem'. Defaults to accountKeys[private_key].
+	 *
+	 * @return string	Returns a JSON encoded string containing the signature.
+	 */
 	public function signRequestKid($payload, $kid, $url, $privateKeyFile = '')
-    {
+	{
 		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
-        $privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
-        $details = openssl_pkey_get_details($privateKey);
+		$privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
+		$details = openssl_pkey_get_details($privateKey);
 
-        $protected = array(
-            "alg" => "RS256",
-            "kid" => $kid,
+		$protected = array(
+			"alg" => "RS256",
+			"kid" => $kid,
 			"nonce" => $this->nonce,
 			"url" => $url
-        );
+		);
 
-        $payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
-        $protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
+		$payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
+		$protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
-        $signed64 = LEFunctions::Base64UrlSafeEncode($signed);
+		openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+		$signed64 = LEFunctions::Base64UrlSafeEncode($signed);
 
-        $data = array(
-            'protected' => $protected64,
-            'payload' => $payload64,
-            'signature' => $signed64
-        );
+		$data = array(
+			'protected' => $protected64,
+			'payload' => $payload64,
+			'signature' => $signed64
+		);
 
-        return json_encode($data);
-    }
+		return json_encode($data);
+	}
 }
 
 ?>

Spacing +11 added lines, -11 removed lines

@@ -86,7 +86,7 @@ 
      */
 	private function getNewNonce()
 	{
-		if(strpos($this->head($this->newNonce)['header'], "204 No Content") == false) throw new \RuntimeException('No new nonce.');
+		if (strpos($this->head($this->newNonce)['header'], "204 No Content") == false) throw new \RuntimeException('No new nonce.');
 	}
 
     /**
@@ -100,7 +100,7 @@ 
      */
 	private function request($method, $URL, $data = null)
 	{
-		if($this->accountDeactivated) throw new \RuntimeException('The account was deactivated. No further requests can be made.');
+		if ($this->accountDeactivated) throw new \RuntimeException('The account was deactivated. No further requests can be made.');
 
 		$headers = array('Accept: application/json', 'Content-Type: application/json');
 		$requestURL = preg_match('~^http~', $URL) ? $URL : $this->baseURL . $URL;
@@ -127,7 +127,7 @@ 
         }
         $response = curl_exec($handle);
 
-        if(curl_errno($handle)) {
+        if (curl_errno($handle)) {
             throw new \RuntimeException('Curl: ' . curl_error($handle));
         }
 
@@ -137,21 +137,21 @@ 
         $body = substr($response, $header_size);
 		$jsonbody = json_decode($body, true);
 		$jsonresponse = array('request' => $method . ' ' . $requestURL, 'header' => $header, 'body' => $jsonbody === null ? $body : $jsonbody);
-		if($this->log >= LECLient::LOG_DEBUG) LEFunctions::log($jsonresponse);
+		if ($this->log >= LECLient::LOG_DEBUG) LEFunctions::log($jsonresponse);
 
-		if(	(($method == 'POST' OR $method == 'GET') AND strpos($header, "200 OK") === false AND strpos($header, "201 Created") === false) OR
+		if ((($method == 'POST' OR $method == 'GET') AND strpos($header, "200 OK") === false AND strpos($header, "201 Created") === false) OR
 			($method == 'HEAD' AND strpos($header, "204 No Content") === false))
 		{
 			throw new \RuntimeException('Invalid response, header: ' . $header);
 		}
 
-		if(preg_match('~Replay\-Nonce: (\S+)~i', $header, $matches))
+		if (preg_match('~Replay\-Nonce: (\S+)~i', $header, $matches))
 		{
 			$this->nonce = trim($matches[1]);
 		}
 		else
 		{
-			if($method == 'POST') $this->getNewNonce(); // Not expecting a new nonce with GET and HEAD requests.
+			if ($method == 'POST') $this->getNewNonce(); // Not expecting a new nonce with GET and HEAD requests.
 		}
 
         return $jsonresponse;
@@ -205,7 +205,7 @@ 
      */
 	public function signRequestJWK($payload, $url, $privateKeyFile = '')
     {
-		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
+		if ($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
 		$privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
         $details = openssl_pkey_get_details($privateKey);
 
@@ -223,7 +223,7 @@ 
         $payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
         $protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+        openssl_sign($protected64 . '.' . $payload64, $signed, $privateKey, "SHA256");
         $signed64 = LEFunctions::Base64UrlSafeEncode($signed);
 
         $data = array(
@@ -247,7 +247,7 @@ 
      */
 	public function signRequestKid($payload, $kid, $url, $privateKeyFile = '')
     {
-		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
+		if ($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
         $privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
         $details = openssl_pkey_get_details($privateKey);
 
@@ -261,7 +261,7 @@ 
         $payload64 = LEFunctions::Base64UrlSafeEncode(str_replace('\\/', '/', is_array($payload) ? json_encode($payload) : $payload));
         $protected64 = LEFunctions::Base64UrlSafeEncode(json_encode($protected));
 
-        openssl_sign($protected64.'.'.$payload64, $signed, $privateKey, "SHA256");
+        openssl_sign($protected64 . '.' . $payload64, $signed, $privateKey, "SHA256");
         $signed64 = LEFunctions::Base64UrlSafeEncode($signed);
 
         $data = array(

Braces +20 added lines, -8 removed lines

@@ -86,7 +86,9 @@ 
      */
 	private function getNewNonce()
 	{
-		if(strpos($this->head($this->newNonce)['header'], "204 No Content") == false) throw new \RuntimeException('No new nonce.');
+		if(strpos($this->head($this->newNonce)['header'], "204 No Content") == false) {
+			throw new \RuntimeException('No new nonce.');
+		}
 	}
 
     /**
@@ -100,7 +102,9 @@ 
      */
 	private function request($method, $URL, $data = null)
 	{
-		if($this->accountDeactivated) throw new \RuntimeException('The account was deactivated. No further requests can be made.');
+		if($this->accountDeactivated) {
+			throw new \RuntimeException('The account was deactivated. No further requests can be made.');
+		}
 
 		$headers = array('Accept: application/json', 'Content-Type: application/json');
 		$requestURL = preg_match('~^http~', $URL) ? $URL : $this->baseURL . $URL;
@@ -137,7 +141,9 @@ 
         $body = substr($response, $header_size);
 		$jsonbody = json_decode($body, true);
 		$jsonresponse = array('request' => $method . ' ' . $requestURL, 'header' => $header, 'body' => $jsonbody === null ? $body : $jsonbody);
-		if($this->log >= LECLient::LOG_DEBUG) LEFunctions::log($jsonresponse);
+		if($this->log >= LECLient::LOG_DEBUG) {
+			LEFunctions::log($jsonresponse);
+		}
 
 		if(	(($method == 'POST' OR $method == 'GET') AND strpos($header, "200 OK") === false AND strpos($header, "201 Created") === false) OR
 			($method == 'HEAD' AND strpos($header, "204 No Content") === false))
@@ -148,10 +154,12 @@ 
 		if(preg_match('~Replay\-Nonce: (\S+)~i', $header, $matches))
 		{
 			$this->nonce = trim($matches[1]);
-		}
-		else
+		} else
 		{
-			if($method == 'POST') $this->getNewNonce(); // Not expecting a new nonce with GET and HEAD requests.
+			if($method == 'POST') {
+				$this->getNewNonce();
+			}
+			// Not expecting a new nonce with GET and HEAD requests.
 		}
 
         return $jsonresponse;
@@ -205,7 +213,9 @@ 
      */
 	public function signRequestJWK($payload, $url, $privateKeyFile = '')
     {
-		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
+		if($privateKeyFile == '') {
+			$privateKeyFile = $this->accountKeys['private_key'];
+		}
 		$privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
         $details = openssl_pkey_get_details($privateKey);
 
@@ -247,7 +257,9 @@ 
      */
 	public function signRequestKid($payload, $kid, $url, $privateKeyFile = '')
     {
-		if($privateKeyFile == '') $privateKeyFile = $this->accountKeys['private_key'];
+		if($privateKeyFile == '') {
+			$privateKeyFile = $this->accountKeys['private_key'];
+		}
         $privateKey = openssl_pkey_get_private(file_get_contents($privateKeyFile));
         $details = openssl_pkey_get_details($privateKey);
 

LEClient/src/LEAuthorization.php

Indentation +17 added lines, -17 removed lines

@@ -46,13 +46,13 @@ 
 	
 	private $log;
 	
-    /**
-     * Initiates the LetsEncrypt Authorization class. Child of a LetsEncrypt Order instance.
-     * 
-     * @param LEConnector	$connector			The LetsEncrypt Connector instance to use for HTTP requests.
-     * @param int 			$log 				The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
-     * @param string 		$authorizationURL 	The URL of the authorization, given by a LetsEncrypt order request.
-     */
+	/**
+	 * Initiates the LetsEncrypt Authorization class. Child of a LetsEncrypt Order instance.
+	 * 
+	 * @param LEConnector	$connector			The LetsEncrypt Connector instance to use for HTTP requests.
+	 * @param int 			$log 				The level of logging. Defaults to no logging. LOG_OFF, LOG_STATUS, LOG_DEBUG accepted.
+	 * @param string 		$authorizationURL 	The URL of the authorization, given by a LetsEncrypt order request.
+	 */
 	public function __construct($connector, $log, $authorizationURL)
 	{
 		$this->connector = $connector;
@@ -73,9 +73,9 @@ 
 		}
 	}
 	
-    /**
-     * Updates the data associated with the current LetsEncrypt Authorization instance.
-     */
+	/**
+	 * Updates the data associated with the current LetsEncrypt Authorization instance.
+	 */
 	
 	public function updateData()
 	{
@@ -93,14 +93,14 @@ 
 		}
 	}
 	
-    /**
-     * Gets the challenge of the given $type for this LetsEncrypt Authorization instance. Throws a Runtime Exception if the given $type is not found in this
+	/**
+	 * Gets the challenge of the given $type for this LetsEncrypt Authorization instance. Throws a Runtime Exception if the given $type is not found in this
 	 * LetsEncrypt Authorization instance.
-     * 
-     * @param int	$type 	The type of verification. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS.
-     * 
-     * @return array	Returns an array with the challenge of the requested $type.
-     */
+	 * 
+	 * @param int	$type 	The type of verification. Supporting LEOrder::CHALLENGE_TYPE_HTTP and LEOrder::CHALLENGE_TYPE_DNS.
+	 * 
+	 * @return array	Returns an array with the challenge of the requested $type.
+	 */
 	public function getChallenge($type)
 	{
 		foreach($this->challenges as $challenge)

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 		$this->authorizationURL = $authorizationURL;
 		
 		$get = $this->connector->get($this->authorizationURL);
-		if(strpos($get['header'], "200 OK") !== false)
+		if (strpos($get['header'], "200 OK") !== false)
 		{
 			$this->identifier = $get['body']['identifier'];
 			$this->status = $get['body']['status'];
@@ -69,7 +69,7 @@ 
 		}
 		else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
 		}
 	}
 	
@@ -80,7 +80,7 @@ 
 	public function updateData()
 	{
 		$get = $this->connector->get($this->authorizationURL);
-		if(strpos($get['header'], "200 OK") !== false)
+		if (strpos($get['header'], "200 OK") !== false)
 		{
 			$this->identifier = $get['body']['identifier'];
 			$this->status = $get['body']['status'];
@@ -89,7 +89,7 @@ 
 		}
 		else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function updateData');
+			if ($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function updateData');
 		}
 	}
 	
@@ -103,9 +103,9 @@ 
      */
 	public function getChallenge($type)
 	{
-		foreach($this->challenges as $challenge)
+		foreach ($this->challenges as $challenge)
 		{
-			if($challenge['type'] == $type) return $challenge;
+			if ($challenge['type'] == $type) return $challenge;
 		}
 		throw new \RuntimeException('No challenge found for type \'' . $type . '\' and identifier \'' . $this->identifier['value'] . '\'.');
 	}

Braces +11 added lines, -7 removed lines

@@ -66,10 +66,11 @@ 
 			$this->status = $get['body']['status'];
 			$this->expires = $get['body']['expires'];
 			$this->challenges = $get['body']['challenges'];
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function LEAuthorization __construct');
+			}
 		}
 	}
 	
@@ -86,10 +87,11 @@ 
 			$this->status = $get['body']['status'];
 			$this->expires = $get['body']['expires'];
 			$this->challenges = $get['body']['challenges'];
-		}
-		else
+		} else
 		{
-			if($this->log >= LECLient::LOG_STATUS) LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function updateData');
+			if($this->log >= LECLient::LOG_STATUS) {
+				LEFunctions::log('Cannot find authorization \'' . $authorizationURL . '\'.', 'function updateData');
+			}
 		}
 	}
 	
@@ -105,7 +107,9 @@ 
 	{
 		foreach($this->challenges as $challenge)
 		{
-			if($challenge['type'] == $type) return $challenge;
+			if($challenge['type'] == $type) {
+				return $challenge;
+			}
 		}
 		throw new \RuntimeException('No challenge found for type \'' . $type . '\' and identifier \'' . $this->identifier['value'] . '\'.');
 	}

exampleDNSInit.php

Spacing +3 added lines, -3 removed lines

@@ -16,14 +16,14 @@
 // Initiating the order instance. The keys and certificate will be stored in /example.org/ (argument 1) and the domains in the array (argument 2) will be on the certificate.
 $order = $client->getOrCreateOrder($basename, $domains);
 // Check whether there are any authorizations pending. If that is the case, try to verify the pending authorizations.
-if(!$order->allAuthorizationsValid())
+if (!$order->allAuthorizationsValid())
 {
 	// Get the DNS challenges from the pending authorizations.
 	$pending = $order->getPendingAuthorizations(LEOrder::CHALLENGE_TYPE_DNS);
 	// Walk the list of pending authorization DNS challenges.
-	if(!empty($pending))
+	if (!empty($pending))
 	{
-		foreach($pending as $challenge)
+		foreach ($pending as $challenge)
 		{
 			// For the purpose of this example, a fictitious functions creates or updates the ACME challenge DNS record for this domain. 
 			setDNSRecord($challenge['identifier'], $challenge['DNSDigest'])

exampleDNSFinish.php

Spacing +6 added lines, -6 removed lines

@@ -16,14 +16,14 @@ 
 // Initiating the order instance. The keys and certificate will be stored in /example.org/ (argument 1) and the domains in the array (argument 2) will be on the certificate.
 $order = $client->getOrCreateOrder($basename, $domains);
 // Check whether there are any authorizations pending. If that is the case, try to verify the pending authorizations.
-if(!$order->allAuthorizationsValid())
+if (!$order->allAuthorizationsValid())
 {
 	// Get the DNS challenges from the pending authorizations.
 	$pending = $order->getPendingAuthorizations(LEOrder::CHALLENGE_TYPE_DNS);
 	// Walk the list of pending authorization DNS challenges.
-	if(!empty($pending))
+	if (!empty($pending))
 	{
-		foreach($pending as $challenge)
+		foreach ($pending as $challenge)
 		{
 			// Let LetsEncrypt verify this challenge, which should have been fulfilled in exampleDNSStart.php.
 			$order->verifyPendingOrderAuthorization($challenge['identifier'], LEOrder::CHALLENGE_TYPE_DNS);
@@ -31,11 +31,11 @@ 
 	}
 }
 // Check once more whether all authorizations are valid before we can finalize the order.
-if($order->allAuthorizationsValid())
+if ($order->allAuthorizationsValid())
 {
 	// Finalize the order first, if that is not yet done.
-	if(!$order->isFinalized()) $order->finalizeOrder();
+	if (!$order->isFinalized()) $order->finalizeOrder();
 	// Check whether the order has been finalized before we can get the certificate. If finalized, get the certificate.
-	if($order->isFinalized()) $order->getCertificate();
+	if ($order->isFinalized()) $order->getCertificate();
 }
 ?>
\ No newline at end of file

Braces +7 added lines, -3 removed lines

@@ -34,8 +34,12 @@
 if($order->allAuthorizationsValid())
 {
 	// Finalize the order first, if that is not yet done.
-	if(!$order->isFinalized()) $order->finalizeOrder();
+	if(!$order->isFinalized()) {
+		$order->finalizeOrder();
+	}
 	// Check whether the order has been finalized before we can get the certificate. If finalized, get the certificate.
-	if($order->isFinalized()) $order->getCertificate();
-}
+	if($order->isFinalized()) {
+		$order->getCertificate();
+	}
+	}
 ?>
\ No newline at end of file