Completed
Push — 1.10.x ( e39098...d9ba33 )
by Julito
34:46
created
main/webservices/cm_soap_inbox.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -11,12 +11,12 @@  discard block
 block discarded – undo
11 11
 
12 12
 
13 13
 $s->register(
14
-	'WSCMInbox.unreadMessage',
15
-	array(
16
-		'username' => 'xsd:string',
17
-		'password' => 'xsd:string',
18
-	),
19
-	array('return' => 'xsd:string'),
14
+    'WSCMInbox.unreadMessage',
15
+    array(
16
+        'username' => 'xsd:string',
17
+        'password' => 'xsd:string',
18
+    ),
19
+    array('return' => 'xsd:string'),
20 20
         'urn:WSCMService',
21 21
         '',
22 22
         '',
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 );
27 27
 
28 28
 $s->register(
29
-	'WSCMInbox.get_message_id',
30
-	array(
31
-		'username' => 'xsd:string',
32
-		'password' => 'xsd:string',
29
+    'WSCMInbox.get_message_id',
30
+    array(
31
+        'username' => 'xsd:string',
32
+        'password' => 'xsd:string',
33 33
                 'from' => 'xsd:string',
34 34
                 'number_of_items' => 'xsd:string'
35
-	),
36
-	array('return' => 'xsd:string'),
35
+    ),
36
+    array('return' => 'xsd:string'),
37 37
         'urn:WSCMService',
38 38
         '',
39 39
         '',
@@ -44,14 +44,14 @@  discard block
 block discarded – undo
44 44
 
45 45
 
46 46
 $s->register(
47
-	'WSCMInbox.get_message_data',
48
-	array(
49
-		'username' => 'xsd:string',
50
-		'password' => 'xsd:string',
47
+    'WSCMInbox.get_message_data',
48
+    array(
49
+        'username' => 'xsd:string',
50
+        'password' => 'xsd:string',
51 51
                 'id' => 'xsd:string',
52 52
                 'field' => 'xsd:string'
53
-	),
54
-	array('return' => 'xsd:string'),
53
+    ),
54
+    array('return' => 'xsd:string'),
55 55
         'urn:WSCMService',
56 56
         '',
57 57
         '',
@@ -61,14 +61,14 @@  discard block
 block discarded – undo
61 61
 );
62 62
 
63 63
 $s->register(
64
-	'WSCMInbox.get_message_id_sent',
65
-	array(
66
-		'username' => 'xsd:string',
67
-		'password' => 'xsd:string',
64
+    'WSCMInbox.get_message_id_sent',
65
+    array(
66
+        'username' => 'xsd:string',
67
+        'password' => 'xsd:string',
68 68
                 'from' => 'xsd:string',
69 69
                 'number_of_items' => 'xsd:string'
70
-	),
71
-	array('return' => 'xsd:string'),
70
+    ),
71
+    array('return' => 'xsd:string'),
72 72
         'urn:WSCMService',
73 73
         '',
74 74
         '',
@@ -78,14 +78,14 @@  discard block
 block discarded – undo
78 78
 );
79 79
 
80 80
 $s->register(
81
-	'WSCMInbox.get_message_data_sent',
82
-	array(
83
-		'username' => 'xsd:string',
84
-		'password' => 'xsd:string',
81
+    'WSCMInbox.get_message_data_sent',
82
+    array(
83
+        'username' => 'xsd:string',
84
+        'password' => 'xsd:string',
85 85
                 'id' => 'xsd:string',
86 86
                 'field' => 'xsd:string'
87
-	),
88
-	array('return' => 'xsd:string'),
87
+    ),
88
+    array('return' => 'xsd:string'),
89 89
         'urn:WSCMService',
90 90
         '',
91 91
         '',
@@ -95,15 +95,15 @@  discard block
 block discarded – undo
95 95
 );
96 96
 
97 97
 $s->register(
98
-	'WSCMInbox.message_send',
99
-	array(
100
-		'username' => 'xsd:string',
101
-		'password' => 'xsd:string',
98
+    'WSCMInbox.message_send',
99
+    array(
100
+        'username' => 'xsd:string',
101
+        'password' => 'xsd:string',
102 102
                 'receiver_user_id' => 'xsd:string',
103 103
                 'subject' => 'xsd:string',
104 104
                 'content' => 'xsd:string'
105
-	),
106
-	array('return' => 'xsd:string'),
105
+    ),
106
+    array('return' => 'xsd:string'),
107 107
         'urn:WSCMService',
108 108
         '',
109 109
         '',
Please login to merge, or discard this patch.
main/webservices/cm_webservice_courses.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
 {
16 16
 
17 17
     public function get_courses_code($username, $password) {
18
-        if($this->verifyUserPass($username, $password) == "valid") {
18
+        if ($this->verifyUserPass($username, $password) == "valid") {
19 19
             $user_id = UserManager::get_user_id_from_username($username);
20 20
             $listOfCourses = UserManager::get_personal_session_course_list($user_id);
21 21
 
22 22
             $courses_id = "#";
23
-            foreach ($listOfCourses as $course){
23
+            foreach ($listOfCourses as $course) {
24 24
                 $courses_id .= $course['code']."#";
25 25
             }
26 26
             return $courses_id;
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
     public function get_course_title($username, $password, $course_code)
33 33
     {
34
-        if($this->verifyUserPass($username, $password) == "valid")
34
+        if ($this->verifyUserPass($username, $password) == "valid")
35 35
         {
36 36
             $course_info = CourseManager::get_course_information($course_code);
37 37
             return $course_info['title'];
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,8 +35,9 @@
 block discarded – undo
35 35
         {
36 36
             $course_info = CourseManager::get_course_information($course_code);
37 37
             return $course_info['title'];
38
-        } else
39
-            return get_lang('InvalidId');
38
+        } else {
39
+                    return get_lang('InvalidId');
40
+        }
40 41
 
41 42
     }
42 43
 
Please login to merge, or discard this patch.
main/webservices/http-auth.php 3 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}");
27 27
 
28 28
 if ($digestParts['response'] != $validResponse)
29
-  requireLogin($realm,$nonce);
29
+    requireLogin($realm,$nonce);
30 30
 else {
31
-  // We're in!
32
-  echo 'a7532ae474e5e66a0c16eddab02e02a7';
33
-  die();
31
+    // We're in!
32
+    echo 'a7532ae474e5e66a0c16eddab02e02a7';
33
+    die();
34 34
 }
35 35
 
36 36
 // This function returns the digest string
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
     // most other servers
43 43
     }
44 44
     elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
45
-      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0)
45
+        if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0)
46 46
         $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
47 47
     }
48 48
     elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
49
-      $digest = $_SERVER['HTTP_WWW_AUTHENTICATE'];
49
+        $digest = $_SERVER['HTTP_WWW_AUTHENTICATE'];
50 50
     }
51 51
     return $digest;
52 52
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 $digest = getDigest();
13 13
 
14 14
 // If there was no digest, show login
15
-if (is_null($digest)) requireLogin($realm,$nonce);
15
+if (is_null($digest)) requireLogin($realm, $nonce);
16 16
 
17 17
 $digestParts = digestParse($digest);
18 18
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}");
27 27
 
28 28
 if ($digestParts['response'] != $validResponse)
29
-  requireLogin($realm,$nonce);
29
+  requireLogin($realm, $nonce);
30 30
 else {
31 31
   // We're in!
32 32
   echo 'a7532ae474e5e66a0c16eddab02e02a7';
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     // most other servers
43 43
     }
44 44
     elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
45
-      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0)
45
+      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']), 'digest') === 0)
46 46
         $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
47 47
     }
48 48
     elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 }
54 54
 
55 55
 // This function forces a login prompt
56
-function requireLogin($realm,$nonce) {
57
-    header('WWW-Authenticate: Digest realm="' . $realm . '",qop="auth",nonce="' . $nonce . '",opaque="' . md5($realm) . '"');
56
+function requireLogin($realm, $nonce) {
57
+    header('WWW-Authenticate: Digest realm="'.$realm.'",qop="auth",nonce="'.$nonce.'",opaque="'.md5($realm).'"');
58 58
     header('HTTP/1.1 401');
59 59
     echo 'Authentication Canceled';
60 60
     die();
Please login to merge, or discard this patch.
Braces   +10 added lines, -9 removed lines patch added patch discarded remove patch
@@ -12,7 +12,9 @@  discard block
 block discarded – undo
12 12
 $digest = getDigest();
13 13
 
14 14
 // If there was no digest, show login
15
-if (is_null($digest)) requireLogin($realm,$nonce);
15
+if (is_null($digest)) {
16
+    requireLogin($realm,$nonce);
17
+}
16 18
 
17 19
 $digestParts = digestParse($digest);
18 20
 
@@ -25,9 +27,9 @@  discard block
 block discarded – undo
25 27
 
26 28
 $validResponse = md5("{$A1}:{$digestParts['nonce']}:{$digestParts['nc']}:{$digestParts['cnonce']}:{$digestParts['qop']}:{$A2}");
27 29
 
28
-if ($digestParts['response'] != $validResponse)
30
+if ($digestParts['response'] != $validResponse) {
29 31
   requireLogin($realm,$nonce);
30
-else {
32
+} else {
31 33
   // We're in!
32 34
   echo 'a7532ae474e5e66a0c16eddab02e02a7';
33 35
   die();
@@ -40,12 +42,11 @@  discard block
 block discarded – undo
40 42
     if (isset($_SERVER['PHP_AUTH_DIGEST'])) {
41 43
         $digest = $_SERVER['PHP_AUTH_DIGEST'];
42 44
     // most other servers
43
-    }
44
-    elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
45
-      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0)
46
-        $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
47
-    }
48
-    elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
45
+    } elseif (isset($_SERVER['HTTP_AUTHENTICATION'])) {
46
+      if (strpos(strtolower($_SERVER['HTTP_AUTHENTICATION']),'digest')===0) {
47
+              $digest = substr($_SERVER['HTTP_AUTHORIZATION'], 7);
48
+      }
49
+    } elseif (isset($_SERVER['HTTP_WWW_AUTHENTICATE'])) {
49 50
       $digest = $_SERVER['HTTP_WWW_AUTHENTICATE'];
50 51
     }
51 52
     return $digest;
Please login to merge, or discard this patch.
main/webservices/cm_webservice.php 3 patches
Indentation   +198 added lines, -198 removed lines patch added patch discarded remove patch
@@ -6,120 +6,120 @@  discard block
 block discarded – undo
6 6
  * Error returned by one of the methods of the web service. Contains an error code and an error message
7 7
  */
8 8
 class WSCMError {
9
-	/**
10
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
11
-	 *
12
-	 * @var WSErrorHandler
13
-	 */
14
-	protected static $_handler;
9
+    /**
10
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
11
+     *
12
+     * @var WSErrorHandler
13
+     */
14
+    protected static $_handler;
15 15
 
16
-	/**
17
-	 * Error code
18
-	 *
19
-	 * @var int
20
-	 */
21
-	public $code;
16
+    /**
17
+     * Error code
18
+     *
19
+     * @var int
20
+     */
21
+    public $code;
22 22
 
23
-	/**
24
-	 * Error message
25
-	 *
26
-	 * @var string
27
-	 */
28
-	public $message;
23
+    /**
24
+     * Error message
25
+     *
26
+     * @var string
27
+     */
28
+    public $message;
29 29
 
30
-	/**
31
-	 * Constructor
32
-	 *
33
-	 * @param int Error code
34
-	 * @param string Error message
35
-	 */
36
-	public function __construct($code, $message) {
37
-		$this->code = $code;
38
-		$this->message = $message;
39
-	}
30
+    /**
31
+     * Constructor
32
+     *
33
+     * @param int Error code
34
+     * @param string Error message
35
+     */
36
+    public function __construct($code, $message) {
37
+        $this->code = $code;
38
+        $this->message = $message;
39
+    }
40 40
 
41
-	/**
42
-	 * Sets the error handler
43
-	 *
44
-	 * @param WSErrorHandler Error handler
45
-	 */
46
-	public static function setErrorHandler($handler) {
47
-		if($handler instanceof WSErrorHandler) {
48
-			self::$_handler = $handler;
49
-		}
50
-	}
41
+    /**
42
+     * Sets the error handler
43
+     *
44
+     * @param WSErrorHandler Error handler
45
+     */
46
+    public static function setErrorHandler($handler) {
47
+        if($handler instanceof WSErrorHandler) {
48
+            self::$_handler = $handler;
49
+        }
50
+    }
51 51
 
52
-	/**
53
-	 * Returns the error handler
54
-	 *
55
-	 * @return WSErrorHandler Error handler
56
-	 */
57
-	public static function getErrorHandler() {
58
-		return self::$_handler;
59
-	}
52
+    /**
53
+     * Returns the error handler
54
+     *
55
+     * @return WSErrorHandler Error handler
56
+     */
57
+    public static function getErrorHandler() {
58
+        return self::$_handler;
59
+    }
60 60
 
61
-	/**
62
-	 * Transforms the error into an array
63
-	 *
64
-	 * @return array Associative array with code and message
65
-	 */
66
-	public function toArray() {
67
-		return array('code' => $this->code, 'message' => $this->message);
68
-	}
61
+    /**
62
+     * Transforms the error into an array
63
+     *
64
+     * @return array Associative array with code and message
65
+     */
66
+    public function toArray() {
67
+        return array('code' => $this->code, 'message' => $this->message);
68
+    }
69 69
 }
70 70
 
71 71
 /**
72 72
  * Interface that must be implemented by any error handler
73 73
  */
74 74
 interface WSCMErrorHandler {
75
-	/**
76
-	 * Handle method
77
-	 *
78
-	 * @param WSError Error
79
-	 */
80
-	public function handle($error);
75
+    /**
76
+     * Handle method
77
+     *
78
+     * @param WSError Error
79
+     */
80
+    public function handle($error);
81 81
 }
82 82
 
83 83
 /**
84 84
  * Main class of the webservice. Webservice classes extend this class
85 85
  */
86 86
 class WSCM {
87
-	/**
88
-	 * Chamilo configuration
89
-	 *
90
-	 * @var array
91
-	 */
92
-	protected $_configuration;
87
+    /**
88
+     * Chamilo configuration
89
+     *
90
+     * @var array
91
+     */
92
+    protected $_configuration;
93 93
 
94
-	/**
95
-	 * Constructor
96
-	 */
97
-	public function __construct() {
98
-		$this->_configuration = $GLOBALS['_configuration'];
99
-	}
94
+    /**
95
+     * Constructor
96
+     */
97
+    public function __construct() {
98
+        $this->_configuration = $GLOBALS['_configuration'];
99
+    }
100 100
 
101
-	/**
102
-	 * Verifies the API key
103
-	 *
104
-	 * @param string Secret key
105
-	 * @return mixed WSError in case of failure, null in case of success
106
-	 */
107
-	protected function verifyKey($secret_key) {
108
-		$ip = trim($_SERVER['REMOTE_ADDR']);
109
-		// if we are behind a reverse proxy, assume it will send the
110
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
111
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
112
-		  list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
113
-		  $ip = trim($ip1);
114
-		}
115
-		$security_key = $ip.$this->_configuration['security_key'];
101
+    /**
102
+     * Verifies the API key
103
+     *
104
+     * @param string Secret key
105
+     * @return mixed WSError in case of failure, null in case of success
106
+     */
107
+    protected function verifyKey($secret_key) {
108
+        $ip = trim($_SERVER['REMOTE_ADDR']);
109
+        // if we are behind a reverse proxy, assume it will send the
110
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
111
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
112
+            list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
113
+            $ip = trim($ip1);
114
+        }
115
+        $security_key = $ip.$this->_configuration['security_key'];
116 116
 
117
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
118
-			return new WSCMError(1, "API key is invalid");
119
-		} else {
120
-			return null;
121
-		}
122
-	}
117
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
118
+            return new WSCMError(1, "API key is invalid");
119
+        } else {
120
+            return null;
121
+        }
122
+    }
123 123
 
124 124
         /**
125 125
          * Verifies if the user is valid
@@ -134,12 +134,12 @@  discard block
 block discarded – undo
134 134
             $login = $username;
135 135
             $password = $pass;
136 136
 
137
-	    //lookup the user in the main database
137
+        //lookup the user in the main database
138 138
             $user_table = Database::get_main_table(TABLE_MAIN_USER);
139
-	    $sql = "SELECT user_id, username, password, auth_source, active, expiration_date
139
+        $sql = "SELECT user_id, username, password, auth_source, active, expiration_date
140 140
 	            FROM $user_table
141 141
 	            WHERE username = '".trim(addslashes($login))."'";
142
-	    $result = Database::query($sql);
142
+        $result = Database::query($sql);
143 143
 
144 144
             if (Database::num_rows($result) > 0) {
145 145
                 $uData = Database::fetch_array($result);
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 
172 172
         /**
173 173
          * Return the encrypted pass
174
-		 * @deprecated
174
+         * @deprecated
175 175
          * @param <String> $pass
176 176
          * @return <String> $pass encrypted
177 177
          */
@@ -180,112 +180,112 @@  discard block
 block discarded – undo
180 180
         }*/
181 181
 
182 182
         /**
183
-	 * 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
184
-	 * in the system database
185
-	 *
186
-	 * @param string User id field name
187
-	 * @param string User id value
188
-	 * @return mixed System user id if the user was found, WSError otherwise
189
-	 */
190
-	protected function getUserId($user_id_field_name, $user_id_value) {
191
-		if($user_id_field_name == "chamilo_user_id") {
192
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
193
-				return intval($user_id_value);
194
-			} else {
195
-				return new WSCMError(100, "User not found");
196
-			}
197
-		} else {
198
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
199
-			if($user_id == 0) {
200
-				return new WSCMError(100, "User not found");
201
-			} else {
202
-				return $user_id;
203
-			}
204
-		}
205
-	}
183
+         * 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
184
+         * in the system database
185
+         *
186
+         * @param string User id field name
187
+         * @param string User id value
188
+         * @return mixed System user id if the user was found, WSError otherwise
189
+         */
190
+    protected function getUserId($user_id_field_name, $user_id_value) {
191
+        if($user_id_field_name == "chamilo_user_id") {
192
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
193
+                return intval($user_id_value);
194
+            } else {
195
+                return new WSCMError(100, "User not found");
196
+            }
197
+        } else {
198
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
199
+            if($user_id == 0) {
200
+                return new WSCMError(100, "User not found");
201
+            } else {
202
+                return $user_id;
203
+            }
204
+        }
205
+    }
206 206
 
207
-	/**
208
-	 * 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
209
-	 * in the system database
210
-	 *
211
-	 * @param string Course id field name
212
-	 * @param string Course id value
213
-	 * @return mixed System course id if the course was found, WSError otherwise
214
-	 */
215
-	protected function getCourseId($course_id_field_name, $course_id_value) {
216
-		if($course_id_field_name == "chamilo_course_id") {
217
-			if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
218
-				return intval($course_id_value);
219
-			} else {
220
-				return new WSCMError(200, "Course not found");
221
-			}
222
-		} else {
223
-			$courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name);
224
-			if (empty($courseId)) {
225
-				return new WSCMError(200, "Course not found");
226
-			} else {
227
-				return $courseId;
228
-			}
229
-		}
230
-	}
207
+    /**
208
+     * 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
209
+     * in the system database
210
+     *
211
+     * @param string Course id field name
212
+     * @param string Course id value
213
+     * @return mixed System course id if the course was found, WSError otherwise
214
+     */
215
+    protected function getCourseId($course_id_field_name, $course_id_value) {
216
+        if($course_id_field_name == "chamilo_course_id") {
217
+            if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
218
+                return intval($course_id_value);
219
+            } else {
220
+                return new WSCMError(200, "Course not found");
221
+            }
222
+        } else {
223
+            $courseId = CourseManager::get_course_code_from_original_id($course_id_value, $course_id_field_name);
224
+            if (empty($courseId)) {
225
+                return new WSCMError(200, "Course not found");
226
+            } else {
227
+                return $courseId;
228
+            }
229
+        }
230
+    }
231 231
 
232
-	/**
233
-	 * 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
234
-	 * in the system database
235
-	 *
236
-	 * @param string Session id field name
237
-	 * @param string Session id value
238
-	 * @return mixed System session id if the session was found, WSError otherwise
239
-	 */
240
-	protected function getSessionId($session_id_field_name, $session_id_value)
241
-	{
242
-		if ($session_id_field_name == "chamilo_session_id") {
243
-			$session = SessionManager::fetch((int)$session_id_value);
244
-			if(!empty($session)) {
245
-				return intval($session_id_value);
246
-			} else {
247
-				return new WSCMError(300, "Session not found");
248
-			}
249
-		} else {
250
-			$session_id = SessionManager::getSessionIdFromOriginalId(
251
-				$session_id_value,
252
-				$session_id_field_name
253
-			);
254
-			if($session_id == 0) {
255
-				return new WSCMError(300, "Session not found");
256
-			} else {
257
-				return $session_id;
258
-			}
259
-		}
260
-	}
232
+    /**
233
+     * 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
234
+     * in the system database
235
+     *
236
+     * @param string Session id field name
237
+     * @param string Session id value
238
+     * @return mixed System session id if the session was found, WSError otherwise
239
+     */
240
+    protected function getSessionId($session_id_field_name, $session_id_value)
241
+    {
242
+        if ($session_id_field_name == "chamilo_session_id") {
243
+            $session = SessionManager::fetch((int)$session_id_value);
244
+            if(!empty($session)) {
245
+                return intval($session_id_value);
246
+            } else {
247
+                return new WSCMError(300, "Session not found");
248
+            }
249
+        } else {
250
+            $session_id = SessionManager::getSessionIdFromOriginalId(
251
+                $session_id_value,
252
+                $session_id_field_name
253
+            );
254
+            if($session_id == 0) {
255
+                return new WSCMError(300, "Session not found");
256
+            } else {
257
+                return $session_id;
258
+            }
259
+        }
260
+    }
261 261
 
262
-	/**
263
-	 * Handles an error by calling the WSError error handler
264
-	 *
265
-	 * @param WSError Error
266
-	 */
267
-	protected function handleError($error) {
268
-		$handler = WSCMError::getErrorHandler();
269
-		$handler->handle($error);
270
-	}
262
+    /**
263
+     * Handles an error by calling the WSError error handler
264
+     *
265
+     * @param WSError Error
266
+     */
267
+    protected function handleError($error) {
268
+        $handler = WSCMError::getErrorHandler();
269
+        $handler->handle($error);
270
+    }
271 271
 
272
-	/**
273
-	 * Gets a successful result
274
-	 *
275
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
276
-	 */
277
-	protected function getSuccessfulResult() {
278
-		return array('code' => 0, 'message' => 'Operation was successful');
279
-	}
272
+    /**
273
+     * Gets a successful result
274
+     *
275
+     * @return array Array with a code of 0 and a message 'Operation was successful'
276
+     */
277
+    protected function getSuccessfulResult() {
278
+        return array('code' => 0, 'message' => 'Operation was successful');
279
+    }
280 280
 
281
-	/**
282
-	 * Test function. Returns the string success
283
-	 *
284
-	 * @return string Success
285
-	 */
286
-	public function test() {
287
-		return "success";
288
-	}
281
+    /**
282
+     * Test function. Returns the string success
283
+     *
284
+     * @return string Success
285
+     */
286
+    public function test() {
287
+        return "success";
288
+    }
289 289
 
290 290
         /**
291 291
          * *Strictly* reverts PHP's nl2br() effects (whether it was used in XHTML mode or not)
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @param WSErrorHandler Error handler
45 45
 	 */
46 46
 	public static function setErrorHandler($handler) {
47
-		if($handler instanceof WSErrorHandler) {
47
+		if ($handler instanceof WSErrorHandler) {
48 48
 			self::$_handler = $handler;
49 49
 		}
50 50
 	}
@@ -109,12 +109,12 @@  discard block
 block discarded – undo
109 109
 		// if we are behind a reverse proxy, assume it will send the
110 110
 		// HTTP_X_FORWARDED_FOR header and use this IP instead
111 111
 		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
112
-		  list($ip1,$ip2) = split(',',$_SERVER['HTTP_X_FORWARDED_FOR']);
112
+		  list($ip1, $ip2) = split(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
113 113
 		  $ip = trim($ip1);
114 114
 		}
115 115
 		$security_key = $ip.$this->_configuration['security_key'];
116 116
 
117
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
117
+		if (!api_is_valid_secret_key($secret_key, $security_key)) {
118 118
 			return new WSCMError(1, "API key is invalid");
119 119
 		} else {
120 120
 			return null;
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
                     // Check the user's password
150 150
                         if ($password == $uData['password'] AND (trim($login) == $uData['username'])) {
151 151
                         // Check if the account is active (not locked)
152
-                            if ($uData['active']=='1') {
152
+                            if ($uData['active'] == '1') {
153 153
                                 // Check if the expiration date has not been reached
154
-                                if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
154
+                                if ($uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date'] == '0000-00-00 00:00:00') {
155 155
                                     return "valid";
156 156
                                 }
157 157
                                 else
@@ -188,15 +188,15 @@  discard block
 block discarded – undo
188 188
 	 * @return mixed System user id if the user was found, WSError otherwise
189 189
 	 */
190 190
 	protected function getUserId($user_id_field_name, $user_id_value) {
191
-		if($user_id_field_name == "chamilo_user_id") {
192
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
191
+		if ($user_id_field_name == "chamilo_user_id") {
192
+			if (UserManager::is_user_id_valid(intval($user_id_value))) {
193 193
 				return intval($user_id_value);
194 194
 			} else {
195 195
 				return new WSCMError(100, "User not found");
196 196
 			}
197 197
 		} else {
198 198
 			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
199
-			if($user_id == 0) {
199
+			if ($user_id == 0) {
200 200
 				return new WSCMError(100, "User not found");
201 201
 			} else {
202 202
 				return $user_id;
@@ -213,8 +213,8 @@  discard block
 block discarded – undo
213 213
 	 * @return mixed System course id if the course was found, WSError otherwise
214 214
 	 */
215 215
 	protected function getCourseId($course_id_field_name, $course_id_value) {
216
-		if($course_id_field_name == "chamilo_course_id") {
217
-			if(CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
216
+		if ($course_id_field_name == "chamilo_course_id") {
217
+			if (CourseManager::get_course_code_from_course_id(intval($course_id_value)) != null) {
218 218
 				return intval($course_id_value);
219 219
 			} else {
220 220
 				return new WSCMError(200, "Course not found");
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
 	protected function getSessionId($session_id_field_name, $session_id_value)
241 241
 	{
242 242
 		if ($session_id_field_name == "chamilo_session_id") {
243
-			$session = SessionManager::fetch((int)$session_id_value);
244
-			if(!empty($session)) {
243
+			$session = SessionManager::fetch((int) $session_id_value);
244
+			if (!empty($session)) {
245 245
 				return intval($session_id_value);
246 246
 			} else {
247 247
 				return new WSCMError(300, "Session not found");
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 				$session_id_value,
252 252
 				$session_id_field_name
253 253
 			);
254
-			if($session_id == 0) {
254
+			if ($session_id == 0) {
255 255
 				return new WSCMError(300, "Session not found");
256 256
 			} else {
257 257
 				return $session_id;
Please login to merge, or discard this patch.
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -153,18 +153,18 @@
 block discarded – undo
153 153
                                 // Check if the expiration date has not been reached
154 154
                                 if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
155 155
                                     return "valid";
156
+                                } else {
157
+                                                                    return get_lang('AccountExpired');
156 158
                                 }
157
-                                else
158
-                                    return get_lang('AccountExpired');
159
+                            } else {
160
+                                                            return get_lang('AccountInactive');
159 161
                             }
160
-                            else
161
-                                return get_lang('AccountInactive');
162
+                        } else {
163
+                                                    return get_lang('InvalidId');
162 164
                         }
163
-                        else
164
-                            return get_lang('InvalidId');
165
+                    } else {
166
+                                            return get_lang('AccountURLInactive');
165 167
                     }
166
-                    else
167
-                        return get_lang('AccountURLInactive');
168 168
                 }
169 169
                 return get_lang('InvalidId');
170 170
         }
Please login to merge, or discard this patch.
main/webservices/cm_webservice_inbox.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
             $table_message = Database::get_main_table(TABLE_MESSAGE);
38 38
 
39 39
             $sql_query = "SELECT id FROM $table_message " .
40
-                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
41
-                                     " ORDER BY send_date LIMIT $from,$number_of_items";
40
+                                        " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
41
+                                        " ORDER BY send_date LIMIT $from,$number_of_items";
42 42
 
43 43
             $sql_result = Database::query($sql_query);
44 44
             $message = "#";
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
             $table_message = Database::get_main_table(TABLE_MESSAGE);
87 87
 
88 88
             $sql_query = "SELECT ".$field_table." FROM $table_message " .
89
-                                     " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
89
+                                        " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
90 90
 
91 91
             $sql_result = Database::query($sql_query);
92 92
             $result = Database::fetch_row($sql_result);
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
             $table_message = Database::get_main_table(TABLE_MESSAGE);
108 108
 
109 109
             $sql_query = "SELECT id FROM $table_message " .
110
-					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
111
-					 "ORDER BY send_date LIMIT $from,$number_of_items";
110
+                        "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
111
+                        "ORDER BY send_date LIMIT $from,$number_of_items";
112 112
 
113 113
             $sql_result = Database::query($sql_query);
114 114
             $message = "#";
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
             $table_message = Database::get_main_table(TABLE_MESSAGE);
158 158
 
159 159
             $sql_query = "SELECT ".$field_table." FROM $table_message " .
160
-                                     " WHERE user_sender_id=".$user_id." AND id=".$id;
160
+                                        " WHERE user_sender_id=".$user_id." AND id=".$id;
161 161
 
162 162
             $sql_result = Database::query($sql_query);
163 163
             $result = Database::fetch_row($sql_result);
@@ -188,11 +188,11 @@  discard block
 block discarded – undo
188 188
             $table_message = Database::get_main_table(TABLE_MESSAGE);
189 189
 
190 190
             $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
191
-                           " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
191
+                            " VALUES ('$user_sender_id', '$receiver_user_id', '1', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
192 192
             $result = Database::query($query);
193 193
 
194 194
             $query = "INSERT INTO $table_message(user_sender_id, user_receiver_id, msg_status, send_date, title, content, group_id, parent_id, update_date ) ".
195
-                           " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
195
+                            " VALUES ('$user_sender_id', '$receiver_user_id', '4', '".api_get_utc_datetime()."','$subject','$content','$group_id','$parent_id', '".api_get_utc_datetime()."')";
196 196
             $result = Database::query($query);
197 197
 
198 198
             $inbox_last_id = Database::insert_id();
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function unreadMessage($username, $password)
14 14
     {
15
-        if($this->verifyUserPass($username, $password) == "valid")
15
+        if ($this->verifyUserPass($username, $password) == "valid")
16 16
         {
17 17
             $table_message = Database::get_main_table(TABLE_MESSAGE);
18 18
             $user_id = UserManager::get_user_id_from_username($username);
@@ -30,14 +30,14 @@  discard block
 block discarded – undo
30 30
 
31 31
     public function get_message_id($username, $password, $from, $number_of_items)
32 32
     {
33
-        if($this->verifyUserPass($username, $password) == "valid")
33
+        if ($this->verifyUserPass($username, $password) == "valid")
34 34
         {
35 35
             $user_id = UserManager::get_user_id_from_username($username);
36 36
 
37 37
             $table_message = Database::get_main_table(TABLE_MESSAGE);
38 38
 
39
-            $sql_query = "SELECT id FROM $table_message " .
40
-                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)" .
39
+            $sql_query = "SELECT id FROM $table_message ".
40
+                                     " WHERE user_receiver_id=".$user_id." AND msg_status IN (0,1)".
41 41
                                      " ORDER BY send_date LIMIT $from,$number_of_items";
42 42
 
43 43
             $sql_result = Database::query($sql_query);
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
     public function get_message_data($username, $password, $message_id, $field)
57 57
     {
58
-        if($this->verifyUserPass($username, $password) == "valid")
58
+        if ($this->verifyUserPass($username, $password) == "valid")
59 59
         {
60 60
             $htmlcode = false;
61 61
             $user_id = UserManager::get_user_id_from_username($username);
@@ -85,14 +85,14 @@  discard block
 block discarded – undo
85 85
 
86 86
             $table_message = Database::get_main_table(TABLE_MESSAGE);
87 87
 
88
-            $sql_query = "SELECT ".$field_table." FROM $table_message " .
88
+            $sql_query = "SELECT ".$field_table." FROM $table_message ".
89 89
                                      " WHERE user_receiver_id=".$user_id." AND id=".$message_id;
90 90
 
91 91
             $sql_result = Database::query($sql_query);
92 92
             $result = Database::fetch_row($sql_result);
93 93
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
94 94
 
95
-        }else
95
+        } else
96 96
             return get_lang('InvalidId');
97 97
 
98 98
 
@@ -100,14 +100,14 @@  discard block
 block discarded – undo
100 100
 
101 101
     public function get_message_id_sent($username, $password, $from, $number_of_items)
102 102
     {
103
-        if($this->verifyUserPass($username, $password) == "valid")
103
+        if ($this->verifyUserPass($username, $password) == "valid")
104 104
         {
105 105
             $user_id = UserManager::get_user_id_from_username($username);
106 106
 
107 107
             $table_message = Database::get_main_table(TABLE_MESSAGE);
108 108
 
109
-            $sql_query = "SELECT id FROM $table_message " .
110
-					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." " .
109
+            $sql_query = "SELECT id FROM $table_message ".
110
+					 "WHERE user_sender_id=".$user_id." AND msg_status=".MESSAGE_STATUS_OUTBOX." ".
111 111
 					 "ORDER BY send_date LIMIT $from,$number_of_items";
112 112
 
113 113
             $sql_result = Database::query($sql_query);
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 
127 127
     public function get_message_data_sent($username, $password, $id, $field)
128 128
     {
129
-        if($this->verifyUserPass($username, $password) == "valid")
129
+        if ($this->verifyUserPass($username, $password) == "valid")
130 130
         {
131 131
             $htmlcode = false;
132 132
             switch ($field)
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 
157 157
             $table_message = Database::get_main_table(TABLE_MESSAGE);
158 158
 
159
-            $sql_query = "SELECT ".$field_table." FROM $table_message " .
159
+            $sql_query = "SELECT ".$field_table." FROM $table_message ".
160 160
                                      " WHERE user_sender_id=".$user_id." AND id=".$id;
161 161
 
162 162
             $sql_result = Database::query($sql_query);
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 
165 165
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
166 166
 
167
-        }else
167
+        } else
168 168
             return get_lang('InvalidId');
169 169
 
170 170
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
     public function message_send($username, $password, $receiver_user_id, $subject, $content)
174 174
     {
175 175
         //TODO: verificar data de envio. Esta divergindo de data!
176
-        if($this->verifyUserPass($username, $password) == "valid")
176
+        if ($this->verifyUserPass($username, $password) == "valid")
177 177
         {
178 178
             $group_id = intval(0);
179 179
             $parent_id = intval(0);
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 
205 205
     }
206 206
 
207
-    protected function set_message_as_read($user_id, $message_id){
207
+    protected function set_message_as_read($user_id, $message_id) {
208 208
         $table_message = Database::get_main_table(TABLE_MESSAGE);
209 209
         $query = "UPDATE $table_message SET msg_status = '".MESSAGE_STATUS_NEW."' WHERE user_receiver_id=".$user_id." AND id='".$message_id."';";
210 210
         $result = Database::query($query);
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 
49 49
             return $message;
50 50
 
51
-        } else
52
-            return get_lang('InvalidId');
51
+        } else {
52
+                    return get_lang('InvalidId');
53
+        }
53 54
 
54 55
     }
55 56
 
@@ -92,8 +93,9 @@  discard block
 block discarded – undo
92 93
             $result = Database::fetch_row($sql_result);
93 94
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
94 95
 
95
-        }else
96
-            return get_lang('InvalidId');
96
+        } else {
97
+                    return get_lang('InvalidId');
98
+        }
97 99
 
98 100
 
99 101
     }
@@ -118,8 +120,9 @@  discard block
 block discarded – undo
118 120
 
119 121
             return $message;
120 122
 
121
-        } else
122
-            return get_lang('InvalidId');
123
+        } else {
124
+                    return get_lang('InvalidId');
125
+        }
123 126
 
124 127
     }
125 128
 
@@ -164,8 +167,9 @@  discard block
 block discarded – undo
164 167
 
165 168
             return (htmlcode) ? html_entity_decode($result[0]) : $result[0];
166 169
 
167
-        }else
168
-            return get_lang('InvalidId');
170
+        } else {
171
+                    return get_lang('InvalidId');
172
+        }
169 173
 
170 174
 
171 175
     }
@@ -199,8 +203,9 @@  discard block
 block discarded – undo
199 203
 
200 204
             return $inbox_last_id;
201 205
 
202
-        } else
203
-            return get_lang('InvalidId');
206
+        } else {
207
+                    return get_lang('InvalidId');
208
+        }
204 209
 
205 210
     }
206 211
 
Please login to merge, or discard this patch.
main/webservices/cm_soap_user.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -8,13 +8,13 @@  discard block
 block discarded – undo
8 8
 $s = WSCMSoapServer::singleton();
9 9
 
10 10
 $s->register(
11
-	'WSCMUser.find_id_user',
12
-	array(
13
-		'username' => 'xsd:string',
14
-		'password' => 'xsd:string',
11
+    'WSCMUser.find_id_user',
12
+    array(
13
+        'username' => 'xsd:string',
14
+        'password' => 'xsd:string',
15 15
                 'name' => 'xsd:string',
16
-	),
17
-	array('return' => 'xsd:string'),
16
+    ),
17
+    array('return' => 'xsd:string'),
18 18
         'urn:WSCMService',
19 19
         '',
20 20
         '',
@@ -23,14 +23,14 @@  discard block
 block discarded – undo
23 23
 );
24 24
 
25 25
 $s->register(
26
-	'WSCMUser.get_user_name',
27
-	array(
28
-		'username' => 'xsd:string',
29
-		'password' => 'xsd:string',
26
+    'WSCMUser.get_user_name',
27
+    array(
28
+        'username' => 'xsd:string',
29
+        'password' => 'xsd:string',
30 30
                 'id' => 'xsd:string',
31 31
                 'field' => 'xsd:string'
32
-	),
33
-	array('return' => 'xsd:string'),
32
+    ),
33
+    array('return' => 'xsd:string'),
34 34
         'urn:WSCMService',
35 35
         '',
36 36
         '',
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 );
40 40
 
41 41
 $s->register(
42
-	'WSCMUser.get_link_user_picture',
43
-	array(
44
-		'username' => 'xsd:string',
45
-		'password' => 'xsd:string',
42
+    'WSCMUser.get_link_user_picture',
43
+    array(
44
+        'username' => 'xsd:string',
45
+        'password' => 'xsd:string',
46 46
                 'id' => 'xsd:string'
47
-	),
48
-	array('return' => 'xsd:string'),
47
+    ),
48
+    array('return' => 'xsd:string'),
49 49
         'urn:WSCMService',
50 50
         '',
51 51
         '',
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
 );
55 55
 
56 56
 $s->register(
57
-	'WSCMUser.send_invitation',
58
-	array(
59
-		'username' => 'xsd:string',
60
-		'password' => 'xsd:string',
57
+    'WSCMUser.send_invitation',
58
+    array(
59
+        'username' => 'xsd:string',
60
+        'password' => 'xsd:string',
61 61
                 'userfriend_id' => 'xsd:string',
62 62
                 'content_message' => 'xsd:string'
63
-	),
64
-	array('return' => 'xsd:string'),
63
+    ),
64
+    array('return' => 'xsd:string'),
65 65
         'urn:WSCMService',
66 66
         '',
67 67
         '',
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 );
71 71
 
72 72
 $s->register(
73
-	'WSCMUser.accept_friend',
74
-	array(
75
-		'username' => 'xsd:string',
76
-		'password' => 'xsd:string',
73
+    'WSCMUser.accept_friend',
74
+    array(
75
+        'username' => 'xsd:string',
76
+        'password' => 'xsd:string',
77 77
                 'userfriend_id' => 'xsd:string'
78
-	),
79
-	array('return' => 'xsd:string'),
78
+    ),
79
+    array('return' => 'xsd:string'),
80 80
         'urn:WSCMService',
81 81
         '',
82 82
         '',
@@ -85,13 +85,13 @@  discard block
 block discarded – undo
85 85
 );
86 86
 
87 87
 $s->register(
88
-	'WSCMUser.denied_invitation',
89
-	array(
90
-		'username' => 'xsd:string',
91
-		'password' => 'xsd:string',
88
+    'WSCMUser.denied_invitation',
89
+    array(
90
+        'username' => 'xsd:string',
91
+        'password' => 'xsd:string',
92 92
                 'userfriend_id' => 'xsd:string'
93
-	),
94
-	array('return' => 'xsd:string'),
93
+    ),
94
+    array('return' => 'xsd:string'),
95 95
         'urn:WSCMService',
96 96
         '',
97 97
         '',
Please login to merge, or discard this patch.
main/webservices/example_fill_users_fields.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id";
23 23
 $res = Database::query($sql);
24 24
 while($row = Database::fetch_array($res)) {
25
-  $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value)
25
+    $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value)
26 26
            VALUES (".$row['user_id'].", 11,'".$row['username']."')";
27
-  $res2 = Database::query($sql2);
27
+    $res2 = Database::query($sql2);
28 28
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 $tuserfv = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
22 22
 $sql = "SELECT user_id, username FROM $tuser ORDER BY user_id";
23 23
 $res = Database::query($sql);
24
-while($row = Database::fetch_array($res)) {
24
+while ($row = Database::fetch_array($res)) {
25 25
   $sql2 = "INSERT INTO $tuserfv (item_id, field_id, value)
26 26
            VALUES (".$row['user_id'].", 11,'".$row['username']."')";
27 27
   $res2 = Database::query($sql2);
Please login to merge, or discard this patch.
main/calendar/ical_export.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 $event = $agenda->get_event($id);
44 44
 
45 45
 if (!empty($event)) {
46
-	define('ICAL_LANG',api_get_language_isocode());
46
+    define('ICAL_LANG',api_get_language_isocode());
47 47
 
48 48
     $ical = new vcalendar();
49 49
     $ical->setConfig('unique_id',api_get_path(WEB_PATH));
@@ -129,6 +129,6 @@  discard block
 block discarded – undo
129 129
             die();
130 130
     }
131 131
 } else {
132
-	header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));
133
-	die();
132
+    header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));
133
+    die();
134 134
 }
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -43,15 +43,15 @@  discard block
 block discarded – undo
43 43
 $event = $agenda->get_event($id);
44 44
 
45 45
 if (!empty($event)) {
46
-	define('ICAL_LANG',api_get_language_isocode());
46
+	define('ICAL_LANG', api_get_language_isocode());
47 47
 
48 48
     $ical = new vcalendar();
49
-    $ical->setConfig('unique_id',api_get_path(WEB_PATH));
50
-    $ical->setProperty( 'method', 'PUBLISH' );
51
-    $ical->setConfig('url',api_get_path(WEB_PATH));
49
+    $ical->setConfig('unique_id', api_get_path(WEB_PATH));
50
+    $ical->setProperty('method', 'PUBLISH');
51
+    $ical->setConfig('url', api_get_path(WEB_PATH));
52 52
     $vevent = new vevent();
53 53
 
54
-    switch($_GET['class']) {
54
+    switch ($_GET['class']) {
55 55
         case 'public':
56 56
             $vevent->setClass('PUBLIC');
57 57
             break;
@@ -69,44 +69,44 @@  discard block
 block discarded – undo
69 69
     $event['start_date'] = api_get_local_time($event['start_date']);
70 70
     $event['end_date'] = api_get_local_time($event['end_date']);
71 71
 
72
-    switch($type) {
72
+    switch ($type) {
73 73
         case 'personal':
74 74
         case 'platform':
75
-            $vevent->setProperty( 'summary', api_convert_encoding($event['title'],'UTF-8', $charset));
76
-            if(empty($event['start_date'])){header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));}
77
-            list($y,$m,$d,$h,$M,$s) = preg_split('/[\s:-]/',$event['start_date']);
78
-            $vevent->setProperty('dtstart',array('year'=>$y,'month'=>$m,'day'=>$d,'hour'=>$h,'min'=>$M,'sec'=>$s));
79
-            if(empty($event['end_date'])) {
80
-                $y2=$y;$m2=$m;$d2=$d;$h2=$h;$M2=$M+15;$s2=$s;
81
-                if($M2>60){$M2=$M2-60;$h2+=1;}
75
+            $vevent->setProperty('summary', api_convert_encoding($event['title'], 'UTF-8', $charset));
76
+            if (empty($event['start_date'])) {header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER'])); }
77
+            list($y, $m, $d, $h, $M, $s) = preg_split('/[\s:-]/', $event['start_date']);
78
+            $vevent->setProperty('dtstart', array('year'=>$y, 'month'=>$m, 'day'=>$d, 'hour'=>$h, 'min'=>$M, 'sec'=>$s));
79
+            if (empty($event['end_date'])) {
80
+                $y2 = $y; $m2 = $m; $d2 = $d; $h2 = $h; $M2 = $M + 15; $s2 = $s;
81
+                if ($M2 > 60) {$M2 = $M2 - 60; $h2 += 1; }
82 82
             } else {
83
-                list($y2,$m2,$d2,$h2,$M2,$s2) = preg_split('/[\s:-]/',$event['end_date']);
83
+                list($y2, $m2, $d2, $h2, $M2, $s2) = preg_split('/[\s:-]/', $event['end_date']);
84 84
             }
85
-            $vevent->setProperty('dtend',array('year'=>$y2,'month'=>$m2,'day'=>$d2,'hour'=>$h2,'min'=>$M2,'sec'=>$s2));
85
+            $vevent->setProperty('dtend', array('year'=>$y2, 'month'=>$m2, 'day'=>$d2, 'hour'=>$h2, 'min'=>$M2, 'sec'=>$s2));
86 86
             //$vevent->setProperty( 'LOCATION', get_lang('Unknown') ); // property name - case independent
87
-            $vevent->setProperty( 'description', api_convert_encoding($event['description'],'UTF-8',$charset));
87
+            $vevent->setProperty('description', api_convert_encoding($event['description'], 'UTF-8', $charset));
88 88
             //$vevent->setProperty( 'comment', 'This is a comment' );
89 89
             //$user = api_get_user_info($event['user']);
90 90
             //$vevent->setProperty('organizer',$user['mail']);
91 91
             //$vevent->setProperty('attendee',$user['mail']);
92 92
             //$vevent->setProperty( 'rrule', array( 'FREQ' => 'WEEKLY', 'count' => 4));// occurs also four next weeks
93
-            $ical->setConfig('filename',$y.$m.$d.$h.$M.$s.'-'.rand(1,1000).'.ics');
94
-            $ical->setComponent ($vevent); // add event to calendar
93
+            $ical->setConfig('filename', $y.$m.$d.$h.$M.$s.'-'.rand(1, 1000).'.ics');
94
+            $ical->setComponent($vevent); // add event to calendar
95 95
             $ical->returnCalendar();
96 96
             break;
97 97
         case 'course':
98
-            $vevent->setProperty( 'summary', api_convert_encoding($event['title'],'UTF-8',$charset));
99
-            if(empty($event['start_date'])){header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER']));}
100
-            list($y,$m,$d,$h,$M,$s) = preg_split('/[\s:-]/',$event['start_date']);
101
-            $vevent->setProperty('dtstart',array('year'=>$y,'month'=>$m,'day'=>$d,'hour'=>$h,'min'=>$M,'sec'=>$s));
98
+            $vevent->setProperty('summary', api_convert_encoding($event['title'], 'UTF-8', $charset));
99
+            if (empty($event['start_date'])) {header('location:'.Security::remove_XSS($_SERVER['HTTP_REFERER'])); }
100
+            list($y, $m, $d, $h, $M, $s) = preg_split('/[\s:-]/', $event['start_date']);
101
+            $vevent->setProperty('dtstart', array('year'=>$y, 'month'=>$m, 'day'=>$d, 'hour'=>$h, 'min'=>$M, 'sec'=>$s));
102 102
             if (empty($event['end_date'])) {
103
-                $y2=$y;$m2=$m;$d2=$d;$h2=$h;$M2=$M+15;$s2=$s;
104
-                if($M2>60){$M2=$M2-60;$h2+=1;}
103
+                $y2 = $y; $m2 = $m; $d2 = $d; $h2 = $h; $M2 = $M + 15; $s2 = $s;
104
+                if ($M2 > 60) {$M2 = $M2 - 60; $h2 += 1; }
105 105
             } else {
106
-                list($y2,$m2,$d2,$h2,$M2,$s2) = preg_split('/[\s:-]/',$event['end_date']);
106
+                list($y2, $m2, $d2, $h2, $M2, $s2) = preg_split('/[\s:-]/', $event['end_date']);
107 107
             }
108
-            $vevent->setProperty('dtend',array('year'=>$y2,'month'=>$m2,'day'=>$d2,'hour'=>$h2,'min'=>$M2,'sec'=>$s2));
109
-            $vevent->setProperty( 'description', api_convert_encoding($event['description'],'UTF-8',$charset));
108
+            $vevent->setProperty('dtend', array('year'=>$y2, 'month'=>$m2, 'day'=>$d2, 'hour'=>$h2, 'min'=>$M2, 'sec'=>$s2));
109
+            $vevent->setProperty('description', api_convert_encoding($event['description'], 'UTF-8', $charset));
110 110
             //$vevent->setProperty( 'comment', 'This is a comment' );
111 111
             //$user = api_get_user_info($event['user']);
112 112
             //$vevent->setProperty('organizer',$user['mail']);
@@ -120,8 +120,8 @@  discard block
 block discarded – undo
120 120
                 $vevent->setProperty('rrule',array('FREQ'=>$freq,'UNTIL'=>array('year'=>$e_y,'month'=>$e_m,'day'=>$e_d),'INTERVAL'=>'1'));
121 121
             }*/
122 122
             //$vevent->setProperty( 'rrule', array( 'FREQ' => 'WEEKLY', 'count' => 4));// occurs also four next weeks
123
-            $ical->setConfig('filename',$y.$m.$d.$h.$M.$s.'-'.rand(1,1000).'.ics');
124
-            $ical->setComponent ($vevent); // add event to calendar
123
+            $ical->setConfig('filename', $y.$m.$d.$h.$M.$s.'-'.rand(1, 1000).'.ics');
124
+            $ical->setComponent($vevent); // add event to calendar
125 125
             $ical->returnCalendar();
126 126
             break;
127 127
         default:
Please login to merge, or discard this patch.
main/calendar/agenda_js.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 if (isset($_REQUEST['cidReq']) && !empty($_REQUEST['cidReq'])) {
37 37
     if ($_REQUEST['cidReq'] == -1) {
38 38
         // When is out of the course tool (e.g My agenda)
39
-        header('Location: ' . api_get_self());
39
+        header('Location: '.api_get_self());
40 40
         exit;
41 41
     } else {
42 42
         $type = 'course';
Please login to merge, or discard this patch.