chamilo / chamilo-lms

plugin/pens/lib/pens/pens_request_alert.php

Indentation +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@
 
 class PENSRequestAlert extends PENSRequest {
 	
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->setCommand("alert");
-	}
+    public function __construct($arguments) {
+        parent::__construct($arguments);
+        $this->setCommand("alert");
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 
-require_once __DIR__ . '/pens_request.php';
+require_once __DIR__.'/pens_request.php';
 
 /**
  * PENSRequestReceipt

plugin/pens/lib/pens/pens_controller.php

Indentation +27 added lines, -27 removed lines

@@ -16,15 +16,15 @@ 
  * along with php-pens.  If not, see <http://www.gnu.org/licenses/>.
  */
  
- /**
- * PENSController
- * 
- * Provides the PENSController class
- * 
- * @package PENS
- * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
- * @licence http://www.gnu.org/licenses/gpl.txt
- */
+    /**
+     * PENSController
+     * 
+     * Provides the PENSController class
+     * 
+     * @package PENS
+     * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
+     * @licence http://www.gnu.org/licenses/gpl.txt
+     */
 
 require_once(dirname(__FILE__)."/pens_request_factory.php");
 
@@ -39,24 +39,24 @@ 
  */
 abstract class PENSController {
 	
-	/**
-	 * Parses a request based on the values present in $_REQUEST
-	 * 
-	 * @return PENSRequest Request generated
-	 * @throws PENSException if the request could not be parsed
-	 */
-	protected function parseRequest() {
-		$request = PENSRequestFactory::createPENSRequest($_REQUEST);
-		return $request;
-	}
+    /**
+     * Parses a request based on the values present in $_REQUEST
+     * 
+     * @return PENSRequest Request generated
+     * @throws PENSException if the request could not be parsed
+     */
+    protected function parseRequest() {
+        $request = PENSRequestFactory::createPENSRequest($_REQUEST);
+        return $request;
+    }
 	
-	/**
-	 * Sends the HTTP Response to the client
-	 * 
-	 * @param PENSResponse Response to be sent
-	 */
-	protected function sendResponse($response) {
-		$response->send();
-	}
+    /**
+     * Sends the HTTP Response to the client
+     * 
+     * @param PENSResponse Response to be sent
+     */
+    protected function sendResponse($response) {
+        $response->send();
+    }
 	
 }

plugin/pens/lib/pens/pens_client.php

Indentation +73 added lines, -73 removed lines

@@ -16,15 +16,15 @@ 
  * along with php-pens.  If not, see <http://www.gnu.org/licenses/>.
  */
  
- /**
- * PENSClient
- * 
- * Provides the PENSClient class
- * 
- * @package PENS
- * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
- * @licence http://www.gnu.org/licenses/gpl.txt
- */
+    /**
+     * PENSClient
+     * 
+     * Provides the PENSClient class
+     * 
+     * @package PENS
+     * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
+     * @licence http://www.gnu.org/licenses/gpl.txt
+     */
  
 require_once(dirname(__FILE__)."/pens_controller.php");
 require_once(dirname(__FILE__)."/pens_request_handler.php");
@@ -39,75 +39,75 @@ 
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 class PENSClient extends PENSController {
-	/**
-	 * Instance of the PENSClient
-	 * @var PENSServer
-	 */
-	private static $_instance;
+    /**
+     * Instance of the PENSClient
+     * @var PENSServer
+     */
+    private static $_instance;
 	
-	/**
-	 * Request handler
-	 * @var PENSRequestHandler
-	 */
-	protected $_request_handler = null;
+    /**
+     * Request handler
+     * @var PENSRequestHandler
+     */
+    protected $_request_handler = null;
 	
-	/**
-	 * Private constructor
-	 */
-	private function __construct() {
-	}
+    /**
+     * Private constructor
+     */
+    private function __construct() {
+    }
 	
-	/**
-	 * Singleton method
-	 */
-	public static function singleton() {
-		if(!isset(self::$_instance)) {
-			$c = __CLASS__;
-			self::$_instance = new $c;
-		}
-		return self::$_instance;
-	}
+    /**
+     * Singleton method
+     */
+    public static function singleton() {
+        if(!isset(self::$_instance)) {
+            $c = __CLASS__;
+            self::$_instance = new $c;
+        }
+        return self::$_instance;
+    }
 	
-	/**
-	 * Prevent users to clone the instance
-	 */
-	public function __clone() {
-		trigger_error('Clone is not allowed', E_USER_ERROR);
-	}
+    /**
+     * Prevent users to clone the instance
+     */
+    public function __clone() {
+        trigger_error('Clone is not allowed', E_USER_ERROR);
+    }
 	
-	public function getRequestHandler() {
-		return $this->_request_handler;
-	}
+    public function getRequestHandler() {
+        return $this->_request_handler;
+    }
 	
-	/**
-	 * Sets the request handler. Does nothing if the argument is not an instance of PENSRequestHandler
-	 * 
-	 * @param PENSRequestHandler Request handler
-	 */
-	public function setRequestHandler($request_handler) {
-		if($request_handler instanceof PENSRequestHandler) {
-			$this->_request_handler = $request_handler;
-		}
-	}
+    /**
+     * Sets the request handler. Does nothing if the argument is not an instance of PENSRequestHandler
+     * 
+     * @param PENSRequestHandler Request handler
+     */
+    public function setRequestHandler($request_handler) {
+        if($request_handler instanceof PENSRequestHandler) {
+            $this->_request_handler = $request_handler;
+        }
+    }
 	
-	/**
-	 * Receives a request, calls the handler and displays the response
-	 */
-	public function receiveRequest() {
-		$request = null;
-		try {
-			$request = $this->parseRequest();
-			$command = $request->getCommand();
-			if($command == "alert" || $command == "receipt") {
-				if(!is_null($this->_request_handler)) {
-					// Call the handler
-					$this->_request_handler->processRequest($request, new PENSResponse($_REQUEST));
-				}
-				$this->sendResponse(new PENSResponse(0, $command." received and understood"));
-			}
-		} catch(PENSException $e) {
-			// If we could not parse the request, send the error
-			$this->sendResponse(new PENSResponse($e));
-		}
-	}
+    /**
+     * Receives a request, calls the handler and displays the response
+     */
+    public function receiveRequest() {
+        $request = null;
+        try {
+            $request = $this->parseRequest();
+            $command = $request->getCommand();
+            if($command == "alert" || $command == "receipt") {
+                if(!is_null($this->_request_handler)) {
+                    // Call the handler
+                    $this->_request_handler->processRequest($request, new PENSResponse($_REQUEST));
+                }
+                $this->sendResponse(new PENSResponse(0, $command." received and understood"));
+            }
+        } catch(PENSException $e) {
+            // If we could not parse the request, send the error
+            $this->sendResponse(new PENSResponse($e));
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -61,7 +61,7 @@ 
 	 * Singleton method
 	 */
 	public static function singleton() {
-		if(!isset(self::$_instance)) {
+		if (!isset(self::$_instance)) {
 			$c = __CLASS__;
 			self::$_instance = new $c;
 		}
@@ -85,7 +85,7 @@ 
 	 * @param PENSRequestHandler Request handler
 	 */
 	public function setRequestHandler($request_handler) {
-		if($request_handler instanceof PENSRequestHandler) {
+		if ($request_handler instanceof PENSRequestHandler) {
 			$this->_request_handler = $request_handler;
 		}
 	}
@@ -98,14 +98,14 @@ 
 		try {
 			$request = $this->parseRequest();
 			$command = $request->getCommand();
-			if($command == "alert" || $command == "receipt") {
-				if(!is_null($this->_request_handler)) {
+			if ($command == "alert" || $command == "receipt") {
+				if (!is_null($this->_request_handler)) {
 					// Call the handler
 					$this->_request_handler->processRequest($request, new PENSResponse($_REQUEST));
 				}
 				$this->sendResponse(new PENSResponse(0, $command." received and understood"));
 			}
-		} catch(PENSException $e) {
+		} catch (PENSException $e) {
 			// If we could not parse the request, send the error
 			$this->sendResponse(new PENSResponse($e));
 		}

plugin/pens/lib/pens/pens_exception.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
 	 * Sets the message based on the code
 	 */
 	protected function setMessageBasedOnCode() {
-		if(empty($this->message) && !empty(self::$_code_to_messages[$this->code])) {
+		if (empty($this->message) && !empty(self::$_code_to_messages[$this->code])) {
 			$this->message = self::$_code_to_messages[$this->code];
 		}
 	}

Indentation +55 added lines, -55 removed lines

@@ -37,62 +37,62 @@
  */
 class PENSException extends Exception {
 
-	/**
-	 * Array that provides an association between exception codes and messages
-	 * @var array
-	 */
-	protected static $_code_to_messages = array(
-		1101 => "Unable to parse PENS command",
-		1201 => "Attempt to pass an invalid argument",
-		1301 => "Unable to retrieve package",
-		1302 => "Unable to retrieve package via HTTPS",
-		1304 => "Unable to retrieve package via FTP",
-		1306 => "Unable to retrieve package via FTPS",
-		1310 => "Unable to retrieve package at specified URL due to error in URL or lack of response from URL",
-		1312 => "Unable to retrieve package at specified URL due to error with access credential for package URL",
-		1320 => "Expiration date is non-null and in an improper format",
-		1322 => "Current time indicates expiry date has passed",
-		1420 => "PENS version not supported",
-		1421 => "Command not supported",
-		1430 => "Package type not supported",
-		// The following error code is not specified in the PENS specification and was added in this implementation
-		1431 => "Package format not supported",
-		1432 => "Internal package error",
-		1440 => "Insufficient host space/storage available",
-		1500 => "Unable to communicate with provided acknowledgement URL",
-		1510 => "Unsupported acknowledgement protocol",
-		1520 => "Unsupported alert protocol",
-		2001 => "PENS version invalid or not specified",
-		2002 => "PENS command invalid or not specified",
-		2003 => "package-type invalid or not specified",
-		2004 => "package-type-version invalid or not specified",
-		2005 => "package-format invalid or not specified",
-		2007 => "package-id invalid or not specified",
-		2008 => "package-url invalid or not specified",
-		2009 => "package-url-expiry date invalid or not specified",
-		2010 => "client submitting package invalid or not specified",
-		2011 => "receipt url invalid or not specified"
-	);
+    /**
+     * Array that provides an association between exception codes and messages
+     * @var array
+     */
+    protected static $_code_to_messages = array(
+        1101 => "Unable to parse PENS command",
+        1201 => "Attempt to pass an invalid argument",
+        1301 => "Unable to retrieve package",
+        1302 => "Unable to retrieve package via HTTPS",
+        1304 => "Unable to retrieve package via FTP",
+        1306 => "Unable to retrieve package via FTPS",
+        1310 => "Unable to retrieve package at specified URL due to error in URL or lack of response from URL",
+        1312 => "Unable to retrieve package at specified URL due to error with access credential for package URL",
+        1320 => "Expiration date is non-null and in an improper format",
+        1322 => "Current time indicates expiry date has passed",
+        1420 => "PENS version not supported",
+        1421 => "Command not supported",
+        1430 => "Package type not supported",
+        // The following error code is not specified in the PENS specification and was added in this implementation
+        1431 => "Package format not supported",
+        1432 => "Internal package error",
+        1440 => "Insufficient host space/storage available",
+        1500 => "Unable to communicate with provided acknowledgement URL",
+        1510 => "Unsupported acknowledgement protocol",
+        1520 => "Unsupported alert protocol",
+        2001 => "PENS version invalid or not specified",
+        2002 => "PENS command invalid or not specified",
+        2003 => "package-type invalid or not specified",
+        2004 => "package-type-version invalid or not specified",
+        2005 => "package-format invalid or not specified",
+        2007 => "package-id invalid or not specified",
+        2008 => "package-url invalid or not specified",
+        2009 => "package-url-expiry date invalid or not specified",
+        2010 => "client submitting package invalid or not specified",
+        2011 => "receipt url invalid or not specified"
+    );
 	
-	/**
-	 * Redefines the constructor so that code is the first argument
-	 * 
-	 * @param int Exception code
-	 * @param string Message to display
-	 * @return PENSException Exception created
-	 */
-	public function __construct($code, $message = null) {
-		parent::__construct($message, $code);
-		$this->setMessageBasedOnCode();
-	}
+    /**
+     * Redefines the constructor so that code is the first argument
+     * 
+     * @param int Exception code
+     * @param string Message to display
+     * @return PENSException Exception created
+     */
+    public function __construct($code, $message = null) {
+        parent::__construct($message, $code);
+        $this->setMessageBasedOnCode();
+    }
 	
-	/**
-	 * Sets the message based on the code
-	 */
-	protected function setMessageBasedOnCode() {
-		if(empty($this->message) && !empty(self::$_code_to_messages[$this->code])) {
-			$this->message = self::$_code_to_messages[$this->code];
-		}
-	}
+    /**
+     * Sets the message based on the code
+     */
+    protected function setMessageBasedOnCode() {
+        if(empty($this->message) && !empty(self::$_code_to_messages[$this->code])) {
+            $this->message = self::$_code_to_messages[$this->code];
+        }
+    }
 	
 }

plugin/pens/lib/pens/pens_request_collect.php

Indentation +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@
 
 class PENSRequestCollect extends PENSRequest {
 	
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->setCommand("collect");
-	}
+    public function __construct($arguments) {
+        parent::__construct($arguments);
+        $this->setCommand("collect");
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 
-require_once __DIR__ . '/pens_request.php';
+require_once __DIR__.'/pens_request.php';
 
 /**
  * PENSRequestReceipt

plugin/pens/lib/pens/pens_package_handler.php

Indentation +73 added lines, -73 removed lines

@@ -16,15 +16,15 @@ 
  * along with php-pens.  If not, see <http://www.gnu.org/licenses/>.
  */
  
- /**
- * PENSPackageHandler
- * 
- * Provides the PENSPackageHandler abstract class
- * 
- * @package PENS
- * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
- * @licence http://www.gnu.org/licenses/gpl.txt
- */
+    /**
+     * PENSPackageHandler
+     * 
+     * Provides the PENSPackageHandler abstract class
+     * 
+     * @package PENS
+     * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
+     * @licence http://www.gnu.org/licenses/gpl.txt
+     */
 
 require_once(dirname(__FILE__)."/pens_config.php");
 
@@ -39,76 +39,76 @@ 
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 abstract class PENSPackageHandler {
-	/**
-	 * Array of supported package types for this handler. Set by default to PENSConfig::$allowed_package_types
-	 * @var array
-	 */
-	protected $_supported_package_types = null;
+    /**
+     * Array of supported package types for this handler. Set by default to PENSConfig::$allowed_package_types
+     * @var array
+     */
+    protected $_supported_package_types = null;
 	
-	/**
-	 * Array of supported package formats for this handler. Set by default to PENSConfig::$allowed_package_formats
-	 * @var array
-	 */
-	protected $_supported_package_formats = null;
+    /**
+     * Array of supported package formats for this handler. Set by default to PENSConfig::$allowed_package_formats
+     * @var array
+     */
+    protected $_supported_package_formats = null;
 	
-	/**
-	 * Constructor. Sets the default values of supported_package_types and supported_package_formats
-	 */
-	public function __construct() {
-		$this->_supported_package_types = PENSConfig::$allowed_package_types;
-		$this->_supported_package_formats = PENSConfig::$allowed_package_formats;
-	}
+    /**
+     * Constructor. Sets the default values of supported_package_types and supported_package_formats
+     */
+    public function __construct() {
+        $this->_supported_package_types = PENSConfig::$allowed_package_types;
+        $this->_supported_package_formats = PENSConfig::$allowed_package_formats;
+    }
 	
-	public function getSupportedPackageTypes() {
-		return $this->_supported_package_types;
-	}
+    public function getSupportedPackageTypes() {
+        return $this->_supported_package_types;
+    }
 	
-	/**
-	 * Sets the supported package types. All package types in the array provided as an argument
-	 * not present in PENSConfig::$allowed_package_types will be ignored. The supported_package_types
-	 * will be set to null if the argument given is not an array
-	 * 
-	 * @param array Supported package types
-	 */
-	public function setSupportedPackageTypes($supported_package_types) {
-		$this->_supported_package_types = null;
-		if(is_array($supported_package_types)) {
-			foreach($supported_package_types as $package_type) {
-				if(in_array($package_type, PENSConfig::$allowed_package_types)) {
-					$this->_supported_package_types[] = $package_type;
-				}
-			}
-		}
-	}
+    /**
+     * Sets the supported package types. All package types in the array provided as an argument
+     * not present in PENSConfig::$allowed_package_types will be ignored. The supported_package_types
+     * will be set to null if the argument given is not an array
+     * 
+     * @param array Supported package types
+     */
+    public function setSupportedPackageTypes($supported_package_types) {
+        $this->_supported_package_types = null;
+        if(is_array($supported_package_types)) {
+            foreach($supported_package_types as $package_type) {
+                if(in_array($package_type, PENSConfig::$allowed_package_types)) {
+                    $this->_supported_package_types[] = $package_type;
+                }
+            }
+        }
+    }
 	
-	public function getSupportedPackageFormats() {
-		return $this->_supported_package_formats;
-	}
+    public function getSupportedPackageFormats() {
+        return $this->_supported_package_formats;
+    }
 	
-	/**
-	 * Sets the supported package formats. All package types in the array provided as an argument
-	 * not present in PENSConfig::$allowed_package_formats will be ignored. The supported_package_formats
-	 * will be set to null if the argument given is not an array.
-	 * 
-	 * @param array Supported package formats
-	 */
-	public function setSupportedPackageFormats($supported_package_formats) {
-		$this->_supported_package_formats = null;
-		if(is_array($supported_package_formats)) {
-			foreach($supported_package_formats as $package_format) {
-				if(in_array($package_format, PENSConfig::$allowed_package_formats)) {
-					$this->_supported_package_formats[] = $package_format;
-				}
-			}
-		}
-	}
+    /**
+     * Sets the supported package formats. All package types in the array provided as an argument
+     * not present in PENSConfig::$allowed_package_formats will be ignored. The supported_package_formats
+     * will be set to null if the argument given is not an array.
+     * 
+     * @param array Supported package formats
+     */
+    public function setSupportedPackageFormats($supported_package_formats) {
+        $this->_supported_package_formats = null;
+        if(is_array($supported_package_formats)) {
+            foreach($supported_package_formats as $package_format) {
+                if(in_array($package_format, PENSConfig::$allowed_package_formats)) {
+                    $this->_supported_package_formats[] = $package_format;
+                }
+            }
+        }
+    }
 	
-	/**
-	 * Processes the package. Must be implemented by subclasses
-	 * 
-	 * @param PENSRequestCollect Collect request sent by the client
-	 * @param string Path to the collected package on the hard drive
-	 */
-	abstract public function processPackage($request, $path_to_package);
+    /**
+     * Processes the package. Must be implemented by subclasses
+     * 
+     * @param PENSRequestCollect Collect request sent by the client
+     * @param string Path to the collected package on the hard drive
+     */
+    abstract public function processPackage($request, $path_to_package);
 	
 }

Spacing +6 added lines, -6 removed lines

@@ -72,9 +72,9 @@ 
 	 */
 	public function setSupportedPackageTypes($supported_package_types) {
 		$this->_supported_package_types = null;
-		if(is_array($supported_package_types)) {
-			foreach($supported_package_types as $package_type) {
-				if(in_array($package_type, PENSConfig::$allowed_package_types)) {
+		if (is_array($supported_package_types)) {
+			foreach ($supported_package_types as $package_type) {
+				if (in_array($package_type, PENSConfig::$allowed_package_types)) {
 					$this->_supported_package_types[] = $package_type;
 				}
 			}
@@ -94,9 +94,9 @@ 
 	 */
 	public function setSupportedPackageFormats($supported_package_formats) {
 		$this->_supported_package_formats = null;
-		if(is_array($supported_package_formats)) {
-			foreach($supported_package_formats as $package_format) {
-				if(in_array($package_format, PENSConfig::$allowed_package_formats)) {
+		if (is_array($supported_package_formats)) {
+			foreach ($supported_package_formats as $package_format) {
+				if (in_array($package_format, PENSConfig::$allowed_package_formats)) {
 					$this->_supported_package_formats[] = $package_format;
 				}
 			}

plugin/pens/lib/pens/pens_request_handler.php

Indentation +16 added lines, -16 removed lines

@@ -16,15 +16,15 @@ 
  * along with php-pens.  If not, see <http://www.gnu.org/licenses/>.
  */
  
- /**
- * PENSRequestHandler
- * 
- * Provides the PENSRequestHandler abstract class
- * 
- * @package PENS
- * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
- * @licence http://www.gnu.org/licenses/gpl.txt
- */
+    /**
+     * PENSRequestHandler
+     * 
+     * Provides the PENSRequestHandler abstract class
+     * 
+     * @package PENS
+     * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
+     * @licence http://www.gnu.org/licenses/gpl.txt
+     */
 
 /**
  * PENSRequestHandler
@@ -37,12 +37,12 @@ 
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 abstract class PENSRequestHandler {
-	/**
-	 * Processes the request. Must be implemented by subclasses
-	 * 
-	 * @param PENSRequest Alert or Receipt request sent by the server
-	 * @param PENSResponse Response sent by the server (error, error-text etc...)
-	 */
-	abstract public function processRequest($request, $response);
+    /**
+     * Processes the request. Must be implemented by subclasses
+     * 
+     * @param PENSRequest Alert or Receipt request sent by the server
+     * @param PENSResponse Response sent by the server (error, error-text etc...)
+     */
+    abstract public function processRequest($request, $response);
 }
 

plugin/pens/lib/pens/pens_request_receipt.php

Indentation +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@
 
 class PENSRequestReceipt extends PENSRequest {
 	
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->setCommand("receipt");
-	}
+    public function __construct($arguments) {
+        parent::__construct($arguments);
+        $this->setCommand("receipt");
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 
-require_once __DIR__ . '/pens_request.php';
+require_once __DIR__.'/pens_request.php';
 
 /**
  * PENSRequestReceipt

plugin/pens/lib/pens/pens_server.php

Indentation +260 added lines, -260 removed lines

@@ -16,15 +16,15 @@ 
  * along with php-pens.  If not, see <http://www.gnu.org/licenses/>.
  */
  
- /**
- * PENSServer
- * 
- * Provides the PENSServer class
- * 
- * @package PENS
- * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
- * @licence http://www.gnu.org/licenses/gpl.txt
- */
+    /**
+     * PENSServer
+     * 
+     * Provides the PENSServer class
+     * 
+     * @package PENS
+     * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
+     * @licence http://www.gnu.org/licenses/gpl.txt
+     */
 
 require_once __DIR__ . '/pens_controller.php';
 require_once __DIR__ . '/pens_package_handler.php';
@@ -42,272 +42,272 @@ 
  */
 class PENSServer extends PENSController {
 
-	/**
-	 * Instance of the PENSServer
-	 * @var PENSServer
-	 */
-	private static $_instance;
+    /**
+     * Instance of the PENSServer
+     * @var PENSServer
+     */
+    private static $_instance;
 	
-	/**
-	 * Package handler
-	 * @var PENSPackageHandler
-	 */
-	protected $_package_handler = null;
+    /**
+     * Package handler
+     * @var PENSPackageHandler
+     */
+    protected $_package_handler = null;
 	
-	/**
-	 * Private constructor
-	 */
-	private function __construct() {
-	}
+    /**
+     * Private constructor
+     */
+    private function __construct() {
+    }
 	
-	/**
-	 * Singleton method
-	 */
-	public static function singleton() {
-		if(!isset(self::$_instance)) {
-			$c = __CLASS__;
-			self::$_instance = new $c;
-		}
-		return self::$_instance;
-	}
+    /**
+     * Singleton method
+     */
+    public static function singleton() {
+        if(!isset(self::$_instance)) {
+            $c = __CLASS__;
+            self::$_instance = new $c;
+        }
+        return self::$_instance;
+    }
 	
-	/**
-	 * Prevent users to clone the instance
-	 */
-	public function __clone() {
-		trigger_error('Clone is not allowed', E_USER_ERROR);
-	}
+    /**
+     * Prevent users to clone the instance
+     */
+    public function __clone() {
+        trigger_error('Clone is not allowed', E_USER_ERROR);
+    }
 	
-	public function getPackageHandler() {
-		return $this->_package_handler;
-	}
+    public function getPackageHandler() {
+        return $this->_package_handler;
+    }
 	
-	/**
-	 * Sets the package handler. Does nothing if the argument is not an instance of PENSPackageHandler
-	 * 
-	 * @param PENSPackageHandler Package handler
-	 */
-	public function setPackageHandler($package_handler) {
-		if($package_handler instanceof PENSPackageHandler) {
-			$this->_package_handler = $package_handler;
-		}
-	}
+    /**
+     * Sets the package handler. Does nothing if the argument is not an instance of PENSPackageHandler
+     * 
+     * @param PENSPackageHandler Package handler
+     */
+    public function setPackageHandler($package_handler) {
+        if($package_handler instanceof PENSPackageHandler) {
+            $this->_package_handler = $package_handler;
+        }
+    }
 	
-	/**
-	 * Receives a collect request and treats it
-	 */
-	public function receiveCollect() {
-		$request = null;
-		try {
-			// First, try to parse the request
-			$request = $this->parseRequest();
-			if($request->getCommand() == "collect") {
-				if(isset($_REQUEST['process'])) {
-					// Collect the package and process it
-					$receipt = null;
-					$path_to_package = null;
-					try {
-						// Collect the package
-						$path_to_package = $this->collectPackage($request);
-						$receipt = new PENSResponse(0, "package successfully collected");
-					} catch(PENSException $e) {
-						$receipt = new PENSResponse($e);
-					}
-					// Send receipt
-					$response = $this->sendReceipt($request, $receipt);
-					if(!is_null($response) && !is_null($path_to_package)) {
-						if($response->getError() === 0) {
-							// Process package
-							$this->processPackage($request, $path_to_package);
-						}
-						unlink($path_to_package);
-					}
-				} else {
-					// Then, send a success response to the client
-					$this->sendResponse(new PENSResponse(0, "collect command received and understood"));
-					// Send a request to process the package: fake multithreading
-					$params = $_REQUEST;
-					$params['process'] = 1;
-					$scheme = "http";
-					if(!empty($_SERVER['HTTPS'])) {
-						$scheme = "https";
-					}
-					$ch = curl_init();
-					curl_setopt($ch, CURLOPT_URL, $scheme."://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
-					curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
-					curl_setopt($ch, CURLOPT_TIMEOUT, 1);
-					curl_exec($ch);
-					curl_close($ch);
-				}
-			}
+    /**
+     * Receives a collect request and treats it
+     */
+    public function receiveCollect() {
+        $request = null;
+        try {
+            // First, try to parse the request
+            $request = $this->parseRequest();
+            if($request->getCommand() == "collect") {
+                if(isset($_REQUEST['process'])) {
+                    // Collect the package and process it
+                    $receipt = null;
+                    $path_to_package = null;
+                    try {
+                        // Collect the package
+                        $path_to_package = $this->collectPackage($request);
+                        $receipt = new PENSResponse(0, "package successfully collected");
+                    } catch(PENSException $e) {
+                        $receipt = new PENSResponse($e);
+                    }
+                    // Send receipt
+                    $response = $this->sendReceipt($request, $receipt);
+                    if(!is_null($response) && !is_null($path_to_package)) {
+                        if($response->getError() === 0) {
+                            // Process package
+                            $this->processPackage($request, $path_to_package);
+                        }
+                        unlink($path_to_package);
+                    }
+                } else {
+                    // Then, send a success response to the client
+                    $this->sendResponse(new PENSResponse(0, "collect command received and understood"));
+                    // Send a request to process the package: fake multithreading
+                    $params = $_REQUEST;
+                    $params['process'] = 1;
+                    $scheme = "http";
+                    if(!empty($_SERVER['HTTPS'])) {
+                        $scheme = "https";
+                    }
+                    $ch = curl_init();
+                    curl_setopt($ch, CURLOPT_URL, $scheme."://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+                    curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+                    curl_setopt($ch, CURLOPT_TIMEOUT, 1);
+                    curl_exec($ch);
+                    curl_close($ch);
+                }
+            }
 				
-		} catch(PENSException $e) {
-			// If we could not parse the request, send the error back to the client
-			$this->sendResponse(new PENSResponse($e));
-		}
-	}
+        } catch(PENSException $e) {
+            // If we could not parse the request, send the error back to the client
+            $this->sendResponse(new PENSResponse($e));
+        }
+    }
 	
-	/**
-	 * Collects the package onto the local server
-	 * 
-	 * @param PENSRequest request
-	 * @return string Path to the package on the hard drive
-	 * @throws PENSException if an exception occured
-	 */
-	protected function collectPackage($request) {
-		$supported_package_types = $this->_package_handler->getSupportedPackageTypes();
-		if(!in_array($request->getPackageType(), $supported_package_types)) {
-			throw new PENSException(1430);
-		}
-		$supported_package_formats = $this->_package_handler->getSupportedPackageFormats();
-		if(!in_array($request->getPackageFormat(), $supported_package_formats)) {
-			throw new PENSException(1431);
-		}
-		if(!$this->isExpiryDateValid($request->getPackageUrlExpiry())) {
-			throw new PENSException(1322);
-		}
+    /**
+     * Collects the package onto the local server
+     * 
+     * @param PENSRequest request
+     * @return string Path to the package on the hard drive
+     * @throws PENSException if an exception occured
+     */
+    protected function collectPackage($request) {
+        $supported_package_types = $this->_package_handler->getSupportedPackageTypes();
+        if(!in_array($request->getPackageType(), $supported_package_types)) {
+            throw new PENSException(1430);
+        }
+        $supported_package_formats = $this->_package_handler->getSupportedPackageFormats();
+        if(!in_array($request->getPackageFormat(), $supported_package_formats)) {
+            throw new PENSException(1431);
+        }
+        if(!$this->isExpiryDateValid($request->getPackageUrlExpiry())) {
+            throw new PENSException(1322);
+        }
 		
-		// Try to download the package in the temporary directory
-		$tmp = null;
-		if(function_exists("sys_get_temp_dir")) {
-			$tmp = sys_get_temp_dir();
-		} else {
-			$tmp = "/tmp";
-		}
-		$path_to_file = $tmp."/".$request->getFilename();
-		$fp = fopen($path_to_file, 'w');
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $request->getPackageUrl());
-		curl_setopt($ch, CURLOPT_HEADER, false);	
-		curl_setopt($ch, CURLOPT_FILE, $fp);
-		if(!is_null($request->getPackageUrlUserId())) {
-			curl_setopt($ch, CURLOPT_USERPWD, $request->getPackageUrlUserId().":".$request->getPackageUrlPassword());
-		}
-		if(curl_exec($ch) === false) {
-			$errno = curl_errno($ch);
-			curl_close($ch);
-			// Error occured. Throw an exception
-			switch($errno) {
-				case CURLE_UNSUPPORTED_PROTOCOL:
-					throw new PENSException(1301);
-					break;
-				case CURLE_URL_MALFORMAT:
-				case CURLE_COULDNT_RESOLVE_PROXY:
-				case CURLE_COULDNT_RESOLVE_HOST:
-				case CURLE_COULDNT_CONNECT:
-				case CURLE_OPERATION_TIMEOUT:
-				case CURLE_REMOTE_FILE_NOT_FOUND:
-					throw new PENSException(1310);
-					break;
-				case CURLE_REMOTE_ACCESS_DENIED:
-					throw new PENSException(1312);
-					break;
-				default:
-					throw new PENSException(1301);
-					break;
-			}
-			return null;
+        // Try to download the package in the temporary directory
+        $tmp = null;
+        if(function_exists("sys_get_temp_dir")) {
+            $tmp = sys_get_temp_dir();
+        } else {
+            $tmp = "/tmp";
+        }
+        $path_to_file = $tmp."/".$request->getFilename();
+        $fp = fopen($path_to_file, 'w');
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $request->getPackageUrl());
+        curl_setopt($ch, CURLOPT_HEADER, false);	
+        curl_setopt($ch, CURLOPT_FILE, $fp);
+        if(!is_null($request->getPackageUrlUserId())) {
+            curl_setopt($ch, CURLOPT_USERPWD, $request->getPackageUrlUserId().":".$request->getPackageUrlPassword());
+        }
+        if(curl_exec($ch) === false) {
+            $errno = curl_errno($ch);
+            curl_close($ch);
+            // Error occured. Throw an exception
+            switch($errno) {
+                case CURLE_UNSUPPORTED_PROTOCOL:
+                    throw new PENSException(1301);
+                    break;
+                case CURLE_URL_MALFORMAT:
+                case CURLE_COULDNT_RESOLVE_PROXY:
+                case CURLE_COULDNT_RESOLVE_HOST:
+                case CURLE_COULDNT_CONNECT:
+                case CURLE_OPERATION_TIMEOUT:
+                case CURLE_REMOTE_FILE_NOT_FOUND:
+                    throw new PENSException(1310);
+                    break;
+                case CURLE_REMOTE_ACCESS_DENIED:
+                    throw new PENSException(1312);
+                    break;
+                default:
+                    throw new PENSException(1301);
+                    break;
+            }
+            return null;
 				
-		} else {
-			curl_close($ch);
-			return $path_to_file;
-		}
-	}
+        } else {
+            curl_close($ch);
+            return $path_to_file;
+        }
+    }
 	
-	/**
-	 * Verifies that the package url is not expired
-	 * 
-	 * @param DateTime DateTime object to verify against current time
-	 */
-	protected function isExpiryDateValid($expiry) {
-		date_default_timezone_set('UTC');
-		$current_time = time();
-		$expiry_time = strtotime($expiry->format(DateTime::ISO8601));
-		if($current_time > $expiry_time) {
-			return false;
-		} else {
-			return true;
-		}
-	}
+    /**
+     * Verifies that the package url is not expired
+     * 
+     * @param DateTime DateTime object to verify against current time
+     */
+    protected function isExpiryDateValid($expiry) {
+        date_default_timezone_set('UTC');
+        $current_time = time();
+        $expiry_time = strtotime($expiry->format(DateTime::ISO8601));
+        if($current_time > $expiry_time) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 	
-	/**
-	 * Sends an alert or a receipt. Called by sendReceipt and sendAlert
-	 * 
-	 * @param PENSRequest Original collect request
-	 * @param PENSResponse Reponse to send in the receipt or the alert
-	 * @param string Mode (alert | receipt)
-	 * @return PENSResponse Response
-	 */
-	protected function sendAlertOrReceipt($request, $response, $mode) {
-		if($mode == "alert") {
-			$url = $request->getAlerts();
-		} else {
-			$url = $request->getReceipt();
-		}
-		if(!empty($url)) {
-			$url_components = parse_url($url);
-			$scheme = $url_components["scheme"];
-			if($scheme == "mailto") {
-				$to = $url_components["path"];
-				if($mode == "alert") {
-					$subject = "PENS Alert for ".$request->getPackageId();
-				} else {
-					$subject = "PENS Receipt for ".$request->getPackageId();
-				}
-				$message = $response->__toString();
-				mail($to, $subject, $message);
-				return new PENSResponse(0, "");
-			} else if($scheme == "http" || $scheme == "https") {
-				if($mode == "alert") {
-					$params = array_merge($request->getSendAlertArray(), $response->getArray());
-				} else {
-					$params = array_merge($request->getSendReceiptArray(), $response->getArray());
-				}
-				$ch = curl_init($url);
-				curl_setopt($ch, CURLOPT_POST, true);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
-				curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-				$data = curl_exec($ch);
-				curl_close($ch);
-				if($data === false) {
-					return null;
-				} else {
-					return new PENSResponse($data);
-				}
-			}
-		}
-	}
+    /**
+     * Sends an alert or a receipt. Called by sendReceipt and sendAlert
+     * 
+     * @param PENSRequest Original collect request
+     * @param PENSResponse Reponse to send in the receipt or the alert
+     * @param string Mode (alert | receipt)
+     * @return PENSResponse Response
+     */
+    protected function sendAlertOrReceipt($request, $response, $mode) {
+        if($mode == "alert") {
+            $url = $request->getAlerts();
+        } else {
+            $url = $request->getReceipt();
+        }
+        if(!empty($url)) {
+            $url_components = parse_url($url);
+            $scheme = $url_components["scheme"];
+            if($scheme == "mailto") {
+                $to = $url_components["path"];
+                if($mode == "alert") {
+                    $subject = "PENS Alert for ".$request->getPackageId();
+                } else {
+                    $subject = "PENS Receipt for ".$request->getPackageId();
+                }
+                $message = $response->__toString();
+                mail($to, $subject, $message);
+                return new PENSResponse(0, "");
+            } else if($scheme == "http" || $scheme == "https") {
+                if($mode == "alert") {
+                    $params = array_merge($request->getSendAlertArray(), $response->getArray());
+                } else {
+                    $params = array_merge($request->getSendReceiptArray(), $response->getArray());
+                }
+                $ch = curl_init($url);
+                curl_setopt($ch, CURLOPT_POST, true);
+                curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+                curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+                $data = curl_exec($ch);
+                curl_close($ch);
+                if($data === false) {
+                    return null;
+                } else {
+                    return new PENSResponse($data);
+                }
+            }
+        }
+    }
 	
-	/**
-	 * Sends a receipt. Returns a PENSResponse in case of success, null if a problem occured
-	 * 
-	 * @param PENSRequest Original collect request
-	 * @param PENSResponse Response to send in the receipt
-	 * @return PENSResponse Response
-	 */
-	protected function sendReceipt($request, $receipt) {
-		return $this->sendAlertOrReceipt($request, $receipt, "receipt");
-	}
+    /**
+     * Sends a receipt. Returns a PENSResponse in case of success, null if a problem occured
+     * 
+     * @param PENSRequest Original collect request
+     * @param PENSResponse Response to send in the receipt
+     * @return PENSResponse Response
+     */
+    protected function sendReceipt($request, $receipt) {
+        return $this->sendAlertOrReceipt($request, $receipt, "receipt");
+    }
 	
-	/**
-	 * Processes the package using the handler provided
-	 * 
-	 * @param PENSRequest Original collect request
-	 * @param string Path to the package on the hard drive
-	 */
-	protected function processPackage($request, $path_to_package) {
-		return $this->_package_handler->processPackage($request, $path_to_package);
-	}
+    /**
+     * Processes the package using the handler provided
+     * 
+     * @param PENSRequest Original collect request
+     * @param string Path to the package on the hard drive
+     */
+    protected function processPackage($request, $path_to_package) {
+        return $this->_package_handler->processPackage($request, $path_to_package);
+    }
 	
-	/**
-	 * Sends an alert to the client. Returns a PENSResponse in case of success, null if a problem occured
-	 * 
-	 * @param PENSRequest Original collect request
-	 * @param PENSResponse Response to send in the alert
-	 * @return PENSResponse Response
-	 */
-	public function sendAlert($request, $alert) {
-		return $this->sendAlertOrReceipt($request, $alert, "alert");
-	}
+    /**
+     * Sends an alert to the client. Returns a PENSResponse in case of success, null if a problem occured
+     * 
+     * @param PENSRequest Original collect request
+     * @param PENSResponse Response to send in the alert
+     * @return PENSResponse Response
+     */
+    public function sendAlert($request, $alert) {
+        return $this->sendAlertOrReceipt($request, $alert, "alert");
+    }
 	
 }

Spacing +28 added lines, -28 removed lines

@@ -26,10 +26,10 @@ 
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
 
-require_once __DIR__ . '/pens_controller.php';
-require_once __DIR__ . '/pens_package_handler.php';
-require_once __DIR__ . '/pens_exception.php';
-require_once __DIR__ . '/pens_response.php';
+require_once __DIR__.'/pens_controller.php';
+require_once __DIR__.'/pens_package_handler.php';
+require_once __DIR__.'/pens_exception.php';
+require_once __DIR__.'/pens_response.php';
 
 /**
  * PENSServer
@@ -64,7 +64,7 @@ 
 	 * Singleton method
 	 */
 	public static function singleton() {
-		if(!isset(self::$_instance)) {
+		if (!isset(self::$_instance)) {
 			$c = __CLASS__;
 			self::$_instance = new $c;
 		}
@@ -88,7 +88,7 @@ 
 	 * @param PENSPackageHandler Package handler
 	 */
 	public function setPackageHandler($package_handler) {
-		if($package_handler instanceof PENSPackageHandler) {
+		if ($package_handler instanceof PENSPackageHandler) {
 			$this->_package_handler = $package_handler;
 		}
 	}
@@ -101,8 +101,8 @@ 
 		try {
 			// First, try to parse the request
 			$request = $this->parseRequest();
-			if($request->getCommand() == "collect") {
-				if(isset($_REQUEST['process'])) {
+			if ($request->getCommand() == "collect") {
+				if (isset($_REQUEST['process'])) {
 					// Collect the package and process it
 					$receipt = null;
 					$path_to_package = null;
@@ -110,13 +110,13 @@ 
 						// Collect the package
 						$path_to_package = $this->collectPackage($request);
 						$receipt = new PENSResponse(0, "package successfully collected");
-					} catch(PENSException $e) {
+					} catch (PENSException $e) {
 						$receipt = new PENSResponse($e);
 					}
 					// Send receipt
 					$response = $this->sendReceipt($request, $receipt);
-					if(!is_null($response) && !is_null($path_to_package)) {
-						if($response->getError() === 0) {
+					if (!is_null($response) && !is_null($path_to_package)) {
+						if ($response->getError() === 0) {
 							// Process package
 							$this->processPackage($request, $path_to_package);
 						}
@@ -129,7 +129,7 @@ 
 					$params = $_REQUEST;
 					$params['process'] = 1;
 					$scheme = "http";
-					if(!empty($_SERVER['HTTPS'])) {
+					if (!empty($_SERVER['HTTPS'])) {
 						$scheme = "https";
 					}
 					$ch = curl_init();
@@ -141,7 +141,7 @@ 
 				}
 			}
 				
-		} catch(PENSException $e) {
+		} catch (PENSException $e) {
 			// If we could not parse the request, send the error back to the client
 			$this->sendResponse(new PENSResponse($e));
 		}
@@ -156,20 +156,20 @@ 
 	 */
 	protected function collectPackage($request) {
 		$supported_package_types = $this->_package_handler->getSupportedPackageTypes();
-		if(!in_array($request->getPackageType(), $supported_package_types)) {
+		if (!in_array($request->getPackageType(), $supported_package_types)) {
 			throw new PENSException(1430);
 		}
 		$supported_package_formats = $this->_package_handler->getSupportedPackageFormats();
-		if(!in_array($request->getPackageFormat(), $supported_package_formats)) {
+		if (!in_array($request->getPackageFormat(), $supported_package_formats)) {
 			throw new PENSException(1431);
 		}
-		if(!$this->isExpiryDateValid($request->getPackageUrlExpiry())) {
+		if (!$this->isExpiryDateValid($request->getPackageUrlExpiry())) {
 			throw new PENSException(1322);
 		}
 		
 		// Try to download the package in the temporary directory
 		$tmp = null;
-		if(function_exists("sys_get_temp_dir")) {
+		if (function_exists("sys_get_temp_dir")) {
 			$tmp = sys_get_temp_dir();
 		} else {
 			$tmp = "/tmp";
@@ -180,14 +180,14 @@ 
 		curl_setopt($ch, CURLOPT_URL, $request->getPackageUrl());
 		curl_setopt($ch, CURLOPT_HEADER, false);	
 		curl_setopt($ch, CURLOPT_FILE, $fp);
-		if(!is_null($request->getPackageUrlUserId())) {
+		if (!is_null($request->getPackageUrlUserId())) {
 			curl_setopt($ch, CURLOPT_USERPWD, $request->getPackageUrlUserId().":".$request->getPackageUrlPassword());
 		}
-		if(curl_exec($ch) === false) {
+		if (curl_exec($ch) === false) {
 			$errno = curl_errno($ch);
 			curl_close($ch);
 			// Error occured. Throw an exception
-			switch($errno) {
+			switch ($errno) {
 				case CURLE_UNSUPPORTED_PROTOCOL:
 					throw new PENSException(1301);
 					break;
@@ -223,7 +223,7 @@ 
 		date_default_timezone_set('UTC');
 		$current_time = time();
 		$expiry_time = strtotime($expiry->format(DateTime::ISO8601));
-		if($current_time > $expiry_time) {
+		if ($current_time > $expiry_time) {
 			return false;
 		} else {
 			return true;
@@ -239,17 +239,17 @@ 
 	 * @return PENSResponse Response
 	 */
 	protected function sendAlertOrReceipt($request, $response, $mode) {
-		if($mode == "alert") {
+		if ($mode == "alert") {
 			$url = $request->getAlerts();
 		} else {
 			$url = $request->getReceipt();
 		}
-		if(!empty($url)) {
+		if (!empty($url)) {
 			$url_components = parse_url($url);
 			$scheme = $url_components["scheme"];
-			if($scheme == "mailto") {
+			if ($scheme == "mailto") {
 				$to = $url_components["path"];
-				if($mode == "alert") {
+				if ($mode == "alert") {
 					$subject = "PENS Alert for ".$request->getPackageId();
 				} else {
 					$subject = "PENS Receipt for ".$request->getPackageId();
@@ -257,8 +257,8 @@ 
 				$message = $response->__toString();
 				mail($to, $subject, $message);
 				return new PENSResponse(0, "");
-			} else if($scheme == "http" || $scheme == "https") {
-				if($mode == "alert") {
+			} else if ($scheme == "http" || $scheme == "https") {
+				if ($mode == "alert") {
 					$params = array_merge($request->getSendAlertArray(), $response->getArray());
 				} else {
 					$params = array_merge($request->getSendReceiptArray(), $response->getArray());
@@ -269,7 +269,7 @@ 
 				curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 				$data = curl_exec($ch);
 				curl_close($ch);
-				if($data === false) {
+				if ($data === false) {
 					return null;
 				} else {
 					return new PENSResponse($data);