chamilo / chamilo-lms

plugin/openmeetings/lib/openmeetings_rest_service.php

Doc Comments +6 added lines

@@ -27,6 +27,9 @@ 
  */
 class OpenMeetingsRestService
 {
+    /**
+     * @param string $request
+     */
     function call($request, $returnAttribute = "return")
     {
         // This will allow you to view errors in the browser
@@ -121,6 +124,9 @@ 
             
     }
 
+    /**
+     * @param DOMDocument $node
+     */
     function getArray($node)
     {
         if (is_null($node) || !is_object($node)) {

Spacing +13 added lines, -13 removed lines

@@ -40,31 +40,31 @@ 
         // $request
         
         // Initialize the session by passing the request as a parameter
-        $session = curl_init ( $request );
+        $session = curl_init($request);
         
         // Set curl options by passing session and flags
         // CURLOPT_HEADER allows us to receive the HTTP header
-        curl_setopt ( $session, CURLOPT_HEADER, true );
+        curl_setopt($session, CURLOPT_HEADER, true);
         
         // CURLOPT_RETURNTRANSFER will return the response
-        curl_setopt ( $session, CURLOPT_RETURNTRANSFER, true );
+        curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
         
         // Make the request
-        $response = curl_exec ( $session );
+        $response = curl_exec($session);
         
         // Close the curl session
-        curl_close ( $session );
+        curl_close($session);
         
         // Confirm that the request was transmitted to the OpenMeetings! Image Search Service
-        if (! $response) {
-            die ( "Request OpenMeetings! OpenMeetings Service failed and no response was returned in ".__CLASS__.'::'.__FUNCTION__.'()' );
+        if (!$response) {
+            die ("Request OpenMeetings! OpenMeetings Service failed and no response was returned in ".__CLASS__.'::'.__FUNCTION__.'()');
         }
         
         // Create an array to store the HTTP response codes
-        $status_code = array ();
+        $status_code = array();
         
         // Use regular expressions to extract the code from the header
-        preg_match ( '/\d\d\d/', $response, $status_code );
+        preg_match('/\d\d\d/', $response, $status_code);
         $bt = debug_backtrace();
         $caller = array_shift($bt);
         $extra = ' (from '.$caller['file'].' at line '.$caller['line'].') ';
@@ -74,24 +74,24 @@ 
                 // Success
                 break;
             case 503 :
-                error_log( 'Your call to OpenMeetings Web Services '.$extra.' failed and returned an HTTP status of 503.
+                error_log('Your call to OpenMeetings Web Services '.$extra.' failed and returned an HTTP status of 503.
                                  That means: Service unavailable. An internal problem prevented us from returning data to you.' );
                 return false;
                 break;
             case 403 :
-                error_log( 'Your call to OpenMeetings Web Services '.$extra.' failed and returned an HTTP status of 403.
+                error_log('Your call to OpenMeetings Web Services '.$extra.' failed and returned an HTTP status of 403.
                                  That means: Forbidden. You do not have permission to access this resource, or are over your rate limit.' );
                 return false;
                 break;
             case 400 :
                 // You may want to fall through here and read the specific XML error
-                error_log( 'Your call to OpenMeetings Web Services '.$extra.' failed and returned an HTTP status of 400.
+                error_log('Your call to OpenMeetings Web Services '.$extra.' failed and returned an HTTP status of 400.
                                  That means:  Bad request. The parameters passed to the service did not match as expected.   
                                  The exact error is returned in the XML response.' );
                 return false;
                 break;
             default :
-                error_log( 'Your call to OpenMeetings Web Services '.$extra.' returned an unexpected HTTP status of: ' . $status_code [0] . " Request " . $request );
+                error_log('Your call to OpenMeetings Web Services '.$extra.' returned an unexpected HTTP status of: '.$status_code [0]." Request ".$request);
                 return false;
         }
         

plugin/openmeetings/lib/room.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
     /**
      * Gets a string from a boolean attribute
      * @param string $attribute Name of the attribute
-     * @param mixed  $voidReturn What to return if the value is not defined
+     * @param string  $voidReturn What to return if the value is not defined
      * @return string The boolean value expressed as string ('true' or 'false')
      */
     public function getString($attribute, $voidReturn = false)

Spacing +3 added lines, -3 removed lines

@@ -49,9 +49,9 @@ 
         global $_configuration;
         $this->name = 'C'.api_get_course_int_id().'-'.api_get_session_id();
         $accessUrl = api_get_access_url($_configuration['access_url']);
-        $this->externalRoomType = substr($accessUrl['url'], strpos($accessUrl['url'],'://')+3,-1);
+        $this->externalRoomType = substr($accessUrl['url'], strpos($accessUrl['url'], '://') + 3, -1);
         if (strcmp($this->externalRoomType, 'localhost') == 0) {
-            $this->externalRoomType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH),'://')+3, -1);
+            $this->externalRoomType = substr(api_get_path(WEB_PATH), strpos(api_get_path(WEB_PATH), '://') + 3, -1);
         }
         $this->externalRoomType = 'chamilolms.'.$this->externalRoomType;
     }
@@ -110,6 +110,6 @@ 
         if (!isset($this->$attribute)) {
             return $voidReturn;
         }
-        return $this->$attribute?'true':'false';
+        return $this->$attribute ? 'true' : 'false';
     }
 }

plugin/pens/lib/pens/pens_exception.php

Doc Comments +1 added lines

@@ -79,6 +79,7 @@
 	 * 
 	 * @param int Exception code
 	 * @param string Message to display
+	 * @param integer $code
 	 * @return PENSException Exception created
 	 */
 	public function __construct($code, $message = null) {

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_server.php

Doc Comments +3 added lines

@@ -236,6 +236,7 @@ 
 	 * @param PENSRequest Original collect request
 	 * @param PENSResponse Reponse to send in the receipt or the alert
 	 * @param string Mode (alert | receipt)
+	 * @param string $mode
 	 * @return PENSResponse Response
 	 */
 	protected function sendAlertOrReceipt($request, $response, $mode) {
@@ -283,6 +284,7 @@ 
 	 * 
 	 * @param PENSRequest Original collect request
 	 * @param PENSResponse Response to send in the receipt
+	 * @param PENSResponse $receipt
 	 * @return PENSResponse Response
 	 */
 	protected function sendReceipt($request, $receipt) {
@@ -294,6 +296,7 @@ 
 	 * 
 	 * @param PENSRequest Original collect request
 	 * @param string Path to the package on the hard drive
+	 * @param string $path_to_package
 	 */
 	protected function processPackage($request, $path_to_package) {
 		return $this->_package_handler->processPackage($request, $path_to_package);

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

plugin/pens/lib/tests/test_pens_request.php

Doc Comments +5 added lines

@@ -76,6 +76,11 @@
 		return PENSRequestFactory::createPENSRequest($myargs);
 	}
 	
+	/**
+	 * @param string $key
+	 * @param string|null $value
+	 * @param integer $code
+	 */
 	public function exceptionTestForValue($key, $value, $code) {
 		try {
 			$myargs = $this->args;

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

Spacing +4 added lines, -4 removed lines

@@ -79,14 +79,14 @@ 
 	public function exceptionTestForValue($key, $value, $code) {
 		try {
 			$myargs = $this->args;
-			if($value === null) {
+			if ($value === null) {
 				unset($myargs[$key]);
 			} else {
 				$myargs[$key] = $value;
 			}
 			$object = $this->createObject($myargs);
 			$this->fail();
-		} catch(PENSException $e) {
+		} catch (PENSException $e) {
 			$this->assertEqual($e->getCode(), $code);
 		}
 	}
@@ -178,7 +178,7 @@ 
 			$myargs["receipt"] = "mailto:name@domain.com,name2@domain.com";
 			$object = $this->createObject($myargs);
 			$this->pass();
-		} catch(PENSException $e) {
+		} catch (PENSException $e) {
 			$this->fail();
 		}
 	}
@@ -204,7 +204,7 @@ 
 			$this->assertEqual($object->getAlerts(), "http://myurl.com/alerts");
 			$this->assertEqual($object->getVendorData(), "here are my data");
 			
-		} catch(PENSException $e) {
+		} catch (PENSException $e) {
 			$this->fail();
 		}
 	}

plugin/search_course/lib/register_course_widget.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
     /**
      * Handle the subscribe action.
      *
-     * @return bool
+     * @return null|boolean
      */
     function action_subscribe_user()
     {
@@ -151,7 +151,7 @@ 
 
     /**
      *
-     * @param type $course_code
+     * @param string $course_code
      * @return type
      */
     function retrieve_course($course_code)

plugin/search_course/lib/search_course_widget.class.php

Doc Comments +8 added lines

@@ -40,11 +40,19 @@
         return isset($_GET[$key]) ? $_GET[$key] : $default;
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     public static function server($key, $default = '')
     {
         return isset($_SERVER[$key]) ? $_SERVER[$key] : $default;
     }
 
+    /**
+     * @param string $name
+     */
     public static function get_lang($name)
     {
         return SearchCoursePlugin::create()->get_lang($name);

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once dirname(__FILE__) . '/register_course_widget.class.php';
+require_once dirname(__FILE__).'/register_course_widget.class.php';
 
 /**
  * Search course widget.
@@ -60,12 +60,12 @@ 
         $url = self::server('REQUEST_URI');
         $url = explode('?', $url);
         $url = reset($url);
-        $url = self::server('SERVER_NAME') . $url;
+        $url = self::server('SERVER_NAME').$url;
 
         $root = api_get_path('WEB_PATH');
         $root = str_replace('https://', '', $root);
         $root = str_replace('http://', '', $root);
-        $index_url = $root . 'index.php';
+        $index_url = $root.'index.php';
 
         return $url == $index_url || $url == $root;
     }
@@ -80,12 +80,12 @@ 
         $url = self::server('REQUEST_URI');
         $url = explode('?', $url);
         $url = reset($url);
-        $url = self::server('SERVER_NAME') . $url;
+        $url = self::server('SERVER_NAME').$url;
 
         $root = api_get_path('WEB_PATH');
         $root = str_replace('https://', '', $root);
         $root = str_replace('http://', '', $root);
-        $index_url = $root . 'user_portal.php';
+        $index_url = $root.'user_portal.php';
 
         return $url == $index_url || $url == $root;
     }
@@ -153,8 +153,8 @@ 
             $parameters[self::PARAM_ACTION] = $action;
         }
         $parameters = implode('&', $parameters);
-        $parameters = $parameters ? '?' . $parameters : '';
-        return $self . $parameters;
+        $parameters = $parameters ? '?'.$parameters : '';
+        return $self.$parameters;
     }
 
     /**
@@ -241,8 +241,8 @@ 
             $details = implode(' - ', $details);
             $title = $course['title'];
 
-            $href = api_get_path(WEB_COURSE_PATH).$course['code'] .'/index.php';
-            echo '<tr><td><b><a href="' . $href . '">' . "$title</a></b><br/>$details</td><td>";
+            $href = api_get_path(WEB_COURSE_PATH).$course['code'].'/index.php';
+            echo '<tr><td><b><a href="'.$href.'">'."$title</a></b><br/>$details</td><td>";
             if (!api_is_anonymous()) {
                 if ($course['registration_code']) {
                     Display::display_icon(
@@ -336,13 +336,13 @@ 
 
         if (api_is_anonymous())
         {
-            $course_fiter = 'visibility = ' . COURSE_VISIBILITY_OPEN_WORLD;
+            $course_fiter = 'visibility = '.COURSE_VISIBILITY_OPEN_WORLD;
         }
         else
         {
-            $course_fiter = 'visibility = ' . COURSE_VISIBILITY_OPEN_WORLD . ' OR ';
-            $course_fiter .= 'visibility = ' . COURSE_VISIBILITY_OPEN_PLATFORM . ' OR ';
-            $course_fiter .= '(visibility = ' . COURSE_VISIBILITY_REGISTERED . ' AND subscribe = 1)';
+            $course_fiter = 'visibility = '.COURSE_VISIBILITY_OPEN_WORLD.' OR ';
+            $course_fiter .= 'visibility = '.COURSE_VISIBILITY_OPEN_PLATFORM.' OR ';
+            $course_fiter .= '(visibility = '.COURSE_VISIBILITY_REGISTERED.' AND subscribe = 1)';
         }
 
         $sql = <<<EOT

Braces +3 added lines, -6 removed lines

@@ -123,8 +123,7 @@ 
         if ($has_content)
         {
             echo '<div class="list">';
-        }
-        else
+        } else
         {
             echo '<div>';
         }
@@ -132,8 +131,7 @@ 
         if (RegisterCourseWidget::factory()->run())
         {
             $result = true;
-        }
-        else
+        } else
         {
             $result = $this->action_display();
         }
@@ -337,8 +335,7 @@ 
         if (api_is_anonymous())
         {
             $course_fiter = 'visibility = ' . COURSE_VISIBILITY_OPEN_WORLD;
-        }
-        else
+        } else
         {
             $course_fiter = 'visibility = ' . COURSE_VISIBILITY_OPEN_WORLD . ' OR ';
             $course_fiter .= 'visibility = ' . COURSE_VISIBILITY_OPEN_PLATFORM . ' OR ';

src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php

Doc Comments +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
     /**
      * @param array $templates
      *
-     * @return null
+     * @return null|string
      */
     public function formatTemplates($templates)
     {

Spacing +8 added lines, -8 removed lines

@@ -55,7 +55,7 @@ 
     public function createHtmlStyle()
     {
         $style = '';
-        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' || $this->value == '' ) {
+        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' || $this->value == '') {
             $cssFile = api_get_path(SYS_CSS_PATH).'themes/'.api_get_visual_theme().'/editor.css';
             if (!is_file($cssFile)) {
                 $cssFile = api_get_path(WEB_CSS_PATH).'editor.css';
@@ -147,14 +147,14 @@ 
         return [[
             'title' => get_lang('EmptyTemplate'),
             'description' => null,
-            'image' => api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/empty.gif',
+            'image' => api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/empty.gif',
             'html' => '
                 <!DOCYTPE html>
                 <html>
                     <head>
-                        <meta charset="' . api_get_system_encoding() . '" />
+                        <meta charset="' . api_get_system_encoding().'" />
                     </head>
-                    <body  dir="' . api_get_text_direction() . '">
+                    <body  dir="' . api_get_text_direction().'">
                         <p>
                             <br/>
                         </p>
@@ -177,7 +177,7 @@ 
         $search = array('{CSS}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}');
         $replace = array(
             '',
-            api_get_path(REL_CODE_PATH) . 'img/',
+            api_get_path(REL_CODE_PATH).'img/',
             api_get_path(REL_PATH),
             api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH),
             api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH)
@@ -188,7 +188,7 @@ 
         foreach ($systemTemplates as $template) {
             $image = $template->getImage();
             $image = !empty($image) ? $image : 'empty.gif';
-            $image = api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/' . $image;
+            $image = api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/'.$image;
 
             /*$image = $this->urlGenerator->generate(
                 'get_document_template_action',
@@ -240,12 +240,12 @@ 
             $templateItem['image'] = api_get_path(WEB_APP_PATH)
                 . 'home/default_platform_document/template_thumb/noimage.gif';
             $templateItem['html'] = file_get_contents(api_get_path(SYS_COURSE_PATH)
-                . $courseDirectory . '/document' . $templateData['path']);
+                . $courseDirectory.'/document'.$templateData['path']);
 
             $image = $template->getImage();
             if (!empty($image)) {
                 $templateItem['image'] = api_get_path(WEB_COURSE_PATH)
-                    . $courseDirectory . '/upload/template_thumbnails/' . $template->getImage();
+                    . $courseDirectory.'/upload/template_thumbnails/'.$template->getImage();
             }
 
             $templateList[] = $templateItem;

src/Chamilo/CoreBundle/Component/Editor/Connector.php

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 
     /**
      * Available driver list.
-     * @return array
+     * @return string[]
      */
     private function getDefaultDriverList()
     {

Indentation +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
             'root_sys' => api_get_path(SYS_PATH),
             'sys_root' => api_get_path(SYS_PATH), // just an alias
             'sys_course_path' => api_get_path(SYS_COURSE_PATH),
-         //   'sys_config_path' => $app['path.config'],
+            //   'sys_config_path' => $app['path.config'],
             'path.temp' => api_get_path(SYS_ARCHIVE_PATH),
             //'sys_log_path' => $app['path.logs']
         );
@@ -325,9 +325,9 @@ 
      **/
     public function access($attr, $path, $data, $volume)
     {
-    	return strpos(basename($path), '.') === 0       // if file/folder begins with '.' (dot)
-    		? !($attr == 'read' || $attr == 'write')    // set read+write to false, other (locked+hidden) set to true
-    		:  null;                                    // else elFinder decide it itself
+        return strpos(basename($path), '.') === 0       // if file/folder begins with '.' (dot)
+            ? !($attr == 'read' || $attr == 'write')    // set read+write to false, other (locked+hidden) set to true
+            :  null;                                    // else elFinder decide it itself
     }
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -327,7 +327,7 @@
     {
     	return strpos(basename($path), '.') === 0       // if file/folder begins with '.' (dot)
     		? !($attr == 'read' || $attr == 'write')    // set read+write to false, other (locked+hidden) set to true
-    		:  null;                                    // else elFinder decide it itself
+    		:  null; // else elFinder decide it itself
     }
 
     /**