chamilo / chamilo-lms

main/webservices/registration.soap.php

Indentation +3 added lines, -3 removed lines

@@ -4930,9 +4930,9 @@
     'This service unsubscribe a user from a course'                     // documentation
 );
 /**
- * @param array $params
- * @return array|null|soap_fault
- */
+     * @param array $params
+     * @return array|null|soap_fault
+     */
 function WSUnSubscribeUserFromCourseSimple($params)
 {
     global $debug;

main/webservices/webservice.php

Indentation +222 added lines, -222 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * @package chamilo.webservices
- */
+     * @package chamilo.webservices
+     */
 require_once(dirname(__FILE__).'/../inc/global.inc.php');
 
 /**
@@ -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/cm_webservice_user.php

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

main/webservices/lp.php

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

main/webservices/cm_soap_course.php

Indentation +195 added lines, -195 removed lines

@@ -9,255 +9,255 @@ 
 $s = WSCMSoapServer::singleton();
 
 $s->wsdl->addComplexType(
-	'course_id',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string')
-	)
+    'course_id',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'course_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_result[]')),
-	'tns:course_result'
+    'course_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_result[]')),
+    'tns:course_result'
 );
 
 $s->register(
-	'WSCMCourse.DeleteCourse',
-	array('secret_key' => 'xsd:string', 'course_id_field_name' => 'xsd:string', 'course_id_value' => 'xsd:string')
+    'WSCMCourse.DeleteCourse',
+    array('secret_key' => 'xsd:string', 'course_id_field_name' => 'xsd:string', 'course_id_value' => 'xsd:string')
 );
 
 $s->register(
-	'WSCMCourse.DeleteCourses',
-	array('secret_key' => 'xsd:string', 'courses' => 'tns:course_id[]'),
-	array('return' => 'tns:course_result_array')
+    'WSCMCourse.DeleteCourses',
+    array('secret_key' => 'xsd:string', 'courses' => 'tns:course_id[]'),
+    array('return' => 'tns:course_result_array')
 );
 
 $s->register(
-	'WSCMCourse.CreateCourse',
-	array(
-		'secret_key' => 'xsd:string',
-		'title' => 'xsd:string',
-		'category_code' => 'xsd:string',
-		'wanted_code' => 'xsd:string',
-		'tutor_name' => 'xsd:string',
-		'course_admin_user_id_field_name' => 'xsd:string',
-		'course_admin_user_id_value' => 'xsd:string',
-		'language' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'extras' => 'tns:extra_field[]'
-	),
-	array('return' => 'xsd:int')
+    'WSCMCourse.CreateCourse',
+    array(
+        'secret_key' => 'xsd:string',
+        'title' => 'xsd:string',
+        'category_code' => 'xsd:string',
+        'wanted_code' => 'xsd:string',
+        'tutor_name' => 'xsd:string',
+        'course_admin_user_id_field_name' => 'xsd:string',
+        'course_admin_user_id_value' => 'xsd:string',
+        'language' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'extras' => 'tns:extra_field[]'
+    ),
+    array('return' => 'xsd:int')
 );
 
 $s->wsdl->addComplexType(
-	'course_create',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'title' => array('name' => 'title', 'type' => 'xsd:string'),
-		'category_code' => array('name' => 'category_code', 'type' => 'xsd:string'),
-		'wanted_code' => array('name' => 'wanted_code', 'type' => 'xsd:int'),
-		'tutor_name' => array('name' => 'tutor_name', 'type' => 'xsd:string'),
-		'course_admin_user_id_field_name' => array('name' => 'course_admin_user_id_field_name', 'type' => 'xsd:string'),
-		'course_admin_user_id_value' => array('name' => 'course_admin_user_id_value', 'type' => 'xsd:string'),
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
-		'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
-		'extras' => array('name' => 'extras', 'type' => 'tns:extra_field[]')
-	)
+    'course_create',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'title' => array('name' => 'title', 'type' => 'xsd:string'),
+        'category_code' => array('name' => 'category_code', 'type' => 'xsd:string'),
+        'wanted_code' => array('name' => 'wanted_code', 'type' => 'xsd:int'),
+        'tutor_name' => array('name' => 'tutor_name', 'type' => 'xsd:string'),
+        'course_admin_user_id_field_name' => array('name' => 'course_admin_user_id_field_name', 'type' => 'xsd:string'),
+        'course_admin_user_id_value' => array('name' => 'course_admin_user_id_value', 'type' => 'xsd:string'),
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
+        'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
+        'extras' => array('name' => 'extras', 'type' => 'tns:extra_field[]')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_create_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
-		'course_id_generated' => array('name' => 'course_id_generated', 'type' => 'xsd:int'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'course_create_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
+        'course_id_generated' => array('name' => 'course_id_generated', 'type' => 'xsd:int'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_create_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_create_result[]')),
-	'tns:course_create_result'
+    'course_create_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_create_result[]')),
+    'tns:course_create_result'
 );
 
 $s->register(
-	'WSCMCourse.CreateCourses',
-	array(
-		'secret_key' => 'xsd:string',
-		'courses' => 'tns:course_create[]'
-	),
-	array('return' => 'tns:course_create_result_array')
+    'WSCMCourse.CreateCourses',
+    array(
+        'secret_key' => 'xsd:string',
+        'courses' => 'tns:course_create[]'
+    ),
+    array('return' => 'tns:course_create_result_array')
 );
 
 $s->register(
-	'WSCMCourse.EditCourse',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'title' => 'xsd:string',
-		'category_code' => 'xsd:string',
-		'department_name' => 'xsd:string',
-		'department_url' => 'xsd:string',
-		'language' => 'xsd:string',
-		'visibility' => 'xsd:int',
-		'subscribe' => 'xsd:int',
-		'unsubscribe' => 'xsd:int',
-		'visual_code' => 'xsd:string',
-		'extras' => 'tns:extra_field[]'
-	)
+    'WSCMCourse.EditCourse',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'title' => 'xsd:string',
+        'category_code' => 'xsd:string',
+        'department_name' => 'xsd:string',
+        'department_url' => 'xsd:string',
+        'language' => 'xsd:string',
+        'visibility' => 'xsd:int',
+        'subscribe' => 'xsd:int',
+        'unsubscribe' => 'xsd:int',
+        'visual_code' => 'xsd:string',
+        'extras' => 'tns:extra_field[]'
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'id' => array('name' => 'id', 'type' => 'xsd:int'),
-		'code' => array('name' => 'code', 'type' => 'xsd:string'),
-		'title' => array('name' => 'title', 'type' => 'xsd:string'),
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
-		'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
-		'category_name' => array('name' => 'category_name', 'type' => 'xsd:string'),
-		'number_students' => array('name' => 'number_students', 'type' => 'xsd:int'),
-		'external_course_id' => array('name' => 'external_course_id', 'type' => 'xsd:string'),
-	)
+    'course',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'id' => array('name' => 'id', 'type' => 'xsd:int'),
+        'code' => array('name' => 'code', 'type' => 'xsd:string'),
+        'title' => array('name' => 'title', 'type' => 'xsd:string'),
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
+        'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
+        'category_name' => array('name' => 'category_name', 'type' => 'xsd:string'),
+        'number_students' => array('name' => 'number_students', 'type' => 'xsd:int'),
+        'external_course_id' => array('name' => 'external_course_id', 'type' => 'xsd:string'),
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course[]')),
-	'tns:course'
+    'course_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course[]')),
+    'tns:course'
 );
 
 $s->register(
-	'WSCMCourse.ListCourses',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string'
-	),
-	array('return' => 'tns:course_array')
+    'WSCMCourse.ListCourses',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string'
+    ),
+    array('return' => 'tns:course_array')
 );
 
 $s->register(
-	'WSCMCourse.SubscribeUserToCourse',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'user_id_field_name' => 'xsd:string',
-		'user_id_value' => 'xsd:string',
-		'status' => 'xsd:int'
-	)
+    'WSCMCourse.SubscribeUserToCourse',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'user_id_field_name' => 'xsd:string',
+        'user_id_value' => 'xsd:string',
+        'status' => 'xsd:int'
+    )
 );
 
 $s->register(
-	'WSCMCourse.UnsubscribeUserFromCourse',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'user_id_field_name' => 'xsd:string',
-		'user_id_value' => 'xsd:string'
-	)
+    'WSCMCourse.UnsubscribeUserFromCourse',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'user_id_field_name' => 'xsd:string',
+        'user_id_value' => 'xsd:string'
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_description',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'course_desc_id' => array('name' => 'course_desc_id', 'type' => 'xsd:int'),
-		'course_desc_title' => array('name' => 'course_desc_title', 'type' => 'xsd:string'),
-		'course_desc_content' => array('name' => 'course_desc_content', 'type' => 'xsd:string')
-	)
+    'course_description',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'course_desc_id' => array('name' => 'course_desc_id', 'type' => 'xsd:int'),
+        'course_desc_title' => array('name' => 'course_desc_title', 'type' => 'xsd:string'),
+        'course_desc_content' => array('name' => 'course_desc_content', 'type' => 'xsd:string')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'course_description_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_description[]')),
-	'tns:course_description'
+    'course_description_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_description[]')),
+    'tns:course_description'
 );
 
 $s->register(
-	'WSCMCourse.GetCourseDescriptions',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string'
-	),
-	array('return' => 'tns:course_description_array')
+    'WSCMCourse.GetCourseDescriptions',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string'
+    ),
+    array('return' => 'tns:course_description_array')
 );
 
 $s->register(
-	'WSCMCourse.EditCourseDescription',
-	array(
-		'secret_key' => 'xsd:string',
-		'course_id_field_name' => 'xsd:string',
-		'course_id_value' => 'xsd:string',
-		'course_desc_id' => 'xsd:int',
-		'course_desc_title' => 'xsd:string',
-		'course_desc_content' => 'xsd:string'
-	)
+    'WSCMCourse.EditCourseDescription',
+    array(
+        'secret_key' => 'xsd:string',
+        'course_id_field_name' => 'xsd:string',
+        'course_id_value' => 'xsd:string',
+        'course_desc_id' => 'xsd:int',
+        'course_desc_title' => 'xsd:string',
+        'course_desc_content' => 'xsd:string'
+    )
 );
 
 $s->register(
-	'WSCMCourse.unreadMessage',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
-	),
-	array('return' => 'xsd:string'),
+    'WSCMCourse.unreadMessage',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -268,12 +268,12 @@ 
 
 
 $s->register(
-	'WSCMCourse.getIdMessage',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
-	),
-	array('return' => 'xsd:string'),
+    'WSCMCourse.getIdMessage',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',

main/webservices/webservice_session.php

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

main/webservices/cm_soap_forum.php

Indentation +47 added lines, -47 removed lines

@@ -12,12 +12,12 @@ 
 
 $s->register(
         'WSCMForum.get_foruns_id',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -26,14 +26,14 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_forum_title',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_forum_title',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'forum_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -42,14 +42,14 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_forum_threads_id',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_forum_threads_id',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'forum_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -58,15 +58,15 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_forum_thread_data',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_forum_thread_data',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'thread_id' => 'xsd:string',
                 'field' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -75,14 +75,14 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_forum_thread_title',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_forum_thread_title',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'thread_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -92,14 +92,14 @@ 
 
 
 $s->register(
-	'WSCMForum.get_posts_id',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_posts_id',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'thread_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -108,15 +108,15 @@ 
 );
 
 $s->register(
-	'WSCMForum.get_post_data',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.get_post_data',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'post_id' => 'xsd:string',
                 'field' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -126,17 +126,17 @@ 
 
 
 $s->register(
-	'WSCMForum.send_post',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMForum.send_post',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'forum_id' => 'xsd:string',
                 'thread_id' => 'xsd:string',
                 'title' => 'xsd:string',
                 'content' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',

main/webservices/courses_list.soap.php

Indentation +29 added lines, -29 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * This script provides the caller service with a list
- * of courses that have a certain level of visibility
- * on this chamilo portal.
- * It is set to work with the Chamilo module for Drupal:
- * http://drupal.org/project/chamilo
- *
- * @author Yannick Warnier <yannick.warnier@beeznest.com>
- * @package chamilo.webservices
- */
+     * This script provides the caller service with a list
+     * of courses that have a certain level of visibility
+     * on this chamilo portal.
+     * It is set to work with the Chamilo module for Drupal:
+     * http://drupal.org/project/chamilo
+     *
+     * @author Yannick Warnier <yannick.warnier@beeznest.com>
+     * @package chamilo.webservices
+     */
 require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
 
@@ -28,11 +28,11 @@ 
         'all',
         '',
         array(
-          'name'=>'code'  , 'type'=>'xsd:string',
-          'name'=>'title'  , 'type'=>'xsd:string',
-          'name'=>'url'    , 'type'=>'xsd:string',
-          'name'=>'teacher', 'type'=>'xsd:string',
-          'name'=>'language','type'=>'xsd:string',
+            'name'=>'code'  , 'type'=>'xsd:string',
+            'name'=>'title'  , 'type'=>'xsd:string',
+            'name'=>'url'    , 'type'=>'xsd:string',
+            'name'=>'teacher', 'type'=>'xsd:string',
+            'name'=>'language','type'=>'xsd:string',
         )
 );
 
@@ -53,8 +53,8 @@ 
 // Register the method to expose
 $server->register('WSCourseList',         // method name
     array('username' => 'xsd:string',
-          'signature' => 'xsd:string',
-          'visibilities' => 'xsd:string'),      // input parameters
+            'signature' => 'xsd:string',
+            'visibilities' => 'xsd:string'),      // input parameters
     array('return' => 'xsd:Array'),             // output parameters
     'urn:WSCourseList',                         // namespace
     'urn:WSCourseList#WSCourseList',      // soapaction
@@ -97,19 +97,19 @@ 
 
     $courses_list = array();
 
-	if (!is_array($visibilities)) {
-		$visibilities = split(',', $visibilities);
-	}
-	foreach ($visibilities as $visibility) {
-		if (!in_array($visibility, array_keys($vis))) {
-   			return array('error_msg' => 'Security check failed');
-		}
-		$courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
-		foreach ($courses_list_tmp as $index => $course) {
-			$course_info = CourseManager::get_course_information($course['code']);
-			$courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
-		}
-	}
+    if (!is_array($visibilities)) {
+        $visibilities = split(',', $visibilities);
+    }
+    foreach ($visibilities as $visibility) {
+        if (!in_array($visibility, array_keys($vis))) {
+                return array('error_msg' => 'Security check failed');
+        }
+        $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
+        foreach ($courses_list_tmp as $index => $course) {
+            $course_info = CourseManager::get_course_information($course['code']);
+            $courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
+        }
+    }
     return $courses_list;
 }
 

main/webservices/user_import/service.php

Indentation +39 added lines, -39 removed lines

@@ -14,45 +14,45 @@
  */
 function import_users_from_file($filepath, $security_key) {
 
-	global $_configuration;
-
-   	$errors_returned = array(
-	   	0 => 'success',
-	   	1 => 'file import does not exist',
-	   	2 => 'no users to import',
-	   	3 => 'wrong datas in file',
-	   	4 => 'security error'
-   	);
-
-   	// Check whether this script is launch by server and security key is ok.
-   	if (empty($_SERVER['REMOTE_ADDR']) || $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'] || $security_key != $_configuration['security_key']) {
-   		return $errors_returned[4];
-   	}
-
-   	// Libraries
-   	require_once 'import.lib.php';
-
-	// Check is users file exists.
-	if (!is_file($filepath)) {
-		return $errors_returned[1];
-	}
-
-	// Get list of users
-	$users = parse_csv_data($filepath);
-	if (count($users) == 0) {
-		return $errors_returned[2];
-	}
-
-	// Check the datas for each user
-	$errors = validate_data($users);
-	if (count($errors) > 0) {
-		return $errors_returned[3];
-	}
-
-	// Apply modifications in database
-	save_data($users);
-
-   	return $errors_returned[0]; // Import successfull
+    global $_configuration;
+
+        $errors_returned = array(
+            0 => 'success',
+            1 => 'file import does not exist',
+            2 => 'no users to import',
+            3 => 'wrong datas in file',
+            4 => 'security error'
+        );
+
+        // Check whether this script is launch by server and security key is ok.
+        if (empty($_SERVER['REMOTE_ADDR']) || $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR'] || $security_key != $_configuration['security_key']) {
+            return $errors_returned[4];
+        }
+
+        // Libraries
+        require_once 'import.lib.php';
+
+    // Check is users file exists.
+    if (!is_file($filepath)) {
+        return $errors_returned[1];
+    }
+
+    // Get list of users
+    $users = parse_csv_data($filepath);
+    if (count($users) == 0) {
+        return $errors_returned[2];
+    }
+
+    // Check the datas for each user
+    $errors = validate_data($users);
+    if (count($errors) > 0) {
+        return $errors_returned[3];
+    }
+
+    // Apply modifications in database
+    save_data($users);
+
+        return $errors_returned[0]; // Import successfull
 }
 
 $server = new soap_server();