chamilo / chamilo-lms

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

plugin/pens/lib/pens/pens_request_factory.php

Indentation +22 added lines, -22 removed lines

@@ -43,26 +43,26 @@
  */
 class PENSRequestFactory {
 
-	/**
-	 * Factory method
-	 * 
-	 * Creates the right PENSRequest object, based on the command inside the arguments
-	 * 
-	 * @param array Associative array of arguments
-	 * @return mixed PENSRequestAlert or PENSRequestCollect or PENSRequestReceipt
-	 * 
-	 * @throws PENSException with code 2002 if command is invalid
-	 */
-	public static function createPENSRequest($arguments) {
-		$command = $arguments["command"];
-		if($command == "alert") {
-			return new PENSRequestAlert($arguments);
-		} else if($command == "collect") {
-			return new PENSRequestCollect($arguments);
-		} else if($command == "receipt") {
-			return new PENSRequestReceipt($arguments);
-		} else {
-			throw new PENSException(2002);
-		}
-	}
+    /**
+     * Factory method
+     * 
+     * Creates the right PENSRequest object, based on the command inside the arguments
+     * 
+     * @param array Associative array of arguments
+     * @return mixed PENSRequestAlert or PENSRequestCollect or PENSRequestReceipt
+     * 
+     * @throws PENSException with code 2002 if command is invalid
+     */
+    public static function createPENSRequest($arguments) {
+        $command = $arguments["command"];
+        if($command == "alert") {
+            return new PENSRequestAlert($arguments);
+        } else if($command == "collect") {
+            return new PENSRequestCollect($arguments);
+        } else if($command == "receipt") {
+            return new PENSRequestReceipt($arguments);
+        } else {
+            throw new PENSException(2002);
+        }
+    }
 }

plugin/pens/lib/pens/pens_request.php

Indentation +462 added lines, -462 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 /**
- * This file is part of php-pens.
- * 
- * php-pens is free software: you can redistribute it and/or modify 
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * php-pens is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with php-pens.  If not, see <http://www.gnu.org/licenses/>.
- */
+     * This file is part of php-pens.
+     * 
+     * php-pens is free software: you can redistribute it and/or modify 
+     * it under the terms of the GNU General Public License as published by
+     * the Free Software Foundation, either version 3 of the License, or
+     * (at your option) any later version.
+     * 
+     * php-pens is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * 
+     * You should have received a copy of the GNU General Public License
+     * along with php-pens.  If not, see <http://www.gnu.org/licenses/>.
+     */
 
 /**
  * PENSRequest
@@ -43,453 +43,453 @@ 
 
 abstract class PENSRequest extends PENSMessage {
 
-	/**
-	 * PENS Version to be used. Currently, the only valid value is 1.0.0. Required.
-	 * @var string
-	 */
-	protected $_pens_version = null;
-	
-	/**
-	 * Command being used. The only valid values are collect, alert and receipt.Required
-	 * @var string
-	 */
-	protected $_command = null;
-	
-	/**
-	 * Package type being used. The only valid values are aicc-pkg, scorm-pif, ims-qti. Required
-	 * @var string
-	 */
-	protected $_package_type = null;
-	
-	/**
-	 * Package type version. Required
-	 * @var string
-	 */
-	protected $_package_type_version = null;
-	
-	/**
-	 * Package format. The only valid values are zip, url, jar, war and xml. Required
-	 * @var string
-	 */
-	protected $_package_format = null;
-	
-	/**
-	 * Package id. Requires a valid URI according to RFC 2396. Required
-	 * @var string
-	 */
-	protected $_package_id = null;
-	
-	/**
-	 * Package url. Requires a valid, fully qualified URL including transport protocol and filename extension. Required
-	 * @var string
-	 */
-	protected $_package_url = null;
-	
-	/**
-	 * User id required for system to retrieve package from URL. Optional.
-	 * @var string
-	 */
-	protected $_package_url_user_id = null;
-	
-	/**
-	 * Account required for system to retrieve package from URL. Optional.
-	 * @var string
-	 */
-	protected $_package_url_account = null;
-	
-	/**
-	 * Password required for system to retrieve package from URL. Optional.
-	 * @var string
-	 */
-	protected $_package_url_password = null;
-	
-	/**
-	 * Expiry date for package URL. ISO 8601 format expressed as UTC. Will be transformed into a PHP DateTime object during construction. Required
-	 * @var DateTime
-	 */
-	protected $_package_url_expiry = null;
-	
-	/**
-	 * Name or ID for client submitting the content package to the target system. Required.
-	 * @var string
-	 */
-	protected $_client = null;
-	
-	/**
-	 * User-id or sign-on for target system. Optional
-	 * @var string
-	 */
-	protected $_system_user_id = null;
-	
-	/**
-	 * Either a URL-encoded password token or the null string. If the 
-	 * target system requires a password and the null string value is 
-	 * passed, then the target system is responsible for prompting for a 
-	 * password for target system. Optional
-	 * @var string
-	 */
-	protected $_system_password = null;
-	
-	/**
-	 * URL to send acknowledgement receipt after collecting a package. Any URL, including mailto (as per RFC 2368 and RFC 2822). Required.
-	 * @var string
-	 */
-	protected $_receipt = null;
-	
-	/**
-	 * URL to send alerts to while processing the package. Any URL, including mailto (as per RFC 2368 and RFC 2822). Optional.
-	 * @var string
-	 */
-	protected $_alerts = null;
-	
-	/**
-	 * Unstructured character string that may be used to transfer vendor-specific data such as processing hints or deployment information. Optional.
-	 * @var string
-	 */
-	protected $_vendor_data = null;
-	
-	/**
-	 * Constructor
-	 * 
-	 * Constructs a PENSRequest based class using the arguments given
-	 * 
-	 * @param array Arguments
-	 */
-	public function __construct($arguments) {
-		$this->setPensVersion($arguments["pens-version"]);
-		$this->setPackageType($arguments["package-type"]);
-		$this->setPackageTypeVersion($arguments["package-type-version"]);
-		$this->setPackageFormat($arguments["package-format"]);
-		$this->setPackageId($arguments["package-id"]);
-		$this->setPackageUrl($arguments["package-url"]);
-		$this->setPackageUrlUserId($arguments["package-url-user-id"]);
-		$this->setPackageUrlAccount($arguments["package-url-account"]);
-		$this->setPackageUrlPassword($arguments["package-url-password"]);
-		$this->setPackageUrlExpiry($arguments["package-url-expiry"]);
-		$this->setClient($arguments["client"]);
-		$this->setSystemUserId($arguments["system-user-id"]);
-		$this->setSystemPassword($arguments["system-password"]);
-		$this->setReceipt($arguments["receipt"]);
-		$this->setAlerts($arguments["alerts"]);
-		$this->setVendorData($arguments["vendor-data"]);
-	}
-	
-	public function getPensVersion() {
-		return $this->_pens_version;
-	}
-	
-	/**
-	 * Sets the PENS version
-	 * 
-	 * @param string PENS version
-	 * 
-	 * @throws PENSException with code 2001 if invalid
-	 */
-	public function setPensVersion($pens_version) {
-		if($pens_version == PENSConfig::$version) {
-			$this->_pens_version = $pens_version;
-		} else {
-			throw new PENSException(2001);
-		}
-	}
-	
-	public function getCommand() {
-		return $this->_command;
-	}
-	
-	/**
-	 * Sets the command
-	 * 
-	 * @param string command
-	 * 
-	 * @throws PENSException with code 2002 if invalid
-	 */
-	protected function setCommand($command) {
-		if(in_array($command, PENSConfig::$allowed_commands)) {
-			$this->_command = $command;
-		} else {
-			throw new PENSException(2002);
-		}
-	}
-	
-	public function getPackageType() {
-		return $this->_package_type;
-	}
-	
-	/**
-	 * Sets the package type
-	 * 
-	 * @param string package type
-	 * 
-	 * @throws PENSException with code 2003 if invalid
-	 */
-	public function setPackageType($package_type) {
-		if(in_array($package_type, PENSConfig::$allowed_package_types)) {
-			$this->_package_type = $package_type;
-		} else {
-			throw new PENSException(2003);
-		}
-	}
-	
-	public function getPackageTypeVersion() {
-		return $this->_package_type_version;
-	}
-	
-	/**
-	 * Sets the package type version
-	 * 
-	 * @param string package type version
-	 * 
-	 * @throws PENSException with code 2004 if invalid
-	 */
-	public function setPackageTypeVersion($package_type_version) {
-		if(empty($package_type_version)) {
-			throw new PENSException(2004);
-		} else {
-			$this->_package_type_version = $package_type_version;
-		}
-	}
-	
-	public function getPackageFormat() {
-		return $this->_package_format;
-	}
-	
-	/**
-	 * Sets the package format
-	 * 
-	 * @param string package format
-	 * 
-	 * @throws PENSException with code 2005 if invalid
-	 */
-	public function setPackageFormat($package_format) {
-		if(in_array($package_format, PENSConfig::$allowed_package_formats)) {
-			$this->_package_format = $package_format;
-		} else {
-			throw new PENSException(2005);
-		}
-	}
-	
-	public function getPackageId() {
-		return $this->_package_id;
-	}
-	
-	/**
-	 * Sets the package Id
-	 * 
-	 * @param string package Id
-	 * 
-	 * @throws PENSException with code 2007 if invalid
-	 */
-	public function setPackageId($package_id) {
-		if (preg_match('/'.ABSOLUTEURI_2396.'/', $package_id)) {
-			$this->_package_id = $package_id;
-		} else {
-			throw new PENSException(2007);
-		}
-	}
-	
-	public function getPackageUrl() {
-		return $this->_package_url;
-	}
-	
-	/**
-	 * Sets the package url
-	 * 
-	 * @param string package url
-	 * 
-	 * @throws PENSException with code 2008 if invalid
-	 */
-	public function setPackageUrl($package_url) {
-		if (preg_match('/'.ABSOLUTEURI_2396.'/', $package_url) && substr($package_url, -4) == ".".$this->_package_format) {
-			$this->_package_url = $package_url;
-		} else {
-			throw new PENSException(2008);
-		}
-	}
-	
-	public function getFilename() {
-		return substr(strrchr($this->_package_url, "/"), 1);
-	}
-	
-	public function getPackageUrlUserId() {
-		return $this->_package_url_user_id;
-	}
-	
-	public function setPackageUrlUserId($package_url_user_id) {
-		if(!empty($package_url_user_id)) {
-			$this->_package_url_user_id = $package_url_user_id;
-		}
-	}
-	
-	public function getPackageUrlAccount() {
-		return $this->_package_url_account;
-	}
-	
-	public function setPackageUrlAccount($package_url_account) {
-		if(!empty($package_url_account)) {
-			$this->_package_url_account = $package_url_account;
-		}
-	}
-	
-	public function getPackageUrlPassword() {
-		return $this->_package_url_password;
-	}
-	
-	public function setPackageUrlPassword($package_url_password) {
-		if(!empty($package_url_password)) {
-			$this->_package_url_password = $package_url_password;
-		}
-	}
-	
-	public function getPackageUrlExpiry() {
-		return $this->_package_url_expiry;
-	}
-	
-	/**
-	 * Sets the package url expiry and transforms it into a php DateTime object
-	 * 
-	 * @param string package url expiry
-	 * 
-	 * @throws PENSException with code 2009 if invalid
-	 * @todo Perform a better validation of the date
-	 */
-	public function setPackageUrlExpiry($package_url_expiry) {
-		if(empty($package_url_expiry)) {
-			throw new PENSException(2009);
-		} else {
-			try {
-				$expiry = new DateTime($package_url_expiry, new DateTimeZone('UTC'));
-				$this->_package_url_expiry = $expiry;
-			} catch(Exception $e) {
-				throw new PENSException(2009);
-			}
-		}
-	}
-	
-	public function getClient() {
-		return $this->_client;
-	}
-	
-	/**
-	 * Sets the client
-	 * 
-	 * @param string client
-	 * 
-	 * @throws PENSException with code 2010 if invalid
-	 */
-	public function setClient($client) {
-		if(!empty($client)) {
-			$this->_client = $client;
-		} else {
-			throw new PENSException(2010);
-		}
-	}
-	
-	public function getSystemUserId() {
-		return $this->_system_user_id;
-	}
-	
-	public function setSystemUserId($system_user_id) {
-		if(!empty($system_user_id)) {
-			$this->_system_user_id = $system_user_id;
-		}
-	}
-	
-	public function getSystemPassword() {
-		return $this->_system_password;
-	}
-	
-	public function setSystemPassword($system_password) {
-		if(!empty($system_password)) {
-			$this->_system_password = $system_password;
-		}
-	}
-	
-	public function getReceipt() {
-		return $this->_receipt;
-	}
-	
-	/**
-	 * Sets the receipt url
-	 * 
-	 * @param string receipt url
-	 * 
-	 * @throws PENSException with code 2011 if invalid
-	 */
-	public function setReceipt($receipt) {
-		if($this instanceof PENSRequestCollect) {
-			if (preg_match('/'.ABSOLUTEURI_2396.'/', $receipt)) {
-				$this->_receipt = $receipt;
-			} else {
-				throw new PENSException(2011);
-			}
-		}
-	}
-	
-	public function getAlerts() {
-		return $this->_alerts;
-	}
-	
-	public function setAlerts($alerts) {
-		if(!empty($alerts)) {
-			if(preg_match('/'.ABSOLUTEURI_2396.'/', $alerts)) {
-				$this->_alerts = $alerts;
-			} else {
-				throw new PENSException(1201);
-			}
-		}
-	}
-	
-	public function getVendorData() {
-		return $this->_vendor_data;
-	}
-	
-	public function setVendorData($vendor_data) {
-		if(!empty($vendor_data)) {
-			$this->_vendor_data = $vendor_data;
-		}
-	}
-	
-	/**
-	 * Returns an associative that contains all the fields needed to send a
-	 * receipt or an alert to the client
-	 * 
-	 * @return array Associative array
-	 */
-	protected function getSendReceiptAlertArray() {
-		return array("pens-version" => $this->getPensVersion(),
-			"package-type" => $this->getPackageType(),
-			"package-type-version" => $this->getPackageTypeVersion(),
-			"package-format" => $this->getPackageFormat(),
-			"package-id" => $this->getPackageId(),
-			"package-url" => $this->getPackageUrl(),
-			"package-url-expiry" => $this->getPackageUrlExpiry()->format(DateTime::ISO8601),
-			"client" => $this->getClient());
-	}
-	
-	/**
-	 * Returns an associative that contains all the fields needed to send a
-	 * receipt to the client
-	 * 
-	 * @return array Associative array
-	 */
-	public function getSendReceiptArray() {
-		$receipt = $this->getSendReceiptAlertArray();
-		$receipt["command"] = "receipt";
-		return $receipt;
-	}
-	
-	/**
-	 * Returns an associative that contains all the fields needed to send an
-	 * alert to the client
-	 * 
-	 * @return array Associative array
-	 */
-	public function getSendAlertArray() {
-		$alert = $this->getSendReceiptAlertArray();
-		$alert["command"] = "alert";
-		return $alert;
-	}
+    /**
+     * PENS Version to be used. Currently, the only valid value is 1.0.0. Required.
+     * @var string
+     */
+    protected $_pens_version = null;
+	
+    /**
+     * Command being used. The only valid values are collect, alert and receipt.Required
+     * @var string
+     */
+    protected $_command = null;
+	
+    /**
+     * Package type being used. The only valid values are aicc-pkg, scorm-pif, ims-qti. Required
+     * @var string
+     */
+    protected $_package_type = null;
+	
+    /**
+     * Package type version. Required
+     * @var string
+     */
+    protected $_package_type_version = null;
+	
+    /**
+     * Package format. The only valid values are zip, url, jar, war and xml. Required
+     * @var string
+     */
+    protected $_package_format = null;
+	
+    /**
+     * Package id. Requires a valid URI according to RFC 2396. Required
+     * @var string
+     */
+    protected $_package_id = null;
+	
+    /**
+     * Package url. Requires a valid, fully qualified URL including transport protocol and filename extension. Required
+     * @var string
+     */
+    protected $_package_url = null;
+	
+    /**
+     * User id required for system to retrieve package from URL. Optional.
+     * @var string
+     */
+    protected $_package_url_user_id = null;
+	
+    /**
+     * Account required for system to retrieve package from URL. Optional.
+     * @var string
+     */
+    protected $_package_url_account = null;
+	
+    /**
+     * Password required for system to retrieve package from URL. Optional.
+     * @var string
+     */
+    protected $_package_url_password = null;
+	
+    /**
+     * Expiry date for package URL. ISO 8601 format expressed as UTC. Will be transformed into a PHP DateTime object during construction. Required
+     * @var DateTime
+     */
+    protected $_package_url_expiry = null;
+	
+    /**
+     * Name or ID for client submitting the content package to the target system. Required.
+     * @var string
+     */
+    protected $_client = null;
+	
+    /**
+     * User-id or sign-on for target system. Optional
+     * @var string
+     */
+    protected $_system_user_id = null;
+	
+    /**
+     * Either a URL-encoded password token or the null string. If the 
+     * target system requires a password and the null string value is 
+     * passed, then the target system is responsible for prompting for a 
+     * password for target system. Optional
+     * @var string
+     */
+    protected $_system_password = null;
+	
+    /**
+     * URL to send acknowledgement receipt after collecting a package. Any URL, including mailto (as per RFC 2368 and RFC 2822). Required.
+     * @var string
+     */
+    protected $_receipt = null;
+	
+    /**
+     * URL to send alerts to while processing the package. Any URL, including mailto (as per RFC 2368 and RFC 2822). Optional.
+     * @var string
+     */
+    protected $_alerts = null;
+	
+    /**
+     * Unstructured character string that may be used to transfer vendor-specific data such as processing hints or deployment information. Optional.
+     * @var string
+     */
+    protected $_vendor_data = null;
+	
+    /**
+     * Constructor
+     * 
+     * Constructs a PENSRequest based class using the arguments given
+     * 
+     * @param array Arguments
+     */
+    public function __construct($arguments) {
+        $this->setPensVersion($arguments["pens-version"]);
+        $this->setPackageType($arguments["package-type"]);
+        $this->setPackageTypeVersion($arguments["package-type-version"]);
+        $this->setPackageFormat($arguments["package-format"]);
+        $this->setPackageId($arguments["package-id"]);
+        $this->setPackageUrl($arguments["package-url"]);
+        $this->setPackageUrlUserId($arguments["package-url-user-id"]);
+        $this->setPackageUrlAccount($arguments["package-url-account"]);
+        $this->setPackageUrlPassword($arguments["package-url-password"]);
+        $this->setPackageUrlExpiry($arguments["package-url-expiry"]);
+        $this->setClient($arguments["client"]);
+        $this->setSystemUserId($arguments["system-user-id"]);
+        $this->setSystemPassword($arguments["system-password"]);
+        $this->setReceipt($arguments["receipt"]);
+        $this->setAlerts($arguments["alerts"]);
+        $this->setVendorData($arguments["vendor-data"]);
+    }
+	
+    public function getPensVersion() {
+        return $this->_pens_version;
+    }
+	
+    /**
+     * Sets the PENS version
+     * 
+     * @param string PENS version
+     * 
+     * @throws PENSException with code 2001 if invalid
+     */
+    public function setPensVersion($pens_version) {
+        if($pens_version == PENSConfig::$version) {
+            $this->_pens_version = $pens_version;
+        } else {
+            throw new PENSException(2001);
+        }
+    }
+	
+    public function getCommand() {
+        return $this->_command;
+    }
+	
+    /**
+     * Sets the command
+     * 
+     * @param string command
+     * 
+     * @throws PENSException with code 2002 if invalid
+     */
+    protected function setCommand($command) {
+        if(in_array($command, PENSConfig::$allowed_commands)) {
+            $this->_command = $command;
+        } else {
+            throw new PENSException(2002);
+        }
+    }
+	
+    public function getPackageType() {
+        return $this->_package_type;
+    }
+	
+    /**
+     * Sets the package type
+     * 
+     * @param string package type
+     * 
+     * @throws PENSException with code 2003 if invalid
+     */
+    public function setPackageType($package_type) {
+        if(in_array($package_type, PENSConfig::$allowed_package_types)) {
+            $this->_package_type = $package_type;
+        } else {
+            throw new PENSException(2003);
+        }
+    }
+	
+    public function getPackageTypeVersion() {
+        return $this->_package_type_version;
+    }
+	
+    /**
+     * Sets the package type version
+     * 
+     * @param string package type version
+     * 
+     * @throws PENSException with code 2004 if invalid
+     */
+    public function setPackageTypeVersion($package_type_version) {
+        if(empty($package_type_version)) {
+            throw new PENSException(2004);
+        } else {
+            $this->_package_type_version = $package_type_version;
+        }
+    }
+	
+    public function getPackageFormat() {
+        return $this->_package_format;
+    }
+	
+    /**
+     * Sets the package format
+     * 
+     * @param string package format
+     * 
+     * @throws PENSException with code 2005 if invalid
+     */
+    public function setPackageFormat($package_format) {
+        if(in_array($package_format, PENSConfig::$allowed_package_formats)) {
+            $this->_package_format = $package_format;
+        } else {
+            throw new PENSException(2005);
+        }
+    }
+	
+    public function getPackageId() {
+        return $this->_package_id;
+    }
+	
+    /**
+     * Sets the package Id
+     * 
+     * @param string package Id
+     * 
+     * @throws PENSException with code 2007 if invalid
+     */
+    public function setPackageId($package_id) {
+        if (preg_match('/'.ABSOLUTEURI_2396.'/', $package_id)) {
+            $this->_package_id = $package_id;
+        } else {
+            throw new PENSException(2007);
+        }
+    }
+	
+    public function getPackageUrl() {
+        return $this->_package_url;
+    }
+	
+    /**
+     * Sets the package url
+     * 
+     * @param string package url
+     * 
+     * @throws PENSException with code 2008 if invalid
+     */
+    public function setPackageUrl($package_url) {
+        if (preg_match('/'.ABSOLUTEURI_2396.'/', $package_url) && substr($package_url, -4) == ".".$this->_package_format) {
+            $this->_package_url = $package_url;
+        } else {
+            throw new PENSException(2008);
+        }
+    }
+	
+    public function getFilename() {
+        return substr(strrchr($this->_package_url, "/"), 1);
+    }
+	
+    public function getPackageUrlUserId() {
+        return $this->_package_url_user_id;
+    }
+	
+    public function setPackageUrlUserId($package_url_user_id) {
+        if(!empty($package_url_user_id)) {
+            $this->_package_url_user_id = $package_url_user_id;
+        }
+    }
+	
+    public function getPackageUrlAccount() {
+        return $this->_package_url_account;
+    }
+	
+    public function setPackageUrlAccount($package_url_account) {
+        if(!empty($package_url_account)) {
+            $this->_package_url_account = $package_url_account;
+        }
+    }
+	
+    public function getPackageUrlPassword() {
+        return $this->_package_url_password;
+    }
+	
+    public function setPackageUrlPassword($package_url_password) {
+        if(!empty($package_url_password)) {
+            $this->_package_url_password = $package_url_password;
+        }
+    }
+	
+    public function getPackageUrlExpiry() {
+        return $this->_package_url_expiry;
+    }
+	
+    /**
+     * Sets the package url expiry and transforms it into a php DateTime object
+     * 
+     * @param string package url expiry
+     * 
+     * @throws PENSException with code 2009 if invalid
+     * @todo Perform a better validation of the date
+     */
+    public function setPackageUrlExpiry($package_url_expiry) {
+        if(empty($package_url_expiry)) {
+            throw new PENSException(2009);
+        } else {
+            try {
+                $expiry = new DateTime($package_url_expiry, new DateTimeZone('UTC'));
+                $this->_package_url_expiry = $expiry;
+            } catch(Exception $e) {
+                throw new PENSException(2009);
+            }
+        }
+    }
+	
+    public function getClient() {
+        return $this->_client;
+    }
+	
+    /**
+     * Sets the client
+     * 
+     * @param string client
+     * 
+     * @throws PENSException with code 2010 if invalid
+     */
+    public function setClient($client) {
+        if(!empty($client)) {
+            $this->_client = $client;
+        } else {
+            throw new PENSException(2010);
+        }
+    }
+	
+    public function getSystemUserId() {
+        return $this->_system_user_id;
+    }
+	
+    public function setSystemUserId($system_user_id) {
+        if(!empty($system_user_id)) {
+            $this->_system_user_id = $system_user_id;
+        }
+    }
+	
+    public function getSystemPassword() {
+        return $this->_system_password;
+    }
+	
+    public function setSystemPassword($system_password) {
+        if(!empty($system_password)) {
+            $this->_system_password = $system_password;
+        }
+    }
+	
+    public function getReceipt() {
+        return $this->_receipt;
+    }
+	
+    /**
+     * Sets the receipt url
+     * 
+     * @param string receipt url
+     * 
+     * @throws PENSException with code 2011 if invalid
+     */
+    public function setReceipt($receipt) {
+        if($this instanceof PENSRequestCollect) {
+            if (preg_match('/'.ABSOLUTEURI_2396.'/', $receipt)) {
+                $this->_receipt = $receipt;
+            } else {
+                throw new PENSException(2011);
+            }
+        }
+    }
+	
+    public function getAlerts() {
+        return $this->_alerts;
+    }
+	
+    public function setAlerts($alerts) {
+        if(!empty($alerts)) {
+            if(preg_match('/'.ABSOLUTEURI_2396.'/', $alerts)) {
+                $this->_alerts = $alerts;
+            } else {
+                throw new PENSException(1201);
+            }
+        }
+    }
+	
+    public function getVendorData() {
+        return $this->_vendor_data;
+    }
+	
+    public function setVendorData($vendor_data) {
+        if(!empty($vendor_data)) {
+            $this->_vendor_data = $vendor_data;
+        }
+    }
+	
+    /**
+     * Returns an associative that contains all the fields needed to send a
+     * receipt or an alert to the client
+     * 
+     * @return array Associative array
+     */
+    protected function getSendReceiptAlertArray() {
+        return array("pens-version" => $this->getPensVersion(),
+            "package-type" => $this->getPackageType(),
+            "package-type-version" => $this->getPackageTypeVersion(),
+            "package-format" => $this->getPackageFormat(),
+            "package-id" => $this->getPackageId(),
+            "package-url" => $this->getPackageUrl(),
+            "package-url-expiry" => $this->getPackageUrlExpiry()->format(DateTime::ISO8601),
+            "client" => $this->getClient());
+    }
+	
+    /**
+     * Returns an associative that contains all the fields needed to send a
+     * receipt to the client
+     * 
+     * @return array Associative array
+     */
+    public function getSendReceiptArray() {
+        $receipt = $this->getSendReceiptAlertArray();
+        $receipt["command"] = "receipt";
+        return $receipt;
+    }
+	
+    /**
+     * Returns an associative that contains all the fields needed to send an
+     * alert to the client
+     * 
+     * @return array Associative array
+     */
+    public function getSendAlertArray() {
+        $alert = $this->getSendReceiptAlertArray();
+        $alert["command"] = "alert";
+        return $alert;
+    }
 	
 	
 }

plugin/pens/lib/pens/pens_response.php

Indentation +119 added lines, -119 removed lines

@@ -39,137 +39,137 @@
  * @author Guillaume Viguier-Just <guillaume@viguierjust.com>
  * @licence http://www.gnu.org/licenses/gpl.txt
  */
- class PENSResponse extends PENSMessage {
-	 /**
-	  * Error code
-	  * @var int
-	  */
-	 protected $_error = null;
+    class PENSResponse extends PENSMessage {
+        /**
+         * Error code
+         * @var int
+         */
+        protected $_error = null;
 	 
-	 /**
-	  * Descriptive text of the error
-	  * @var string
-	  */
-	 protected $_error_text = null;
+        /**
+         * Descriptive text of the error
+         * @var string
+         */
+        protected $_error_text = null;
 	 
-	 /**
-	  * Data linked to the error
-	  * @var string
-	  */
-	 protected $_pens_data = null;
+        /**
+         * Data linked to the error
+         * @var string
+         */
+        protected $_pens_data = null;
 	 
-	 /**
-	  * Version
-	  * @var string
-	  */
-	 protected $_pens_version = null;
+        /**
+         * Version
+         * @var string
+         */
+        protected $_pens_version = null;
 	 
-	 /**
-	  * Constructor
-	  * 
-	  * @param mixed Can be a PENSException or an error code or a string representing an HTTP response
-	  * @param string error text
-	  * @param string PENS data
-	  */
-	public function __construct($error, $error_text = null, $pens_data = null) {
-		$this->_pens_version = PENSConfig::$version;
-		if($error instanceof PENSException) {
-			$this->_error = $error->getCode();
-			$this->_error_text = $error->getMessage();
-		} else if(is_string($error)){
-			// Parse the string
-			$this->parseResponse($error);
-		} else if(is_array($error)) {
-			// Try to build from array
-			$this->_error = $error["error"];
-			$this->_error_text = $error["error-text"];
-			$this->_pens_data = $error["pens-data"];
-		} else {
-			$this->_error = $error;
-			$this->_error_text = $error_text;
-			$this->_pens_data = $pens_data;
-		}
+        /**
+         * Constructor
+         * 
+         * @param mixed Can be a PENSException or an error code or a string representing an HTTP response
+         * @param string error text
+         * @param string PENS data
+         */
+    public function __construct($error, $error_text = null, $pens_data = null) {
+        $this->_pens_version = PENSConfig::$version;
+        if($error instanceof PENSException) {
+            $this->_error = $error->getCode();
+            $this->_error_text = $error->getMessage();
+        } else if(is_string($error)){
+            // Parse the string
+            $this->parseResponse($error);
+        } else if(is_array($error)) {
+            // Try to build from array
+            $this->_error = $error["error"];
+            $this->_error_text = $error["error-text"];
+            $this->_pens_data = $error["pens-data"];
+        } else {
+            $this->_error = $error;
+            $this->_error_text = $error_text;
+            $this->_pens_data = $pens_data;
+        }
 		
-	}
+    }
 	
-	/**
-	 * Parses an HTTP response and assigns the attributes of the object
-	 * 
-	 * @param string HTTP response
-	 */
-	protected function parseResponse($response) {
-		$lines = explode(PENSConfig::$eol, $response);
-		$i = 1;
-		foreach($lines as $line) {
-			if($i < 5) {
-				$pair = explode("=", $line);
-				if($pair[0] == "error") {
-					$this->_error = intval($pair[1]);
-				} else if($pair[0] == "error-text") {
-					$this->_error_text = $pair[1];
-				} else if($pair[0] == "version") {
-					$this->_pens_version = $pair[1];
-				} else if($pair[0] == "pens-data") {
-					if(!empty($pair[1])) {
-						$this->_pens_data = $pair[1].PENSConfig::$eol;
-					}
-				}
-			} else {
-				if(!empty($line)) {
-					$this->_pens_data .= $line.PENSConfig::$eol;
-				}
-			}
-			$i++;
-		}
-	}
+    /**
+     * Parses an HTTP response and assigns the attributes of the object
+     * 
+     * @param string HTTP response
+     */
+    protected function parseResponse($response) {
+        $lines = explode(PENSConfig::$eol, $response);
+        $i = 1;
+        foreach($lines as $line) {
+            if($i < 5) {
+                $pair = explode("=", $line);
+                if($pair[0] == "error") {
+                    $this->_error = intval($pair[1]);
+                } else if($pair[0] == "error-text") {
+                    $this->_error_text = $pair[1];
+                } else if($pair[0] == "version") {
+                    $this->_pens_version = $pair[1];
+                } else if($pair[0] == "pens-data") {
+                    if(!empty($pair[1])) {
+                        $this->_pens_data = $pair[1].PENSConfig::$eol;
+                    }
+                }
+            } else {
+                if(!empty($line)) {
+                    $this->_pens_data .= $line.PENSConfig::$eol;
+                }
+            }
+            $i++;
+        }
+    }
 	
-	public function getError() {
-		return $this->_error;
-	}
+    public function getError() {
+        return $this->_error;
+    }
 	
-	public function getErrorText() {
-		return $this->_error_text;
-	}
+    public function getErrorText() {
+        return $this->_error_text;
+    }
 	
-	public function getPensData() {
-		return $this->_pens_data;
-	}
+    public function getPensData() {
+        return $this->_pens_data;
+    }
 	
-	public function getVersion() {
-		return $this->_pens_version;
-	}
+    public function getVersion() {
+        return $this->_pens_version;
+    }
 	
-	/**
-	 * Sends the response content through HTTP headers
-	 */
-	public function send() {
-		header("Content-Type: text/plain");
-		print $this;
-	}
+    /**
+     * Sends the response content through HTTP headers
+     */
+    public function send() {
+        header("Content-Type: text/plain");
+        print $this;
+    }
 	
-	/**
-	 * Returns an associative array of the response
-	 * 
-	 * @return array Associative array
-	 */
-	public function getArray() {
-		return array("error" => $this->_error,
-			"error-text" => $this->_error_text,
-			"version" => PENSConfig::$version,
-			"pens-data" => $this->_pens_data);
-	}
+    /**
+     * Returns an associative array of the response
+     * 
+     * @return array Associative array
+     */
+    public function getArray() {
+        return array("error" => $this->_error,
+            "error-text" => $this->_error_text,
+            "version" => PENSConfig::$version,
+            "pens-data" => $this->_pens_data);
+    }
 	
-	/**
-	 * Transforms the object into a string
-	 */
-	public function __toString() {
-		$eol = PENSConfig::$eol;
-		$return = "error=".$this->_error.$eol;
-		$return .= "error-text=".$this->_error_text.$eol;
-		$return .= "version=".PENSConfig::$version.$eol;
-		$return .= "pens-data=".$this->_pens_data.$eol;
-		return $return;
-	}
+    /**
+     * Transforms the object into a string
+     */
+    public function __toString() {
+        $eol = PENSConfig::$eol;
+        $return = "error=".$this->_error.$eol;
+        $return .= "error-text=".$this->_error_text.$eol;
+        $return .= "version=".PENSConfig::$version.$eol;
+        $return .= "pens-data=".$this->_pens_data.$eol;
+        return $return;
+    }
  
- }
+    }
  

plugin/pens/lib/pens_server_test.php

Indentation +3 added lines, -3 removed lines

@@ -26,9 +26,9 @@
 require_once __DIR__ . '/pens.php';
 
 class MyPackageHandler extends PENSPackageHandler {
-	public function processPackage($request, $path_to_package) {
-		// Do the package processing here
-	}
+    public function processPackage($request, $path_to_package) {
+        // Do the package processing here
+    }
 }
 
 $handler = new MyPackageHandler();

plugin/pens/lib/tests/test_pens_response.php

Indentation +19 added lines, -19 removed lines

@@ -44,25 +44,25 @@
  */
 class TestPENSResponse extends UnitTestCase {
 	
-	public function testCreationFromPENSException() {
-		$object = new PENSResponse(new PENSException(1101));
-		$this->assertEqual($object->getError(), 1101);
-		$this->assertNotNull($object->getErrorText());
-	}
+    public function testCreationFromPENSException() {
+        $object = new PENSResponse(new PENSException(1101));
+        $this->assertEqual($object->getError(), 1101);
+        $this->assertNotNull($object->getErrorText());
+    }
 	
-	public function testCreationFromArguments() {
-		$object = new PENSResponse(0, "collect command received and understood");
-		$this->assertIdentical($object->getError(), 0);
-		$this->assertEqual($object->getErrorText(), "collect command received and understood");
-	}
+    public function testCreationFromArguments() {
+        $object = new PENSResponse(0, "collect command received and understood");
+        $this->assertIdentical($object->getError(), 0);
+        $this->assertEqual($object->getErrorText(), "collect command received and understood");
+    }
 	
-	public function testCreationFromHTTPResponse() {
-		$eol = PENSConfig::$eol;
-		$response = "error=1101".$eol."error-text=unable to parse PENS command".$eol."version=1.0.0".$eol."pens-data=".$eol;
-		$object = new PENSResponse($response);
-		$this->assertIdentical($object->getError(), 1101);
-		$this->assertIdentical($object->getErrorText(), "unable to parse PENS command");
-		$this->assertIdentical($object->getVersion(), "1.0.0");
-		$this->assertNull($object->getPensData());
-	}
+    public function testCreationFromHTTPResponse() {
+        $eol = PENSConfig::$eol;
+        $response = "error=1101".$eol."error-text=unable to parse PENS command".$eol."version=1.0.0".$eol."pens-data=".$eol;
+        $object = new PENSResponse($response);
+        $this->assertIdentical($object->getError(), 1101);
+        $this->assertIdentical($object->getErrorText(), "unable to parse PENS command");
+        $this->assertIdentical($object->getVersion(), "1.0.0");
+        $this->assertNull($object->getPensData());
+    }
 }

plugin/pens/lib/tests/test_pens_package_handler.php

Indentation +32 added lines, -32 removed lines

@@ -33,8 +33,8 @@ 
 require_once(dirname(__FILE__)."/../pens.php");
 
 class MyPackageHandler extends PENSPackageHandler {
-	public function processPackage($request, $path_to_package) {
-	}
+    public function processPackage($request, $path_to_package) {
+    }
 }
 
 /**
@@ -49,39 +49,39 @@ 
  */
 class TestPENSPackageHandler extends UnitTestCase {
 	
-	public function testSupportedPackageTypesInvalid() {
-		$object = new MyPackageHandler();
-		$object->setSupportedPackageTypes("testing");
-		$this->assertEqual($object->getSupportedPackageTypes(), null);
-	}
+    public function testSupportedPackageTypesInvalid() {
+        $object = new MyPackageHandler();
+        $object->setSupportedPackageTypes("testing");
+        $this->assertEqual($object->getSupportedPackageTypes(), null);
+    }
 	
-	public function testSupportedPackageTypesInvalid2() {
-		$object = new MyPackageHandler();
-		$object->setSupportedPackageTypes(array("aicc-pkg", "testing"));
-		$this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg"));
-	}
+    public function testSupportedPackageTypesInvalid2() {
+        $object = new MyPackageHandler();
+        $object->setSupportedPackageTypes(array("aicc-pkg", "testing"));
+        $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg"));
+    }
 	
-	public function testSupportedPackageTypesValid() {
-		$object = new MyPackageHandler();
-		$object->setSupportedPackageTypes(array("aicc-pkg", "lms-qti"));
-		$this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg", "lms-qti"));
-	}
+    public function testSupportedPackageTypesValid() {
+        $object = new MyPackageHandler();
+        $object->setSupportedPackageTypes(array("aicc-pkg", "lms-qti"));
+        $this->assertEqual($object->getSupportedPackageTypes(), array("aicc-pkg", "lms-qti"));
+    }
 	
-	public function testSupportedPackageFormatsInvalid() {
-		$object = new MyPackageHandler();
-		$object->setSupportedPackageFormats("testing");
-		$this->assertEqual($object->getSupportedPackageFormats(), null);
-	}
+    public function testSupportedPackageFormatsInvalid() {
+        $object = new MyPackageHandler();
+        $object->setSupportedPackageFormats("testing");
+        $this->assertEqual($object->getSupportedPackageFormats(), null);
+    }
 	
-	public function testSupportedPackageFormatsInvalid2() {
-		$object = new MyPackageHandler();
-		$object->setSupportedPackageFormats(array("zip", "testing"));
-		$this->assertEqual($object->getSupportedPackageFormats(), array("zip"));
-	}
+    public function testSupportedPackageFormatsInvalid2() {
+        $object = new MyPackageHandler();
+        $object->setSupportedPackageFormats(array("zip", "testing"));
+        $this->assertEqual($object->getSupportedPackageFormats(), array("zip"));
+    }
 	
-	public function testSupportedPackageFormatsValid() {
-		$object = new MyPackageHandler();
-		$object->setSupportedPackageFormats(array("zip", "jar"));
-		$this->assertEqual($object->getSupportedPackageFormats(), array("zip", "jar"));
-	}
+    public function testSupportedPackageFormatsValid() {
+        $object = new MyPackageHandler();
+        $object->setSupportedPackageFormats(array("zip", "jar"));
+        $this->assertEqual($object->getSupportedPackageFormats(), array("zip", "jar"));
+    }
 }

plugin/pens/lib/tests/test_pens_server.php

Indentation +58 added lines, -58 removed lines

@@ -46,77 +46,77 @@
  */
 class TestPENSServer extends WebTestCase {
 	
-	private $_valid_params = array(
-		"command" => "collect",
-		"pens-version" => "1.0.0",
-		"package-type" => "aicc-pkg",
-		"package-type-version" => "1.0",
-		"package-format" => "zip",
-		"package-id" => "http://myurl.com/12345",
-		"package-url" => "http://www.aicc.org/pens/sample/captivatequiz.zip",
-		"package-url-expiry" => "2099-04-09T14:17:43Z",
-		"client" => "test-pens-server",
-		"receipt" => PENS_TEST_RECEIPT_MAILTO);
+    private $_valid_params = array(
+        "command" => "collect",
+        "pens-version" => "1.0.0",
+        "package-type" => "aicc-pkg",
+        "package-type-version" => "1.0",
+        "package-format" => "zip",
+        "package-id" => "http://myurl.com/12345",
+        "package-url" => "http://www.aicc.org/pens/sample/captivatequiz.zip",
+        "package-url-expiry" => "2099-04-09T14:17:43Z",
+        "client" => "test-pens-server",
+        "receipt" => PENS_TEST_RECEIPT_MAILTO);
 		
-	public function testEmptyQuery() {
-		$this->get(PENS_TEST_SERVER_URL);
-		$this->assertText("error=2002");
-	}
+    public function testEmptyQuery() {
+        $this->get(PENS_TEST_SERVER_URL);
+        $this->assertText("error=2002");
+    }
 	
-	public function testValidQuery() {
-		$this->get(PENS_TEST_SERVER_URL, $this->_valid_params);
-		$this->assertText("error=0");
-	}
+    public function testValidQuery() {
+        $this->get(PENS_TEST_SERVER_URL, $this->_valid_params);
+        $this->assertText("error=0");
+    }
 	
-	private function invalidParameterTest($name, $value, $error) {
-		$params = $this->_valid_params;
-		$params[$name] = $value;
-		$this->get(PENS_TEST_SERVER_URL, $params);
-		$this->assertText("error=".$error);
-	}
+    private function invalidParameterTest($name, $value, $error) {
+        $params = $this->_valid_params;
+        $params[$name] = $value;
+        $this->get(PENS_TEST_SERVER_URL, $params);
+        $this->assertText("error=".$error);
+    }
 	
-	private function validParameterTest($name, $value) {
-		$params = $this->_valid_params;
-		$params[$name] = $value;
-		$this->get(PENS_TEST_SERVER_URL, $params);
-		$this->assertText("error=0");
-	}
+    private function validParameterTest($name, $value) {
+        $params = $this->_valid_params;
+        $params[$name] = $value;
+        $this->get(PENS_TEST_SERVER_URL, $params);
+        $this->assertText("error=0");
+    }
 	
-	public function testInvalidCommand() {
-		$this->invalidParameterTest("command", "invalid", 2002);
-	}
+    public function testInvalidCommand() {
+        $this->invalidParameterTest("command", "invalid", 2002);
+    }
 	
-	public function testInvalidVersion() {
-		$this->invalidParameterTest("pens-version", "0.8.0", 2001);
-	}
+    public function testInvalidVersion() {
+        $this->invalidParameterTest("pens-version", "0.8.0", 2001);
+    }
 	
-	public function testInvalidPackageType() {
-		$this->invalidParameterTest("package-type", "invalid", 2003);
-	}
+    public function testInvalidPackageType() {
+        $this->invalidParameterTest("package-type", "invalid", 2003);
+    }
 	
-	public function testEmptyPackageTypeVersion() {
-		$this->invalidParameterTest("package-type-version", null, 2004);
-	}
+    public function testEmptyPackageTypeVersion() {
+        $this->invalidParameterTest("package-type-version", null, 2004);
+    }
 	
-	public function testInvalidPackageFormat() {
-		$this->invalidParameterTest("package-format", "invalid", 2005);
-	}
+    public function testInvalidPackageFormat() {
+        $this->invalidParameterTest("package-format", "invalid", 2005);
+    }
 	
-	public function testInvalidPackageId() {
-		$this->invalidParameterTest("package-id", "invalid", 2007);
-	}
+    public function testInvalidPackageId() {
+        $this->invalidParameterTest("package-id", "invalid", 2007);
+    }
 	
-	public function testInvalidPackageUrl() {
-		$this->invalidParameterTest("package-url", "invalid", 2008);
-	}
+    public function testInvalidPackageUrl() {
+        $this->invalidParameterTest("package-url", "invalid", 2008);
+    }
 	
-	public function testInvalidPackageUrlExpiry() {
-		$this->invalidParameterTest("package-url-expiry", "invalid", 2009);
-	}
+    public function testInvalidPackageUrlExpiry() {
+        $this->invalidParameterTest("package-url-expiry", "invalid", 2009);
+    }
 	
-	public function testValidPackageUrlExpiry() {
-		$this->validParameterTest("package-url-expiry", "2099-01-01");
-	}
+    public function testValidPackageUrlExpiry() {
+        $this->validParameterTest("package-url-expiry", "2099-01-01");
+    }
 	
 }
 

plugin/pens/lib/tests/test_pens_request.php

Indentation +163 added lines, -163 removed lines

@@ -44,170 +44,170 @@
  */
 class TestPENSRequest extends UnitTestCase {
 	
-	/**
-	 * Valid arguments to be used for tests
-	 * 
-	 * @var array
-	 */
-	private $args = null;
-	
-	public function setUp() {
-		$this->args = array(
-			"pens-version" => "1.0.0",
-			"command" => "collect",
-			"package-type" => "aicc-pkg",
-			"package-type-version" => "1.0",
-			"package-format" => "zip",
-			"package-id" => "http://myurl.com/12345",
-			"package-url" => "http://myurl.com/mypackage.zip",
-			"package-url-expiry" => "2006-04-01T06:51:29Z",
-			"client" => "Authorware7",
-			"receipt" => "mailto:name@domain.com",
-			"package-url-user-id" => "guillaumev",
-			"package-url-account" => "toto",
-			"package-url-password" => "12345",
-			"system-user-id" => "guillaumev",
-			"system-password" => "12345",
-			"alerts" => "http://myurl.com/alerts",
-			"vendor-data" => "here are my data");
-	}
-	
-	public function createObject($myargs) {
-		return PENSRequestFactory::createPENSRequest($myargs);
-	}
-	
-	public function exceptionTestForValue($key, $value, $code) {
-		try {
-			$myargs = $this->args;
-			if($value === null) {
-				unset($myargs[$key]);
-			} else {
-				$myargs[$key] = $value;
-			}
-			$object = $this->createObject($myargs);
-			$this->fail();
-		} catch(PENSException $e) {
-			$this->assertEqual($e->getCode(), $code);
-		}
-	}
-	
-	public function testPensVersionInvalid() {
-		$this->exceptionTestForValue("pens-version", "0.8.0", 2001);
-	}
-	
-	public function testPensVersionNull() {
-		$this->exceptionTestForValue("pens-version", null, 2001);
-	}
-	
-	
-	public function testCommandInvalid() {
-		$this->exceptionTestForValue("command", "testing", 2002);
-	}
-	
-	public function testCommandNull() {
-		$this->exceptionTestForValue("command", null, 2002);
-	}
-	
-	public function testPackageTypeInvalid() {
-		$this->exceptionTestForValue("package-type", "testing", 2003);
-	}
-	
-	public function testPackageTypeNull() {
-		$this->exceptionTestForValue("package-type", null, 2003);
-	}
-	
-	public function testPackageTypeVersionNull() {
-		$this->exceptionTestForValue("package-type-version", null, 2004);
-	}
-	
-	public function testPackageFormatInvalid() {
-		$this->exceptionTestForValue("package-format", "testing", 2005);
-	}
-	
-	public function testPackageFormatNull() {
-		$this->exceptionTestForValue("package-format", null, 2005);
-	}
-	
-	public function testPackageIdInvalid() {
-		$this->exceptionTestForValue("package-id", "testing", 2007);
-	}
-	
-	public function testPackageIdNull() {
-		$this->exceptionTestForValue("package-id", null, 2007);
-	}
-	
-	public function testPackageUrlInvalid() {
-		$this->exceptionTestForValue("package-url", "testing", 2008);
-	}
-	
-	public function testPackageUrlInvalid2() {
-		$this->exceptionTestForValue("package-url", "http://myurl.com/mypackage", 2008);
-	}
-	
-	public function testPackageUrlNull() {
-		$this->exceptionTestForValue("package-url", null, 2008);
-	}
-	
-	public function testPackageUrlExpiryNull() {
-		$this->exceptionTestForValue("package-url-expiry", null, 2009);
-	}
-	
-	public function testPackageUrlExpiryInvalid() {
-		$this->exceptionTestForValue("package-url-expiry", "testing", 2009);
-	}
-	
-	public function testClientNull() {
-		$this->exceptionTestForValue("client", null, 2010);
-	}
-	
-	public function testReceiptNull() {
-		$this->exceptionTestForValue("receipt", null, 2011);
-	}
-	
-	public function testReceiptInvalid() {
-		$this->exceptionTestForValue("receipt", "testing", 2011);
-	}
-	
-	public function testAlertsInvalid() {
-		$this->exceptionTestForValue("alerts", "testing", 1201);
-	}
-	
-	public function testReceiptValid() {
-		try {
-			$myargs = $this->args;
-			$myargs["receipt"] = "mailto:name@domain.com,name2@domain.com";
-			$object = $this->createObject($myargs);
-			$this->pass();
-		} catch(PENSException $e) {
-			$this->fail();
-		}
-	}
-	
-	public function testValid() {
-		try {
-			$object = $this->createObject($this->args);
-			$this->assertIsA($object, "PENSRequestCollect");
-			$this->assertEqual($object->getPensVersion(), "1.0.0");
-			$this->assertEqual($object->getPackageType(), "aicc-pkg");
-			$this->assertEqual($object->getPackageTypeVersion(), "1.0");
-			$this->assertEqual($object->getPackageFormat(), "zip");
-			$this->assertEqual($object->getPackageId(), "http://myurl.com/12345");
-			$this->assertEqual($object->getPackageUrl(), "http://myurl.com/mypackage.zip");
-			$this->assertIsA($object->getPackageUrlExpiry(), "DateTime");
-			$this->assertEqual($object->getClient(), "Authorware7");
-			$this->assertEqual($object->getReceipt(), "mailto:name@domain.com");
-			$this->assertEqual($object->getPackageUrlUserId(), "guillaumev");
-			$this->assertEqual($object->getPackageUrlAccount(), "toto");
-			$this->assertEqual($object->getPackageUrlPassword(), "12345");
-			$this->assertEqual($object->getSystemUserId(), "guillaumev");
-			$this->assertEqual($object->getSystemPassword(), "12345");
-			$this->assertEqual($object->getAlerts(), "http://myurl.com/alerts");
-			$this->assertEqual($object->getVendorData(), "here are my data");
+    /**
+     * Valid arguments to be used for tests
+     * 
+     * @var array
+     */
+    private $args = null;
+	
+    public function setUp() {
+        $this->args = array(
+            "pens-version" => "1.0.0",
+            "command" => "collect",
+            "package-type" => "aicc-pkg",
+            "package-type-version" => "1.0",
+            "package-format" => "zip",
+            "package-id" => "http://myurl.com/12345",
+            "package-url" => "http://myurl.com/mypackage.zip",
+            "package-url-expiry" => "2006-04-01T06:51:29Z",
+            "client" => "Authorware7",
+            "receipt" => "mailto:name@domain.com",
+            "package-url-user-id" => "guillaumev",
+            "package-url-account" => "toto",
+            "package-url-password" => "12345",
+            "system-user-id" => "guillaumev",
+            "system-password" => "12345",
+            "alerts" => "http://myurl.com/alerts",
+            "vendor-data" => "here are my data");
+    }
+	
+    public function createObject($myargs) {
+        return PENSRequestFactory::createPENSRequest($myargs);
+    }
+	
+    public function exceptionTestForValue($key, $value, $code) {
+        try {
+            $myargs = $this->args;
+            if($value === null) {
+                unset($myargs[$key]);
+            } else {
+                $myargs[$key] = $value;
+            }
+            $object = $this->createObject($myargs);
+            $this->fail();
+        } catch(PENSException $e) {
+            $this->assertEqual($e->getCode(), $code);
+        }
+    }
+	
+    public function testPensVersionInvalid() {
+        $this->exceptionTestForValue("pens-version", "0.8.0", 2001);
+    }
+	
+    public function testPensVersionNull() {
+        $this->exceptionTestForValue("pens-version", null, 2001);
+    }
+	
+	
+    public function testCommandInvalid() {
+        $this->exceptionTestForValue("command", "testing", 2002);
+    }
+	
+    public function testCommandNull() {
+        $this->exceptionTestForValue("command", null, 2002);
+    }
+	
+    public function testPackageTypeInvalid() {
+        $this->exceptionTestForValue("package-type", "testing", 2003);
+    }
+	
+    public function testPackageTypeNull() {
+        $this->exceptionTestForValue("package-type", null, 2003);
+    }
+	
+    public function testPackageTypeVersionNull() {
+        $this->exceptionTestForValue("package-type-version", null, 2004);
+    }
+	
+    public function testPackageFormatInvalid() {
+        $this->exceptionTestForValue("package-format", "testing", 2005);
+    }
+	
+    public function testPackageFormatNull() {
+        $this->exceptionTestForValue("package-format", null, 2005);
+    }
+	
+    public function testPackageIdInvalid() {
+        $this->exceptionTestForValue("package-id", "testing", 2007);
+    }
+	
+    public function testPackageIdNull() {
+        $this->exceptionTestForValue("package-id", null, 2007);
+    }
+	
+    public function testPackageUrlInvalid() {
+        $this->exceptionTestForValue("package-url", "testing", 2008);
+    }
+	
+    public function testPackageUrlInvalid2() {
+        $this->exceptionTestForValue("package-url", "http://myurl.com/mypackage", 2008);
+    }
+	
+    public function testPackageUrlNull() {
+        $this->exceptionTestForValue("package-url", null, 2008);
+    }
+	
+    public function testPackageUrlExpiryNull() {
+        $this->exceptionTestForValue("package-url-expiry", null, 2009);
+    }
+	
+    public function testPackageUrlExpiryInvalid() {
+        $this->exceptionTestForValue("package-url-expiry", "testing", 2009);
+    }
+	
+    public function testClientNull() {
+        $this->exceptionTestForValue("client", null, 2010);
+    }
+	
+    public function testReceiptNull() {
+        $this->exceptionTestForValue("receipt", null, 2011);
+    }
+	
+    public function testReceiptInvalid() {
+        $this->exceptionTestForValue("receipt", "testing", 2011);
+    }
+	
+    public function testAlertsInvalid() {
+        $this->exceptionTestForValue("alerts", "testing", 1201);
+    }
+	
+    public function testReceiptValid() {
+        try {
+            $myargs = $this->args;
+            $myargs["receipt"] = "mailto:name@domain.com,name2@domain.com";
+            $object = $this->createObject($myargs);
+            $this->pass();
+        } catch(PENSException $e) {
+            $this->fail();
+        }
+    }
+	
+    public function testValid() {
+        try {
+            $object = $this->createObject($this->args);
+            $this->assertIsA($object, "PENSRequestCollect");
+            $this->assertEqual($object->getPensVersion(), "1.0.0");
+            $this->assertEqual($object->getPackageType(), "aicc-pkg");
+            $this->assertEqual($object->getPackageTypeVersion(), "1.0");
+            $this->assertEqual($object->getPackageFormat(), "zip");
+            $this->assertEqual($object->getPackageId(), "http://myurl.com/12345");
+            $this->assertEqual($object->getPackageUrl(), "http://myurl.com/mypackage.zip");
+            $this->assertIsA($object->getPackageUrlExpiry(), "DateTime");
+            $this->assertEqual($object->getClient(), "Authorware7");
+            $this->assertEqual($object->getReceipt(), "mailto:name@domain.com");
+            $this->assertEqual($object->getPackageUrlUserId(), "guillaumev");
+            $this->assertEqual($object->getPackageUrlAccount(), "toto");
+            $this->assertEqual($object->getPackageUrlPassword(), "12345");
+            $this->assertEqual($object->getSystemUserId(), "guillaumev");
+            $this->assertEqual($object->getSystemPassword(), "12345");
+            $this->assertEqual($object->getAlerts(), "http://myurl.com/alerts");
+            $this->assertEqual($object->getVendorData(), "here are my data");
 			
-		} catch(PENSException $e) {
-			$this->fail();
-		}
-	}
+        } catch(PENSException $e) {
+            $this->fail();
+        }
+    }
 	
 	
 }