chamilo / chamilo-lms

main/webservices/additional_webservices.php

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 }
 
 /**
- * @param $directoryPath
+ * @param string $directoryPath
  * @return bool
  */
 function deleteDirectory($directoryPath)

Spacing +17 added lines, -17 removed lines

@@ -19,12 +19,12 @@ 
 {
     $fileData = $pptData['file_data'];
     $dataInfo = pathinfo($pptData['file_name']);
-    $fileName =  basename($pptData['file_name'], '.' . $dataInfo['extension']);
+    $fileName = basename($pptData['file_name'], '.'.$dataInfo['extension']);
     $fullFileName = $pptData['file_name'];
 
     $tempArchivePath = api_get_path(SYS_ARCHIVE_PATH);
-    $tempPath = $tempArchivePath . 'wsConvert/' . $fileName . '/';
-    $tempPathNewFiles = $tempArchivePath . 'wsConvert/' . $fileName . '-n/';
+    $tempPath = $tempArchivePath.'wsConvert/'.$fileName.'/';
+    $tempPathNewFiles = $tempArchivePath.'wsConvert/'.$fileName.'-n/';
 
     $perms = api_get_permissions_for_new_directories();
     if (!is_dir($tempPath)) {
@@ -33,28 +33,28 @@ 
     if (!is_dir($tempPathNewFiles)) {
         mkdir($tempPathNewFiles, $perms, true);
     }
-    if (!is_dir($tempPathNewFiles . $fileName)) {
-        mkdir($tempPathNewFiles . $fileName, $perms, true);
+    if (!is_dir($tempPathNewFiles.$fileName)) {
+        mkdir($tempPathNewFiles.$fileName, $perms, true);
     }
 
     $file = base64_decode($fileData);
-    file_put_contents($tempPath . $fullFileName, $file);
+    file_put_contents($tempPath.$fullFileName, $file);
 
     if (IS_WINDOWS_OS) { // IS_WINDOWS_OS has been defined in main_api.lib.php
-        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png');
-        $classPath = $converterPath . ';' . $converterPath . '/jodconverter-2.2.2.jar;' . $converterPath . '/jodconverter-cli-2.2.2.jar';
-        $cmd = 'java -Dfile.encoding=UTF-8 -cp "' . $classPath . '" DokeosConverter';
+        $converterPath = str_replace('/', '\\', api_get_path(SYS_PATH).'main/inc/lib/ppt2png');
+        $classPath = $converterPath.';'.$converterPath.'/jodconverter-2.2.2.jar;'.$converterPath.'/jodconverter-cli-2.2.2.jar';
+        $cmd = 'java -Dfile.encoding=UTF-8 -cp "'.$classPath.'" DokeosConverter';
     } else {
-        $converterPath = api_get_path(SYS_PATH) . 'main/inc/lib/ppt2png';
+        $converterPath = api_get_path(SYS_PATH).'main/inc/lib/ppt2png';
         $classPath = ' -Dfile.encoding=UTF-8 -cp .:jodconverter-2.2.2.jar:jodconverter-cli-2.2.2.jar';
-        $cmd = 'cd ' . $converterPath . ' && java ' . $classPath . ' DokeosConverter';
+        $cmd = 'cd '.$converterPath.' && java '.$classPath.' DokeosConverter';
     }
 
-    $cmd .= ' -p ' . api_get_setting('service_ppt2lp', 'port');
-    $cmd .= ' -w 720 -h 540 -d oogie "' . $tempPath . $fullFileName.'"  "' . $tempPathNewFiles . $fileName . '.html"';
+    $cmd .= ' -p '.api_get_setting('service_ppt2lp', 'port');
+    $cmd .= ' -w 720 -h 540 -d oogie "'.$tempPath.$fullFileName.'"  "'.$tempPathNewFiles.$fileName.'.html"';
 
     $perms = api_get_permissions_for_new_files();
-    chmod($tempPathNewFiles . $fileName, $perms, true);
+    chmod($tempPathNewFiles.$fileName, $perms, true);
 
     $files = array();
     $return = 0;
@@ -64,7 +64,7 @@ 
         $images = array();
         foreach ($files as $file) {
             $imageData = explode('||', $file);
-            $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles . $fileName . '/' . $imageData[1]));
+            $images[$imageData[1]] = base64_encode(file_get_contents($tempPathNewFiles.$fileName.'/'.$imageData[1]));
         }
         $data = array(
             'files' => $files,
@@ -89,7 +89,7 @@ 
  */
 function deleteDirectory($directoryPath)
 {
-    $files = array_diff(scandir($directoryPath), array('.','..'));
+    $files = array_diff(scandir($directoryPath), array('.', '..'));
     foreach ($files as $file) {
         if (is_dir("$directoryPath/$file")) {
             deleteDirectory("$directoryPath/$file");
@@ -106,7 +106,7 @@ 
 $webCodePath = api_get_path(WEB_CODE_PATH);
 $options = array(
     'uri' => $webPath,
-    'location' => $webCodePath . 'webservices/additional_webservices.php'
+    'location' => $webCodePath.'webservices/additional_webservices.php'
 );
 
 $soapServer = new SoapServer(NULL, $options);

main/webservices/cm_webservice.php

Doc Comments +5 added lines, -1 removed lines

@@ -32,6 +32,8 @@ 
 	 *
 	 * @param int Error code
 	 * @param string Error message
+	 * @param integer $code
+	 * @param string $message
 	 */
 	public function __construct($code, $message) {
 		$this->code = $code;
@@ -42,6 +44,7 @@ 
 	 * Sets the error handler
 	 *
 	 * @param WSErrorHandler Error handler
+	 * @param WSCMSoapErrorHandler $handler
 	 */
 	public static function setErrorHandler($handler) {
 		if($handler instanceof WSErrorHandler) {
@@ -76,6 +79,7 @@ 
 	 * Handle method
 	 *
 	 * @param WSError Error
+	 * @return void
 	 */
 	public function handle($error);
 }
@@ -102,7 +106,7 @@ 
 	 * Verifies the API key
 	 *
 	 * @param string Secret key
-	 * @return mixed WSError in case of failure, null in case of success
+	 * @return WSCMError|null WSError in case of failure, null in case of success
 	 */
 	protected function verifyKey($secret_key) {
 		$ip = trim($_SERVER['REMOTE_ADDR']);

Indentation +198 added lines, -198 removed lines

@@ -6,120 +6,120 @@ 
  * Error returned by one of the methods of the web service. Contains an error code and an error message
  */
 class WSCMError {
-	/**
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
-	 *
-	 * @var WSErrorHandler
-	 */
-	protected static $_handler;
+    /**
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
+     *
+     * @var WSErrorHandler
+     */
+    protected static $_handler;
 
-	/**
-	 * Error code
-	 *
-	 * @var int
-	 */
-	public $code;
+    /**
+     * Error code
+     *
+     * @var int
+     */
+    public $code;
 
-	/**
-	 * Error message
-	 *
-	 * @var string
-	 */
-	public $message;
+    /**
+     * Error message
+     *
+     * @var string
+     */
+    public $message;
 
-	/**
-	 * Constructor
-	 *
-	 * @param int Error code
-	 * @param string Error message
-	 */
-	public function __construct($code, $message) {
-		$this->code = $code;
-		$this->message = $message;
-	}
+    /**
+     * Constructor
+     *
+     * @param int Error code
+     * @param string Error message
+     */
+    public function __construct($code, $message) {
+        $this->code = $code;
+        $this->message = $message;
+    }
 
-	/**
-	 * Sets the error handler
-	 *
-	 * @param WSErrorHandler Error handler
-	 */
-	public static function setErrorHandler($handler) {
-		if($handler instanceof WSErrorHandler) {
-			self::$_handler = $handler;
-		}
-	}
+    /**
+     * Sets the error handler
+     *
+     * @param WSErrorHandler Error handler
+     */
+    public static function setErrorHandler($handler) {
+        if($handler instanceof WSErrorHandler) {
+            self::$_handler = $handler;
+        }
+    }
 
-	/**
-	 * Returns the error handler
-	 *
-	 * @return WSErrorHandler Error handler
-	 */
-	public static function getErrorHandler() {
-		return self::$_handler;
-	}
+    /**
+     * Returns the error handler
+     *
+     * @return WSErrorHandler Error handler
+     */
+    public static function getErrorHandler() {
+        return self::$_handler;
+    }
 
-	/**
-	 * Transforms the error into an array
-	 *
-	 * @return array Associative array with code and message
-	 */
-	public function toArray() {
-		return array('code' => $this->code, 'message' => $this->message);
-	}
+    /**
+     * Transforms the error into an array
+     *
+     * @return array Associative array with code and message
+     */
+    public function toArray() {
+        return array('code' => $this->code, 'message' => $this->message);
+    }
 }
 
 /**
  * Interface that must be implemented by any error handler
  */
 interface WSCMErrorHandler {
-	/**
-	 * Handle method
-	 *
-	 * @param WSError Error
-	 */
-	public function handle($error);
+    /**
+     * Handle method
+     *
+     * @param WSError Error
+     */
+    public function handle($error);
 }
 
 /**
  * Main class of the webservice. Webservice classes extend this class
  */
 class WSCM {
-	/**
-	 * Chamilo configuration
-	 *
-	 * @var array
-	 */
-	protected $_configuration;
+    /**
+     * Chamilo configuration
+     *
+     * @var array
+     */
+    protected $_configuration;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->_configuration = $GLOBALS['_configuration'];
-	}
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->_configuration = $GLOBALS['_configuration'];
+    }
 
-	/**
-	 * Verifies the API key
-	 *
-	 * @param string Secret key
-	 * @return mixed WSError in case of failure, null in case of success
-	 */
-	protected function verifyKey($secret_key) {
-		$ip = trim($_SERVER['REMOTE_ADDR']);
-		// if we are behind a reverse proxy, assume it will send the
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-		  list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
-		  $ip = trim($ip1);
-		}
-		$security_key = $ip.$this->_configuration['security_key'];
+    /**
+     * Verifies the API key
+     *
+     * @param string Secret key
+     * @return mixed WSError in case of failure, null in case of success
+     */
+    protected function verifyKey($secret_key) {
+        $ip = trim($_SERVER['REMOTE_ADDR']);
+        // if we are behind a reverse proxy, assume it will send the
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
+            $ip = trim($ip1);
+        }
+        $security_key = $ip.$this->_configuration['security_key'];
 
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
-			return new WSCMError(1, "API key is invalid");
-		} else {
-			return null;
-		}
-	}
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
+            return new WSCMError(1, "API key is invalid");
+        } else {
+            return null;
+        }
+    }
 
         /**
          * Verifies if the user is valid
@@ -134,12 +134,12 @@ 
             $login = $username;
             $password = $pass;
 
-	    //lookup the user in the main database
+        //lookup the user in the main database
             $user_table = Database::get_main_table(TABLE_MAIN_USER);
-	    $sql = "SELECT user_id, username, password, auth_source, active, expiration_date
+        $sql = "SELECT user_id, username, password, auth_source, active, expiration_date
 	            FROM $user_table
 	            WHERE username = '".trim(addslashes($login))."'";
-	    $result = Database::query($sql);
+        $result = Database::query($sql);
 
             if (Database::num_rows($result) > 0) {
                 $uData = Database::fetch_array($result);
@@ -171,7 +171,7 @@ 
 
         /**
          * Return the encrypted pass
-		 * @deprecated
+         * @deprecated
          * @param <String> $pass
          * @return <String> $pass encrypted
          */
@@ -180,112 +180,112 @@ 
         }*/
 
         /**
-	 * Gets the real user id based on the user id field name and value. Note that if the user id field name is "chamilo_user_id", it will use the user id
-	 * in the system database
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @return mixed System user id if the user was found, WSError otherwise
-	 */
-	protected function getUserId($user_id_field_name, $user_id_value) {
-		if($user_id_field_name == "chamilo_user_id") {
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
-				return intval($user_id_value);
-			} else {
-				return new WSCMError(100, "User not found");
-			}
-		} else {
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
-			if($user_id == 0) {
-				return new WSCMError(100, "User not found");
-			} else {
-				return $user_id;
-			}
-		}
-	}
+         * Gets the real user id based on the user id field name and value. Note that if the user id field name is "chamilo_user_id", it will use the user id
+         * in the system database
+         *
+         * @param string User id field name
+         * @param string User id value
+         * @return mixed System user id if the user was found, WSError otherwise
+         */
+    protected function getUserId($user_id_field_name, $user_id_value) {
+        if($user_id_field_name == "chamilo_user_id") {
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
+                return intval($user_id_value);
+            } else {
+                return new WSCMError(100, "User not found");
+            }
+        } else {
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
+            if($user_id == 0) {
+                return new WSCMError(100, "User not found");
+            } else {
+                return $user_id;
+            }
+        }
+    }
 
-	/**
-	 * Gets the real course id based on the course id field name and value. Note that if the course id field name is "chamilo_course_id", it will use the course id
-	 * in the system database
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed System course id if the course was found, WSError otherwise
-	 */
-	protected function getCourseId($course_id_field_name, $course_id_value) {
-		if($course_id_field_name == "chamilo_course_id") {
-			if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
-				return intval($course_id_value);
-			} else {
-				return new WSCMError(200, "Course not found");
-			}
-		} else {
-			$courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name);
-			if (empty($courseId)) {
-				return new WSCMError(200, "Course not found");
-			} else {
-				return $courseId;
-			}
-		}
-	}
+    /**
+     * Gets the real course id based on the course id field name and value. Note that if the course id field name is "chamilo_course_id", it will use the course id
+     * in the system database
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed System course id if the course was found, WSError otherwise
+     */
+    protected function getCourseId($course_id_field_name, $course_id_value) {
+        if($course_id_field_name == "chamilo_course_id") {
+            if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
+                return intval($course_id_value);
+            } else {
+                return new WSCMError(200, "Course not found");
+            }
+        } else {
+            $courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name);
+            if (empty($courseId)) {
+                return new WSCMError(200, "Course not found");
+            } else {
+                return $courseId;
+            }
+        }
+    }
 
-	/**
-	 * Gets the real session id based on the session id field name and value. Note that if the session id field name is "chamilo_session_id", it will use the session id
-	 * in the system database
-	 *
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @return mixed System session id if the session was found, WSError otherwise
-	 */
-	protected function getSessionId($session_id_field_name, $session_id_value)
-	{
-		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
-			if(!empty($session)) {
-				return intval($session_id_value);
-			} else {
-				return new WSCMError(300, "Session not found");
-			}
-		} else {
-			$session_id = SessionManager::getSessionIdFromOriginalId(
-				$session_id_value,
-				$session_id_field_name
-			);
-			if($session_id == 0) {
-				return new WSCMError(300, "Session not found");
-			} else {
-				return $session_id;
-			}
-		}
-	}
+    /**
+     * Gets the real session id based on the session id field name and value. Note that if the session id field name is "chamilo_session_id", it will use the session id
+     * in the system database
+     *
+     * @param string Session id field name
+     * @param string Session id value
+     * @return mixed System session id if the session was found, WSError otherwise
+     */
+    protected function getSessionId($session_id_field_name, $session_id_value)
+    {
+        if ($session_id_field_name == "chamilo_session_id") {
+            $session = SessionManager::fetch((int)$session_id_value);
+            if(!empty($session)) {
+                return intval($session_id_value);
+            } else {
+                return new WSCMError(300, "Session not found");
+            }
+        } else {
+            $session_id = SessionManager::getSessionIdFromOriginalId(
+                $session_id_value,
+                $session_id_field_name
+            );
+            if($session_id == 0) {
+                return new WSCMError(300, "Session not found");
+            } else {
+                return $session_id;
+            }
+        }
+    }
 
-	/**
-	 * Handles an error by calling the WSError error handler
-	 *
-	 * @param WSError Error
-	 */
-	protected function handleError($error) {
-		$handler = WSCMError::getErrorHandler();
-		$handler->handle($error);
-	}
+    /**
+     * Handles an error by calling the WSError error handler
+     *
+     * @param WSError Error
+     */
+    protected function handleError($error) {
+        $handler = WSCMError::getErrorHandler();
+        $handler->handle($error);
+    }
 
-	/**
-	 * Gets a successful result
-	 *
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
-	 */
-	protected function getSuccessfulResult() {
-		return array('code' => 0, 'message' => 'Operation was successful');
-	}
+    /**
+     * Gets a successful result
+     *
+     * @return array Array with a code of 0 and a message 'Operation was successful'
+     */
+    protected function getSuccessfulResult() {
+        return array('code' => 0, 'message' => 'Operation was successful');
+    }
 
-	/**
-	 * Test function. Returns the string success
-	 *
-	 * @return string Success
-	 */
-	public function test() {
-		return "success";
-	}
+    /**
+     * Test function. Returns the string success
+     *
+     * @return string Success
+     */
+    public function test() {
+        return "success";
+    }
 
         /**
          * *Strictly* reverts PHP's nl2br() effects (whether it was used in XHTML mode or not)

Spacing +13 added lines, -13 removed lines

@@ -44,7 +44,7 @@ 
 	 * @param WSErrorHandler Error handler
 	 */
 	public static function setErrorHandler($handler) {
-		if($handler instanceof WSErrorHandler) {
+		if ($handler instanceof WSErrorHandler) {
 			self::$_handler = $handler;
 		}
 	}
@@ -109,12 +109,12 @@ 
 		// if we are behind a reverse proxy, assume it will send the
 		// HTTP_X_FORWARDED_FOR header and use this IP instead
 		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-		  list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
+		  list($ip1, $ip2) = split(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
 		  $ip = trim($ip1);
 		}
 		$security_key = $ip.$this->_configuration['security_key'];
 
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
+		if (!api_is_valid_secret_key($secret_key, $security_key)) {
 			return new WSCMError(1, "API key is invalid");
 		} else {
 			return null;
@@ -149,9 +149,9 @@ 
                     // Check the user's password
                         if ($password == $uData['password'] AND (trim($login) == $uData['username'])) {
                         // Check if the account is active (not locked)
-                            if ($uData['active']=='1') {
+                            if ($uData['active'] == '1') {
                                 // Check if the expiration date has not been reached
-                                if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
+                                if ($uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date'] == '0000-00-00 00:00:00') {
                                     return "valid";
                                 }
                                 else
@@ -188,15 +188,15 @@ 
 	 * @return mixed System user id if the user was found, WSError otherwise
 	 */
 	protected function getUserId($user_id_field_name, $user_id_value) {
-		if($user_id_field_name == "chamilo_user_id") {
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
+		if ($user_id_field_name == "chamilo_user_id") {
+			if (UserManager::is_user_id_valid(intval($user_id_value))) {
 				return intval($user_id_value);
 			} else {
 				return new WSCMError(100, "User not found");
 			}
 		} else {
 			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
-			if($user_id == 0) {
+			if ($user_id == 0) {
 				return new WSCMError(100, "User not found");
 			} else {
 				return $user_id;
@@ -213,8 +213,8 @@ 
 	 * @return mixed System course id if the course was found, WSError otherwise
 	 */
 	protected function getCourseId($course_id_field_name, $course_id_value) {
-		if($course_id_field_name == "chamilo_course_id") {
-			if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
+		if ($course_id_field_name == "chamilo_course_id") {
+			if (CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
 				return intval($course_id_value);
 			} else {
 				return new WSCMError(200, "Course not found");
@@ -240,8 +240,8 @@ 
 	protected function getSessionId($session_id_field_name, $session_id_value)
 	{
 		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
-			if(!empty($session)) {
+			$session = SessionManager::fetch((int) $session_id_value);
+			if (!empty($session)) {
 				return intval($session_id_value);
 			} else {
 				return new WSCMError(300, "Session not found");
@@ -251,7 +251,7 @@ 
 				$session_id_value,
 				$session_id_field_name
 			);
-			if($session_id == 0) {
+			if ($session_id == 0) {
 				return new WSCMError(300, "Session not found");
 			} else {
 				return $session_id;

Braces +8 added lines, -8 removed lines

@@ -153,18 +153,18 @@
                                 // Check if the expiration date has not been reached
                                 if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
                                     return "valid";
+                                } else {
+                                                                    return get_lang('AccountExpired');
                                 }
-                                else
-                                    return get_lang('AccountExpired');
+                            } else {
+                                                            return get_lang('AccountInactive');
                             }
-                            else
-                                return get_lang('AccountInactive');
+                        } else {
+                                                    return get_lang('InvalidId');
                         }
-                        else
-                            return get_lang('InvalidId');
+                    } else {
+                                            return get_lang('AccountURLInactive');
                     }
-                    else
-                        return get_lang('AccountURLInactive');
                 }
                 return get_lang('InvalidId');
         }

main/webservices/cm_webservice_inbox.php

Doc Comments +3 added lines

@@ -204,6 +204,9 @@
 
     }
 
+    /**
+     * @param integer $user_id
+     */
     protected function set_message_as_read($user_id, $message_id){
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' WHERE user_receiver_id=".$user_id." AND id='".$message_id."';";

Indentation +8 added lines, -8 removed lines

@@ -37,8 +37,8 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $sql_query = "SELECT id FROM $table_message " .
-                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
-                                     " ORDER BY send_date LIMIT $from,$number_of_items";
+                                        " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
+                                        " ORDER BY send_date LIMIT $from,$number_of_items";
 
             $sql_result = Database::query($sql_query);
             $message = "#";
@@ -86,7 +86,7 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $sql_query = "SELECT ".$field_table." FROM $table_message " .
-                                     " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
+                                        " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
 
             $sql_result = Database::query($sql_query);
             $result = Database::fetch_row($sql_result);
@@ -107,8 +107,8 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $sql_query = "SELECT id FROM $table_message " .
-					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
-					 "ORDER BY send_date LIMIT $from,$number_of_items";
+                        "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
+                        "ORDER BY send_date LIMIT $from,$number_of_items";
 
             $sql_result = Database::query($sql_query);
             $message = "#";
@@ -157,7 +157,7 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $sql_query = "SELECT ".$field_table." FROM $table_message " .
-                                     " WHERE user_sender_id=".$user_id." AND id=".$id;
+                                        " WHERE user_sender_id=".$user_id." AND id=".$id;
 
             $sql_result = Database::query($sql_query);
             $result = Database::fetch_row($sql_result);
@@ -188,11 +188,11 @@ 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
             $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
-                           " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
+                            " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
             $result = Database::query($query);
 
             $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
-                           " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
+                            " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
             $result = Database::query($query);
 
             $inbox_last_id = Database::insert_id();

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 {
     public function unreadMessage($username, $password)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $table_message = Database::get_main_table(TABLE_MESSAGE);
             $user_id = UserManager::get_user_id_from_username($username);
@@ -30,14 +30,14 @@ 
 
     public function get_message_id($username, $password, $from, $number_of_items)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $user_id = UserManager::get_user_id_from_username($username);
 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
-            $sql_query = "SELECT id FROM $table_message " .
-                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
+            $sql_query = "SELECT id FROM $table_message ".
+                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)".
                                      " ORDER BY send_date LIMIT $from,$number_of_items";
 
             $sql_result = Database::query($sql_query);
@@ -55,7 +55,7 @@ 
 
     public function get_message_data($username, $password, $message_id, $field)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $htmlcode = false;
             $user_id = UserManager::get_user_id_from_username($username);
@@ -85,14 +85,14 @@ 
 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
-            $sql_query = "SELECT ".$field_table." FROM $table_message " .
+            $sql_query = "SELECT ".$field_table." FROM $table_message ".
                                      " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
 
             $sql_result = Database::query($sql_query);
             $result = Database::fetch_row($sql_result);
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
 
-        }else
+        } else
             return get_lang('InvalidId');
 
 
@@ -100,14 +100,14 @@ 
 
     public function get_message_id_sent($username, $password, $from, $number_of_items)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $user_id = UserManager::get_user_id_from_username($username);
 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
-            $sql_query = "SELECT id FROM $table_message " .
-					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
+            $sql_query = "SELECT id FROM $table_message ".
+					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." ".
 					 "ORDER BY send_date LIMIT $from,$number_of_items";
 
             $sql_result = Database::query($sql_query);
@@ -126,7 +126,7 @@ 
 
     public function get_message_data_sent($username, $password, $id, $field)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $htmlcode = false;
             switch ($field)
@@ -156,7 +156,7 @@ 
 
             $table_message = Database::get_main_table(TABLE_MESSAGE);
 
-            $sql_query = "SELECT ".$field_table." FROM $table_message " .
+            $sql_query = "SELECT ".$field_table." FROM $table_message ".
                                      " WHERE user_sender_id=".$user_id." AND id=".$id;
 
             $sql_result = Database::query($sql_query);
@@ -164,7 +164,7 @@ 
 
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
 
-        }else
+        } else
             return get_lang('InvalidId');
 
 
@@ -173,7 +173,7 @@ 
     public function message_send($username, $password, $receiver_user_id, $subject, $content)
     {
         //TODO: verificar data de envio. Esta divergindo de data!
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
             $group_id = intval(0);
             $parent_id = intval(0);
@@ -204,7 +204,7 @@ 
 
     }
 
-    protected function set_message_as_read($user_id, $message_id){
+    protected function set_message_as_read($user_id, $message_id) {
         $table_message = Database::get_main_table(TABLE_MESSAGE);
         $query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' WHERE user_receiver_id=".$user_id." AND id='".$message_id."';";
         $result = Database::query($query);

Braces +15 added lines, -10 removed lines

@@ -48,8 +48,9 @@ 
 
             return $message;
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
     }
 
@@ -92,8 +93,9 @@ 
             $result = Database::fetch_row($sql_result);
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
 
-        }else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
 
     }
@@ -118,8 +120,9 @@ 
 
             return $message;
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
     }
 
@@ -164,8 +167,9 @@ 
 
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
 
-        }else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
 
     }
@@ -199,8 +203,9 @@ 
 
             return $inbox_last_id;
 
-        } else
-            return get_lang('InvalidId');
+        } else {
+                    return get_lang('InvalidId');
+        }
 
     }
 

main/webservices/cm_webservice_user.php

Doc Comments +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
     /**
     * Get a list of users of which the given conditions match with a LIKE '%cond%'
     * @param array $conditions a list of condition (exemple : status=>STUDENT)
-    * @param array $order_by a list of fields on which sort
+    * @param string[] $order_by a list of fields on which sort
     * @return array An array with all users of the platform.
     * @todo optional course code parameter, optional sorting parameters...
      *@todo Use the UserManager class

Indentation +7 added lines, -7 removed lines

@@ -95,7 +95,7 @@ 
     {
         global $charset;
         if ($this->verifyUserPass($username, $password) == "valid") {
-		    $user_id = UserManager::get_user_id_from_username($username);
+            $user_id = UserManager::get_user_id_from_username($username);
             $message_title = get_lang('Invitation');
             $count_is_true = SocialManager::send_invitation_friend($user_id,$userfriend_id, $message_title, $content_message);
 
@@ -135,14 +135,14 @@ 
 
 
     /**
-    * Get a list of users of which the given conditions match with a LIKE '%cond%'
-    * @param array $conditions a list of condition (exemple : status=>STUDENT)
-    * @param array $order_by a list of fields on which sort
-    * @return array An array with all users of the platform.
-    * @todo optional course code parameter, optional sorting parameters...
+     * Get a list of users of which the given conditions match with a LIKE '%cond%'
+     * @param array $conditions a list of condition (exemple : status=>STUDENT)
+     * @param array $order_by a list of fields on which sort
+     * @return array An array with all users of the platform.
+     * @todo optional course code parameter, optional sorting parameters...
      *@todo Use the UserManager class
      * @todo security filter order by
-    */
+     */
     private static function get_user_list_like_start($conditions = array(), $order_by = array())
     {
         $user_table = Database :: get_main_table(TABLE_MAIN_USER);

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
 
     public function find_id_user($username, $password, $name)
     {
-        if($this->verifyUserPass($username, $password) == "valid")
+        if ($this->verifyUserPass($username, $password) == "valid")
         {
 
             $listResult = "#";
@@ -40,9 +40,9 @@ 
             }
 
             $listArrayResult = array_unique($listArray);
-            foreach($listArrayResult as $result)
+            foreach ($listArrayResult as $result)
             {
-                $listResult .= $result . "#";
+                $listResult .= $result."#";
             }
 
             return $listResult;
@@ -97,12 +97,12 @@ 
         if ($this->verifyUserPass($username, $password) == "valid") {
 		    $user_id = UserManager::get_user_id_from_username($username);
             $message_title = get_lang('Invitation');
-            $count_is_true = SocialManager::send_invitation_friend($user_id,$userfriend_id, $message_title, $content_message);
+            $count_is_true = SocialManager::send_invitation_friend($user_id, $userfriend_id, $message_title, $content_message);
 
             if ($count_is_true) {
-                return Display::display_normal_message(api_htmlentities(get_lang('InvitationHasBeenSent'), ENT_QUOTES,$charset),false);
+                return Display::display_normal_message(api_htmlentities(get_lang('InvitationHasBeenSent'), ENT_QUOTES, $charset), false);
             } else {
-                return Display::display_error_message(api_htmlentities(get_lang('YouAlreadySentAnInvitation'), ENT_QUOTES,$charset),false);
+                return Display::display_error_message(api_htmlentities(get_lang('YouAlreadySentAnInvitation'), ENT_QUOTES, $charset), false);
             }
         }
         return get_lang('InvalidId');

main/webservices/lp.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 
 define('WS_ERROR_SECRET_KEY', 1);
 
+/**
+ * @param integer $code
+ */
 function return_error($code) {
     $fault = null;
     switch ($code) {

Indentation +1 added lines, -1 removed lines

@@ -581,7 +581,7 @@
     /*$sessionIdName = isset($params['session_id_name']) ? $params['session_id_name'] : null;
     $sessionIdValue = isset($params['session_id_value']) ? $params['session_id_value'] : null;*/
 
-     $courseInfo = CourseManager::getCourseInfoFromOriginalId(
+        $courseInfo = CourseManager::getCourseInfoFromOriginalId(
         $courseIdValue,
         $courseIdName
     );

Spacing +37 added lines, -37 removed lines

@@ -65,7 +65,7 @@ 
     }
 
     if ($debug) {
-        error_log("checkip " . intval($check_ip));
+        error_log("checkip ".intval($check_ip));
     }
 
     if ($check_ip) {
@@ -120,13 +120,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSImportLP',                            // method name
-    array('params' => 'tns:params'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSImportLP',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSImportLP', // method name
+    array('params' => 'tns:params'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSImportLP', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users'                                               // documentation
 );
 
@@ -183,7 +183,7 @@ 
 
     $uniqueFile = uniqid();
     $userId = 1; // admin
-    $filePath = api_get_path(SYS_ARCHIVE_PATH) . $uniqueFile;
+    $filePath = api_get_path(SYS_ARCHIVE_PATH).$uniqueFile;
     file_put_contents($filePath, $fileData);
 
     $fileName = $params['filename'];
@@ -257,8 +257,8 @@ 
     'all',
     '',
     array(
-        'id'    => array('name' => 'id',    'type' => 'xsd:string'),
-        'name'  => array('name' => 'name',  'type' => 'xsd:string'),
+        'id'    => array('name' => 'id', 'type' => 'xsd:string'),
+        'name'  => array('name' => 'name', 'type' => 'xsd:string'),
     )
 );
 
@@ -274,13 +274,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSGetLpList',                            // method name
-    array('params' => 'tns:paramsGetLpList'),  // input parameters
-    array('return' => 'tns:lpList'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSGetLpList',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSGetLpList', // method name
+    array('params' => 'tns:paramsGetLpList'), // input parameters
+    array('return' => 'tns:lpList'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSGetLpList', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users'                                               // documentation
 );
 
@@ -369,13 +369,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSDeleteLp',                            // method name
-    array('params' => 'tns:paramsDeleteLp'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSDeleteLp',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSDeleteLp', // method name
+    array('params' => 'tns:paramsDeleteLp'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSDeleteLp', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a LP'                                               // documentation
 );
 
@@ -434,9 +434,9 @@ 
     if ($lp) {
         if ($debug) error_log("LP deleted $lpId");
 
-        $course_dir = $courseInfo['directory'] . '/document';
+        $course_dir = $courseInfo['directory'].'/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
-        $base_work_dir = $sys_course_path . $course_dir;
+        $base_work_dir = $sys_course_path.$course_dir;
 
         $items = $lp->get_flat_ordered_items_list($lpId, 0, $courseId);
 
@@ -495,9 +495,9 @@ 
     'all',
     '',
     array(
-        'data'  => array('name' => 'data',  'type' => 'xsd:string'),
-        'title'  => array('name' => 'title',  'type' => 'xsd:string'),
-        'filename'  => array('name' => 'filename',  'type' => 'xsd:string'),
+        'data'  => array('name' => 'data', 'type' => 'xsd:string'),
+        'title'  => array('name' => 'title', 'type' => 'xsd:string'),
+        'filename'  => array('name' => 'filename', 'type' => 'xsd:string'),
     )
 );
 
@@ -548,13 +548,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateLp',                            // method name
-    array('params' => 'tns:paramsCreateLp'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSLP',                                                   // namespace
-    'urn:WSLP#WSCreateLp',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSCreateLp', // method name
+    array('params' => 'tns:paramsCreateLp'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSLP', // namespace
+    'urn:WSLP#WSCreateLp', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service creates a LP'                                               // documentation
 );
 

Braces +48 added lines, -20 removed lines

@@ -48,19 +48,22 @@ 
         list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
-            if ($debug)
-                error_log("ip_matches: $ip_matches");
+            if ($debug) {
+                            error_log("ip_matches: $ip_matches");
+            }
         }
     }
 
@@ -76,8 +79,9 @@ 
     }
     $result = api_is_valid_secret_key($secret_key, $security_key);
     //error_log($secret_key.'-'.$security_key);
-    if ($debug)
-        error_log('WSHelperVerifyKey result: '.intval($result));
+    if ($debug) {
+            error_log('WSHelperVerifyKey result: '.intval($result));
+    }
     return $result;
 }
 
@@ -140,7 +144,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return return_error(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSImportLP');
+    if ($debug) {
+        error_log('WSImportLP');
+    }
 
     $courseIdName = $params['course_id_name'];
     $courseIdValue = $params['course_id_value'];
@@ -156,7 +162,9 @@ 
     $courseId = $courseInfo['real_id'];
 
     if (empty($courseInfo)) {
-        if ($debug) error_log('Course not found');
+        if ($debug) {
+            error_log('Course not found');
+        }
         return 'Course not found';
     }
 
@@ -169,7 +177,9 @@ 
 
         if (empty($sessionId)) {
 
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -196,7 +206,9 @@ 
     $manifest = $oScorm->import_package($fileInfo, '', $courseInfo);
 
     if (!$manifest) {
-        if ($debug) error_log('manifest.xml file not found');
+        if ($debug) {
+            error_log('manifest.xml file not found');
+        }
         //if api_set_failure
         return 'manifest.xml file not found';
     }
@@ -215,10 +227,14 @@ 
         $oScorm->set_maker($maker, $courseId);
         //$oScorm->set_jslib('scorm_api.php');
 
-        if ($debug) error_log('scorm was added');
+        if ($debug) {
+            error_log('scorm was added');
+        }
         return 1;
     } else {
-        if ($debug) error_log('manifest data empty');
+        if ($debug) {
+            error_log('manifest data empty');
+        }
         return 'manifest data empty';
     }
 }
@@ -311,7 +327,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
 
@@ -326,7 +344,9 @@ 
 
         if (empty($sessionId)) {
 
-            if ($debug) error_log('Session not found');
+            if ($debug) {
+                error_log('Session not found');
+            }
             return 'Session not found';
         }
     }
@@ -407,7 +427,9 @@ 
     );
 
     if (empty($courseInfo)) {
-        if ($debug) error_log("Course not found: $courseIdName : $courseIdValue");
+        if ($debug) {
+            error_log("Course not found: $courseIdName : $courseIdValue");
+        }
         return 'Course not found';
     }
     $courseId = $courseInfo['real_id'];
@@ -432,7 +454,9 @@ 
 
     $lp = new learnpath($courseCode, $lpId, null);
     if ($lp) {
-        if ($debug) error_log("LP deleted $lpId");
+        if ($debug) {
+            error_log("LP deleted $lpId");
+        }
 
         $course_dir = $courseInfo['directory'] . '/document';
         $sys_course_path = api_get_path(SYS_COURSE_PATH);
@@ -448,7 +472,9 @@ 
                 if ($item) {
                     $documentId = $item->get_path();
 
-                    if ($debug) error_log("lp item id found #$itemId");
+                    if ($debug) {
+                        error_log("lp item id found #$itemId");
+                    }
 
                     $documentInfo = DocumentManager::get_document_data_by_id(
                         $documentId,
@@ -474,7 +500,9 @@ 
                         }
                     }
                 } else {
-                    if ($debug) error_log("Document not found #$itemId");
+                    if ($debug) {
+                        error_log("Document not found #$itemId");
+                    }
                 }
             }
         }

main/webservices/registration.soap.php

Doc Comments +3 added lines

@@ -2617,6 +2617,9 @@
     )
 );
 
+/**
+ * @param string $type
+ */
 function WSHelperActionOnUsers($params, $type) {
     if(!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);

Braces +169 added lines, -62 removed lines

@@ -63,19 +63,22 @@ 
         list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
         $ip = trim($ip1);
     }
-    if ($debug)
-        error_log("ip: $ip");
+    if ($debug) {
+            error_log("ip: $ip");
+    }
     // Check if a file that limits access from webservices exists and contains
     // the restraining check
     if (is_file('webservice-auth-ip.conf.php')) {
         include 'webservice-auth-ip.conf.php';
-        if ($debug)
-            error_log("webservice-auth-ip.conf.php file included");
+        if ($debug) {
+                    error_log("webservice-auth-ip.conf.php file included");
+        }
         if (!empty($ws_auth_ip)) {
             $check_ip = true;
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
-            if ($debug)
-                error_log("ip_matches: $ip_matches");
+            if ($debug) {
+                            error_log("ip_matches: $ip_matches");
+            }
         }
     }
 
@@ -92,8 +95,9 @@ 
 
     $result = api_is_valid_secret_key($secret_key, $security_key);
 
-    if ($debug)
-        error_log('WSHelperVerifyKey result: '.intval($result));
+    if ($debug) {
+            error_log('WSHelperVerifyKey result: '.intval($result));
+    }
     return $result;
 }
 
@@ -553,7 +557,9 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
@@ -1012,7 +1018,9 @@ 
     if (empty($userId) && empty($sessionId) && empty($courseId)) {
         // try original values
 
-        if ($debug) error_log('try original values');
+        if ($debug) {
+            error_log('try original values');
+        }
 
         $userIdName = isset($params['original_user_id_name']) ? $params['original_user_id_name'] : 0;
         $userIdValue = isset($params['original_user_id_value']) ? $params['original_user_id_value'] : 0;
@@ -1044,9 +1052,15 @@ 
         );
     }
 
-    if ($debug) error_log('$userId found: '. $userId);
-    if ($debug) error_log('$courseId found: '. $courseId);
-    if ($debug) error_log('$sessionId found: '. $sessionId);
+    if ($debug) {
+        error_log('$userId found: '. $userId);
+    }
+    if ($debug) {
+        error_log('$courseId found: '. $courseId);
+    }
+    if ($debug) {
+        error_log('$sessionId found: '. $sessionId);
+    }
 
     return [
         'user_id' => $userId,
@@ -1076,13 +1090,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1095,13 +1113,17 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  '. print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  '. print_r($coaches, 1));
+        }
         if (in_array($userId, $coaches)) {
             $result = 1;
         }
     }
 
-    if ($debug) error_log('Result:  '. $result);
+    if ($debug) {
+        error_log('Result:  '. $result);
+    }
 
     return $result;
 }
@@ -1127,13 +1149,17 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeTeacherToSessionCourse');
+    if ($debug) {
+        error_log('WSSubscribeTeacherToSessionCourse');
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1147,7 +1173,9 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  ' . print_r($coaches, 1));
+        if ($debug) {
+            error_log('Coaches:  ' . print_r($coaches, 1));
+        }
         if (!in_array($userId, $coaches)) {
             $result = 1;
         }
@@ -1155,7 +1183,9 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) {
+        error_log('Final Result: '. $result);
+    }
 
     return $result;
 }
@@ -1207,8 +1237,12 @@ 
 {
     global $_user, $_configuration, $debug;
     $debug = 1;
-    if ($debug) error_log('WSCreateUserPasswordCrypted');
-    if ($debug) error_log(print_r($params,1));
+    if ($debug) {
+        error_log('WSCreateUserPasswordCrypted');
+    }
+    if ($debug) {
+        error_log(print_r($params,1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -1244,22 +1278,30 @@ 
         if ($_configuration['password_encryption'] === $encrypt_method ) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
 
             } else if ($encrypt_method == 'sha1' && !preg_match('/^[A-Fa-f0-9]{40}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
-                if ($debug) error_log($msg);
+                if ($debug) {
+                    error_log($msg);
+                }
                 return $msg;
             }
         } else {
             $msg = "This encryption $encrypt_method is not configured";
-            if ($debug) error_log($msg);
+            if ($debug) {
+                error_log($msg);
+            }
             return $msg;
         }
     } else {
         $msg = 'The chamilo setting $_configuration["password_encryption"] is not configured';
-        if ($debug) error_log($msg);
+        if ($debug) {
+            error_log($msg);
+        }
         return $msg;
     }
 
@@ -1279,10 +1321,14 @@ 
         $original_user_id_name
     );
 
-    if ($debug) error_log('Ready to create user');
+    if ($debug) {
+        error_log('Ready to create user');
+    }
 
     if ($user_id > 0) {
-        if ($debug) error_log('User found with id: '.$user_id);
+        if ($debug) {
+            error_log('User found with id: '.$user_id);
+        }
 
         // Check whether user is not active
         //@todo why this condition exists??
@@ -1293,7 +1339,9 @@ 
         $count_check_user = Database::num_rows($resu);
         if ($count_check_user > 0) {
 
-            if ($debug) error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            if ($debug) {
+                error_log('User id: '.$user_id.' exists and is NOT active. Updating user and setting setting active = 1');
+            }
 
             $sql = "UPDATE $table_user SET
                     lastname='".Database::escape_string($lastName)."',
@@ -1313,7 +1361,9 @@ 
                     active='1',
                     hr_dept_id=".intval($hr_dept_id);
             $sql .=    " WHERE user_id='".$r_check_user[0]."'";
-            if ($debug) error_log($sql);
+            if ($debug) {
+                error_log($sql);
+            }
             Database::query($sql);
 
             if (is_array($extra_list) && count($extra_list) > 0) {
@@ -1330,11 +1380,15 @@ 
             }
             return $r_check_user[0];
         } else {
-            if ($debug) error_log('User exists but is active. Cant be updated');
+            if ($debug) {
+                error_log('User exists but is active. Cant be updated');
+            }
             return 0;
         }
     } else {
-        if ($debug) error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        if ($debug) {
+            error_log("User not found with original_id = $original_user_id_value and original_name = $original_user_id_name");
+        }
     }
 
     // Default language.
@@ -1350,7 +1404,9 @@ 
 
     // First check wether the login already exists
     if (!UserManager::is_username_available($loginName)) {
-        if ($debug) error_log("Username $loginName is not available");
+        if ($debug) {
+            error_log("Username $loginName is not available");
+        }
         return 0;
     }
 
@@ -1372,7 +1428,9 @@ 
             expiration_date     = '".Database::escape_string($expiration_date)."',
             hr_dept_id          = '".Database::escape_string($hr_dept_id)."',
             active              = '".Database::escape_string($active)."'";
-    if ($debug) error_log($sql);
+    if ($debug) {
+        error_log($sql);
+    }
 
     Database::query($sql);
     $return = Database::insert_id();
@@ -1384,7 +1442,9 @@ 
 
         $url_id = api_get_current_access_url_id();
         UrlManager::add_user_to_url($return, $url_id);
-        if ($debug) error_log("Adding user_id = $return to URL id $url_id ");
+        if ($debug) {
+            error_log("Adding user_id = $return to URL id $url_id ");
+        }
 
         // Create extra field for the original_user_id_name
         UserManager::create_extra_field(
@@ -1421,7 +1481,9 @@ 
             }
         }
     } else {
-        if ($debug) error_log('Error while inserting a user');
+        if ($debug) {
+            error_log('Error while inserting a user');
+        }
         return 0;
     }
 
@@ -4480,7 +4542,9 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    }
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -4499,7 +4563,9 @@ 
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if ($debug) error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        if ($debug) {
+            error_log('WSSubscribeUserToCourse user_id: '.$user_id);
+        }
 
         if ($user_id == 0) {
             // If user was not found, there was a problem
@@ -4517,13 +4583,19 @@ 
                 // Course was not found
                 $resultValue = 0;
             } else {
-                if ($debug) error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                if ($debug) {
+                    error_log('WSSubscribeUserToCourse courseCode: '.$courseCode);
+                }
                 $result = CourseManager::add_user_to_course($user_id, $courseCode, $status, false);
                 if ($result) {
                     $resultValue = 1;
-                    if ($debug) error_log('WSSubscribeUserToCourse subscribed');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse subscribed');
+                    }
                 } else {
-                    if ($debug) error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    if ($debug) {
+                        error_log('WSSubscribeUserToCourse NOT subscribed: ');
+                    }
                 }
             }
         }
@@ -4581,8 +4653,12 @@ 
 function WSSubscribeUserToCourseSimple($params) {
     global $debug;
 
-    if ($debug) error_log('WSSubscribeUserToCourseSimple');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('WSSubscribeUserToCourseSimple');
+    }
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
@@ -4597,7 +4673,9 @@ 
     if (empty($user_data)) {
         // If user was not found, there was a problem
         $result = "User $user_id does not exist";
-        if ($debug) error_log($result);
+        if ($debug) {
+            error_log($result);
+        }
         return $result;
     }
     if (!empty($course_code)) {
@@ -4605,14 +4683,22 @@ 
         if (empty($course_data)) {
             // Course was not found
             $result = "Course $course_code does not exist in the platform ";
-            if ($debug) error_log($result);
+            if ($debug) {
+                error_log($result);
+            }
         } else {
-            if ($debug) error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            if ($debug) {
+                error_log('Try to register: user_id= '.$user_id.' to course: '.$course_data['code']);
+            }
             if (!CourseManager::add_user_to_course($user_id, $course_data['code'], $status)) {
                 $result = 'User was not registered possible reasons: User already registered to the course, Course visibility doesnt allow user subscriptions ';
-                if ($debug) error_log($result);
+                if ($debug) {
+                    error_log($result);
+                }
             } else {
-                if ($debug) error_log('User registered to the course: '.$course_data['code']);
+                if ($debug) {
+                    error_log('User registered to the course: '.$course_data['code']);
+                }
                 $result = 1;
             }
         }
@@ -4664,8 +4750,12 @@ 
 // define the method WSGetUser
 function WSGetUser($params) {
     global $debug;
-    if ($debug) error_log('WSGetUser');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUser');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -4718,8 +4808,12 @@ 
 // define the method WSGetUserFromUsername
 function WSGetUserFromUsername($params) {
     global $debug;
-    if ($debug) error_log('WSGetUserFromUsername');
-    if ($debug) error_log('$params: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSGetUserFromUsername');
+    }
+    if ($debug) {
+        error_log('$params: '.print_r($params, 1));
+    }
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -5169,7 +5263,9 @@ 
                 $orig_session_id_value[] = $original_session_id_value;
                 $results[] = 1;
 
-                if ($debug) error_log("subscribe user:$user_id to session $sessionId");
+                if ($debug) {
+                    error_log("subscribe user:$user_id to session $sessionId");
+                }
             }
         }
     } // end principal foreach
@@ -5253,7 +5349,9 @@ 
                 SESSION_VISIBLE_READ_ONLY,
                 false
             );
-            if ($debug) error_log('User registered to the course: '.$session_id);
+            if ($debug) {
+                error_log('User registered to the course: '.$session_id);
+            }
             $result = 1;
         }
     }
@@ -5399,7 +5497,9 @@ 
                 $orig_session_id_value[] = $original_session_id_value;
                 $results[] = 1;
 
-                if ($debug) error_log("Unsubscribe user:$user_id to session:$id_session");
+                if ($debug) {
+                    error_log("Unsubscribe user:$user_id to session:$id_session");
+                }
             }
         }
     } // end principal foreach
@@ -5546,7 +5646,9 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    if ($debug) {
+        error_log('WSSuscribeCoursesToSession: '.print_r($params, 1));
+    }
 
     $coursessessions_params = $params['coursessessions'];
     $results = array();
@@ -5584,7 +5686,9 @@ 
                     array($courseInfo['real_id']),
                     false
                 );
-                if ($debug) error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                if ($debug) {
+                    error_log("add_courses_to_session: course:$courseCode to session:$sessionId");
+                }
 
                 $results[] = 1;
                 $orig_course_id_value[] = $original_session_id_value;
@@ -5935,8 +6039,7 @@ 
             UserManager::create_extra_field($params['original_user_id_name'], 1, $params['original_user_id_name'], '');
             // Save the external system's id into user_field_value table.
             UserManager::update_extra_field_value($user_id, $params['original_user_id_name'], $params['original_user_id_value']);
-        }
-        else {
+        } else {
             return 0;
         }
     }
@@ -6086,8 +6189,12 @@ 
 {
     global $debug;
 
-    if ($debug) error_log('WSUserSubscribedInCourse');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) {
+        error_log('WSUserSubscribedInCourse');
+    }
+    if ($debug) {
+        error_log('Params '. print_r($params, 1));
+    }
     if (!WSHelperVerifyKey($params)) {
 
         return returnError(WS_ERROR_SECRET_KEY);

Spacing +455 added lines, -455 removed lines

@@ -80,7 +80,7 @@ 
     }
 
     if ($debug) {
-        error_log("checkip " . intval($check_ip));
+        error_log("checkip ".intval($check_ip));
     }
 
     if ($check_ip) {
@@ -138,7 +138,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:extras[]')),
     'tns:extras'
 );
 
@@ -171,7 +171,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:usersParams[]')),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:usersParams[]')),
     'tns:usersParams'
 );
 
@@ -210,17 +210,17 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:result_createUsers[]')),'tns:result_createUsers'
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:result_createUsers[]')), 'tns:result_createUsers'
 );
 
 // Register the method to expose
-$server->register('WSCreateUsers',                 // method name
-    array('createUsers' => 'tns:createUsers'),     // input parameters
-    array('return' => 'tns:results_createUsers'),  // output parameters
-    'urn:WSRegistration',                          // namespace
-    'urn:WSRegistration#WSCreateUsers',            // soapaction
-    'rpc',                                         // style
-    'encoded',                                     // use
+$server->register('WSCreateUsers', // method name
+    array('createUsers' => 'tns:createUsers'), // input parameters
+    array('return' => 'tns:results_createUsers'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user'                     // documentation
 );
 
@@ -401,7 +401,7 @@ 
             continue;
         }
 
-        $results[] =  $userId;
+        $results[] = $userId;
 
     } // end principal foreach
 
@@ -447,13 +447,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSCreateUser',                // method name
-    array('createUser' => 'tns:createUser'),     // input parameters
-    array('return' => 'xsd:string'),             // output parameters
-    'urn:WSRegistration',                        // namespace
-    'urn:WSRegistration#WSCreateUser',           // soapaction
-    'rpc',                                       // style
-    'encoded',                                   // use
+$server->register('WSCreateUser', // method name
+    array('createUser' => 'tns:createUser'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user'                   // documentation
 );
 
@@ -558,7 +558,7 @@ 
     }
 
     if (isset($original_user_id_name) && isset($original_user_id_value)) {
-        $_SESSION['ws_' . $original_user_id_name] = $original_user_id_value;
+        $_SESSION['ws_'.$original_user_id_name] = $original_user_id_value;
     }
 
     /** @var User $user */
@@ -606,7 +606,7 @@ 
         );
 
         if (isset($original_user_id_name) && isset($original_user_id_value)) {
-            unset($_SESSION['ws_' . $original_user_id_name]);
+            unset($_SESSION['ws_'.$original_user_id_name]);
         }
 
         if (is_array($extra_list) && count($extra_list) > 0) {
@@ -658,7 +658,7 @@ 
         'language'              => array('name' => 'language', 'type' => 'xsd:string'),
         'phone'                 => array('name' => 'phone', 'type' => 'xsd:string'),
         'expiration_date'       => array('name' => 'expiration_date', 'type' => 'xsd:string'),
-        'official_code'         => array('name' => 'official_code',    'type' => 'xsd:string'),
+        'official_code'         => array('name' => 'official_code', 'type' => 'xsd:string'),
         'original_user_id_name' => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
         'original_user_id_value'=> array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
         'extra'                 => array('name' => 'extra', 'type' => 'tns:extrasList')
@@ -686,7 +686,7 @@ 
     'all',
     '',
     array(
-        'users'         => array('name' => 'users',      'type' => 'tns:createUsersPassEncryptParamsList'),
+        'users'         => array('name' => 'users', 'type' => 'tns:createUsersPassEncryptParamsList'),
         'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
@@ -716,13 +716,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateUsersPasswordCrypted',                            // method name
+$server->register('WSCreateUsersPasswordCrypted', // method name
     array('createUsersPasswordCrypted' => 'tns:createUsersPasswordCrypted'), // input parameters
-    array('return' => 'tns:results_createUsersPassEncrypt'),                 // output parameters
-    'urn:WSRegistration',                                                    // namespace
-    'urn:WSRegistration#WSCreateUsersPasswordCrypted',                       // soapaction
-    'rpc',                                                                   // style
-    'encoded',                                                               // use
+    array('return' => 'tns:results_createUsersPassEncrypt'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUsersPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users to the system'                                  // documentation
 );
 
@@ -769,7 +769,7 @@ 
         $salt = '';
 
         if (!empty($_configuration['password_encryption'])) {
-            if ($_configuration['password_encryption'] === $encrypt_method ) {
+            if ($_configuration['password_encryption'] === $encrypt_method) {
                 if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                     $msg = "Encryption $encrypt_method is invalid";
                     $results[] = $msg;
@@ -792,7 +792,7 @@ 
 
         if (is_array($extra_list) && count($extra_list) > 0) {
             foreach ($extra_list as $extra) {
-                if($extra['field_name'] == 'salt') {
+                if ($extra['field_name'] == 'salt') {
                     $salt = $extra['field_value'];
                     break;
                 }
@@ -847,7 +847,7 @@ 
                         active='1',
                         hr_dept_id=".intval($hr_dept_id);
 
-                $sql .=  " WHERE user_id='".$r_check_user[0]."'";
+                $sql .= " WHERE user_id='".$r_check_user[0]."'";
                 Database::query($sql);
 
                 if (is_array($extra_list) && count($extra_list) > 0) {
@@ -967,7 +967,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_user_id_value' => $orig_user_id_value[$i],
             'result' => $results[$i],
@@ -986,9 +986,9 @@ 
     'all',
     '',
     array(
-        'user_id' => array('name' => 'course',     'type' => 'xsd:string'), // Chamilo user Id
-        'session_id' => array('name' => 'user_id',    'type' => 'xsd:string'), // Current Session course ID
-        'course_id' =>array('name' => 'courseId',      'type' => 'xsd:string'), // Course Real Id
+        'user_id' => array('name' => 'course', 'type' => 'xsd:string'), // Chamilo user Id
+        'session_id' => array('name' => 'user_id', 'type' => 'xsd:string'), // Current Session course ID
+        'course_id' =>array('name' => 'courseId', 'type' => 'xsd:string'), // Course Real Id
         'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string'),
 
         // optional
@@ -1044,9 +1044,9 @@ 
         );
     }
 
-    if ($debug) error_log('$userId found: '. $userId);
-    if ($debug) error_log('$courseId found: '. $courseId);
-    if ($debug) error_log('$sessionId found: '. $sessionId);
+    if ($debug) error_log('$userId found: '.$userId);
+    if ($debug) error_log('$courseId found: '.$courseId);
+    if ($debug) error_log('$sessionId found: '.$sessionId);
 
     return [
         'user_id' => $userId,
@@ -1082,7 +1082,7 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1095,13 +1095,13 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  '. print_r($coaches, 1));
+        if ($debug) error_log('Coaches:  '.print_r($coaches, 1));
         if (in_array($userId, $coaches)) {
             $result = 1;
         }
     }
 
-    if ($debug) error_log('Result:  '. $result);
+    if ($debug) error_log('Result:  '.$result);
 
     return $result;
 }
@@ -1133,7 +1133,7 @@ 
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
 
     $params = parseCourseSessionUserParams($params);
 
@@ -1147,7 +1147,7 @@ 
     $result = 0;
 
     if (!empty($coaches)) {
-        if ($debug) error_log('Coaches:  ' . print_r($coaches, 1));
+        if ($debug) error_log('Coaches:  '.print_r($coaches, 1));
         if (!in_array($userId, $coaches)) {
             $result = 1;
         }
@@ -1155,7 +1155,7 @@ 
         $result = 1;
     }
 
-    if ($debug) error_log('Final Result: '. $result);
+    if ($debug) error_log('Final Result: '.$result);
 
     return $result;
 }
@@ -1173,32 +1173,32 @@ 
     'all',
     '',
     array(
-        'firstname'                 => array('name' => 'firstname',                 'type' => 'xsd:string'),
-        'lastname'                  => array('name' => 'lastname',                  'type' => 'xsd:string'),
-        'status'                    => array('name' => 'status',                    'type' => 'xsd:string'),
-        'email'                     => array('name' => 'email',                     'type' => 'xsd:string'),
-        'loginname'                 => array('name' => 'loginname',                 'type' => 'xsd:string'),
-        'password'                  => array('name' => 'password',                  'type' => 'xsd:string'), //encripted password using the encrypt_method
-        'encrypt_method'            => array('name' => 'encrypt_method',            'type' => 'xsd:string'),
-        'language'                  => array('name' => 'language',                  'type' => 'xsd:string'),
-        'phone'                     => array('name' => 'phone',                     'type' => 'xsd:string'),
-        'expiration_date'           => array('name' => 'expiration_date',           'type' => 'xsd:string'),
-        'official_code'             => array('name' => 'official_code',             'type' => 'xsd:string'),
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'extra'                     => array('name' => 'extra',                     'type' => 'tns:extrasList'),
-        'secret_key'                => array('name' => 'secret_key',                'type' => 'xsd:string')
+        'firstname'                 => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname'                  => array('name' => 'lastname', 'type' => 'xsd:string'),
+        'status'                    => array('name' => 'status', 'type' => 'xsd:string'),
+        'email'                     => array('name' => 'email', 'type' => 'xsd:string'),
+        'loginname'                 => array('name' => 'loginname', 'type' => 'xsd:string'),
+        'password'                  => array('name' => 'password', 'type' => 'xsd:string'), //encripted password using the encrypt_method
+        'encrypt_method'            => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
+        'language'                  => array('name' => 'language', 'type' => 'xsd:string'),
+        'phone'                     => array('name' => 'phone', 'type' => 'xsd:string'),
+        'expiration_date'           => array('name' => 'expiration_date', 'type' => 'xsd:string'),
+        'official_code'             => array('name' => 'official_code', 'type' => 'xsd:string'),
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'extra'                     => array('name' => 'extra', 'type' => 'tns:extrasList'),
+        'secret_key'                => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
 // Register the method to expose
-$server->register('WSCreateUserPasswordCrypted',                            // method name
-    array('createUserPasswordCrypted' => 'tns:createUserPasswordCrypted'),  // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSRegistration',                                                   // namespace
-    'urn:WSRegistration#WSCreateUserPasswordCrypted',                       // soapaction
-    'rpc',                                                                  // style
-    'encoded',                                                              // use
+$server->register('WSCreateUserPasswordCrypted', // method name
+    array('createUserPasswordCrypted' => 'tns:createUserPasswordCrypted'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateUserPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds users'                                               // documentation
 );
 
@@ -1208,7 +1208,7 @@ 
     global $_user, $_configuration, $debug;
     $debug = 1;
     if ($debug) error_log('WSCreateUserPasswordCrypted');
-    if ($debug) error_log(print_r($params,1));
+    if ($debug) error_log(print_r($params, 1));
 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
@@ -1241,7 +1241,7 @@ 
     $extra_list = isset($params['extra']) ? $params['extra'] : '';
 
     if (!empty($_configuration['password_encryption'])) {
-        if ($_configuration['password_encryption'] === $encrypt_method ) {
+        if ($_configuration['password_encryption'] === $encrypt_method) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
                 if ($debug) error_log($msg);
@@ -1303,7 +1303,7 @@ 
             if (!is_null($auth_source)) {
                 $sql .= " auth_source='".Database::escape_string($auth_source)."',";
             }
-            $sql .=    "
+            $sql .= "
                     password='".Database::escape_string($password)."',
                     email='".Database::escape_string($email)."',
                     status='".Database::escape_string($status)."',
@@ -1312,7 +1312,7 @@ 
                     expiration_date='".Database::escape_string($expiration_date)."',
                     active='1',
                     hr_dept_id=".intval($hr_dept_id);
-            $sql .=    " WHERE user_id='".$r_check_user[0]."'";
+            $sql .= " WHERE user_id='".$r_check_user[0]."'";
             if ($debug) error_log($sql);
             Database::query($sql);
 
@@ -1492,13 +1492,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUserCredentials',                      // method name
-    array('editUserCredentials' => 'tns:editUserCredentials'),  // input parameters
-    array('return' => 'xsd:string'),                            // output parameters
-    'urn:WSRegistration',                                       // namespace
-    'urn:WSRegistration#WSEditUserCredentials',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSEditUserCredentials', // method name
+    array('editUserCredentials' => 'tns:editUserCredentials'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUserCredentials', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits the username and password of a user'    // documentation
 );
 
@@ -1597,13 +1597,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUsers',                // method name
-    array('editUsers' => 'tns:editUsers'),      // input parameters
+$server->register('WSEditUsers', // method name
+    array('editUsers' => 'tns:editUsers'), // input parameters
     array('return' => 'tns:results_editUsers'), // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSEditUsers',           // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user from wiener'     // documentation
 );
 
@@ -1795,13 +1795,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUser',              // method name
-    array('editUser' => 'tns:editUser'),     // input parameters
-    array('return' => 'xsd:string'),         // output parameters
-    'urn:WSRegistration',                    // namespace
-    'urn:WSRegistration#WSEditUser',         // soapaction
-    'rpc',                                   // style
-    'encoded',                               // use
+$server->register('WSEditUser', // method name
+    array('editUser' => 'tns:editUser'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user from wiener'  // documentation
 );
 
@@ -1972,13 +1972,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUserWithPicture',              // method name
-    array('editUserWithPicture' => 'tns:editUserWithPicture'),     // input parameters
-    array('return' => 'xsd:string'),                    // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSEditUserWithPicture',         // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+$server->register('WSEditUserWithPicture', // method name
+    array('editUserWithPicture' => 'tns:editUserWithPicture'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUserWithPicture', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user from wiener'             // documentation
 );
 
@@ -2036,8 +2036,8 @@ 
     $tempDir = api_get_path(SYS_ARCHIVE_PATH);
     // Make sure the file download was OK by checking the HTTP headers for OK
     if (strpos(get_headers($picture_url)[0], "OK")) {
-        file_put_contents($tempDir . $filename, file_get_contents($picture_url));
-        $pictureUri = UserManager::update_user_picture($user_id, $filename, $tempDir . $filename);
+        file_put_contents($tempDir.$filename, file_get_contents($picture_url));
+        $pictureUri = UserManager::update_user_picture($user_id, $filename, $tempDir.$filename);
     }
 
     if ($user_id == 0) {
@@ -2108,7 +2108,7 @@ 
         ->setExpirationDate($expiration_date)
         ->setHrDeptId($hr_dept_id)
         ->setActive(true)
-        ->setPictureUri($pictureUri);;
+        ->setPictureUri($pictureUri); ;
 
     if (!is_null($creator_id)) {
         $user->setCreatorId($creator_id);
@@ -2205,13 +2205,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUsersPasswordCrypted',                           // method name
-    array('editUsersPasswordCrypted' => 'tns:editUsersPasswordCrypted'),  // input parameters
-    array('return' => 'tns:results_editUsersPasswordCrypted'),            // output parameters
-    'urn:WSRegistration',                                                 // namespace
-    'urn:WSRegistration#WSEditUsersPasswordCrypted',                      // soapaction
-    'rpc',                                                                // style
-    'encoded',                                                            // use
+$server->register('WSEditUsersPasswordCrypted', // method name
+    array('editUsersPasswordCrypted' => 'tns:editUsersPasswordCrypted'), // input parameters
+    array('return' => 'tns:results_editUsersPasswordCrypted'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUsersPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user'                                           // documentation
 );
 
@@ -2219,7 +2219,7 @@ 
 function WSEditUsersPasswordCrypted($params) {
     global $_configuration;
 
-    if(!WSHelperVerifyKey($params)) {
+    if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
@@ -2256,7 +2256,7 @@ 
 
             $password = $user_param['password'];
             $encrypt_method = $user_param['encrypt_method'];
-            if ($_configuration['password_encryption'] === $encrypt_method ) {
+            if ($_configuration['password_encryption'] === $encrypt_method) {
                 if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                     $msg = "Encryption $encrypt_method is invalid";
                     $results[] = $msg;
@@ -2271,11 +2271,11 @@ 
                 $results[] = $msg;
                 continue;
             }
-        } elseif (!empty($user_param['password']) && empty($user_param['encrypt_method'])){
+        } elseif (!empty($user_param['password']) && empty($user_param['encrypt_method'])) {
             $msg = "If password is not empty the encrypt_method param is required ";
             $results[] = $msg;
             continue;
-        } elseif (empty($user_param['password']) && !empty($user_param['encrypt_method'])){
+        } elseif (empty($user_param['password']) && !empty($user_param['encrypt_method'])) {
             $msg = "If encrypt_method is not empty the password param is required ";
             $results[] = $msg;
             continue;
@@ -2411,13 +2411,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditUserPasswordCrypted',                         // method name
+$server->register('WSEditUserPasswordCrypted', // method name
     array('editUserPasswordCrypted' => 'tns:editUserPasswordCrypted'), // input parameters
-    array('return' => 'xsd:string'),                                   // output parameters
-    'urn:WSRegistration',                                              // namespace
-    'urn:WSRegistration#WSEditUserPasswordCrypted',                    // soapaction
-    'rpc',                                                             // style
-    'encoded',                                                         // use
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditUserPasswordCrypted', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a user'                                        // documentation
 );
 
@@ -2461,7 +2461,7 @@ 
     if (!empty($params['password']) && !empty($params['encrypt_method'])) {
         $password = $params['password'];
         $encrypt_method = $params['encrypt_method'];
-        if ($_configuration['password_encryption'] === $encrypt_method ) {
+        if ($_configuration['password_encryption'] === $encrypt_method) {
             if ($encrypt_method == 'md5' && !preg_match('/^[A-Fa-f0-9]{32}$/', $password)) {
                 $msg = "Encryption $encrypt_method is invalid";
                 return $msg;
@@ -2606,7 +2606,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:user_id[]')),'tns:user_id'
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_id[]')), 'tns:user_id'
 );
 
 $server->wsdl->addComplexType(
@@ -2622,35 +2622,35 @@ 
 );
 
 function WSHelperActionOnUsers($params, $type) {
-    if(!WSHelperVerifyKey($params)) {
+    if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
     $original_user_ids = $params['ids'];
-    foreach($original_user_ids as $original_user_id) {
+    foreach ($original_user_ids as $original_user_id) {
         $user_id = UserManager::get_user_id_from_original_id(
             $original_user_id['original_user_id_value'],
             $original_user_id['original_user_id_name']
         );
-        if($user_id > 0) {
-            if($type == "delete") {
+        if ($user_id > 0) {
+            if ($type == "delete") {
                 UserManager::delete_user($user_id);
-            } else if($type == "disable") {
+            } else if ($type == "disable") {
                 UserManager::disable($user_id);
-            } else if($type == "enable") {
+            } else if ($type == "enable") {
                 UserManager::enable($user_id);
             }
         }
     }
 }
 
-$server->register('WSDeleteUsers',                         // method name
-    array('user_ids' => 'tns:user_ids'),                   // input parameters
-    array(),                                               // output parameters
-    'urn:WSRegistration',                                  // namespace
-    'urn:WSRegistration#WSDeleteUsers',                    // soapaction
-    'rpc',                                                 // style
-    'encoded',                                             // use
+$server->register('WSDeleteUsers', // method name
+    array('user_ids' => 'tns:user_ids'), // input parameters
+    array(), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Deletes users provided as parameters from the system' // documentation
 );
 
@@ -2659,13 +2659,13 @@ 
 }
 
 /** WSDisableUsers **/
-$server->register('WSDisableUsers',                         // method name
-    array('user_ids' => 'tns:user_ids'),                    // input parameters
-    array(),                                                // output parameters
-    'urn:WSRegistration',                                   // namespace
-    'urn:WSRegistration#WSDisableUsers',                    // soapaction
-    'rpc',                                                  // style
-    'encoded',                                              // use
+$server->register('WSDisableUsers', // method name
+    array('user_ids' => 'tns:user_ids'), // input parameters
+    array(), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDisableUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Disables users provided as parameters from the system' // documentation
 );
 
@@ -2674,13 +2674,13 @@ 
 }
 
 /** WSEnableUsers **/
-$server->register('WSEnableUsers',            // method name
-    array('user_ids' => 'tns:user_ids'),      // input parameters
-    array(),                                  // output parameters
-    'urn:WSRegistration',                     // namespace
-    'urn:WSRegistration#WSEnableUsers',       // soapaction
-    'rpc',                                    // style
-    'encoded',                                // use
+$server->register('WSEnableUsers', // method name
+    array('user_ids' => 'tns:user_ids'), // input parameters
+    array(), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEnableUsers', // soapaction
+    'rpc', // style
+    'encoded', // use
     'Enables users provided as parameters'    // documentation
 );
 
@@ -2730,7 +2730,7 @@ 
     '',
     'SOAP-ENC:Array',
     array(),
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:createCourseParams[]')),'tns:createCourseParams'
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:createCourseParams[]')), 'tns:createCourseParams'
 );
 
 // Register the data structures used by the service
@@ -2771,13 +2771,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateCourse',                // method name
-    array('createCourse' => 'tns:createCourse'),   // input parameters
+$server->register('WSCreateCourse', // method name
+    array('createCourse' => 'tns:createCourse'), // input parameters
     array('return' => 'tns:results_createCourse'), // output parameters
-    'urn:WSRegistration',                          // namespace
-    'urn:WSRegistration#WSCreateCourse',           // soapaction
-    'rpc',                                         // style
-    'encoded',                                     // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a course'                   // documentation
 );
 
@@ -2833,7 +2833,7 @@ 
                             category_code='".Database::escape_string($category_code)."',
                             tutor_name='".Database::escape_string($tutor_name)."',
                             visual_code='".Database::escape_string($wanted_code)."'";
-                if($visibility !== null) {
+                if ($visibility !== null) {
                     $sql .= ", visibility = '$visibility' ";
                 }
                 $sql .= " WHERE id='".$courseInfo['real_id']."'";
@@ -2883,7 +2883,7 @@ 
         $params['title'] = $title;
         $params['wanted_code'] = $wanted_code;
         $params['category_code'] = $category_code;
-        $params['course_category']    = $category_code;
+        $params['course_category'] = $category_code;
         $params['tutor_name'] = $tutor_name;
         $params['course_language'] = $course_language;
         $params['user_id'] = api_get_user_id();
@@ -3014,13 +3014,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSCreateCourseByTitle',                     // method name
+$server->register('WSCreateCourseByTitle', // method name
     array('createCourseByTitle' => 'tns:createCourseByTitle'), // input parameters
-    array('return' => 'tns:results_createCourseByTitle'),      // output parameters
-    'urn:WSRegistration',                                      // namespace
-    'urn:WSRegistration#WSCreateCourseByTitle',                // soapaction
-    'rpc',                                                     // style
-    'encoded',                                                 // use
+    array('return' => 'tns:results_createCourseByTitle'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateCourseByTitle', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a course by title'                      // documentation
 );
 
@@ -3251,18 +3251,18 @@ 
 );
 
 // Register the method to expose
-$server->register('WSEditCourse',                // method name
-    array('editCourse' => 'tns:editCourse'),     // input parameters
+$server->register('WSEditCourse', // method name
+    array('editCourse' => 'tns:editCourse'), // input parameters
     array('return' => 'tns:results_editCourse'), // output parameters
-    'urn:WSRegistration',                        // namespace
-    'urn:WSRegistration#WSEditCourse',           // soapaction
-    'rpc',                                       // style
-    'encoded',                                   // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a course'                // documentation
 );
 
 // Define the method WSEditCourse
-function WSEditCourse($params){
+function WSEditCourse($params) {
 
     global $_configuration;
     if (!WSHelperVerifyKey($params)) {
@@ -3417,13 +3417,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSCourseDescription',                    // method name
-    array('courseDescription' => 'tns:courseDescription'),  // input parameters
-    array('return' => 'tns:fields_course_desc_list'),       // output parameters
-    'urn:WSRegistration',                                   // namespace
-    'urn:WSRegistration#WSCourseDescription',               // soapaction
-    'rpc',                                                  // style
-    'encoded',                                              // use
+$server->register('WSCourseDescription', // method name
+    array('courseDescription' => 'tns:courseDescription'), // input parameters
+    array('return' => 'tns:fields_course_desc_list'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCourseDescription', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a course description'               // documentation
 );
 
@@ -3476,14 +3476,14 @@ 
     }
 
     while ($row = Database::fetch_array($result)) {
-        $ind = (int)$row['id'];
+        $ind = (int) $row['id'];
         $array_course_desc_title[$ind] = $row['title'];
         $array_course_desc_content[$ind] = $row['content'];
     }
 
     $count_results = count($default_titles);
     $output = array();
-    for($i = 1; $i <= $count_results; $i++) {
+    for ($i = 1; $i <= $count_results; $i++) {
         $output[] = array(
             'course_desc_id' => $array_course_desc_id[$i],
             'course_desc_default_title' => $array_course_desc_default_title[$i],
@@ -3563,13 +3563,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSEditCourseDescription',                       // method name
+$server->register('WSEditCourseDescription', // method name
     array('editCourseDescription' => 'tns:editCourseDescription'), // input parameters
-    array('return' => 'tns:results_editCourseDescription'),        // output parameters
-    'urn:WSRegistration',                                          // namespace
-    'urn:WSRegistration#WSEditCourseDescription',                  // soapaction
-    'rpc',                                                         // style
-    'encoded',                                                     // use
+    array('return' => 'tns:results_editCourseDescription'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditCourseDescription', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a course description'                      // documentation
 );
 
@@ -3613,7 +3613,7 @@ 
         $course_desc_title = Database::escape_string($course_desc_title);
         $course_desc_content = Database::escape_string($course_desc_content);
 
-        $course_desc_id = (int)$course_desc_id;
+        $course_desc_id = (int) $course_desc_id;
         if ($course_desc_id > 8 && $course_desc_id < 1) {
             $results[] = 0; // course_desc_id invalid.
             continue;
@@ -3647,7 +3647,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_course_id_value' => $orig_course_id_value[$i],
             'result' => $results[$i],
@@ -3719,13 +3719,13 @@ 
     'tns:result_deleteCourse'
 );
 
-$server->register('WSDeleteCourse',                // method name
-    array('deleteCourse' => 'tns:deleteCourse'),   // input parameters
+$server->register('WSDeleteCourse', // method name
+    array('deleteCourse' => 'tns:deleteCourse'), // input parameters
     array('return' => 'tns:results_deleteCourse'), // output parameters
-    'urn:WSRegistration',                          // namespace
-    'urn:WSRegistration#WSDeleteCourse',           // soapaction
-    'rpc',                                         // style
-    'encoded',                                     // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a course '               // documentation
 );
 
@@ -3851,13 +3851,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateSession',                // method name
-    array('createSession' => 'tns:createSession'),  // input parameters
+$server->register('WSCreateSession', // method name
+    array('createSession' => 'tns:createSession'), // input parameters
     array('return' => 'tns:results_createSession'), // output parameters
-    'urn:WSRegistration',                           // namespace
-    'urn:WSRegistration#WSCreateSession',           // soapaction
-    'rpc',                                          // style
-    'encoded',                                      // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a session'                  // documentation
 );
 
@@ -3911,8 +3911,8 @@ 
         }
 
         if (empty($nolimit)) {
-            $date_start = "$year_start-".(($month_start < 10)?"0$month_start":$month_start)."-".(($day_start < 10)?"0$day_start":$day_start) . ' 00:00:00';
-            $date_end = "$year_end-".(($month_end < 10)?"0$month_end":$month_end)."-".(($day_end < 10)?"0$day_end":$day_end) . ' 23:59:59';
+            $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start).' 00:00:00';
+            $date_end = "$year_end-".(($month_end < 10) ? "0$month_end" : $month_end)."-".(($day_end < 10) ? "0$day_end" : $day_end).' 23:59:59';
         } else {
             $date_start = "";
             $date_end = "";
@@ -3930,7 +3930,7 @@ 
             }
             $results[] = 0;
             continue;
-        } elseif (empty($nolimit) && (!$month_end || !$day_end || !$year_end || !checkdate($month_end,  $day_end, $year_end))) {
+        } elseif (empty($nolimit) && (!$month_end || !$day_end || !$year_end || !checkdate($month_end, $day_end, $year_end))) {
             $results[] = 0;
             if ($debug) {
                 error_log("There's an error with the end date: $month_end - $day_end - $year_end");
@@ -4033,7 +4033,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_session_id_value' => $orig_session_id_value[$i],
             'result' => $results[$i],
@@ -4118,13 +4118,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSEditSession',                // method name
-    array('editSession' => 'tns:editSession'),    // input parameters
+$server->register('WSEditSession', // method name
+    array('editSession' => 'tns:editSession'), // input parameters
     array('return' => 'tns:results_editSession'), // output parameters
-    'urn:WSRegistration',                         // namespace
-    'urn:WSRegistration#WSEditSession',           // soapaction
-    'rpc',                                        // style
-    'encoded',                                    // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSEditSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service edits a session'                // documentation
 );
 
@@ -4174,11 +4174,11 @@ 
         }
 
         if (empty($nolimit)) {
-            $date_start="$year_start-".(($month_start < 10)?"0$month_start":$month_start)."-".(($day_start < 10)?"0$day_start":$day_start);
-            $date_end="$year_end-".(($month_end < 10)?"0$month_end":$month_end)."-".(($day_end < 10)?"0$day_end":$day_end);
+            $date_start = "$year_start-".(($month_start < 10) ? "0$month_start" : $month_start)."-".(($day_start < 10) ? "0$day_start" : $day_start);
+            $date_end = "$year_end-".(($month_end < 10) ? "0$month_end" : $month_end)."-".(($day_end < 10) ? "0$day_end" : $day_end);
         } else {
-            $date_start="";
-            $date_end="";
+            $date_start = "";
+            $date_end = "";
         }
         if (empty($name)) {
             $results[] = 0; //SessionNameIsRequired
@@ -4322,13 +4322,13 @@ 
     'tns:result_deleteSession'
 );
 
-$server->register('WSDeleteSession',                // method name
-    array('deleteSession' => 'tns:deleteSession'),  // input parameters
+$server->register('WSDeleteSession', // method name
+    array('deleteSession' => 'tns:deleteSession'), // input parameters
     array('return' => 'tns:results_deleteSession'), // output parameters
-    'urn:WSRegistration',                           // namespace
-    'urn:WSRegistration#WSDeleteSession',           // soapaction
-    'rpc',                                          // style
-    'encoded',                                      // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a session '               // documentation
 );
 
@@ -4410,10 +4410,10 @@ 
     'struct',
     'all',
     '',
-    array (
+    array(
         'course_id' => array('name' => 'course_id', 'type' => 'tns:course_id'),
-        'user_id'   => array('name' => 'user_id',   'type' => 'tns:user_id'),
-        'status'    => array('name' => 'status',    'type' => 'xsd:int')
+        'user_id'   => array('name' => 'user_id', 'type' => 'tns:user_id'),
+        'status'    => array('name' => 'status', 'type' => 'xsd:int')
     )
 );
 
@@ -4423,9 +4423,9 @@ 
     'struct',
     'all',
     '',
-    array (
-        'userscourses'  => array('name' => 'userscourses',  'type' => 'tns:user_course_status_array'), //removed []
-        'secret_key'    => array('name' => 'secret_key',    'type' => 'xsd:string')
+    array(
+        'userscourses'  => array('name' => 'userscourses', 'type' => 'tns:user_course_status_array'), //removed []
+        'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -4450,9 +4450,9 @@ 
     'all',
     '',
     array(
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'original_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'result'                    => array('name' => 'result',                    'type' => 'xsd:int')
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'original_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'result'                    => array('name' => 'result', 'type' => 'xsd:int')
     )
 );
 
@@ -4468,13 +4468,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSSubscribeUserToCourse',                            // method name
-    array('subscribeUserToCourse' => 'tns:subscribeUserToCourse_arg'),  // input parameters
+$server->register('WSSubscribeUserToCourse', // method name
+    array('subscribeUserToCourse' => 'tns:subscribeUserToCourse_arg'), // input parameters
     array('return' => 'tns:subscribeUserToCourse_return_global'),
-    'urn:WSRegistration',                                               // namespace
-    'urn:WSRegistration#WSSubscribeUserToCourse',                       // soapaction
-    'rpc',                                                              // style
-    'encoded',                                                          // use
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSubscribeUserToCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a course'                        // documentation
 );
 
@@ -4484,7 +4484,7 @@ 
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
-    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params,1));
+    if ($debug) error_log('WSSubscribeUserToCourse params: '.print_r($params, 1));
 
     $results = array();
     $userscourses = $params['userscourses'];
@@ -4552,8 +4552,8 @@ 
     'all',
     '',
     array(
-        'course'       => array('name' => 'course',     'type' => 'xsd:string'), //Course string code
-        'user_id'      => array('name' => 'user_id',    'type' => 'xsd:string'), //Chamilo user_id
+        'course'       => array('name' => 'course', 'type' => 'xsd:string'), //Course string code
+        'user_id'      => array('name' => 'user_id', 'type' => 'xsd:string'), //Chamilo user_id
         'secret_key'   => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
@@ -4566,18 +4566,18 @@ 
     'struct',
     'all',
     '',
-    array('message' => array('name' => 'message',    'type' => 'xsd:string'))
+    array('message' => array('name' => 'message', 'type' => 'xsd:string'))
 );
 
 
 // Register the method to expose
-$server->register('WSSubscribeUserToCourseSimple',                                 // method name
+$server->register('WSSubscribeUserToCourseSimple', // method name
     array('subscribeUserToCourseSimple' => 'tns:subscribeUserToCourseSimple_arg'), // input parameters
-    array('return' => 'xsd:string'),                                               // output parameters
-    'urn:WSRegistration',                                                          // namespace
-    'urn:WSRegistration#WSSubscribeUserToCourseSimple',                            // soapaction
-    'rpc',                                                                         // style
-    'encoded',                                                                     // use
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSubscribeUserToCourseSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a course in a simple way'                   // documentation
 );
 
@@ -4586,7 +4586,7 @@ 
     global $debug;
 
     if ($debug) error_log('WSSubscribeUserToCourseSimple');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
     if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
@@ -4634,9 +4634,9 @@ 
     'all',
     '',
     array(
-        'original_user_id_value'      => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'original_user_id_name'       => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'secret_key'                  => array('name' => 'secret_key',                'type' => 'xsd:string')
+        'original_user_id_value'      => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'original_user_id_name'       => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'secret_key'                  => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -4647,21 +4647,21 @@ 
     'struct',
     'all',
     '',
-    array (
-        'user_id'      => array('name' => 'user_id',    'type' => 'xsd:string'),
-        'firstname'    => array('name' => 'firstname',  'type' => 'xsd:string'),
-        'lastname'     => array('name' => 'lastname',   'type' => 'xsd:string'),
+    array(
+        'user_id'      => array('name' => 'user_id', 'type' => 'xsd:string'),
+        'firstname'    => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname'     => array('name' => 'lastname', 'type' => 'xsd:string'),
     )
 );
 
 // Register the method to expose
-$server->register('WSGetUser',                   // method name
-    array('GetUser' => 'tns:GetUserArg'),        // input parameters
-    array('return' => 'tns:User'),               // output parameters
-    'urn:WSRegistration',                        // namespace
-    'urn:WSRegistration#WSGetUser',              // soapaction
-    'rpc',                                       // style
-    'encoded',                                   // use
+$server->register('WSGetUser', // method name
+    array('GetUser' => 'tns:GetUserArg'), // input parameters
+    array('return' => 'tns:User'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSGetUser', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service get user information by id'    // documentation
 );
 
@@ -4705,17 +4705,17 @@ 
     '',
     array(
         'username'      => array('name' => 'username', 'type' => 'xsd:string'),
-        'secret_key'    => array('name' => 'secret_key','type' => 'xsd:string')
+        'secret_key'    => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 // Register the method to expose
-$server->register('WSGetUserFromUsername',                     // method name
-    array('GetUserFromUsername' => 'tns:GetUserArgUsername'),  // input params
-    array('return' => 'tns:User'),                             // output parameters
-    'urn:WSRegistration',                                      // namespace
-    'urn:WSRegistration#WSGetUserFromUsername',                // soapaction
-    'rpc',                                                     // style
-    'encoded',                                                 // use
+$server->register('WSGetUserFromUsername', // method name
+    array('GetUserFromUsername' => 'tns:GetUserArgUsername'), // input params
+    array('return' => 'tns:User'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSGetUserFromUsername', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service get user information by username'            // documentation
 );
 
@@ -4756,10 +4756,10 @@ 
     'all',
     '',
     array(
-        'original_user_id_values'   => array('name' => 'original_user_id_values',   'type' => 'tns:originalUsersList'),
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'original_course_id_name'   => array('name' => 'original_course_id_name',   'type' => 'xsd:string'),
+        'original_user_id_values'   => array('name' => 'original_user_id_values', 'type' => 'tns:originalUsersList'),
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'original_course_id_name'   => array('name' => 'original_course_id_name', 'type' => 'xsd:string'),
     )
 );
 
@@ -4812,13 +4812,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUnsubscribeUserFromCourse',                         // method name
+$server->register('WSUnsubscribeUserFromCourse', // method name
     array('unsuscribeUserFromCourse' => 'tns:unsuscribeUserFromCourse'), // input parameters
-    array('return' => 'tns:results_unsuscribeUserFromCourse'),           // output parameters
-    'urn:WSRegistration',                                                // namespace
-    'urn:WSRegistration#WSUnsubscribeUserFromCourse',                    // soapaction
-    'rpc',                                                               // style
-    'encoded',                                                           // use
+    array('return' => 'tns:results_unsuscribeUserFromCourse'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnsubscribeUserFromCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribes a user from a course'                     // documentation
 );
 
@@ -4830,7 +4830,7 @@ 
     }
 
     $user_table = Database::get_main_table(TABLE_MAIN_USER);
-    $table_course     = Database :: get_main_table(TABLE_MAIN_COURSE);
+    $table_course = Database :: get_main_table(TABLE_MAIN_COURSE);
     $table_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
 
     $userscourses_params = $params['userscourses'];
@@ -4840,8 +4840,8 @@ 
     foreach ($userscourses_params as $usercourse_param) {
 
         $original_user_id_values     = $usercourse_param['original_user_id_values'];
-        $original_user_id_name         = $usercourse_param['original_user_id_name'];
-        $original_course_id_value     = $usercourse_param['original_course_id_value'];
+        $original_user_id_name = $usercourse_param['original_user_id_name'];
+        $original_course_id_value = $usercourse_param['original_course_id_value'];
         $original_course_id_name     = $usercourse_param['original_course_id_name'];
         $orig_course_id_value[] = $original_course_id_value;
 
@@ -4862,7 +4862,7 @@ 
             $usersList[] = $user_id;
         }
 
-        $orig_user_id_value[] = implode(',',$usersList);
+        $orig_user_id_value[] = implode(',', $usersList);
 
         $courseInfo = CourseManager::getCourseInfoFromOriginalId(
             $original_course_id_value,
@@ -4895,7 +4895,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_user_id_values' => $orig_user_id_value[$i],
             'original_course_id_value' => $orig_course_id_value[$i],
@@ -4924,13 +4924,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSUnSubscribeUserFromCourseSimple',                         // method name
+$server->register('WSUnSubscribeUserFromCourseSimple', // method name
     array('unSubscribeUserFromCourseSimple' => 'tns:unSubscribeUserFromCourseSimple'), // input parameters
-    array('return' => 'tns:result_createUsersPassEncrypt'),           // output parameters
-    'urn:WSRegistration',                                                // namespace
-    'urn:WSRegistration#WSUnSubscribeUserFromCourseSimple',                    // soapaction
-    'rpc',                                                               // style
-    'encoded',                                                           // use
+    array('return' => 'tns:result_createUsersPassEncrypt'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnSubscribeUserFromCourseSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribe a user from a course'                     // documentation
 );
 /**
@@ -5000,10 +5000,10 @@ 
     'all',
     '',
     array(
-        'original_user_id_values'   => array('name' => 'original_user_id_values',   'type' => 'tns:originalUsersList'),
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_course_id_value'  => array('name' => 'original_course_id_value',  'type' => 'xsd:string'),
-        'original_course_id_name'   => array('name' => 'original_course_id_value',  'type' => 'xsd:string')
+        'original_user_id_values'   => array('name' => 'original_user_id_values', 'type' => 'tns:originalUsersList'),
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_course_id_value'  => array('name' => 'original_course_id_value', 'type' => 'xsd:string'),
+        'original_course_id_name'   => array('name' => 'original_course_id_value', 'type' => 'xsd:string')
     )
 );
 
@@ -5097,13 +5097,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSSuscribeUsersToSession',                          // method name
+$server->register('WSSuscribeUsersToSession', // method name
     array('subscribeUsersToSession' => 'tns:subscribeUsersToSession'), // input parameters
-    array('return' => 'tns:results_subscribeUsersToSession'),          // output parameters
-    'urn:WSRegistration',                                              // namespace
-    'urn:WSRegistration#WSSuscribeUsersToSession',                     // soapaction
-    'rpc',                                                             // style
-    'encoded',                                                         // use
+    array('return' => 'tns:results_subscribeUsersToSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSuscribeUsersToSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a session'                      // documentation
 );
 
@@ -5180,7 +5180,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_user_id_values' => $orig_user_id_value[$i],
             'original_session_id_value' => $orig_session_id_value[$i],
@@ -5200,25 +5200,25 @@ 
     'all',
     '',
     array(
-        'session'    => array('name' => 'session',    'type' => 'xsd:string'), // Session ID
-        'user_id'    => array('name' => 'user_id',    'type' => 'xsd:string'), // Chamilo user_id
+        'session'    => array('name' => 'session', 'type' => 'xsd:string'), // Session ID
+        'user_id'    => array('name' => 'user_id', 'type' => 'xsd:string'), // Chamilo user_id
         'secret_key' => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
-$server->register('WSSubscribeUserToSessionSimple',                                   // method name
-    array('subscribeUserToSessionSimple' => 'tns:subscribeUserToSessionSimple_arg'),  // input parameters
-    array('return' => 'xsd:string'),                                                  // output parameters
-    'urn:WSRegistration',                                                             // namespace
-    'urn:WSRegistration#WSSubscribeUserToSessionSimple',                              // soapaction
-    'rpc',                                                                            // style
-    'encoded',                                                                        // use
+$server->register('WSSubscribeUserToSessionSimple', // method name
+    array('subscribeUserToSessionSimple' => 'tns:subscribeUserToSessionSimple_arg'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSubscribeUserToSessionSimple', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a user to a session in a simple way'                     // documentation
 );
 function WSSubscribeUserToSessionSimple($params) {
     global $debug;
 
     if ($debug) {
-        error_log('WSSubscribeUserToSessionSimple with params=[' . serialize($params). ']');
+        error_log('WSSubscribeUserToSessionSimple with params=['.serialize($params).']');
     }
 
     // Check security key
@@ -5227,8 +5227,8 @@ 
     }
 
     // Get input parameters
-    $session_id = intval($params['session']);  // Session ID
-    $user_id    = intval($params['user_id']);  // Chamilo user id
+    $session_id = intval($params['session']); // Session ID
+    $user_id    = intval($params['user_id']); // Chamilo user id
 
     // Get user id
     $user_data = api_get_user_info($user_id);
@@ -5329,13 +5329,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUnsuscribeUsersFromSession',                              // method name
+$server->register('WSUnsuscribeUsersFromSession', // method name
     array('unsubscribeUsersFromSession' => 'tns:unsubscribeUsersFromSession'), // input parameters
-    array('return' => 'tns:results_unsubscribeUsersFromSession'),              // output parameters
-    'urn:WSRegistration',                                                      // namespace
-    'urn:WSRegistration#WSUnsuscribeUsersFromSession',                         // soapaction
-    'rpc',                                                                     // style
-    'encoded',                                                                 // use
+    array('return' => 'tns:results_unsubscribeUsersFromSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnsuscribeUsersFromSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unsubscribes a user to a session'                            // documentation
 );
 
@@ -5349,7 +5349,7 @@ 
     global $debug;
 
     if ($debug) {
-        error_log('WSUnsuscribeUsersFromSession with params=[' . serialize($params). ']');
+        error_log('WSUnsuscribeUsersFromSession with params=['.serialize($params).']');
     }
 
     $user_table = Database::get_main_table(TABLE_MAIN_USER);
@@ -5441,7 +5441,7 @@ 
     'all',
     '',
     array(
-        'course_code'   => array('name' => 'course_code',   'type' => 'xsd:string'),
+        'course_code'   => array('name' => 'course_code', 'type' => 'xsd:string'),
     )
 );
 
@@ -5477,9 +5477,9 @@ 
     '',
     array(
         'original_course_id_values' => array('name' => 'original_course_id_values', 'type' => 'tns:originalCoursesList'),
-        'original_course_id_name'   => array('name' => 'original_course_id_name',   'type' => 'xsd:string'),
+        'original_course_id_name'   => array('name' => 'original_course_id_name', 'type' => 'xsd:string'),
         'original_session_id_value' => array('name' => 'original_session_id_value', 'type' => 'xsd:string'),
-        'original_session_id_name'  => array('name' => 'original_session_id_name',  'type' => 'xsd:string')
+        'original_session_id_name'  => array('name' => 'original_session_id_name', 'type' => 'xsd:string')
     )
 );
 
@@ -5532,13 +5532,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSSuscribeCoursesToSession',                            // method name
+$server->register('WSSuscribeCoursesToSession', // method name
     array('subscribeCoursesToSession' => 'tns:subscribeCoursesToSession'), // input parameters
-    array('return' => 'tns:results_subscribeCoursesToSession'),            // output parameters
-    'urn:WSRegistration',                                                  // namespace
-    'urn:WSRegistration#WSSuscribeCoursesToSession',                       // soapaction
-    'rpc',                                                                 // style
-    'encoded',                                                             // use
+    array('return' => 'tns:results_subscribeCoursesToSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSuscribeCoursesToSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a course to a session'                        // documentation
 );
 
@@ -5676,13 +5676,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSUnsuscribeCoursesFromSession',                                // method name
+$server->register('WSUnsuscribeCoursesFromSession', // method name
     array('unsubscribeCoursesFromSession' => 'tns:unsubscribeCoursesFromSession'), // input parameters
-    array('return' => 'tns:results_unsubscribeCoursesFromSession'),                // output parameters
-    'urn:WSRegistration',                                                          // namespace
-    'urn:WSRegistration#WSUnsuscribeCoursesFromSession',                           // soapaction
-    'rpc',                                                                         // style
-    'encoded',                                                                     // use
+    array('return' => 'tns:results_unsubscribeCoursesFromSession'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUnsuscribeCoursesFromSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service subscribes a course to a session'                                // documentation
 );
 
@@ -5789,7 +5789,7 @@ 
 
     $count_results = count($results);
     $output = array();
-    for($i = 0; $i < $count_results; $i++) {
+    for ($i = 0; $i < $count_results; $i++) {
         $output[] = array(
             'original_course_id_values' => $orig_course_id_value[$i],
             'original_session_id_value' => $orig_session_id_value[$i],
@@ -5847,13 +5847,13 @@ 
 
 
 // Register the method to expose
-$server->register('WSListCourses',                                                  // method name
+$server->register('WSListCourses', // method name
     array('listCourseInput' => 'tns:listCourseInput'), // input parameters
-    array('return' => 'tns:courses'),                                               // output parameters
-    'urn:WSRegistration',                                                           // namespace
-    'urn:WSRegistration#WSListCourses',                                             // soapaction
-    'rpc',                                                                          // style
-    'encoded',                                                                      // use
+    array('return' => 'tns:courses'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSListCourses', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service list courses available on the system'                             // documentation
 );
 
@@ -5933,27 +5933,27 @@ 
     'all',
     '',
     array(
-        'original_user_id_name'     => array('name' => 'original_user_id_name',     'type' => 'xsd:string'),
-        'original_user_id_value'    => array('name' => 'original_user_id_value',    'type' => 'xsd:string'),
-        'chamilo_username'          => array('name' => 'chamilo_username',          'type' => 'xsd:string'),
-        'secret_key'                => array('name' => 'secret_key',                'type' => 'xsd:string')
+        'original_user_id_name'     => array('name' => 'original_user_id_name', 'type' => 'xsd:string'),
+        'original_user_id_value'    => array('name' => 'original_user_id_value', 'type' => 'xsd:string'),
+        'chamilo_username'          => array('name' => 'chamilo_username', 'type' => 'xsd:string'),
+        'secret_key'                => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
 // Register the method to expose
-$server->register('WSUpdateUserApiKey',      // method name
+$server->register('WSUpdateUserApiKey', // method name
     array('userApiKey' => 'tns:userApiKey'), // input parameters
-    array('return' => 'xsd:string'),         // output parameters
-    'urn:WSRegistration',                    // namespace
-    'urn:WSRegistration#WSListCourses',      // soapaction
-    'rpc',                                   // style
-    'encoded',                               // use
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSListCourses', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service return user api key'       // documentation
 );
 
 
 function WSUpdateUserApiKey($params) {
-    if(!WSHelperVerifyKey($params)) {
+    if (!WSHelperVerifyKey($params)) {
         return returnError(WS_ERROR_SECRET_KEY);
     }
 
@@ -5995,11 +5995,11 @@ 
     'all',
     '',
     array(
-        'from'  => array('name' => 'from',  'type' => 'xsd:int'),
-        'to'    => array('name' => 'to',    'type' => 'xsd:int'),
-        'date_start'  => array('name' => 'date_start',  'type' => 'xsd:string'),
-        'date_end'    => array('name' => 'date_end',    'type' => 'xsd:string'),
-        'secret_key'  => array('name' => 'secret_key',  'type' => 'xsd:string')
+        'from'  => array('name' => 'from', 'type' => 'xsd:int'),
+        'to'    => array('name' => 'to', 'type' => 'xsd:int'),
+        'date_start'  => array('name' => 'date_start', 'type' => 'xsd:string'),
+        'date_end'    => array('name' => 'date_end', 'type' => 'xsd:string'),
+        'secret_key'  => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
@@ -6010,11 +6010,11 @@ 
     'all',
     '',
     array(
-        'id' => array ('name' => 'id'  , 'type' => 'xsd:int'),
-        'title' => array ('name' => 'title', 'type' => 'xsd:string'),
-        'url' => array ('name' => 'url', 'type' => 'xsd:string'),
-        'date_start' => array ('name' => 'date_start', 'type' => 'xsd:string'),
-        'date_end' => array ('name' => 'date_end', 'type' => 'xsd:string'),
+        'id' => array('name' => 'id', 'type' => 'xsd:int'),
+        'title' => array('name' => 'title', 'type' => 'xsd:string'),
+        'url' => array('name' => 'url', 'type' => 'xsd:string'),
+        'date_start' => array('name' => 'date_start', 'type' => 'xsd:string'),
+        'date_end' => array('name' => 'date_end', 'type' => 'xsd:string'),
     )
 );
 
@@ -6033,13 +6033,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSListSessions',           // method name
-    array('input'  => 'tns:session_arg'),     // input parameters
-    array('return' => 'tns:sessions'),        // output parameters
-    'urn:WSRegistration',                     // namespace
-    'urn:WSRegistration#WSListSessions',      // soapaction
-    'rpc',                                    // style
-    'encoded',                                // use
+$server->register('WSListSessions', // method name
+    array('input'  => 'tns:session_arg'), // input parameters
+    array('return' => 'tns:sessions'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSListSessions', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service returns a list of sessions' // documentation
 );
 
@@ -6097,20 +6097,20 @@ 
     'all',
     '',
     array(
-        'course'       => array('name' => 'course',     'type' => 'xsd:string'), //Course string code
-        'user_id'      => array('name' => 'user_id',    'type' => 'xsd:string'), //Chamilo user_id
+        'course'       => array('name' => 'course', 'type' => 'xsd:string'), //Course string code
+        'user_id'      => array('name' => 'user_id', 'type' => 'xsd:string'), //Chamilo user_id
         'secret_key'   => array('name' => 'secret_key', 'type' => 'xsd:string')
     )
 );
 
 // Register the method to expose
-$server->register('WSUserSubscribedInCourse',                            // method name
-    array('UserSubscribedInCourse' => 'tns:UserSubscribedInCourse'),    // input parameters
-    array('return' => 'xsd:string'),                                        // output parameters
-    'urn:WSRegistration',                                                    // namespace
-    'urn:WSRegistration#WSUserSubscribedInCourse',                       // soapaction
-    'rpc',                                                                    // style
-    'encoded',                                                                // use
+$server->register('WSUserSubscribedInCourse', // method name
+    array('UserSubscribedInCourse' => 'tns:UserSubscribedInCourse'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUserSubscribedInCourse', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service checks if user assigned to course'    // documentation
 );
 
@@ -6124,7 +6124,7 @@ 
     global $debug;
 
     if ($debug) error_log('WSUserSubscribedInCourse');
-    if ($debug) error_log('Params '. print_r($params, 1));
+    if ($debug) error_log('Params '.print_r($params, 1));
     if (!WSHelperVerifyKey($params)) {
 
         return returnError(WS_ERROR_SECRET_KEY);
@@ -6132,7 +6132,7 @@ 
     $courseCode  = $params['course']; //Course code
     $userId      = $params['user_id']; //chamilo user id
 
-    return (CourseManager::is_user_subscribed_in_course($userId,$courseCode));
+    return (CourseManager::is_user_subscribed_in_course($userId, $courseCode));
 }
 
 
@@ -6160,8 +6160,8 @@ 
     'all',
     '',
     array(
-        'variable' => array('name'=>'variable','type'=>'xsd:string'),
-        'value' => array('name'=>'value','type'=>'xsd:string')
+        'variable' => array('name'=>'variable', 'type'=>'xsd:string'),
+        'value' => array('name'=>'value', 'type'=>'xsd:string')
     )
 );
 
@@ -6223,12 +6223,12 @@ 
 //Reister WSSearchSession
 $server->register(
     'WSSearchSession',
-    array('SearchSession' => 'tns:SearchSession'),      // input parameters
-    array('return' => 'tns:searchedSessionList'),       // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSSearchSession',               // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+    array('SearchSession' => 'tns:SearchSession'), // input parameters
+    array('return' => 'tns:searchedSessionList'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSSearchSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service to get a session list filtered by name, description or short description extra field'    // documentation
 );
 
@@ -6283,12 +6283,12 @@ 
 //Reister WSFetchSession
 $server->register(
     'WSFetchSession',
-    array('SearchSession' => 'tns:FetchSession'),                    // input parameters
-    array('return' => 'tns:searchedSessionList'),       // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSFetchSession',                // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+    array('SearchSession' => 'tns:FetchSession'), // input parameters
+    array('return' => 'tns:searchedSessionList'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSFetchSession', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service get a session by its id. Optionally can get its extra fields values'    // documentation
 );
 
@@ -6365,16 +6365,16 @@ 
 );
 // Register the method to expose
 $server->register(
-    'WSCertificatesList',                           // method name
+    'WSCertificatesList', // method name
     array(
-        'startingDate' => 'xsd:string',             // input parameters
+        'startingDate' => 'xsd:string', // input parameters
         'endingDate' => 'xsd:string'
     ),
-    array('return' => 'tns:certificatesList'),      // output parameters
-    'urn:WSRegistration',                           // namespace
-    'urn:WSRegistration#WSCertificatesList',        // soapaction
-    'rpc',                                          // style
-    'encoded',                                      // use
+    array('return' => 'tns:certificatesList'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCertificatesList', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service returns a list of certificates'   // documentation
 );
 
@@ -6440,13 +6440,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSCreateGroup',              // method name
-    array('createGroup' => 'tns:createGroup'),  // input parameters
-    array('return' => 'xsd:string'),            // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSCreateGroup',         // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+$server->register('WSCreateGroup', // method name
+    array('createGroup' => 'tns:createGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSCreateGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a group'                 // documentation
 );
 
@@ -6489,13 +6489,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUpdateGroup',              // method name
-    array('updateGroup' => 'tns:updateGroup'),  // input parameters
-    array('return' => 'xsd:string'),            // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSUpdateGroup',         // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+$server->register('WSUpdateGroup', // method name
+    array('updateGroup' => 'tns:updateGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUpdateGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service updates a group'              // documentation
 );
 
@@ -6540,13 +6540,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSDeleteGroup',              // method name
-    array('deleteGroup' => 'tns:deleteGroup'),  // input parameters
-    array('return' => 'xsd:string'),            // output parameters
-    'urn:WSRegistration',                       // namespace
-    'urn:WSRegistration#WSDeleteGroup',         // soapaction
-    'rpc',                                      // style
-    'encoded',                                  // use
+$server->register('WSDeleteGroup', // method name
+    array('deleteGroup' => 'tns:deleteGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a group'              // documentation
 );
 
@@ -6583,13 +6583,13 @@ 
 );
 
 // Register the method to expose
-$server->register('GroupBindToParent',                      // method name
-    array('groupBindToParent' => 'tns:groupBindToParent'),  // input parameters
-    array('return' => 'xsd:string'),                        // output parameters
-    'urn:WSRegistration',                                   // namespace
-    'urn:WSRegistration#GroupBindToParent',                 // soapaction
-    'rpc',                                                  // style
-    'encoded',                                              // use
+$server->register('GroupBindToParent', // method name
+    array('groupBindToParent' => 'tns:groupBindToParent'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#GroupBindToParent', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service binds a group to a parent'                // documentation
 );
 
@@ -6625,13 +6625,13 @@ 
 );
 
 // Register the method to expose
-$server->register('GroupUnbindFromParent',                          // method name
-    array('groupUnbindFromParent' => 'tns:groupUnbindFromParent'),  // input parameters
-    array('return' => 'xsd:string'),                                // output parameters
-    'urn:WSRegistration',                                           // namespace
-    'urn:WSRegistration#GroupUnbindFromParent',                     // soapaction
-    'rpc',                                                          // style
-    'encoded',                                                      // use
+$server->register('GroupUnbindFromParent', // method name
+    array('groupUnbindFromParent' => 'tns:groupUnbindFromParent'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#GroupUnbindFromParent', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service unbinds a group from its parent'                  // documentation
 );
 
@@ -6665,13 +6665,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSAddUserToGroup',                   // method name
-    array('addUserToGroup' => 'tns:addUserToGroup'),    // input parameters
-    array('return' => 'xsd:string'),                    // output parameters
-    'urn:WSRegistration',                               // namespace
-    'urn:WSRegistration#WSAddUserToGroup',              // soapaction
-    'rpc',                                              // style
-    'encoded',                                          // use
+$server->register('WSAddUserToGroup', // method name
+    array('addUserToGroup' => 'tns:addUserToGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSAddUserToGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service adds a user to a group'               // documentation
 );
 
@@ -6708,13 +6708,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSUpdateUserRoleInGroup',                        // method name
-    array('updateUserRoleInGroup' => 'tns:updateUserRoleInGroup'),  // input parameters
-    array('return' => 'xsd:string'),                                // output parameters
-    'urn:WSRegistration',                                           // namespace
-    'urn:WSRegistration#WSUpdateUserRoleInGroup',                   // soapaction
-    'rpc',                                                          // style
-    'encoded',                                                      // use
+$server->register('WSUpdateUserRoleInGroup', // method name
+    array('updateUserRoleInGroup' => 'tns:updateUserRoleInGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSUpdateUserRoleInGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service updates a user role in group'                     // documentation
 );
 
@@ -6753,13 +6753,13 @@ 
 );
 
 // Register the method to expose
-$server->register('WSDeleteUserFromGroup',                      // method name
-    array('deleteUserFromGroup' => 'tns:deleteUserFromGroup'),  // input parameters
-    array('return' => 'xsd:string'),                            // output parameters
-    'urn:WSRegistration',                                       // namespace
-    'urn:WSRegistration#WSDeleteUserFromGroup',                 // soapaction
-    'rpc',                                                      // style
-    'encoded',                                                  // use
+$server->register('WSDeleteUserFromGroup', // method name
+    array('deleteUserFromGroup' => 'tns:deleteUserFromGroup'), // input parameters
+    array('return' => 'xsd:string'), // output parameters
+    'urn:WSRegistration', // namespace
+    'urn:WSRegistration#WSDeleteUserFromGroup', // soapaction
+    'rpc', // style
+    'encoded', // use
     'This service deletes a user from a group'                  // documentation
 );
 

main/webservices/webservice.php

Doc Comments +5 added lines, -1 removed lines

@@ -37,6 +37,8 @@ 
 	 *
 	 * @param int Error code
 	 * @param string Error message
+	 * @param integer $code
+	 * @param string $message
 	 */
 	public function __construct($code, $message) {
 		$this->code = $code;
@@ -47,6 +49,7 @@ 
 	 * Sets the error handler
 	 *
 	 * @param WSErrorHandler Error handler
+	 * @param WSSoapErrorHandler $handler
 	 */
 	public static function setErrorHandler($handler) {
 		if($handler instanceof WSErrorHandler) {
@@ -81,6 +84,7 @@ 
 	 * Handle method
 	 *
 	 * @param WSError Error
+	 * @return void
 	 */
 	public function handle($error);
 }
@@ -107,7 +111,7 @@ 
 	 * Verifies the API key
 	 *
 	 * @param string Secret key
-	 * @return mixed WSError in case of failure, null in case of success
+	 * @return WSError|null WSError in case of failure, null in case of success
 	 */
 	protected function verifyKey($secret_key) {
 		$ip = trim($_SERVER['REMOTE_ADDR']);

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param WSErrorHandler Error handler
 	 */
 	public static function setErrorHandler($handler) {
-		if($handler instanceof WSErrorHandler) {
+		if ($handler instanceof WSErrorHandler) {
 			self::$_handler = $handler;
 		}
 	}
@@ -114,12 +114,12 @@ 
 		// if we are behind a reverse proxy, assume it will send the
 		// HTTP_X_FORWARDED_FOR header and use this IP instead
 		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
+			list($ip1, $ip2) = preg_split('/,/', $_SERVER['HTTP_X_FORWARDED_FOR']);
 			$ip = trim($ip1);
 		}
 		$security_key = $ip.$this->_configuration['security_key'];
 
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
+		if (!api_is_valid_secret_key($secret_key, $security_key)) {
 			return new WSError(1, "API key is invalid");
 		} else {
 			return null;
@@ -136,15 +136,15 @@ 
 	 * @return mixed System user id if the user was found, WSError otherwise
 	 */
 	protected function getUserId($user_id_field_name, $user_id_value) {
-		if($user_id_field_name == "chamilo_user_id") {
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
+		if ($user_id_field_name == "chamilo_user_id") {
+			if (UserManager::is_user_id_valid(intval($user_id_value))) {
 				return intval($user_id_value);
 			} else {
 				return new WSError(100, "User not found");
 			}
 		} else {
 			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
-			if($user_id == 0) {
+			if ($user_id == 0) {
 				return new WSError(100, "User not found");
 			} else {
 				return $user_id;
@@ -197,7 +197,7 @@ 
 	protected function getSessionId($session_id_field_name, $session_id_value)
 	{
 		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
+			$session = SessionManager::fetch((int) $session_id_value);
 			if (!empty($session)) {
 				return intval($session_id_value);
 			} else {

Indentation +220 added lines, -220 removed lines

@@ -11,237 +11,237 @@
  */
 class WSError
 {
-	/**
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
-	 *
-	 * @var WSErrorHandler
-	 */
-	protected static $_handler;
-
-	/**
-	 * Error code
-	 *
-	 * @var int
-	 */
-	public $code;
-
-	/**
-	 * Error message
-	 *
-	 * @var string
-	 */
-	public $message;
-
-	/**
-	 * Constructor
-	 *
-	 * @param int Error code
-	 * @param string Error message
-	 */
-	public function __construct($code, $message) {
-		$this->code = $code;
-		$this->message = $message;
-	}
-
-	/**
-	 * Sets the error handler
-	 *
-	 * @param WSErrorHandler Error handler
-	 */
-	public static function setErrorHandler($handler) {
-		if($handler instanceof WSErrorHandler) {
-			self::$_handler = $handler;
-		}
-	}
-
-	/**
-	 * Returns the error handler
-	 *
-	 * @return WSErrorHandler Error handler
-	 */
-	public static function getErrorHandler() {
-		return self::$_handler;
-	}
-
-	/**
-	 * Transforms the error into an array
-	 *
-	 * @return array Associative array with code and message
-	 */
-	public function toArray() {
-		return array('code' => $this->code, 'message' => $this->message);
-	}
+    /**
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
+     *
+     * @var WSErrorHandler
+     */
+    protected static $_handler;
+
+    /**
+     * Error code
+     *
+     * @var int
+     */
+    public $code;
+
+    /**
+     * Error message
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * Constructor
+     *
+     * @param int Error code
+     * @param string Error message
+     */
+    public function __construct($code, $message) {
+        $this->code = $code;
+        $this->message = $message;
+    }
+
+    /**
+     * Sets the error handler
+     *
+     * @param WSErrorHandler Error handler
+     */
+    public static function setErrorHandler($handler) {
+        if($handler instanceof WSErrorHandler) {
+            self::$_handler = $handler;
+        }
+    }
+
+    /**
+     * Returns the error handler
+     *
+     * @return WSErrorHandler Error handler
+     */
+    public static function getErrorHandler() {
+        return self::$_handler;
+    }
+
+    /**
+     * Transforms the error into an array
+     *
+     * @return array Associative array with code and message
+     */
+    public function toArray() {
+        return array('code' => $this->code, 'message' => $this->message);
+    }
 }
 
 /**
  * Interface that must be implemented by any error handler
  */
 interface WSErrorHandler {
-	/**
-	 * Handle method
-	 *
-	 * @param WSError Error
-	 */
-	public function handle($error);
+    /**
+     * Handle method
+     *
+     * @param WSError Error
+     */
+    public function handle($error);
 }
 
 /**
  * Main class of the webservice. Webservice classes extend this class
  */
 class WS {
-	/**
-	 * Chamilo configuration
-	 *
-	 * @var array
-	 */
-	protected $_configuration;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->_configuration = $GLOBALS['_configuration'];
-	}
-
-	/**
-	 * Verifies the API key
-	 *
-	 * @param string Secret key
-	 * @return mixed WSError in case of failure, null in case of success
-	 */
-	protected function verifyKey($secret_key) {
-		$ip = trim($_SERVER['REMOTE_ADDR']);
-		// if we are behind a reverse proxy, assume it will send the
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
-			list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
-			$ip = trim($ip1);
-		}
-		$security_key = $ip.$this->_configuration['security_key'];
-
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
-			return new WSError(1, "API key is invalid");
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Gets the real user id based on the user id field name and value.
-	 * Note that if the user id field name is "chamilo_user_id", it will use the user id
-	 * in the system database
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @return mixed System user id if the user was found, WSError otherwise
-	 */
-	protected function getUserId($user_id_field_name, $user_id_value) {
-		if($user_id_field_name == "chamilo_user_id") {
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
-				return intval($user_id_value);
-			} else {
-				return new WSError(100, "User not found");
-			}
-		} else {
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
-			if($user_id == 0) {
-				return new WSError(100, "User not found");
-			} else {
-				return $user_id;
-			}
-		}
-	}
-
-	/**
-	 * Gets the real course id based on the course id field name and value.
-	 * Note that if the course id field name is "chamilo_course_id", it will use the course id
-	 * in the system database
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @return mixed System course id if the course was found, WSError otherwise
-	 */
-	protected function getCourseId($course_id_field_name, $course_id_value)
-	{
-		if ($course_id_field_name == "chamilo_course_id") {
-			if (CourseManager::get_course_code_from_course_id(
-					intval($course_id_value)
-				) != null
-			) {
-				return intval($course_id_value);
-			} else {
-				return new WSError(200, "Course not found");
-			}
-		} else {
-			$courseId = CourseManager::get_course_code_from_original_id(
-				$course_id_value,
-				$course_id_field_name
-			);
-			if (!empty($courseId)) {
-				return $courseId;
-			} else {
-				return new WSError(200, "Course not found");
-			}
-		}
-	}
-
-	/**
-	 * Gets the real session id based on the session id field name and value.
-	 * Note that if the session id field name is "chamilo_session_id", it will use the session id
-	 * in the system database
-	 *
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @return mixed System session id if the session was found, WSError otherwise
-	 */
-	protected function getSessionId($session_id_field_name, $session_id_value)
-	{
-		if ($session_id_field_name == "chamilo_session_id") {
-			$session = SessionManager::fetch((int)$session_id_value);
-			if (!empty($session)) {
-				return intval($session_id_value);
-			} else {
-				return new WSError(300, "Session not found");
-			}
-		} else {
-			$session_id = SessionManager::getSessionIdFromOriginalId(
-				$session_id_value,
-				$session_id_field_name
-			);
-			if ($session_id == 0) {
-				return new WSError(300, "Session not found");
-			} else {
-				return $session_id;
-			}
-		}
-	}
-
-	/**
-	 * Handles an error by calling the WSError error handler
-	 *
-	 * @param WSError Error
-	 */
-	protected function handleError($error) {
-		$handler = WSError::getErrorHandler();
-		$handler->handle($error);
-	}
-
-	/**
-	 * Gets a successful result
-	 *
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
-	 */
-	protected function getSuccessfulResult() {
-		return array('code' => 0, 'message' => 'Operation was successful');
-	}
-
-	/**
-	 * Test function. Returns the string success
-	 *
-	 * @return string Success
-	 */
-	public function test() {
-		return "success";
-	}
+    /**
+     * Chamilo configuration
+     *
+     * @var array
+     */
+    protected $_configuration;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->_configuration = $GLOBALS['_configuration'];
+    }
+
+    /**
+     * Verifies the API key
+     *
+     * @param string Secret key
+     * @return mixed WSError in case of failure, null in case of success
+     */
+    protected function verifyKey($secret_key) {
+        $ip = trim($_SERVER['REMOTE_ADDR']);
+        // if we are behind a reverse proxy, assume it will send the
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+            list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
+            $ip = trim($ip1);
+        }
+        $security_key = $ip.$this->_configuration['security_key'];
+
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
+            return new WSError(1, "API key is invalid");
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Gets the real user id based on the user id field name and value.
+     * Note that if the user id field name is "chamilo_user_id", it will use the user id
+     * in the system database
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @return mixed System user id if the user was found, WSError otherwise
+     */
+    protected function getUserId($user_id_field_name, $user_id_value) {
+        if($user_id_field_name == "chamilo_user_id") {
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
+                return intval($user_id_value);
+            } else {
+                return new WSError(100, "User not found");
+            }
+        } else {
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
+            if($user_id == 0) {
+                return new WSError(100, "User not found");
+            } else {
+                return $user_id;
+            }
+        }
+    }
+
+    /**
+     * Gets the real course id based on the course id field name and value.
+     * Note that if the course id field name is "chamilo_course_id", it will use the course id
+     * in the system database
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @return mixed System course id if the course was found, WSError otherwise
+     */
+    protected function getCourseId($course_id_field_name, $course_id_value)
+    {
+        if ($course_id_field_name == "chamilo_course_id") {
+            if (CourseManager::get_course_code_from_course_id(
+                    intval($course_id_value)
+                ) != null
+            ) {
+                return intval($course_id_value);
+            } else {
+                return new WSError(200, "Course not found");
+            }
+        } else {
+            $courseId = CourseManager::get_course_code_from_original_id(
+                $course_id_value,
+                $course_id_field_name
+            );
+            if (!empty($courseId)) {
+                return $courseId;
+            } else {
+                return new WSError(200, "Course not found");
+            }
+        }
+    }
+
+    /**
+     * Gets the real session id based on the session id field name and value.
+     * Note that if the session id field name is "chamilo_session_id", it will use the session id
+     * in the system database
+     *
+     * @param string Session id field name
+     * @param string Session id value
+     * @return mixed System session id if the session was found, WSError otherwise
+     */
+    protected function getSessionId($session_id_field_name, $session_id_value)
+    {
+        if ($session_id_field_name == "chamilo_session_id") {
+            $session = SessionManager::fetch((int)$session_id_value);
+            if (!empty($session)) {
+                return intval($session_id_value);
+            } else {
+                return new WSError(300, "Session not found");
+            }
+        } else {
+            $session_id = SessionManager::getSessionIdFromOriginalId(
+                $session_id_value,
+                $session_id_field_name
+            );
+            if ($session_id == 0) {
+                return new WSError(300, "Session not found");
+            } else {
+                return $session_id;
+            }
+        }
+    }
+
+    /**
+     * Handles an error by calling the WSError error handler
+     *
+     * @param WSError Error
+     */
+    protected function handleError($error) {
+        $handler = WSError::getErrorHandler();
+        $handler->handle($error);
+    }
+
+    /**
+     * Gets a successful result
+     *
+     * @return array Array with a code of 0 and a message 'Operation was successful'
+     */
+    protected function getSuccessfulResult() {
+        return array('code' => 0, 'message' => 'Operation was successful');
+    }
+
+    /**
+     * Test function. Returns the string success
+     *
+     * @return string Success
+     */
+    public function test() {
+        return "success";
+    }
 }
 

main/webservices/webservice_session.php

Doc Comments +1 added lines

@@ -453,6 +453,7 @@
 	 * @param string Session id field name
 	 * @param string Session id value
 	 * @param int State (1 to subscribe, 0 to unsubscribe)
+	 * @param integer $state
 	 * @return mixed True on success, WSError otherwise
 	 */
 	protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {

Indentation +361 added lines, -361 removed lines

@@ -14,177 +14,177 @@ 
 class WSSession extends WS
 {
 
-	/**
-	 * Creates a session (helper method)
-	 *
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 * @return mixed Generated id in case of success, WSError otherwise
-	 */
-	protected function createSessionHelper(
-		$name,
-		$start_date,
-		$end_date,
-		$nb_days_access_before,
-		$nb_days_access_after,
-		$nolimit,
-		$visibility,
-		$user_id_field_name,
-		$user_id_value,
-		$session_id_field_name,
-		$session_id_value,
-		$extras
-	) {
-		// Verify that coach exists and get its id
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if ($user_id instanceof WSError) {
-			return $user_id;
-		}
+    /**
+     * Creates a session (helper method)
+     *
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     * @return mixed Generated id in case of success, WSError otherwise
+     */
+    protected function createSessionHelper(
+        $name,
+        $start_date,
+        $end_date,
+        $nb_days_access_before,
+        $nb_days_access_after,
+        $nolimit,
+        $visibility,
+        $user_id_field_name,
+        $user_id_value,
+        $session_id_field_name,
+        $session_id_value,
+        $extras
+    ) {
+        // Verify that coach exists and get its id
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if ($user_id instanceof WSError) {
+            return $user_id;
+        }
 
-		$coachStartDate = null;
-		if (!empty($nb_days_access_before)) {
-			$day = intval($nb_days_access_before);
-			$coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
-		}
+        $coachStartDate = null;
+        if (!empty($nb_days_access_before)) {
+            $day = intval($nb_days_access_before);
+            $coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
+        }
 
-		$coachEndDate = null;
-		if (!empty($nb_days_access_after)) {
-			$day = intval($nb_days_access_after);
-			$coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
-		}
+        $coachEndDate = null;
+        if (!empty($nb_days_access_after)) {
+            $day = intval($nb_days_access_after);
+            $coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
+        }
 
-		// Try to create the session
-		$session_id = SessionManager::create_session(
-			$name,
-			$start_date,
-			$end_date,
-			$start_date,
-			$end_date,
-			$coachStartDate,
-			$coachEndDate,
-			$user_id,
-			0,
-			$visibility
-		);
-		if(!is_int($session_id)) {
-			return new WSError(301, 'Could not create the session');
-		} else {
-			// Add the Original session id to the extra fields
-			$extras_associative = array();
-			if($session_id_field_name != "chamilo_session_id") {
-				$extras_associative[$session_id_field_name] = $session_id_value;
-			}
-			foreach($extras as $extra) {
-				$extras_associative[$extra['field_name']] = $extra['field_value'];
-			}
-			// Create the extra fields
-			foreach($extras_associative as $fname => $fvalue) {
-				SessionManager::create_session_extra_field($fname, 1, $fname);
-				SessionManager::update_session_extra_field_value(
-					$session_id,
-					$fname,
-					$fvalue
-				);
-			}
-			return $session_id;
-		}
-	}
+        // Try to create the session
+        $session_id = SessionManager::create_session(
+            $name,
+            $start_date,
+            $end_date,
+            $start_date,
+            $end_date,
+            $coachStartDate,
+            $coachEndDate,
+            $user_id,
+            0,
+            $visibility
+        );
+        if(!is_int($session_id)) {
+            return new WSError(301, 'Could not create the session');
+        } else {
+            // Add the Original session id to the extra fields
+            $extras_associative = array();
+            if($session_id_field_name != "chamilo_session_id") {
+                $extras_associative[$session_id_field_name] = $session_id_value;
+            }
+            foreach($extras as $extra) {
+                $extras_associative[$extra['field_name']] = $extra['field_value'];
+            }
+            // Create the extra fields
+            foreach($extras_associative as $fname => $fvalue) {
+                SessionManager::create_session_extra_field($fname, 1, $fname);
+                SessionManager::update_session_extra_field_value(
+                    $session_id,
+                    $fname,
+                    $fvalue
+                );
+            }
+            return $session_id;
+        }
+    }
 
-	/**
-	 * Creates a session
-	 *
-	 * @param string API secret key
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 * @return int Session id generated
-	 */
-	public function CreateSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$session_id = $this->createSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id instanceof WSError) {
-				$this->handleError($session_id);
-			} else {
-				return $session_id;
-			}
-		}
-	}
+    /**
+     * Creates a session
+     *
+     * @param string API secret key
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     * @return int Session id generated
+     */
+    public function CreateSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $session_id = $this->createSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
+            if($session_id instanceof WSError) {
+                $this->handleError($session_id);
+            } else {
+                return $session_id;
+            }
+        }
+    }
 
-	/**
-	 * Deletes a session (helper method)
-	 *
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @return mixed True in case of success, WSError otherwise
-	 */
-	protected function deleteSessionHelper($session_id_field_name, $session_id_value) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			SessionManager::delete($session_id, true);
-			return true;
-		}
-	}
+    /**
+     * Deletes a session (helper method)
+     *
+     * @param string Session id field name
+     * @param string Session id value
+     * @return mixed True in case of success, WSError otherwise
+     */
+    protected function deleteSessionHelper($session_id_field_name, $session_id_value) {
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            SessionManager::delete($session_id, true);
+            return true;
+        }
+    }
 
-	/**
-	 * Deletes a session
-	 *
-	 * @param string API secret key
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function DeleteSession($secret_key, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteSessionHelper($session_id_field_name, $session_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a session
+     *
+     * @param string API secret key
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function DeleteSession($secret_key, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteSessionHelper($session_id_field_name, $session_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Edits a session (helper method)
-	 *
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 * @return mixed True on success, WSError otherwise
-	 */
+    /**
+     * Edits a session (helper method)
+     *
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     * @return mixed True on success, WSError otherwise
+     */
     protected function editSessionHelper(
         $name,
         $start_date,
@@ -199,15 +199,15 @@ 
         $session_id_value,
         $extras
     ) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			// Verify that coach exists and get its id
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if ($user_id instanceof WSError) {
-				return $user_id;
-			}
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            // Verify that coach exists and get its id
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if ($user_id instanceof WSError) {
+                return $user_id;
+            }
 
             $coachStartDate = null;
             if (!empty($nb_days_access_before)) {
@@ -234,127 +234,127 @@ 
                 0,
                 (int)$visibility
             );
-			if(!is_int($result_id)) {
-				return new WSError(302, 'Could not edit the session');
-			} else {
-				if(!empty($extras)) {
-					$extras_associative = array();
-					foreach($extras as $extra) {
-						$extras_associative[$extra['field_name']] = $extra['field_value'];
-					}
-					// Create the extra fields
-					foreach($extras_associative as $fname => $fvalue) {
-						SessionManager::create_session_extra_field($fname, 1, $fname);
-						SessionManager::update_session_extra_field_value($session_id, $fname, $fvalue);
-					}
-				}
-				return true;
-			}
-		}
-	}
+            if(!is_int($result_id)) {
+                return new WSError(302, 'Could not edit the session');
+            } else {
+                if(!empty($extras)) {
+                    $extras_associative = array();
+                    foreach($extras as $extra) {
+                        $extras_associative[$extra['field_name']] = $extra['field_value'];
+                    }
+                    // Create the extra fields
+                    foreach($extras_associative as $fname => $fvalue) {
+                        SessionManager::create_session_extra_field($fname, 1, $fname);
+                        SessionManager::update_session_extra_field_value($session_id, $fname, $fvalue);
+                    }
+                }
+                return true;
+            }
+        }
+    }
 
-	/**
-	 * Edits a session
-	 *
-	 * @param string API secret key
-	 * @param string Name of the session
-	 * @param string Start date, use the 'YYYY-MM-DD' format
-	 * @param string End date, use the 'YYYY-MM-DD' format
-	 * @param int Access delays of the coach (days before)
-	 * @param int Access delays of the coach (days after)
-	 * @param int Nolimit (0 = no limit of time, 1 = limit of time)
-	 * @param int Visibility
-	 * @param string User id field name for the coach
-	 * @param string User id value for the coach
-	 * @param string Original session id field name (use "chamilo_session_id" to use internal id)
-	 * @param string Original session id value
-	 * @param array Array of extra fields
-	 */
-	public function EditSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->editSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id_value instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Edits a session
+     *
+     * @param string API secret key
+     * @param string Name of the session
+     * @param string Start date, use the 'YYYY-MM-DD' format
+     * @param string End date, use the 'YYYY-MM-DD' format
+     * @param int Access delays of the coach (days before)
+     * @param int Access delays of the coach (days after)
+     * @param int Nolimit (0 = no limit of time, 1 = limit of time)
+     * @param int Visibility
+     * @param string User id field name for the coach
+     * @param string User id value for the coach
+     * @param string Original session id field name (use "chamilo_session_id" to use internal id)
+     * @param string Original session id value
+     * @param array Array of extra fields
+     */
+    public function EditSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->editSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
+            if($session_id_value instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Change user subscription (helper method)
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @param int State (1 to subscribe, 0 to unsubscribe)
-	 * @return mixed True on success, WSError otherwise
-	 */
-	protected function changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $state) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
-				return $user_id;
-			} else {
-				if($state  == 1) {
-					SessionManager::suscribe_users_to_session($session_id, array($user_id));
-				} else {
-					$result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
-					if (!$result) {
-						return new WSError(303, 'There was an error unsubscribing this user from the session');
-					}
-				}
-				return true;
-			}
-		}
-	}
+    /**
+     * Change user subscription (helper method)
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @param string Session id field name
+     * @param string Session id value
+     * @param int State (1 to subscribe, 0 to unsubscribe)
+     * @return mixed True on success, WSError otherwise
+     */
+    protected function changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $state) {
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+            if($user_id instanceof WSError) {
+                return $user_id;
+            } else {
+                if($state  == 1) {
+                    SessionManager::suscribe_users_to_session($session_id, array($user_id));
+                } else {
+                    $result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
+                    if (!$result) {
+                        return new WSError(303, 'There was an error unsubscribing this user from the session');
+                    }
+                }
+                return true;
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a session
-	 *
-	 * @param string API secret key
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function SubscribeUserToSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a session
+     *
+     * @param string API secret key
+     * @param string User id field name
+     * @param string User id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function SubscribeUserToSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 1);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Subscribe user to a session
-	 *
-	 * @param string API secret key
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function UnsubscribeUserFromSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe user to a session
+     *
+     * @param string API secret key
+     * @param string User id field name
+     * @param string User id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function UnsubscribeUserFromSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
     
     /**
      * Change Teacher subscription (helper method)
@@ -446,79 +446,79 @@ 
     }
 
     /**
-	 * Change course subscription
-	 *
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 * @param int State (1 to subscribe, 0 to unsubscribe)
-	 * @return mixed True on success, WSError otherwise
-	 */
-	protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {
-		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
-			return $session_id;
-		} else {
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
-				return $course_id;
-			} else {
-				if($state  == 1) {
-					SessionManager::add_courses_to_session($session_id, array($course_id));
-					return true;
-				} else {
-					$result = SessionManager::unsubscribe_course_from_session($session_id, $course_id);
-					if ($result) {
-						return true;
-					} else {
-						return new WSError(304, 'Error unsubscribing course from session');
-					}
-				}
-			}
-		}
+     * Change course subscription
+     *
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Session id field name
+     * @param string Session id value
+     * @param int State (1 to subscribe, 0 to unsubscribe)
+     * @return mixed True on success, WSError otherwise
+     */
+    protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {
+        $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
+        if($session_id instanceof WSError) {
+            return $session_id;
+        } else {
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
+            if($course_id instanceof WSError) {
+                return $course_id;
+            } else {
+                if($state  == 1) {
+                    SessionManager::add_courses_to_session($session_id, array($course_id));
+                    return true;
+                } else {
+                    $result = SessionManager::unsubscribe_course_from_session($session_id, $course_id);
+                    if ($result) {
+                        return true;
+                    } else {
+                        return new WSError(304, 'Error unsubscribing course from session');
+                    }
+                }
+            }
+        }
     }
 
-	/**
-	 * Subscribe course to session
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function SubscribeCourseToSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Subscribe course to session
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function SubscribeCourseToSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 1);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Unsubscribe course from session
-	 *
-	 * @param string API secret key
-	 * @param string Course id field name
-	 * @param string Course id value
-	 * @param string Session id field name
-	 * @param string Session id value
-	 */
-	public function UnsubscribeCourseFromSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Unsubscribe course from session
+     *
+     * @param string API secret key
+     * @param string Course id field name
+     * @param string Course id value
+     * @param string Session id field name
+     * @param string Session id value
+     */
+    public function UnsubscribeCourseFromSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
 }

Spacing +36 added lines, -36 removed lines

@@ -54,13 +54,13 @@ 
 		$coachStartDate = null;
 		if (!empty($nb_days_access_before)) {
 			$day = intval($nb_days_access_before);
-			$coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
+			$coachStartDate = date('Y-m-d ', strtotime($start_date.' + '.$day.' days'));
 		}
 
 		$coachEndDate = null;
 		if (!empty($nb_days_access_after)) {
 			$day = intval($nb_days_access_after);
-			$coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
+			$coachEndDate = date('Y-m-d ', strtotime($end_date.' + '.$day.' days'));
 		}
 
 		// Try to create the session
@@ -76,19 +76,19 @@ 
 			0,
 			$visibility
 		);
-		if(!is_int($session_id)) {
+		if (!is_int($session_id)) {
 			return new WSError(301, 'Could not create the session');
 		} else {
 			// Add the Original session id to the extra fields
 			$extras_associative = array();
-			if($session_id_field_name != "chamilo_session_id") {
+			if ($session_id_field_name != "chamilo_session_id") {
 				$extras_associative[$session_id_field_name] = $session_id_value;
 			}
-			foreach($extras as $extra) {
+			foreach ($extras as $extra) {
 				$extras_associative[$extra['field_name']] = $extra['field_value'];
 			}
 			// Create the extra fields
-			foreach($extras_associative as $fname => $fvalue) {
+			foreach ($extras_associative as $fname => $fvalue) {
 				SessionManager::create_session_extra_field($fname, 1, $fname);
 				SessionManager::update_session_extra_field_value(
 					$session_id,
@@ -120,11 +120,11 @@ 
 	 */
 	public function CreateSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$session_id = $this->createSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id instanceof WSError) {
+			if ($session_id instanceof WSError) {
 				$this->handleError($session_id);
 			} else {
 				return $session_id;
@@ -141,7 +141,7 @@ 
 	 */
 	protected function deleteSessionHelper($session_id_field_name, $session_id_value) {
 		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
+		if ($session_id instanceof WSError) {
 			return $session_id;
 		} else {
 			SessionManager::delete($session_id, true);
@@ -158,11 +158,11 @@ 
 	 */
 	public function DeleteSession($secret_key, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->deleteSessionHelper($session_id_field_name, $session_id_value);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -200,7 +200,7 @@ 
         $extras
     ) {
 		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
+		if ($session_id instanceof WSError) {
 			return $session_id;
 		} else {
 			// Verify that coach exists and get its id
@@ -212,13 +212,13 @@ 
             $coachStartDate = null;
             if (!empty($nb_days_access_before)) {
                 $day = intval($nb_days_access_before);
-                $coachStartDate = date('Y-m-d ', strtotime($start_date. ' + '.$day.' days'));
+                $coachStartDate = date('Y-m-d ', strtotime($start_date.' + '.$day.' days'));
             }
 
             $coachEndDate = null;
             if (!empty($nb_days_access_after)) {
                 $day = intval($nb_days_access_after);
-                $coachEndDate = date('Y-m-d ', strtotime($end_date. ' + '.$day.' days'));
+                $coachEndDate = date('Y-m-d ', strtotime($end_date.' + '.$day.' days'));
             }
 
             $result_id = SessionManager::edit_session(
@@ -232,18 +232,18 @@ 
                 $coachEndDate,
                 $user_id,
                 0,
-                (int)$visibility
+                (int) $visibility
             );
-			if(!is_int($result_id)) {
+			if (!is_int($result_id)) {
 				return new WSError(302, 'Could not edit the session');
 			} else {
-				if(!empty($extras)) {
+				if (!empty($extras)) {
 					$extras_associative = array();
-					foreach($extras as $extra) {
+					foreach ($extras as $extra) {
 						$extras_associative[$extra['field_name']] = $extra['field_value'];
 					}
 					// Create the extra fields
-					foreach($extras_associative as $fname => $fvalue) {
+					foreach ($extras_associative as $fname => $fvalue) {
 						SessionManager::create_session_extra_field($fname, 1, $fname);
 						SessionManager::update_session_extra_field_value($session_id, $fname, $fvalue);
 					}
@@ -272,11 +272,11 @@ 
 	 */
 	public function EditSession($secret_key, $name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->editSessionHelper($name, $start_date, $end_date, $nb_days_access_before, $nb_days_access_after, $nolimit, $visibility, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $extras);
-			if($session_id_value instanceof WSError) {
+			if ($session_id_value instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -294,14 +294,14 @@ 
 	 */
 	protected function changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, $state) {
 		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
+		if ($session_id instanceof WSError) {
 			return $session_id;
 		} else {
 			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-			if($user_id instanceof WSError) {
+			if ($user_id instanceof WSError) {
 				return $user_id;
 			} else {
-				if($state  == 1) {
+				if ($state == 1) {
 					SessionManager::suscribe_users_to_session($session_id, array($user_id));
 				} else {
 					$result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
@@ -325,11 +325,11 @@ 
 	 */
 	public function SubscribeUserToSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -346,11 +346,11 @@ 
 	 */
 	public function UnsubscribeUserFromSession($secret_key, $user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserSubscription($user_id_field_name, $user_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -385,7 +385,7 @@ 
                     if ($state == 1) {
                         SessionManager::set_coach_to_course_session($user_id, $session_id, $course_id);
                     } else {
-                        $user_id = array (0 => $user_id);
+                        $user_id = array(0 => $user_id);
                         $result = SessionManager::removeUsersFromCourseSession($user_id, $session_id, $course_id);
                         if (!$result) {
                             return new WSError(303, 'There was an error unsubscribing this Teacher from the session');
@@ -457,14 +457,14 @@ 
 	 */
 	protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {
 		$session_id = $this->getSessionId($session_id_field_name, $session_id_value);
-		if($session_id instanceof WSError) {
+		if ($session_id instanceof WSError) {
 			return $session_id;
 		} else {
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
-			if($course_id instanceof WSError) {
+			if ($course_id instanceof WSError) {
 				return $course_id;
 			} else {
-				if($state  == 1) {
+				if ($state == 1) {
 					SessionManager::add_courses_to_session($session_id, array($course_id));
 					return true;
 				} else {
@@ -490,11 +490,11 @@ 
 	 */
 	public function SubscribeCourseToSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 1);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -511,11 +511,11 @@ 
 	 */
 	public function UnsubscribeCourseFromSession($secret_key, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}

main/webservices/webservice_user.php

Doc Comments +6 added lines

@@ -36,6 +36,7 @@ 
 	 *
 	 * @param array Users
 	 * @param int Set to 1 to enable and to 0 to disable
+	 * @param integer $state
 	 * @return array Array of results
 	 */
 	protected function changeUsersActiveState($users, $state) {
@@ -217,6 +218,11 @@ 
 	 * @param string Phone.
 	 * @param string Expiration date
 	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field').
+	 * @param integer|null $visibility
+	 * @param string|null $email
+	 * @param string|null $language
+	 * @param string|null $phone
+	 * @param string|null $expiration_date
 	 * @return mixed New user id generated by the system, WSError otherwise
 	 */
 	protected function createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras = array()) {

Indentation +426 added lines, -426 removed lines

@@ -11,458 +11,458 @@
  */
 class WSUser extends WS {
 
-	/**
-	 * Enables or disables a user
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param int Set to 1 to enable and to 0 to disable
-	 */
-	protected function changeUserActiveState($user_id_field_name, $user_id_value, $state) {
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
-			if($state == 0) {
-				UserManager::disable($user_id);
-			} else if($state == 1) {
-				UserManager::enable($user_id);
-			}
-		}
-	}
+    /**
+     * Enables or disables a user
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @param int Set to 1 to enable and to 0 to disable
+     */
+    protected function changeUserActiveState($user_id_field_name, $user_id_value, $state) {
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
+            if($state == 0) {
+                UserManager::disable($user_id);
+            } else if($state == 1) {
+                UserManager::enable($user_id);
+            }
+        }
+    }
 
-	/**
-	 * Enables or disables multiple users
-	 *
-	 * @param array Users
-	 * @param int Set to 1 to enable and to 0 to disable
-	 * @return array Array of results
-	 */
-	protected function changeUsersActiveState($users, $state) {
-		$results = array();
-		foreach($users as $user) {
-			$result_tmp = array();
-			$result_op = $this->changeUserActiveState($user['user_id_field_name'], $user['user_id_value'], $state);
-			$result_tmp['user_id_value'] = $user['user_id_value'];
-			if($result_op instanceof WSError) {
-				// Return the error in the results
-				$result_tmp['result'] = $result_op->toArray();
-			} else {
-				$result_tmp['result'] = $this->getSuccessfulResult();
-			}
-			$results[] = $result_tmp;
-		}
-		return $results;
-	}
+    /**
+     * Enables or disables multiple users
+     *
+     * @param array Users
+     * @param int Set to 1 to enable and to 0 to disable
+     * @return array Array of results
+     */
+    protected function changeUsersActiveState($users, $state) {
+        $results = array();
+        foreach($users as $user) {
+            $result_tmp = array();
+            $result_op = $this->changeUserActiveState($user['user_id_field_name'], $user['user_id_value'], $state);
+            $result_tmp['user_id_value'] = $user['user_id_value'];
+            if($result_op instanceof WSError) {
+                // Return the error in the results
+                $result_tmp['result'] = $result_op->toArray();
+            } else {
+                $result_tmp['result'] = $this->getSuccessfulResult();
+            }
+            $results[] = $result_tmp;
+        }
+        return $results;
+    }
 
-	/**
-	 * Disables a user
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 */
-	public function DisableUser($secret_key, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			// Let the implementation handle it
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Disables a user
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     */
+    public function DisableUser($secret_key, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            // Let the implementation handle it
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Disables multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DisableUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			// Let the implementation handle it
-			$this->handleError($verifKey);
-		} else {
-			return $this->changeUsersActiveState($users, 0);
-		}
-	}
+    /**
+     * Disables multiple users
+     *
+     * @param string API secret key
+     * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DisableUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            // Let the implementation handle it
+            $this->handleError($verifKey);
+        } else {
+            return $this->changeUsersActiveState($users, 0);
+        }
+    }
 
-	/**
-	 * Enables a user
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 */
-	public function EnableUser($secret_key, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 1);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Enables a user
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     */
+    public function EnableUser($secret_key, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 1);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Enables multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function EnableUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			// Let the implementation handle it
-			$this->handleError($verifKey);
-		} else {
-			return $this->changeUsersActiveState($users, 1);
-		}
-	}
+    /**
+     * Enables multiple users
+     *
+     * @param string API secret key
+     * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function EnableUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            // Let the implementation handle it
+            $this->handleError($verifKey);
+        } else {
+            return $this->changeUsersActiveState($users, 1);
+        }
+    }
 
-	/**
-	 * Deletes a user (helper method)
-	 *
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 * @return mixed True if user was successfully deleted, WSError otherwise
-	 */
-	protected function deleteUserHelper($user_id_field_name, $user_id_value) {
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
-			if(!UserManager::delete_user($user_id)) {
-				return new WSError(101, "There was a problem while deleting this user");
-			} else {
-				return true;
-			}
-		}
-	}
+    /**
+     * Deletes a user (helper method)
+     *
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     * @return mixed True if user was successfully deleted, WSError otherwise
+     */
+    protected function deleteUserHelper($user_id_field_name, $user_id_value) {
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
+            if(!UserManager::delete_user($user_id)) {
+                return new WSError(101, "There was a problem while deleting this user");
+            } else {
+                return true;
+            }
+        }
+    }
 
-	/**
-	 * Deletes a user
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 */
-	public function DeleteUser($secret_key, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteUserHelper($user_id_field_name, $user_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a user
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     */
+    public function DeleteUser($secret_key, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteUserHelper($user_id_field_name, $user_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Deletes multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($users as $user) {
-				$result_tmp = array();
-				$result_op = $this->deleteUserHelper($user['user_id_field_name'], $user['user_id_value']);
-				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+    /**
+     * Deletes multiple users
+     *
+     * @param string API secret key
+     * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($users as $user) {
+                $result_tmp = array();
+                $result_op = $this->deleteUserHelper($user['user_id_field_name'], $user['user_id_value']);
+                $result_tmp['user_id_value'] = $user['user_id_value'];
+                if($result_op instanceof WSError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Creates a user (helper method)
-	 *
-	 * @param string User first name
-	 * @param string User last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password (encrypted or not)
-	 * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
-	 * to include the salt in the extra fields if you are encrypting the password
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value. Leave blank if you are using the internal user_id
-	 * @param int Visibility.
-	 * @param string User email.
-	 * @param string Language.
-	 * @param string Phone.
-	 * @param string Expiration date
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field').
-	 * @return mixed New user id generated by the system, WSError otherwise
-	 */
-	protected function createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras = array()) {
+    /**
+     * Creates a user (helper method)
+     *
+     * @param string User first name
+     * @param string User last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password (encrypted or not)
+     * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
+     * to include the salt in the extra fields if you are encrypting the password
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value. Leave blank if you are using the internal user_id
+     * @param int Visibility.
+     * @param string User email.
+     * @param string Language.
+     * @param string Phone.
+     * @param string Expiration date
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field').
+     * @return mixed New user id generated by the system, WSError otherwise
+     */
+    protected function createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras = array()) {
         global $api_failureList;
-		// Add the original user id field name and value to the extra fields if needed
-		$extras_associative = array();
-		if($user_id_field_name != "chamilo_user_id") {
-			$extras_associative[$user_id_field_name] = $user_id_value;
-		}
+        // Add the original user id field name and value to the extra fields if needed
+        $extras_associative = array();
+        if($user_id_field_name != "chamilo_user_id") {
+            $extras_associative[$user_id_field_name] = $user_id_value;
+        }
                 if (!empty($extras)) {
                     foreach($extras as $extra) {
                         $extras_associative[$extra['field_name']] = $extra['field_value'];
                     }
                 }
-		$result = UserManager::create_user($firstname, $lastname, $status, $email, $login, $password, '', $language, $phone, '', PLATFORM_AUTH_SOURCE, $expiration_date, $visibility, 0, $extras_associative, $encrypt_method);
-		if (!$result) {
-			$failure = $api_failureList[0];
-			if($failure == 'login-pass already taken') {
-				return new WSError(102, 'This username is already taken');
-			} else if($failure == 'encrypt_method invalid') {
-				return new WSError(103, 'The encryption of the password is invalid');
-			} else {
-				return new WSError(104, 'There was an error creating the user');
-			}
-		} else {
-			return $result;
-		}
-	}
+        $result = UserManager::create_user($firstname, $lastname, $status, $email, $login, $password, '', $language, $phone, '', PLATFORM_AUTH_SOURCE, $expiration_date, $visibility, 0, $extras_associative, $encrypt_method);
+        if (!$result) {
+            $failure = $api_failureList[0];
+            if($failure == 'login-pass already taken') {
+                return new WSError(102, 'This username is already taken');
+            } else if($failure == 'encrypt_method invalid') {
+                return new WSError(103, 'The encryption of the password is invalid');
+            } else {
+                return new WSError(104, 'There was an error creating the user');
+            }
+        } else {
+            return $result;
+        }
+    }
 
-	/**
-	 * Creates a user
-	 *
-	 * @param string API secret key
-	 * @param string User first name
-	 * @param string User last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password (encrypted or not)
-	 * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
-	 * to include the salt in the extra fields if you are encrypting the password
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value. Leave blank if you are using the internal user_id
-	 * @param int Visibility. Set by default to 1
-	 * @param string User email. Set by default to an empty string
-	 * @param string Language. Set by default to english
-	 * @param string Phone. Set by default to an empty string
-	 * @param string Expiration date. Set to null by default
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Set to an empty array by default
-	 * @return int New user id generated by the system
-	 */
-	public function CreateUser($secret_key, $firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility = 1, $email = '', $language = 'english', $phone = '', $expiration_date = '0000-00-00 00:00:00', $extras = array()) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
+    /**
+     * Creates a user
+     *
+     * @param string API secret key
+     * @param string User first name
+     * @param string User last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password (encrypted or not)
+     * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
+     * to include the salt in the extra fields if you are encrypting the password
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value. Leave blank if you are using the internal user_id
+     * @param int Visibility. Set by default to 1
+     * @param string User email. Set by default to an empty string
+     * @param string Language. Set by default to english
+     * @param string Phone. Set by default to an empty string
+     * @param string Expiration date. Set to null by default
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Set to an empty array by default
+     * @return int New user id generated by the system
+     */
+    public function CreateUser($secret_key, $firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility = 1, $email = '', $language = 'english', $phone = '', $expiration_date = '0000-00-00 00:00:00', $extras = array()) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Creates multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Users array. Each member of this array must follow the structure imposed by the CreateUser method
-	 * @return array Array with elements of the form array('user_id_value' => 'original value sent', 'user_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($users as $user) {
-				$result_tmp = array();
+    /**
+     * Creates multiple users
+     *
+     * @param string API secret key
+     * @param array Users array. Each member of this array must follow the structure imposed by the CreateUser method
+     * @return array Array with elements of the form array('user_id_value' => 'original value sent', 'user_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($users as $user) {
+                $result_tmp = array();
                 // re-initialize variables just in case
                 $firstname = $lastname = $status = $login = $password = $encrypt_method = $user_id_field_name = $user_id_value = $visibility = $email = $language = $phone = $expiration_date = $extras = null;
-				extract($user);
-				$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-				if($result instanceof WSError) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['user_id_value'] = $user_id_value;
-					$result_tmp['user_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['user_id_value'] = $user_id_value;
-					$result_tmp['user_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                extract($user);
+                $result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
+                if($result instanceof WSError) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['user_id_value'] = $user_id_value;
+                    $result_tmp['user_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['user_id_value'] = $user_id_value;
+                    $result_tmp['user_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Edits user info (helper method)
-	 *
-	 * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
-	 * @param string User id value
-	 * @param string First name
-	 * @param string Last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password. Leave blank if you don't want to update it
-	 * @param string Encrypt method
-	 * @param string User email
-	 * @param string Language. Set by default to english
-	 * @param string Phone. Set by default to an empty string
-	 * @param string Expiration date. Set to null by default
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
-	 * @return mixed True if user was successfully updated, WSError otherwise
-	 */
-	protected function editUserHelper(
-		$user_id_field_name,
-		$user_id_value,
-		$firstname,
-		$lastname,
-		$status,
-		$loginname,
-		$password,
-		$encrypt_method,
-		$email,
-		$language,
-		$phone,
-		$expiration_date,
-		$extras
-	) {
+    /**
+     * Edits user info (helper method)
+     *
+     * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
+     * @param string User id value
+     * @param string First name
+     * @param string Last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password. Leave blank if you don't want to update it
+     * @param string Encrypt method
+     * @param string User email
+     * @param string Language. Set by default to english
+     * @param string Phone. Set by default to an empty string
+     * @param string Expiration date. Set to null by default
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
+     * @return mixed True if user was successfully updated, WSError otherwise
+     */
+    protected function editUserHelper(
+        $user_id_field_name,
+        $user_id_value,
+        $firstname,
+        $lastname,
+        $status,
+        $loginname,
+        $password,
+        $encrypt_method,
+        $email,
+        $language,
+        $phone,
+        $expiration_date,
+        $extras
+    ) {
         global $api_failureList;
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
-			if($password == '') {
-				$password = null;
-			}
-			$user_info = api_get_user_info($user_id);
-			if (count($extras) == 0) {
-				$extras = null;
-			}
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
+            if($password == '') {
+                $password = null;
+            }
+            $user_info = api_get_user_info($user_id);
+            if (count($extras) == 0) {
+                $extras = null;
+            }
 
-			$result = UserManager::update_user(
-				$user_id,
-				$firstname,
-				$lastname,
-				$loginname,
-				$password,
-				PLATFORM_AUTH_SOURCE,
-				$email,
-				$status,
-				'',
-				$phone,
-				$user_info['picture_uri'],
-				$expiration_date,
-				$user_info['active'],
-				null,
-				$user_info['hr_dept_id'],
-				$extras,
-				$encrypt_method
-			);
-			if (!$result) {
-				$failure = $api_failureList[0];
-				if($failure == 'encrypt_method invalid') {
-					return new WSError(103, 'The encryption of the password is invalid');
-				} else {
-					return new WSError(105, 'There was an error updating the user');
-				}
-			} else {
-				return $result;
-			}
-		}
-	}
+            $result = UserManager::update_user(
+                $user_id,
+                $firstname,
+                $lastname,
+                $loginname,
+                $password,
+                PLATFORM_AUTH_SOURCE,
+                $email,
+                $status,
+                '',
+                $phone,
+                $user_info['picture_uri'],
+                $expiration_date,
+                $user_info['active'],
+                null,
+                $user_info['hr_dept_id'],
+                $extras,
+                $encrypt_method
+            );
+            if (!$result) {
+                $failure = $api_failureList[0];
+                if($failure == 'encrypt_method invalid') {
+                    return new WSError(103, 'The encryption of the password is invalid');
+                } else {
+                    return new WSError(105, 'There was an error updating the user');
+                }
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Edits user info
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
-	 * @param string User id value
-	 * @param string First name
-	 * @param string Last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password. Leave blank if you don't want to update it
-	 * @param string Encrypt method
-	 * @param string User email
-	 * @param string Language. Set by default to english
-	 * @param string Phone. Set by default to an empty string
-	 * @param string Expiration date. Set to null by default
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
-	 */
-	public function EditUser($secret_key, $user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
+    /**
+     * Edits user info
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
+     * @param string User id value
+     * @param string First name
+     * @param string Last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password. Leave blank if you don't want to update it
+     * @param string Encrypt method
+     * @param string User email
+     * @param string Language. Set by default to english
+     * @param string Phone. Set by default to an empty string
+     * @param string Expiration date. Set to null by default
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
+     */
+    public function EditUser($secret_key, $user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
 
-			$extras_associative = array();
-			if (!empty($extras)) {
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-			}
+            $extras_associative = array();
+            if (!empty($extras)) {
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+            }
 
-			$result = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras_associative);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+            $result = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras_associative);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Edits multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Users array. Each member of this array must follow the structure imposed by the EditUser method
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function EditUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($users as $user) {
-				$result_tmp = array();
+    /**
+     * Edits multiple users
+     *
+     * @param string API secret key
+     * @param array Users array. Each member of this array must follow the structure imposed by the EditUser method
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function EditUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($users as $user) {
+                $result_tmp = array();
                 // re-initialize variables just in case
                 $user_id_field_name = $user_id_value = $firstname = $lastname = $status = $loginname = $password = $encrypt_method = $email = $language = $phone = $expiration_date = $extras = null;
-				extract($user);
-				$result_op = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras);
-				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                extract($user);
+                $result_op = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras);
+                $result_tmp['user_id_value'] = $user['user_id_value'];
+                if($result_op instanceof WSError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 }

Spacing +36 added lines, -36 removed lines

@@ -20,12 +20,12 @@ 
 	 */
 	protected function changeUserActiveState($user_id_field_name, $user_id_value, $state) {
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
-			if($state == 0) {
+			if ($state == 0) {
 				UserManager::disable($user_id);
-			} else if($state == 1) {
+			} else if ($state == 1) {
 				UserManager::enable($user_id);
 			}
 		}
@@ -40,11 +40,11 @@ 
 	 */
 	protected function changeUsersActiveState($users, $state) {
 		$results = array();
-		foreach($users as $user) {
+		foreach ($users as $user) {
 			$result_tmp = array();
 			$result_op = $this->changeUserActiveState($user['user_id_field_name'], $user['user_id_value'], $state);
 			$result_tmp['user_id_value'] = $user['user_id_value'];
-			if($result_op instanceof WSError) {
+			if ($result_op instanceof WSError) {
 				// Return the error in the results
 				$result_tmp['result'] = $result_op->toArray();
 			} else {
@@ -64,12 +64,12 @@ 
 	 */
 	public function DisableUser($secret_key, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			// Let the implementation handle it
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -85,7 +85,7 @@ 
 	 */
 	public function DisableUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			// Let the implementation handle it
 			$this->handleError($verifKey);
 		} else {
@@ -102,11 +102,11 @@ 
 	 */
 	public function EnableUser($secret_key, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 1);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -122,7 +122,7 @@ 
 	 */
 	public function EnableUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			// Let the implementation handle it
 			$this->handleError($verifKey);
 		} else {
@@ -139,10 +139,10 @@ 
 	 */
 	protected function deleteUserHelper($user_id_field_name, $user_id_value) {
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
-			if(!UserManager::delete_user($user_id)) {
+			if (!UserManager::delete_user($user_id)) {
 				return new WSError(101, "There was a problem while deleting this user");
 			} else {
 				return true;
@@ -159,11 +159,11 @@ 
 	 */
 	public function DeleteUser($secret_key, $user_id_field_name, $user_id_value) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->deleteUserHelper($user_id_field_name, $user_id_value);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -179,15 +179,15 @@ 
 	 */
 	public function DeleteUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($users as $user) {
+			foreach ($users as $user) {
 				$result_tmp = array();
 				$result_op = $this->deleteUserHelper($user['user_id_field_name'], $user['user_id_value']);
 				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
+				if ($result_op instanceof WSError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {
@@ -223,20 +223,20 @@ 
         global $api_failureList;
 		// Add the original user id field name and value to the extra fields if needed
 		$extras_associative = array();
-		if($user_id_field_name != "chamilo_user_id") {
+		if ($user_id_field_name != "chamilo_user_id") {
 			$extras_associative[$user_id_field_name] = $user_id_value;
 		}
                 if (!empty($extras)) {
-                    foreach($extras as $extra) {
+                    foreach ($extras as $extra) {
                         $extras_associative[$extra['field_name']] = $extra['field_value'];
                     }
                 }
 		$result = UserManager::create_user($firstname, $lastname, $status, $email, $login, $password, '', $language, $phone, '', PLATFORM_AUTH_SOURCE, $expiration_date, $visibility, 0, $extras_associative, $encrypt_method);
 		if (!$result) {
 			$failure = $api_failureList[0];
-			if($failure == 'login-pass already taken') {
+			if ($failure == 'login-pass already taken') {
 				return new WSError(102, 'This username is already taken');
-			} else if($failure == 'encrypt_method invalid') {
+			} else if ($failure == 'encrypt_method invalid') {
 				return new WSError(103, 'The encryption of the password is invalid');
 			} else {
 				return new WSError(104, 'There was an error creating the user');
@@ -270,11 +270,11 @@ 
 	public function CreateUser($secret_key, $firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility = 1, $email = '', $language = 'english', $phone = '', $expiration_date = '0000-00-00 00:00:00', $extras = array()) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			} else {
 				return $result;
@@ -291,17 +291,17 @@ 
 	 */
 	public function CreateUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($users as $user) {
+			foreach ($users as $user) {
 				$result_tmp = array();
                 // re-initialize variables just in case
                 $firstname = $lastname = $status = $login = $password = $encrypt_method = $user_id_field_name = $user_id_value = $visibility = $email = $language = $phone = $expiration_date = $extras = null;
 				extract($user);
 				$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-				if($result instanceof WSError) {
+				if ($result instanceof WSError) {
 					$result_tmp['result'] = $result->toArray();
 					$result_tmp['user_id_value'] = $user_id_value;
 					$result_tmp['user_id_generated'] = 0;
@@ -351,10 +351,10 @@ 
 	) {
         global $api_failureList;
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
+		if ($user_id instanceof WSError) {
 			return $user_id;
 		} else {
-			if($password == '') {
+			if ($password == '') {
 				$password = null;
 			}
 			$user_info = api_get_user_info($user_id);
@@ -383,7 +383,7 @@ 
 			);
 			if (!$result) {
 				$failure = $api_failureList[0];
-				if($failure == 'encrypt_method invalid') {
+				if ($failure == 'encrypt_method invalid') {
 					return new WSError(103, 'The encryption of the password is invalid');
 				} else {
 					return new WSError(105, 'There was an error updating the user');
@@ -415,19 +415,19 @@ 
 	public function EditUser($secret_key, $user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras) {
 		// First, verify the secret key
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 
 			$extras_associative = array();
 			if (!empty($extras)) {
-				foreach($extras as $extra) {
+				foreach ($extras as $extra) {
 					$extras_associative[$extra['field_name']] = $extra['field_value'];
 				}
 			}
 
 			$result = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras_associative);
-			if($result instanceof WSError) {
+			if ($result instanceof WSError) {
 				$this->handleError($result);
 			}
 		}
@@ -443,18 +443,18 @@ 
 	 */
 	public function EditUsers($secret_key, $users) {
 		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
+		if ($verifKey instanceof WSError) {
 			$this->handleError($verifKey);
 		} else {
 			$results = array();
-			foreach($users as $user) {
+			foreach ($users as $user) {
 				$result_tmp = array();
                 // re-initialize variables just in case
                 $user_id_field_name = $user_id_value = $firstname = $lastname = $status = $loginname = $password = $encrypt_method = $email = $language = $phone = $expiration_date = $extras = null;
 				extract($user);
 				$result_op = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras);
 				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
+				if ($result_op instanceof WSError) {
 					// Return the error in the results
 					$result_tmp['result'] = $result_op->toArray();
 				} else {