chamilo / chamilo-lms

main/webservices/soap_user.php

Indentation +168 added lines, -168 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * Configures the WSUser SOAP service
- * @package chamilo.webservices
- */
+     * Configures the WSUser SOAP service
+     * @package chamilo.webservices
+     */
 require_once(dirname(__FILE__).'/webservice_user.php');
 require_once(dirname(__FILE__).'/soap.php');
 
@@ -14,223 +14,223 @@ 
 $s = WSSoapServer::singleton();
 
 $s->wsdl->addComplexType(
-	'user_id',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string')
-	)
+    'user_id',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'user_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_result[]')),
-	'tns:user_result'
+    'user_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_result[]')),
+    'tns:user_result'
 );
 
 $s->register(
-	'WSUser.DisableUser',
-	array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
+    'WSUser.DisableUser',
+    array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
 );
 
 $s->register(
-	'WSUser.DisableUsers',
-	array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
-	array('return' => 'tns:user_result_array')
+    'WSUser.DisableUsers',
+    array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
+    array('return' => 'tns:user_result_array')
 );
 
 $s->register(
-	'WSUser.EnableUser',
-	array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
+    'WSUser.EnableUser',
+    array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
 );
 
 $s->register(
-	'WSUser.EnableUsers',
-	array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
-	array('return' => 'tns:user_result_array')
+    'WSUser.EnableUsers',
+    array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
+    array('return' => 'tns:user_result_array')
 );
 
 $s->register(
-	'WSUser.DeleteUser',
-	array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
+    'WSUser.DeleteUser',
+    array('secret_key' => 'xsd:string', 'user_id_field_name' => 'xsd:string', 'user_id_value' => 'xsd:string')
 );
 
 $s->register(
-	'WSUser.DeleteUsers',
-	array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
-	array('return' => 'tns:user_result_array')
+    'WSUser.DeleteUsers',
+    array('secret_key' => 'xsd:string', 'users' => 'tns:user_id[]'),
+    array('return' => 'tns:user_result_array')
 );
 
 $s->register(
-	'WSUser.CreateUser',
-	array(
-		'secret_key' => 'xsd:string',
-		'firstname' => 'xsd:string',
-		'lastname' => 'xsd:string',
-		'status' => 'xsd:int',
-		'loginname' => 'xsd:string',
-		'password' => 'xsd:string',
-		'encrypt_method' => 'xsd:string',
-		'user_id_field_name' => 'xsd:string',
-		'user_id_value' => 'xsd:string',
-		'visibility' => 'xsd:int',
-		'email' => 'xsd:string',
-		'language' => 'xsd:string',
-		'phone' => 'xsd:string',
-		'expiration_date' => 'xsd:string',
-		'extras' => 'tns:extra_field'
-	),
-	array('return' => 'xsd:int')
+    'WSUser.CreateUser',
+    array(
+        'secret_key' => 'xsd:string',
+        'firstname' => 'xsd:string',
+        'lastname' => 'xsd:string',
+        'status' => 'xsd:int',
+        'loginname' => 'xsd:string',
+        'password' => 'xsd:string',
+        'encrypt_method' => 'xsd:string',
+        'user_id_field_name' => 'xsd:string',
+        'user_id_value' => 'xsd:string',
+        'visibility' => 'xsd:int',
+        'email' => 'xsd:string',
+        'language' => 'xsd:string',
+        'phone' => 'xsd:string',
+        'expiration_date' => 'xsd:string',
+        'extras' => 'tns:extra_field'
+    ),
+    array('return' => 'xsd:int')
 );
 
 $s->wsdl->addComplexType(
-	'user_create',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
-		'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
-		'status' => array('name' => 'status', 'type' => 'xsd:int'),
-		'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
-		'password' => array('name' => 'password', 'type' => 'xsd:string'),
-		'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
-		'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
-		'email' => array('name' => 'email', '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'),
-		'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
-	)
+    'user_create',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
+        'status' => array('name' => 'status', 'type' => 'xsd:int'),
+        'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
+        'password' => array('name' => 'password', 'type' => 'xsd:string'),
+        'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
+        'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
+        'email' => array('name' => 'email', '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'),
+        'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_create_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'user_id_generated' => array('name' => 'user_id_generated', 'type' => 'xsd:int'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'user_create_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'user_id_generated' => array('name' => 'user_id_generated', 'type' => 'xsd:int'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_create_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_create_result[]')),
-	'tns:user_create_result'
+    'user_create_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_create_result[]')),
+    'tns:user_create_result'
 );
 
 $s->register(
-	'WSUser.CreateUsers',
-	array(
-		'secret_key' => 'xsd:string',
-		'users' => 'tns:user_create[]'
-	),
-	array('return' => 'tns:user_create_result_array')
+    'WSUser.CreateUsers',
+    array(
+        'secret_key' => 'xsd:string',
+        'users' => 'tns:user_create[]'
+    ),
+    array('return' => 'tns:user_create_result_array')
 );
 
 $s->register(
-	'WSUser.EditUser',
-	array(
-		'secret_key' => 'xsd:string',
-		'user_id_field_name' => 'xsd:string',
-		'user_id_value' => 'xsd:string',
-		'firstname' => 'xsd:string',
-		'lastname' => 'xsd:string',
-		'status' => 'xsd:int',
-		'loginname' => 'xsd:string',
-		'password' => 'xsd:string',
-		'encrypt_method' => 'xsd:string',
-		'email' => 'xsd:string',
-		'language' => 'xsd:string',
-		'phone' => 'xsd:string',
-		'expiration_date' => 'xsd:string',
-		'extras' => 'tns:extra_field'
-	)
+    'WSUser.EditUser',
+    array(
+        'secret_key' => 'xsd:string',
+        'user_id_field_name' => 'xsd:string',
+        'user_id_value' => 'xsd:string',
+        'firstname' => 'xsd:string',
+        'lastname' => 'xsd:string',
+        'status' => 'xsd:int',
+        'loginname' => 'xsd:string',
+        'password' => 'xsd:string',
+        'encrypt_method' => 'xsd:string',
+        'email' => 'xsd:string',
+        'language' => 'xsd:string',
+        'phone' => 'xsd:string',
+        'expiration_date' => 'xsd:string',
+        'extras' => 'tns:extra_field'
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_edit',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
-		'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
-		'status' => array('name' => 'status', 'type' => 'xsd:int'),
-		'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
-		'password' => array('name' => 'password', 'type' => 'xsd:string'),
-		'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
-		'email' => array('name' => 'email', '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'),
-		'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
-	)
+    'user_edit',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_field_name' => array('name' => 'user_id_field_name', 'type' => 'xsd:string'),
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'firstname' => array('name' => 'firstname', 'type' => 'xsd:string'),
+        'lastname' => array('name' => 'lastname', 'type' => 'xsd:string'),
+        'status' => array('name' => 'status', 'type' => 'xsd:int'),
+        'loginname' => array('name' => 'loginname', 'type' => 'xsd:string'),
+        'password' => array('name' => 'password', 'type' => 'xsd:string'),
+        'encrypt_method' => array('name' => 'encrypt_method', 'type' => 'xsd:string'),
+        'email' => array('name' => 'email', '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'),
+        'extras' => array('name' => 'extras', 'type' => 'tns:extra_field')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_edit_result',
-	'complexType',
-	'struct',
-	'all',
-	'',
-	array(
-		'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
-		'result' => array('name' => 'result', 'type' => 'tns:result')
-	)
+    'user_edit_result',
+    'complexType',
+    'struct',
+    'all',
+    '',
+    array(
+        'user_id_value' => array('name' => 'user_id_value', 'type' => 'xsd:string'),
+        'result' => array('name' => 'result', 'type' => 'tns:result')
+    )
 );
 
 $s->wsdl->addComplexType(
-	'user_edit_result_array',
-	'complexType',
-	'array',
-	'',
-	'SOAP-ENC:Array',
-	array(),
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_edit_result[]')),
-	'tns:user_edit_result'
+    'user_edit_result_array',
+    'complexType',
+    'array',
+    '',
+    'SOAP-ENC:Array',
+    array(),
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:user_edit_result[]')),
+    'tns:user_edit_result'
 );
 
 $s->register(
-	'WSUser.EditUsers',
-	array(
-		'secret_key' => 'xsd:string',
-		'users' => 'tns:user_edit[]'
-	),
-	array('return' => 'tns:user_edit_result_array')
+    'WSUser.EditUsers',
+    array(
+        'secret_key' => 'xsd:string',
+        'users' => 'tns:user_edit[]'
+    ),
+    array('return' => 'tns:user_edit_result_array')
 );

main/webservices/cm_soap_announcements.php

Indentation +12 added lines, -12 removed lines

@@ -11,13 +11,13 @@ 
 
 
 $s->register(
-	'WSCMAnnouncements.get_announcements_id',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMAnnouncements.get_announcements_id',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -27,15 +27,15 @@ 
 );
 
 $s->register(
-	'WSCMAnnouncements.get_announcement_data',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMAnnouncements.get_announcement_data',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'course_code' => 'xsd:string',
                 'announcement_id' => 'xsd:string',
                 'field' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',

main/webservices/cm_soap_inbox.php

Indentation +36 added lines, -36 removed lines

@@ -11,12 +11,12 @@ 
 
 
 $s->register(
-	'WSCMInbox.unreadMessage',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
-	),
-	array('return' => 'xsd:string'),
+    'WSCMInbox.unreadMessage',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -26,14 +26,14 @@ 
 );
 
 $s->register(
-	'WSCMInbox.get_message_id',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMInbox.get_message_id',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'from' => 'xsd:string',
                 'number_of_items' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -44,14 +44,14 @@ 
 
 
 $s->register(
-	'WSCMInbox.get_message_data',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMInbox.get_message_data',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'id' => 'xsd:string',
                 'field' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -61,14 +61,14 @@ 
 );
 
 $s->register(
-	'WSCMInbox.get_message_id_sent',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMInbox.get_message_id_sent',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'from' => 'xsd:string',
                 'number_of_items' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -78,14 +78,14 @@ 
 );
 
 $s->register(
-	'WSCMInbox.get_message_data_sent',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMInbox.get_message_data_sent',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'id' => 'xsd:string',
                 'field' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -95,15 +95,15 @@ 
 );
 
 $s->register(
-	'WSCMInbox.message_send',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMInbox.message_send',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'receiver_user_id' => 'xsd:string',
                 'subject' => 'xsd:string',
                 'content' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',

main/webservices/cm_webservice.php

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)

main/webservices/cm_webservice_inbox.php

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

main/webservices/cm_soap_user.php

Indentation +36 added lines, -36 removed lines

@@ -8,13 +8,13 @@ 
 $s = WSCMSoapServer::singleton();
 
 $s->register(
-	'WSCMUser.find_id_user',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMUser.find_id_user',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'name' => 'xsd:string',
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -23,14 +23,14 @@ 
 );
 
 $s->register(
-	'WSCMUser.get_user_name',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMUser.get_user_name',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'id' => 'xsd:string',
                 'field' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -39,13 +39,13 @@ 
 );
 
 $s->register(
-	'WSCMUser.get_link_user_picture',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMUser.get_link_user_picture',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -54,14 +54,14 @@ 
 );
 
 $s->register(
-	'WSCMUser.send_invitation',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMUser.send_invitation',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'userfriend_id' => 'xsd:string',
                 'content_message' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -70,13 +70,13 @@ 
 );
 
 $s->register(
-	'WSCMUser.accept_friend',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMUser.accept_friend',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'userfriend_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',
@@ -85,13 +85,13 @@ 
 );
 
 $s->register(
-	'WSCMUser.denied_invitation',
-	array(
-		'username' => 'xsd:string',
-		'password' => 'xsd:string',
+    'WSCMUser.denied_invitation',
+    array(
+        'username' => 'xsd:string',
+        'password' => 'xsd:string',
                 'userfriend_id' => 'xsd:string'
-	),
-	array('return' => 'xsd:string'),
+    ),
+    array('return' => 'xsd:string'),
         'urn:WSCMService',
         '',
         '',

main/webservices/example_fill_users_fields.php

Indentation +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@
 $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id";
 $res = Database::query($sql);
 while($row = Database::fetch_array($res)) {
-  $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value)
+    $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value)
            VALUES (".$row['user_id'].", 11,'".$row['username']."')";
-  $res2 = Database::query($sql2);
+    $res2 = Database::query($sql2);
 }

main/calendar/ical_export.php

Indentation +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
 $event = $agenda->get_event($id);
 
 if (!empty($event)) {
-	define('ICAL_LANG',api_get_language_isocode());
+    define('ICAL_LANG',api_get_language_isocode());
 
     $ical = new vcalendar();
     $ical->setConfig('unique_id',api_get_path(WEB_PATH));
@@ -129,6 +129,6 @@ 
             die();
     }
 } else {
-	header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));
-	die();
+    header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));
+    die();
 }

main/document/record_audio_wami.php

Indentation +22 added lines, -22 removed lines

@@ -35,7 +35,7 @@ 
 //make some vars
 $wamidir=$dir;
 if($wamidir=="/"){
- $wamidir="";
+    $wamidir="";
 }
 $wamiurlplay = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$wamidir."/";
 $groupId = api_get_group_id();
@@ -45,48 +45,48 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO: clean
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
-	$noPHP_SELF = true;
-	$group = GroupManager :: get_group_properties($groupId);
-	$path = explode('/', $dir);
-	if ('/'.$path[1] != $group['directory']) {
-		api_not_allowed(true);
-	}
+    $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
+    $noPHP_SELF = true;
+    $group = GroupManager :: get_group_properties($groupId);
+    $path = explode('/', $dir);
+    if ('/'.$path[1] != $group['directory']) {
+        api_not_allowed(true);
+    }
 }
 
 $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id.'&'.api_get_cidreq(), "name" => get_lang('Documents'));
 
 if (!$is_allowed_in_course) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
-	api_not_allowed(true);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -94,10 +94,10 @@ 
 
 $display_dir = $dir;
 if (isset ($group)) {
-	$display_dir = explode('/', $dir);
-	unset ($display_dir[0]);
-	unset ($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset ($display_dir[0]);
+    unset ($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 // Interbreadcrumb for the current directory root path
@@ -121,7 +121,7 @@ 
 
 Display :: display_header($nameTools, 'Doc');
 echo '<div class="actions">';
-		echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="document.php?id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 ?>
 <!-- swfobject is a commonly used library to embed Flash content https://ajax.googleapis.com/ajax/libs/swfobject/2.2/ -->