Completed
Push — 1.10.x ( 2524fc...6bc0e1 )
by Yannick
47:10
created
main/webservices/webservice_course.php 3 patches
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 */
22 22
 	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
23 23
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
24
-		if($course_id instanceof WSError) {
24
+		if ($course_id instanceof WSError) {
25 25
 			return $course_id;
26 26
 		} else {
27 27
 			$course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -39,11 +39,11 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
41 41
 		$verifKey = $this->verifyKey($secret_key);
42
-		if($verifKey instanceof WSError) {
42
+		if ($verifKey instanceof WSError) {
43 43
 			$this->handleError($verifKey);
44 44
 		} else {
45 45
 			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
46
-			if($result instanceof WSError) {
46
+			if ($result instanceof WSError) {
47 47
 				$this->handleError($result);
48 48
 			}
49 49
 		}
@@ -59,15 +59,15 @@  discard block
 block discarded – undo
59 59
 	 */
60 60
 	public function DeleteCourses($secret_key, $courses) {
61 61
 		$verifKey = $this->verifyKey($secret_key);
62
-		if($verifKey instanceof WSError) {
62
+		if ($verifKey instanceof WSError) {
63 63
 			$this->handleError($verifKey);
64 64
 		} else {
65 65
 			$results = array();
66
-			foreach($courses as $course) {
66
+			foreach ($courses as $course) {
67 67
 				$result_tmp = array();
68 68
 				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
69 69
 				$result_tmp['course_id_value'] = $course['course_id_value'];
70
-				if($result_op instanceof WSError) {
70
+				if ($result_op instanceof WSError) {
71 71
 					// Return the error in the results
72 72
 					$result_tmp['result'] = $result_op->toArray();
73 73
 				} else {
@@ -97,17 +97,17 @@  discard block
 block discarded – undo
97 97
 	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
98 98
 		// Add the original course id field name and value to the extra fields if needed
99 99
 		$extras_associative = array();
100
-		if($course_id_field_name != "chamilo_course_id") {
100
+		if ($course_id_field_name != "chamilo_course_id") {
101 101
 			$extras_associative[$course_id_field_name] = $course_id_value;
102 102
 		}
103
-		foreach($extras as $extra) {
103
+		foreach ($extras as $extra) {
104 104
 			$extras_associative[$extra['field_name']] = $extra['field_value'];
105 105
 		}
106 106
 		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
107
-		if($course_admin_id instanceof WSError) {
107
+		if ($course_admin_id instanceof WSError) {
108 108
 			return $course_admin_id;
109 109
 		}
110
-		if($wanted_code == '') {
110
+		if ($wanted_code == '') {
111 111
 			$wanted_code = CourseManager::generate_course_code($title);
112 112
 		}
113 113
 		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 			return new WSError(202, 'There was an error creating the course');
116 116
 		} else {
117 117
 			// Update extra fields
118
-			foreach($extras_associative as $fname => $fvalue) {
118
+			foreach ($extras_associative as $fname => $fvalue) {
119 119
 				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
120 120
 			}
121 121
 			// Get course id
@@ -143,11 +143,11 @@  discard block
 block discarded – undo
143 143
 	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
144 144
 		// First, verify the secret key
145 145
 		$verifKey = $this->verifyKey($secret_key);
146
-		if($verifKey instanceof WSError) {
146
+		if ($verifKey instanceof WSError) {
147 147
 			$this->handleError($verifKey);
148 148
 		} else {
149 149
 			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
150
-			if($result instanceof WSError) {
150
+			if ($result instanceof WSError) {
151 151
 				$this->handleError($result);
152 152
 			} else {
153 153
 				return $result;
@@ -165,17 +165,17 @@  discard block
 block discarded – undo
165 165
 	public function CreateCourses($secret_key, $courses) {
166 166
 		// First, verify the secret key
167 167
 		$verifKey = $this->verifyKey($secret_key);
168
-		if($verifKey instanceof WSError) {
168
+		if ($verifKey instanceof WSError) {
169 169
 			$this->handleError($verifKey);
170 170
 		} else {
171 171
 			$results = array();
172
-			foreach($courses as $course) {
172
+			foreach ($courses as $course) {
173 173
 				$result_tmp = array();
174 174
                 // re-initialize variables just in case
175 175
                 $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = 0;
176 176
 				extract($course);
177 177
 				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
178
-				if($result instanceof WSError) {
178
+				if ($result instanceof WSError) {
179 179
 					$result_tmp['result'] = $result->toArray();
180 180
 					$result_tmp['course_id_value'] = $course_id_value;
181 181
 					$result_tmp['course_id_generated'] = 0;
@@ -209,47 +209,47 @@  discard block
 block discarded – undo
209 209
 	 */
210 210
 	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
211 211
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
212
-		if($course_id instanceof WSError) {
212
+		if ($course_id instanceof WSError) {
213 213
 			return $course_id;
214 214
 		} else {
215 215
 			$attributes = array();
216
-			if(!is_empty($title)) {
216
+			if (!is_empty($title)) {
217 217
 				$attributes['title'] = $title;
218 218
 			}
219
-			if(!is_empty($category_code)) {
219
+			if (!is_empty($category_code)) {
220 220
 				$attributes['category_code'] = $category_code;
221 221
 			}
222
-			if(!is_empty($department_name)) {
222
+			if (!is_empty($department_name)) {
223 223
 				$attributes['department_name'] = $department_name;
224 224
 			}
225
-			if(!is_empty($department_url)) {
225
+			if (!is_empty($department_url)) {
226 226
 				$attributes['department_url'] = $department_url;
227 227
 			}
228
-			if(!is_empty($language)) {
228
+			if (!is_empty($language)) {
229 229
 				$attributes['course_language'] = $language;
230 230
 			}
231
-			if($visibility != '') {
232
-				$attributes['visibility'] = (int)$visibility;
231
+			if ($visibility != '') {
232
+				$attributes['visibility'] = (int) $visibility;
233 233
 			}
234
-			if($subscribe != '') {
235
-				$attributes['subscribe'] = (int)$subscribe;
234
+			if ($subscribe != '') {
235
+				$attributes['subscribe'] = (int) $subscribe;
236 236
 			}
237
-			if($unsubscribe != '') {
238
-				$attributes['unsubscribe'] = (int)$unsubscribe;
237
+			if ($unsubscribe != '') {
238
+				$attributes['unsubscribe'] = (int) $unsubscribe;
239 239
 			}
240
-			if(!is_empty($visual_code)) {
240
+			if (!is_empty($visual_code)) {
241 241
 				$attributes['visual_code'] = $visual_code;
242 242
 			}
243
-			if(!is_empty($attributes)) {
243
+			if (!is_empty($attributes)) {
244 244
 				CourseManager::update_attributes($course_id, $attributes);
245 245
 			}
246
-			if(!empty($extras)) {
246
+			if (!empty($extras)) {
247 247
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
248 248
 				$extras_associative = array();
249
-				foreach($extras as $extra) {
249
+				foreach ($extras as $extra) {
250 250
 					$extras_associative[$extra['field_name']] = $extra['field_value'];
251 251
 				}
252
-				foreach($extras_associative as $fname => $fvalue) {
252
+				foreach ($extras_associative as $fname => $fvalue) {
253 253
 					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
254 254
 				}
255 255
 			}
@@ -276,11 +276,11 @@  discard block
 block discarded – undo
276 276
 	 */
277 277
 	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
278 278
 		$verifKey = $this->verifyKey($secret_key);
279
-		if($verifKey instanceof WSError) {
279
+		if ($verifKey instanceof WSError) {
280 280
 			$this->handleError($verifKey);
281 281
 		} else {
282 282
 			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
283
-			if($result instanceof WSError) {
283
+			if ($result instanceof WSError) {
284 284
 				$this->handleError($result);
285 285
 			}
286 286
 		}
@@ -296,10 +296,10 @@  discard block
 block discarded – undo
296 296
 	 */
297 297
 	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
298 298
 		$verifKey = $this->verifyKey($secret_key);
299
-		if($verifKey instanceof WSError) {
299
+		if ($verifKey instanceof WSError) {
300 300
 			$this->handleError($verifKey);
301 301
 		} else {
302
-            $visibilities = split(',',$visibility);
302
+            $visibilities = split(',', $visibility);
303 303
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
304 304
             foreach ($visibilities as $p => $visibility) {
305 305
                 $visibilities[$p] = $vis[$visibility];
@@ -308,9 +308,9 @@  discard block
 block discarded – undo
308 308
 			$category_names = array();
309 309
 
310 310
 			$courses = CourseManager::get_courses_list();
311
-			foreach($courses as $course) {
311
+			foreach ($courses as $course) {
312 312
                 //skip elements that do not match required visibility
313
-                if (!in_array($course['visibility'],$visibilities)) { continue; }
313
+                if (!in_array($course['visibility'], $visibilities)) { continue; }
314 314
 				$course_tmp = array();
315 315
 				$course_tmp['id'] = $course['id'];
316 316
 				$course_tmp['code'] = $course['code'];
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 				$course_tmp['visibility'] = $course['visibility'];
320 320
 
321 321
 				// Determining category name
322
-				if($category_names[$course['category_code']]) {
322
+				if ($category_names[$course['category_code']]) {
323 323
 					$course_tmp['category_name'] = $category_names[$course['category_code']];
324 324
 				} else {
325 325
 					$category = CourseManager::get_course_category($course['category_code']);
@@ -355,21 +355,21 @@  discard block
 block discarded – undo
355 355
 	 */
356 356
 	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
357 357
 		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
358
-		if($course_id instanceof WSError) {
358
+		if ($course_id instanceof WSError) {
359 359
 			return $course_id;
360 360
 		} else {
361 361
 			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
362
-			if($user_id instanceof WSError) {
362
+			if ($user_id instanceof WSError) {
363 363
 				return $user_id;
364 364
 			} else {
365 365
 				$course_code = CourseManager::get_course_code_from_course_id($course_id);
366
-				if($state == 0) {
366
+				if ($state == 0) {
367 367
 					// Unsubscribe user
368 368
 					CourseManager::unsubscribe_user($user_id, $course_code);
369 369
 					return true;
370 370
 				} else {
371 371
 					// Subscribe user
372
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
372
+					if (CourseManager::subscribe_user($user_id, $course_code, $status)) {
373 373
 						return true;
374 374
 					} else {
375 375
 						return new WSError(203, 'An error occured subscribing to this course');
@@ -391,11 +391,11 @@  discard block
 block discarded – undo
391 391
 	 */
392 392
 	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
393 393
 		$verifKey = $this->verifyKey($secret_key);
394
-		if($verifKey instanceof WSError) {
394
+		if ($verifKey instanceof WSError) {
395 395
 			$this->handleError($verifKey);
396 396
 		} else {
397 397
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
398
-			if($result instanceof WSError) {
398
+			if ($result instanceof WSError) {
399 399
 				$this->handleError($result);
400 400
 			}
401 401
 		}
@@ -412,11 +412,11 @@  discard block
 block discarded – undo
412 412
 	 */
413 413
 	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
414 414
 		$verifKey = $this->verifyKey($secret_key);
415
-		if($verifKey instanceof WSError) {
415
+		if ($verifKey instanceof WSError) {
416 416
 			$this->handleError($verifKey);
417 417
 		} else {
418 418
 			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
419
-			if($result instanceof WSError) {
419
+			if ($result instanceof WSError) {
420 420
 				$this->handleError($result);
421 421
 			}
422 422
 		}
@@ -432,17 +432,17 @@  discard block
 block discarded – undo
432 432
 	 */
433 433
 	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
434 434
 		$verifKey = $this->verifyKey($secret_key);
435
-		if($verifKey instanceof WSError) {
435
+		if ($verifKey instanceof WSError) {
436 436
 			$this->handleError($verifKey);
437 437
 		} else {
438 438
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
439
-			if($course_id instanceof WSError) {
439
+			if ($course_id instanceof WSError) {
440 440
 				return $course_id;
441 441
 			} else {
442 442
 				// Course exists, get its descriptions
443 443
 				$descriptions = CourseDescription::get_descriptions($course_id);
444 444
 				$results = array();
445
-				foreach($descriptions as $description) {
445
+				foreach ($descriptions as $description) {
446 446
 					$results[] = array('course_desc_id' => $description->get_description_type(),
447 447
 										'course_desc_title' => $description->get_title(),
448 448
 										'course_desc_content' => $description->get_content());
@@ -465,11 +465,11 @@  discard block
 block discarded – undo
465 465
 	 */
466 466
 	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
467 467
 		$verifKey = $this->verifyKey($secret_key);
468
-		if($verifKey instanceof WSError) {
468
+		if ($verifKey instanceof WSError) {
469 469
 			$this->handleError($verifKey);
470 470
 		} else {
471 471
 			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
472
-			if($course_id instanceof WSError) {
472
+			if ($course_id instanceof WSError) {
473 473
 				return $course_id;
474 474
 			} else {
475 475
 				// Create the new course description
@@ -484,8 +484,8 @@  discard block
 block discarded – undo
484 484
 				// Check if this course description exists
485 485
 				$descriptions = CourseDescription::get_descriptions($course_id);
486 486
 				$exists = false;
487
-				foreach($descriptions as $description) {
488
-					if($description->get_description_type() == $course_desc_id) {
487
+				foreach ($descriptions as $description) {
488
+					if ($description->get_description_type() == $course_desc_id) {
489 489
 						$exists = true;
490 490
 					}
491 491
 				}
Please login to merge, or discard this patch.
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -453,6 +453,7 @@
 block discarded – undo
453 453
 	 * @param string Session id field name
454 454
 	 * @param string Session id value
455 455
 	 * @param int State (1 to subscribe, 0 to unsubscribe)
456
+	 * @param integer $state
456 457
 	 * @return mixed True on success, WSError otherwise
457 458
 	 */
458 459
 	protected function changeCourseSubscription($course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value, $state) {
Please login to merge, or discard this patch.
Indentation   +455 added lines, -455 removed lines patch added patch discarded remove patch
@@ -12,490 +12,490 @@
 block discarded – undo
12 12
  */
13 13
 class WSCourse extends WS
14 14
 {
15
-	/**
16
-	 * Deletes a course (helper method)
17
-	 *
18
-	 * @param string Course id field name
19
-	 * @param string Course id value
20
-	 * @return mixed True if the course was successfully deleted, WSError otherwise
21
-	 */
22
-	protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
23
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
24
-		if($course_id instanceof WSError) {
25
-			return $course_id;
26
-		} else {
27
-			$course_code = CourseManager::get_course_code_from_course_id($course_id);
28
-			CourseManager::delete_course($course_code);
29
-			return true;
30
-		}
31
-	}
15
+    /**
16
+     * Deletes a course (helper method)
17
+     *
18
+     * @param string Course id field name
19
+     * @param string Course id value
20
+     * @return mixed True if the course was successfully deleted, WSError otherwise
21
+     */
22
+    protected function deleteCourseHelper($course_id_field_name, $course_id_value) {
23
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
24
+        if($course_id instanceof WSError) {
25
+            return $course_id;
26
+        } else {
27
+            $course_code = CourseManager::get_course_code_from_course_id($course_id);
28
+            CourseManager::delete_course($course_code);
29
+            return true;
30
+        }
31
+    }
32 32
 
33
-	/**
34
-	 * Deletes a course
35
-	 *
36
-	 * @param string API secret key
37
-	 * @param string Course id field name
38
-	 * @param string Course id value
39
-	 */
40
-	public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
41
-		$verifKey = $this->verifyKey($secret_key);
42
-		if($verifKey instanceof WSError) {
43
-			$this->handleError($verifKey);
44
-		} else {
45
-			$result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
46
-			if($result instanceof WSError) {
47
-				$this->handleError($result);
48
-			}
49
-		}
50
-	}
33
+    /**
34
+     * Deletes a course
35
+     *
36
+     * @param string API secret key
37
+     * @param string Course id field name
38
+     * @param string Course id value
39
+     */
40
+    public function DeleteCourse($secret_key, $course_id_field_name, $course_id_value) {
41
+        $verifKey = $this->verifyKey($secret_key);
42
+        if($verifKey instanceof WSError) {
43
+            $this->handleError($verifKey);
44
+        } else {
45
+            $result = $this->deleteCourseHelper($course_id_field_name, $course_id_value);
46
+            if($result instanceof WSError) {
47
+                $this->handleError($result);
48
+            }
49
+        }
50
+    }
51 51
 
52
-	/**
53
-	 * Deletes multiple courses
54
-	 *
55
-	 * @param string API secret key
56
-	 * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
57
-	 * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
58
-	 * than 0, an error occured
59
-	 */
60
-	public function DeleteCourses($secret_key, $courses) {
61
-		$verifKey = $this->verifyKey($secret_key);
62
-		if($verifKey instanceof WSError) {
63
-			$this->handleError($verifKey);
64
-		} else {
65
-			$results = array();
66
-			foreach($courses as $course) {
67
-				$result_tmp = array();
68
-				$result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
69
-				$result_tmp['course_id_value'] = $course['course_id_value'];
70
-				if($result_op instanceof WSError) {
71
-					// Return the error in the results
72
-					$result_tmp['result'] = $result_op->toArray();
73
-				} else {
74
-					$result_tmp['result'] = $this->getSuccessfulResult();
75
-				}
76
-				$results[] = $result_tmp;
77
-			}
78
-			return $results;
79
-		}
80
-	}
52
+    /**
53
+     * Deletes multiple courses
54
+     *
55
+     * @param string API secret key
56
+     * @param array Array of courses with elements of the form array('course_id_field_name' => 'name_of_field', 'course_id_value' => 'value')
57
+     * @return array Array with elements like array('course_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
58
+     * than 0, an error occured
59
+     */
60
+    public function DeleteCourses($secret_key, $courses) {
61
+        $verifKey = $this->verifyKey($secret_key);
62
+        if($verifKey instanceof WSError) {
63
+            $this->handleError($verifKey);
64
+        } else {
65
+            $results = array();
66
+            foreach($courses as $course) {
67
+                $result_tmp = array();
68
+                $result_op = $this->deleteCourseHelper($course['course_id_field_name'], $course['course_id_value']);
69
+                $result_tmp['course_id_value'] = $course['course_id_value'];
70
+                if($result_op instanceof WSError) {
71
+                    // Return the error in the results
72
+                    $result_tmp['result'] = $result_op->toArray();
73
+                } else {
74
+                    $result_tmp['result'] = $this->getSuccessfulResult();
75
+                }
76
+                $results[] = $result_tmp;
77
+            }
78
+            return $results;
79
+        }
80
+    }
81 81
 
82
-	/**
83
-	 * Creates a course (helper method)
84
-	 *
85
-	 * @param string Title
86
-	 * @param string Category code
87
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
88
-	 * @param string Tutor name
89
-	 * @param string Course admin user id field name
90
-	 * @param string Course admin user id value
91
-	 * @param string Course language
92
-	 * @param string Course id field name
93
-	 * @param string Course id value
94
-	 * @param array Course extra fields
95
-	 * @return mixed Generated id if creation was successful, WSError otherwise
96
-	 */
97
-	protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
98
-		// Add the original course id field name and value to the extra fields if needed
99
-		$extras_associative = array();
100
-		if($course_id_field_name != "chamilo_course_id") {
101
-			$extras_associative[$course_id_field_name] = $course_id_value;
102
-		}
103
-		foreach($extras as $extra) {
104
-			$extras_associative[$extra['field_name']] = $extra['field_value'];
105
-		}
106
-		$course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
107
-		if($course_admin_id instanceof WSError) {
108
-			return $course_admin_id;
109
-		}
110
-		if($wanted_code == '') {
111
-			$wanted_code = CourseManager::generate_course_code($title);
112
-		}
113
-		$result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
114
-		if (!$result) {
115
-			return new WSError(202, 'There was an error creating the course');
116
-		} else {
117
-			// Update extra fields
118
-			foreach($extras_associative as $fname => $fvalue) {
119
-				CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
120
-			}
121
-			// Get course id
122
-			$course_info = CourseManager::get_course_information($result);
123
-			return $course_info['real_id'];
124
-		}
125
-	}
82
+    /**
83
+     * Creates a course (helper method)
84
+     *
85
+     * @param string Title
86
+     * @param string Category code
87
+     * @param string Wanted code. If it's not defined, it will be generated automatically
88
+     * @param string Tutor name
89
+     * @param string Course admin user id field name
90
+     * @param string Course admin user id value
91
+     * @param string Course language
92
+     * @param string Course id field name
93
+     * @param string Course id value
94
+     * @param array Course extra fields
95
+     * @return mixed Generated id if creation was successful, WSError otherwise
96
+     */
97
+    protected function createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
98
+        // Add the original course id field name and value to the extra fields if needed
99
+        $extras_associative = array();
100
+        if($course_id_field_name != "chamilo_course_id") {
101
+            $extras_associative[$course_id_field_name] = $course_id_value;
102
+        }
103
+        foreach($extras as $extra) {
104
+            $extras_associative[$extra['field_name']] = $extra['field_value'];
105
+        }
106
+        $course_admin_id = $this->getUserId($course_admin_user_id_field_name, $course_admin_user_id_value);
107
+        if($course_admin_id instanceof WSError) {
108
+            return $course_admin_id;
109
+        }
110
+        if($wanted_code == '') {
111
+            $wanted_code = CourseManager::generate_course_code($title);
112
+        }
113
+        $result = create_course($wanted_code, $title, $tutor_name, $category_code, $language, $course_admin_id, $this->_configuration['db_prefix'], 0);
114
+        if (!$result) {
115
+            return new WSError(202, 'There was an error creating the course');
116
+        } else {
117
+            // Update extra fields
118
+            foreach($extras_associative as $fname => $fvalue) {
119
+                CourseManager::update_course_extra_field_value($result, $fname, $fvalue);
120
+            }
121
+            // Get course id
122
+            $course_info = CourseManager::get_course_information($result);
123
+            return $course_info['real_id'];
124
+        }
125
+    }
126 126
 
127
-	/**
128
-	 * Creates a course
129
-	 *
130
-	 * @param string API secret key
131
-	 * @param string Title
132
-	 * @param string Category code
133
-	 * @param string Wanted code. If it's not defined, it will be generated automatically
134
-	 * @param string Tutor name
135
-	 * @param string Course admin user id field name
136
-	 * @param string Course admin user id value
137
-	 * @param string Course language
138
-	 * @param string Course id field name
139
-	 * @param string Course id value
140
-	 * @param array Course extra fields
141
-	 * @return int Course id generated
142
-	 */
143
-	public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
144
-		// First, verify the secret key
145
-		$verifKey = $this->verifyKey($secret_key);
146
-		if($verifKey instanceof WSError) {
147
-			$this->handleError($verifKey);
148
-		} else {
149
-			$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
150
-			if($result instanceof WSError) {
151
-				$this->handleError($result);
152
-			} else {
153
-				return $result;
154
-			}
155
-		}
156
-	}
127
+    /**
128
+     * Creates a course
129
+     *
130
+     * @param string API secret key
131
+     * @param string Title
132
+     * @param string Category code
133
+     * @param string Wanted code. If it's not defined, it will be generated automatically
134
+     * @param string Tutor name
135
+     * @param string Course admin user id field name
136
+     * @param string Course admin user id value
137
+     * @param string Course language
138
+     * @param string Course id field name
139
+     * @param string Course id value
140
+     * @param array Course extra fields
141
+     * @return int Course id generated
142
+     */
143
+    public function CreateCourse($secret_key, $title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras) {
144
+        // First, verify the secret key
145
+        $verifKey = $this->verifyKey($secret_key);
146
+        if($verifKey instanceof WSError) {
147
+            $this->handleError($verifKey);
148
+        } else {
149
+            $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
150
+            if($result instanceof WSError) {
151
+                $this->handleError($result);
152
+            } else {
153
+                return $result;
154
+            }
155
+        }
156
+    }
157 157
 
158
-	/**
159
-	 * Create multiple courses
160
-	 *
161
-	 * @param string API secret key
162
-	 * @param array Courses to be created, with elements following the structure presented in CreateCourse
163
-	 * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
164
-	 */
165
-	public function CreateCourses($secret_key, $courses) {
166
-		// First, verify the secret key
167
-		$verifKey = $this->verifyKey($secret_key);
168
-		if($verifKey instanceof WSError) {
169
-			$this->handleError($verifKey);
170
-		} else {
171
-			$results = array();
172
-			foreach($courses as $course) {
173
-				$result_tmp = array();
158
+    /**
159
+     * Create multiple courses
160
+     *
161
+     * @param string API secret key
162
+     * @param array Courses to be created, with elements following the structure presented in CreateCourse
163
+     * @return array Array with elements of the form array('course_id_value' => 'original value sent', 'course_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
164
+     */
165
+    public function CreateCourses($secret_key, $courses) {
166
+        // First, verify the secret key
167
+        $verifKey = $this->verifyKey($secret_key);
168
+        if($verifKey instanceof WSError) {
169
+            $this->handleError($verifKey);
170
+        } else {
171
+            $results = array();
172
+            foreach($courses as $course) {
173
+                $result_tmp = array();
174 174
                 // re-initialize variables just in case
175 175
                 $title = $category_code = $wanted_code = $tutor_name = $course_admin_user_id_field_name = $course_admin_user_id_value = $language = $course_id_field_name = $course_id_value = $extras = 0;
176
-				extract($course);
177
-				$result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
178
-				if($result instanceof WSError) {
179
-					$result_tmp['result'] = $result->toArray();
180
-					$result_tmp['course_id_value'] = $course_id_value;
181
-					$result_tmp['course_id_generated'] = 0;
182
-				} else {
183
-					$result_tmp['result'] = $this->getSuccessfulResult();
184
-					$result_tmp['course_id_value'] = $course_id_value;
185
-					$result_tmp['course_id_generated'] = $result;
186
-				}
187
-				$results[] = $result_tmp;
188
-			}
189
-			return $results;
190
-		}
191
-	}
176
+                extract($course);
177
+                $result = $this->createCourseHelper($title, $category_code, $wanted_code, $tutor_name, $course_admin_user_id_field_name, $course_admin_user_id_value, $language, $course_id_field_name, $course_id_value, $extras);
178
+                if($result instanceof WSError) {
179
+                    $result_tmp['result'] = $result->toArray();
180
+                    $result_tmp['course_id_value'] = $course_id_value;
181
+                    $result_tmp['course_id_generated'] = 0;
182
+                } else {
183
+                    $result_tmp['result'] = $this->getSuccessfulResult();
184
+                    $result_tmp['course_id_value'] = $course_id_value;
185
+                    $result_tmp['course_id_generated'] = $result;
186
+                }
187
+                $results[] = $result_tmp;
188
+            }
189
+            return $results;
190
+        }
191
+    }
192 192
 
193
-	/**
194
-	 * Edits a course (helper method)
195
-	 *
196
-	 * @param string Course id field name
197
-	 * @param string Course id value
198
-	 * @param string Title
199
-	 * @param string Category code
200
-	 * @param string Department name
201
-	 * @param string Department url
202
-	 * @param string Course language
203
-	 * @param int Visibility
204
-	 * @param int Subscribe (0 = denied, 1 = allowed)
205
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
206
-	 * @param string Visual code
207
-	 * @param array Course extra fields
208
-	 * @return mixed True in case of success, WSError otherwise
209
-	 */
210
-	protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
211
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
212
-		if($course_id instanceof WSError) {
213
-			return $course_id;
214
-		} else {
215
-			$attributes = array();
216
-			if(!is_empty($title)) {
217
-				$attributes['title'] = $title;
218
-			}
219
-			if(!is_empty($category_code)) {
220
-				$attributes['category_code'] = $category_code;
221
-			}
222
-			if(!is_empty($department_name)) {
223
-				$attributes['department_name'] = $department_name;
224
-			}
225
-			if(!is_empty($department_url)) {
226
-				$attributes['department_url'] = $department_url;
227
-			}
228
-			if(!is_empty($language)) {
229
-				$attributes['course_language'] = $language;
230
-			}
231
-			if($visibility != '') {
232
-				$attributes['visibility'] = (int)$visibility;
233
-			}
234
-			if($subscribe != '') {
235
-				$attributes['subscribe'] = (int)$subscribe;
236
-			}
237
-			if($unsubscribe != '') {
238
-				$attributes['unsubscribe'] = (int)$unsubscribe;
239
-			}
240
-			if(!is_empty($visual_code)) {
241
-				$attributes['visual_code'] = $visual_code;
242
-			}
243
-			if(!is_empty($attributes)) {
244
-				CourseManager::update_attributes($course_id, $attributes);
245
-			}
246
-			if(!empty($extras)) {
247
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
248
-				$extras_associative = array();
249
-				foreach($extras as $extra) {
250
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
251
-				}
252
-				foreach($extras_associative as $fname => $fvalue) {
253
-					CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
254
-				}
255
-			}
256
-			return true;
257
-		}
258
-	}
193
+    /**
194
+     * Edits a course (helper method)
195
+     *
196
+     * @param string Course id field name
197
+     * @param string Course id value
198
+     * @param string Title
199
+     * @param string Category code
200
+     * @param string Department name
201
+     * @param string Department url
202
+     * @param string Course language
203
+     * @param int Visibility
204
+     * @param int Subscribe (0 = denied, 1 = allowed)
205
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
206
+     * @param string Visual code
207
+     * @param array Course extra fields
208
+     * @return mixed True in case of success, WSError otherwise
209
+     */
210
+    protected function editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
211
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
212
+        if($course_id instanceof WSError) {
213
+            return $course_id;
214
+        } else {
215
+            $attributes = array();
216
+            if(!is_empty($title)) {
217
+                $attributes['title'] = $title;
218
+            }
219
+            if(!is_empty($category_code)) {
220
+                $attributes['category_code'] = $category_code;
221
+            }
222
+            if(!is_empty($department_name)) {
223
+                $attributes['department_name'] = $department_name;
224
+            }
225
+            if(!is_empty($department_url)) {
226
+                $attributes['department_url'] = $department_url;
227
+            }
228
+            if(!is_empty($language)) {
229
+                $attributes['course_language'] = $language;
230
+            }
231
+            if($visibility != '') {
232
+                $attributes['visibility'] = (int)$visibility;
233
+            }
234
+            if($subscribe != '') {
235
+                $attributes['subscribe'] = (int)$subscribe;
236
+            }
237
+            if($unsubscribe != '') {
238
+                $attributes['unsubscribe'] = (int)$unsubscribe;
239
+            }
240
+            if(!is_empty($visual_code)) {
241
+                $attributes['visual_code'] = $visual_code;
242
+            }
243
+            if(!is_empty($attributes)) {
244
+                CourseManager::update_attributes($course_id, $attributes);
245
+            }
246
+            if(!empty($extras)) {
247
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
248
+                $extras_associative = array();
249
+                foreach($extras as $extra) {
250
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
251
+                }
252
+                foreach($extras_associative as $fname => $fvalue) {
253
+                    CourseManager::update_extra_field_value($course_code, $fname, $fvalue);
254
+                }
255
+            }
256
+            return true;
257
+        }
258
+    }
259 259
 
260
-	/**
261
-	 * Edits a course
262
-	 *
263
-	 * @param string API secret key
264
-	 * @param string Course id field name
265
-	 * @param string Course id value
266
-	 * @param string Title
267
-	 * @param string Category code
268
-	 * @param string Department name
269
-	 * @param string Department url
270
-	 * @param string Course language
271
-	 * @param int Visibility
272
-	 * @param int Subscribe (0 = denied, 1 = allowed)
273
-	 * @param int Unsubscribe (0 = denied, 1 = allowed)
274
-	 * @param string Visual code
275
-	 * @param array Course extra fields
276
-	 */
277
-	public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
278
-		$verifKey = $this->verifyKey($secret_key);
279
-		if($verifKey instanceof WSError) {
280
-			$this->handleError($verifKey);
281
-		} else {
282
-			$result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
283
-			if($result instanceof WSError) {
284
-				$this->handleError($result);
285
-			}
286
-		}
287
-	}
260
+    /**
261
+     * Edits a course
262
+     *
263
+     * @param string API secret key
264
+     * @param string Course id field name
265
+     * @param string Course id value
266
+     * @param string Title
267
+     * @param string Category code
268
+     * @param string Department name
269
+     * @param string Department url
270
+     * @param string Course language
271
+     * @param int Visibility
272
+     * @param int Subscribe (0 = denied, 1 = allowed)
273
+     * @param int Unsubscribe (0 = denied, 1 = allowed)
274
+     * @param string Visual code
275
+     * @param array Course extra fields
276
+     */
277
+    public function EditCourse($secret_key, $course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras) {
278
+        $verifKey = $this->verifyKey($secret_key);
279
+        if($verifKey instanceof WSError) {
280
+            $this->handleError($verifKey);
281
+        } else {
282
+            $result = $this->editCourseHelper($course_id_field_name, $course_id_value, $title, $category_code, $department_name, $department_url, $language, $visibility, $subscribe, $unsubscribe, $visual_code, $extras);
283
+            if($result instanceof WSError) {
284
+                $this->handleError($result);
285
+            }
286
+        }
287
+    }
288 288
 
289
-	/**
290
-	 * List courses
291
-	 *
292
-	 * @param string API secret key
293
-	 * @param string A list of visibility filter we want to apply
294
-	 * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
295
-	 * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
296
-	 */
297
-	public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
298
-		$verifKey = $this->verifyKey($secret_key);
299
-		if($verifKey instanceof WSError) {
300
-			$this->handleError($verifKey);
301
-		} else {
289
+    /**
290
+     * List courses
291
+     *
292
+     * @param string API secret key
293
+     * @param string A list of visibility filter we want to apply
294
+     * @return array An array with elements of the form ('id' => 'Course internal id', 'code' => 'Course code', 'title' => 'Course title', 'language' => 'Course language', 'visibility' => 'Course visibility',
295
+     * 'category_name' => 'Name of the category of the course', 'number_students' => 'Number of students in the course', 'external_course_id' => 'External course id')
296
+     */
297
+    public function ListCourses($secret_key, $visibility = 'public,public-registered,private,closed') {
298
+        $verifKey = $this->verifyKey($secret_key);
299
+        if($verifKey instanceof WSError) {
300
+            $this->handleError($verifKey);
301
+        } else {
302 302
             $visibilities = split(',',$visibility);
303 303
             $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
304 304
             foreach ($visibilities as $p => $visibility) {
305 305
                 $visibilities[$p] = $vis[$visibility];
306 306
             }
307
-			$courses_result = array();
308
-			$category_names = array();
307
+            $courses_result = array();
308
+            $category_names = array();
309 309
 
310
-			$courses = CourseManager::get_courses_list();
311
-			foreach($courses as $course) {
310
+            $courses = CourseManager::get_courses_list();
311
+            foreach($courses as $course) {
312 312
                 //skip elements that do not match required visibility
313 313
                 if (!in_array($course['visibility'],$visibilities)) { continue; }
314
-				$course_tmp = array();
315
-				$course_tmp['id'] = $course['id'];
316
-				$course_tmp['code'] = $course['code'];
317
-				$course_tmp['title'] = $course['title'];
318
-				$course_tmp['language'] = $course['course_language'];
319
-				$course_tmp['visibility'] = $course['visibility'];
314
+                $course_tmp = array();
315
+                $course_tmp['id'] = $course['id'];
316
+                $course_tmp['code'] = $course['code'];
317
+                $course_tmp['title'] = $course['title'];
318
+                $course_tmp['language'] = $course['course_language'];
319
+                $course_tmp['visibility'] = $course['visibility'];
320 320
 
321
-				// Determining category name
322
-				if($category_names[$course['category_code']]) {
323
-					$course_tmp['category_name'] = $category_names[$course['category_code']];
324
-				} else {
325
-					$category = CourseManager::get_course_category($course['category_code']);
326
-					$category_names[$course['category_code']] = $category['name'];
327
-					$course_tmp['category_name'] = $category['name'];
328
-				}
321
+                // Determining category name
322
+                if($category_names[$course['category_code']]) {
323
+                    $course_tmp['category_name'] = $category_names[$course['category_code']];
324
+                } else {
325
+                    $category = CourseManager::get_course_category($course['category_code']);
326
+                    $category_names[$course['category_code']] = $category['name'];
327
+                    $course_tmp['category_name'] = $category['name'];
328
+                }
329 329
 
330
-				// Determining number of students registered in course
331
-				$user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
332
-				$course_tmp['number_students'] = count($user_list);
330
+                // Determining number of students registered in course
331
+                $user_list = CourseManager::get_user_list_from_course_code($course['code'], 0);
332
+                $course_tmp['number_students'] = count($user_list);
333 333
 
334
-				// Determining external course id - this code misses the external course id field name
335
-				// $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
334
+                // Determining external course id - this code misses the external course id field name
335
+                // $course_tmp['external_course_id'] = CourseManager::get_course_extra_field_value($course_field_name, $course['code']);
336 336
 
337 337
 
338
-				$courses_result[] = $course_tmp;
339
-			}
338
+                $courses_result[] = $course_tmp;
339
+            }
340 340
 
341
-			return $courses_result;
342
-		}
343
-	}
341
+            return $courses_result;
342
+        }
343
+    }
344 344
 
345
-	/**
346
-	 * Subscribe or unsubscribe user to a course (helper method)
347
-	 *
348
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
349
-	 * @param string Course id value.
350
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
351
-	 * @param string User id value
352
-	 * @param int Set to 1 to subscribe, 0 to unsubscribe
353
-	 * @param int Status (STUDENT or TEACHER) Used for subscription only
354
-	 * @return mixed True if subscription or unsubscription was successful, false otherwise
355
-	 */
356
-	protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
357
-		$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
358
-		if($course_id instanceof WSError) {
359
-			return $course_id;
360
-		} else {
361
-			$user_id = $this->getUserId($user_id_field_name, $user_id_value);
362
-			if($user_id instanceof WSError) {
363
-				return $user_id;
364
-			} else {
365
-				$course_code = CourseManager::get_course_code_from_course_id($course_id);
366
-				if($state == 0) {
367
-					// Unsubscribe user
368
-					CourseManager::unsubscribe_user($user_id, $course_code);
369
-					return true;
370
-				} else {
371
-					// Subscribe user
372
-					if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
373
-						return true;
374
-					} else {
375
-						return new WSError(203, 'An error occured subscribing to this course');
376
-					}
377
-				}
378
-			}
379
-		}
380
-	}
345
+    /**
346
+     * Subscribe or unsubscribe user to a course (helper method)
347
+     *
348
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
349
+     * @param string Course id value.
350
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
351
+     * @param string User id value
352
+     * @param int Set to 1 to subscribe, 0 to unsubscribe
353
+     * @param int Status (STUDENT or TEACHER) Used for subscription only
354
+     * @return mixed True if subscription or unsubscription was successful, false otherwise
355
+     */
356
+    protected function changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $state, $status = STUDENT) {
357
+        $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
358
+        if($course_id instanceof WSError) {
359
+            return $course_id;
360
+        } else {
361
+            $user_id = $this->getUserId($user_id_field_name, $user_id_value);
362
+            if($user_id instanceof WSError) {
363
+                return $user_id;
364
+            } else {
365
+                $course_code = CourseManager::get_course_code_from_course_id($course_id);
366
+                if($state == 0) {
367
+                    // Unsubscribe user
368
+                    CourseManager::unsubscribe_user($user_id, $course_code);
369
+                    return true;
370
+                } else {
371
+                    // Subscribe user
372
+                    if(CourseManager::subscribe_user($user_id, $course_code, $status)) {
373
+                        return true;
374
+                    } else {
375
+                        return new WSError(203, 'An error occured subscribing to this course');
376
+                    }
377
+                }
378
+            }
379
+        }
380
+    }
381 381
 
382
-	/**
383
-	 * Subscribe user to a course
384
-	 *
385
-	 * @param string API secret key
386
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
387
-	 * @param string Course id value.
388
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
389
-	 * @param string User id value
390
-	 * @param int Status (1 = Teacher, 5 = Student)
391
-	 */
392
-	public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
393
-		$verifKey = $this->verifyKey($secret_key);
394
-		if($verifKey instanceof WSError) {
395
-			$this->handleError($verifKey);
396
-		} else {
397
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
398
-			if($result instanceof WSError) {
399
-				$this->handleError($result);
400
-			}
401
-		}
402
-	}
382
+    /**
383
+     * Subscribe user to a course
384
+     *
385
+     * @param string API secret key
386
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
387
+     * @param string Course id value.
388
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
389
+     * @param string User id value
390
+     * @param int Status (1 = Teacher, 5 = Student)
391
+     */
392
+    public function SubscribeUserToCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, $status) {
393
+        $verifKey = $this->verifyKey($secret_key);
394
+        if($verifKey instanceof WSError) {
395
+            $this->handleError($verifKey);
396
+        } else {
397
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 1, $status);
398
+            if($result instanceof WSError) {
399
+                $this->handleError($result);
400
+            }
401
+        }
402
+    }
403 403
 
404
-	/**
405
-	 * Unsusbscribe user from course
406
-	 *
407
-	 * @param string API secret key
408
-	 * @param string Course id field name. Use "chamilo_course_id" to use internal id
409
-	 * @param string Course id value.
410
-	 * @param string User id field name. Use "chamilo_user_id" to use internal id
411
-	 * @param string User id value
412
-	 */
413
-	public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
414
-		$verifKey = $this->verifyKey($secret_key);
415
-		if($verifKey instanceof WSError) {
416
-			$this->handleError($verifKey);
417
-		} else {
418
-			$result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
419
-			if($result instanceof WSError) {
420
-				$this->handleError($result);
421
-			}
422
-		}
423
-	}
404
+    /**
405
+     * Unsusbscribe user from course
406
+     *
407
+     * @param string API secret key
408
+     * @param string Course id field name. Use "chamilo_course_id" to use internal id
409
+     * @param string Course id value.
410
+     * @param string User id field name. Use "chamilo_user_id" to use internal id
411
+     * @param string User id value
412
+     */
413
+    public function UnsubscribeUserFromCourse($secret_key, $course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value) {
414
+        $verifKey = $this->verifyKey($secret_key);
415
+        if($verifKey instanceof WSError) {
416
+            $this->handleError($verifKey);
417
+        } else {
418
+            $result = $this->changeUserSubscription($course_id_field_name, $course_id_value, $user_id_field_name, $user_id_value, 0);
419
+            if($result instanceof WSError) {
420
+                $this->handleError($result);
421
+            }
422
+        }
423
+    }
424 424
 
425
-	/**
426
-	 * Returns the descriptions of a course, along with their id
427
-	 *
428
-	 * @param string API secret key
429
-	 * @param string Course id field name
430
-	 * @param string Course id value
431
-	 * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
432
-	 */
433
-	public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
434
-		$verifKey = $this->verifyKey($secret_key);
435
-		if($verifKey instanceof WSError) {
436
-			$this->handleError($verifKey);
437
-		} else {
438
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
439
-			if($course_id instanceof WSError) {
440
-				return $course_id;
441
-			} else {
442
-				// Course exists, get its descriptions
443
-				$descriptions = CourseDescription::get_descriptions($course_id);
444
-				$results = array();
445
-				foreach($descriptions as $description) {
446
-					$results[] = array('course_desc_id' => $description->get_description_type(),
447
-										'course_desc_title' => $description->get_title(),
448
-										'course_desc_content' => $description->get_content());
449
-				}
450
-				return $results;
451
-			}
452
-		}
453
-	}
425
+    /**
426
+     * Returns the descriptions of a course, along with their id
427
+     *
428
+     * @param string API secret key
429
+     * @param string Course id field name
430
+     * @param string Course id value
431
+     * @return array Returns an array with elements of the form ('course_desc_id' => 1, 'course_desc_title' => 'Title', 'course_desc_content' => 'Content')
432
+     */
433
+    public function GetCourseDescriptions($secret_key, $course_id_field_name, $course_id_value) {
434
+        $verifKey = $this->verifyKey($secret_key);
435
+        if($verifKey instanceof WSError) {
436
+            $this->handleError($verifKey);
437
+        } else {
438
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
439
+            if($course_id instanceof WSError) {
440
+                return $course_id;
441
+            } else {
442
+                // Course exists, get its descriptions
443
+                $descriptions = CourseDescription::get_descriptions($course_id);
444
+                $results = array();
445
+                foreach($descriptions as $description) {
446
+                    $results[] = array('course_desc_id' => $description->get_description_type(),
447
+                                        'course_desc_title' => $description->get_title(),
448
+                                        'course_desc_content' => $description->get_content());
449
+                }
450
+                return $results;
451
+            }
452
+        }
453
+    }
454 454
 
455 455
 
456
-	/**
457
-	 * Edit course description
458
-	 *
459
-	 * @param string API secret key
460
-	 * @param string Course id field name
461
-	 * @param string Course id value
462
-	 * @param int Category id from course description
463
-	 * @param string Description title
464
-	 * @param string Course description content
465
-	 */
466
-	public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
467
-		$verifKey = $this->verifyKey($secret_key);
468
-		if($verifKey instanceof WSError) {
469
-			$this->handleError($verifKey);
470
-		} else {
471
-			$course_id = $this->getCourseId($course_id_field_name, $course_id_value);
472
-			if($course_id instanceof WSError) {
473
-				return $course_id;
474
-			} else {
475
-				// Create the new course description
476
-				$cd = new CourseDescription();
477
-				$cd->set_description_type($course_desc_id);
478
-				$cd->set_title($course_desc_title);
479
-				$cd->set_content($course_desc_content);
480
-				$cd->set_session_id(0);
481
-				// Get course info
482
-				$course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
456
+    /**
457
+     * Edit course description
458
+     *
459
+     * @param string API secret key
460
+     * @param string Course id field name
461
+     * @param string Course id value
462
+     * @param int Category id from course description
463
+     * @param string Description title
464
+     * @param string Course description content
465
+     */
466
+    public function EditCourseDescription($secret_key, $course_id_field_name, $course_id_value, $course_desc_id, $course_desc_title, $course_desc_content) {
467
+        $verifKey = $this->verifyKey($secret_key);
468
+        if($verifKey instanceof WSError) {
469
+            $this->handleError($verifKey);
470
+        } else {
471
+            $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
472
+            if($course_id instanceof WSError) {
473
+                return $course_id;
474
+            } else {
475
+                // Create the new course description
476
+                $cd = new CourseDescription();
477
+                $cd->set_description_type($course_desc_id);
478
+                $cd->set_title($course_desc_title);
479
+                $cd->set_content($course_desc_content);
480
+                $cd->set_session_id(0);
481
+                // Get course info
482
+                $course_info = CourseManager::get_course_information(CourseManager::get_course_code_from_course_id($course_id));
483 483
                 $cd->set_course_id($course_info['real_id']);
484
-				// Check if this course description exists
485
-				$descriptions = CourseDescription::get_descriptions($course_id);
486
-				$exists = false;
487
-				foreach($descriptions as $description) {
488
-					if($description->get_description_type() == $course_desc_id) {
489
-						$exists = true;
490
-					}
491
-				}
492
-				if (!$exists) {
493
-					$cd->set_progress(0);
494
-					$cd->insert();
495
-				} else {
496
-					$cd->update();
497
-				}
498
-			}
499
-		}
500
-	}
484
+                // Check if this course description exists
485
+                $descriptions = CourseDescription::get_descriptions($course_id);
486
+                $exists = false;
487
+                foreach($descriptions as $description) {
488
+                    if($description->get_description_type() == $course_desc_id) {
489
+                        $exists = true;
490
+                    }
491
+                }
492
+                if (!$exists) {
493
+                    $cd->set_progress(0);
494
+                    $cd->insert();
495
+                } else {
496
+                    $cd->update();
497
+                }
498
+            }
499
+        }
500
+    }
501 501
 }
Please login to merge, or discard this patch.
main/webservices/testip.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  */
6 6
 $ip = trim($_SERVER['REMOTE_ADDR']);
7 7
 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
8
-  list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
9
-  $ip = trim($ip1);
8
+    list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
9
+    $ip = trim($ip1);
10 10
 }
11 11
 echo htmlentities($ip);
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  */
6 6
 $ip = trim($_SERVER['REMOTE_ADDR']);
7 7
 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
8
-  list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
8
+  list($ip1, $ip2) = preg_split('/,/', $_SERVER['HTTP_X_FORWARDED_FOR']);
9 9
   $ip = trim($ip1);
10 10
 }
11 11
 echo htmlentities($ip);
Please login to merge, or discard this patch.
main/webservices/webservice_report.php 2 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -11,32 +11,32 @@  discard block
 block discarded – undo
11 11
  */
12 12
 class WSReport extends WS {
13 13
 
14
-	/**
15
-	 * Gets the time spent on the platform by a given user
16
-	 *
17
-	 * @param string User id field name
18
-	 * @param string User id value
14
+    /**
15
+     * Gets the time spent on the platform by a given user
16
+     *
17
+     * @param string User id field name
18
+     * @param string User id value
19 19
      * @return array Array of results
20
-	 */
21
-	public function GetTimeSpentOnPlatform($user_id_field_name, $user_id_value) {
22
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
23
-		if($user_id instanceof WSError) {
24
-			return $user_id;
25
-		} else {
20
+     */
21
+    public function GetTimeSpentOnPlatform($user_id_field_name, $user_id_value) {
22
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
23
+        if($user_id instanceof WSError) {
24
+            return $user_id;
25
+        } else {
26 26
             return Tracking::get_time_spent_on_the_platform($user_id);
27
-		}
28
-	}
27
+        }
28
+    }
29 29
 
30
-	/**
30
+    /**
31 31
      * Gets the time spent in a course by a given user
32
-	 *
32
+     *
33 33
      * @param string User id field name
34 34
      * @param string User id value
35 35
      * @param string Course id field name
36 36
      * @param string Course id value
37
-	 * @return array Array of results
38
-	 */
39
-	public function GetTimeSpentOnCourse($user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value) {
37
+     * @return array Array of results
38
+     */
39
+    public function GetTimeSpentOnCourse($user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value) {
40 40
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
41 41
         if($user_id instanceof WSError) {
42 42
             return $user_id;
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
49 49
         }
50 50
         return Tracking::get_time_spent_on_the_course($user_id, $course_id);
51
-	}
51
+    }
52 52
 
53 53
     /**
54 54
      * Gets the time spent in a course by a given user
@@ -128,8 +128,8 @@  discard block
 block discarded – undo
128 128
         }
129 129
         $lp = new learnpath($course_code, $learnpath_id, $user_id);
130 130
         $return = array(
131
-          'progress_bar_mode' => $lp->progress_bar_mode,
132
-          'progress_db' => $lp->progress_db,
131
+            'progress_bar_mode' => $lp->progress_bar_mode,
132
+            'progress_db' => $lp->progress_db,
133 133
         );
134 134
         return $return;
135 135
     }
@@ -191,10 +191,10 @@  discard block
 block discarded – undo
191 191
 
192 192
         $lp = new learnpath($course_code, $learnpath_id, $user_id);
193 193
         $return = array(
194
-          'min_score' => $lp->items[$learnpath_item_id]->min_score,
195
-          'max_score' => $lp->items[$learnpath_item_id]->max_score,
196
-          'mastery_score' => $lp->items[$learnpath_item_id]->mastery_score,
197
-          'current_score' => $lp->items[$learnpath_item_id]->current_score,
194
+            'min_score' => $lp->items[$learnpath_item_id]->min_score,
195
+            'max_score' => $lp->items[$learnpath_item_id]->max_score,
196
+            'mastery_score' => $lp->items[$learnpath_item_id]->mastery_score,
197
+            'current_score' => $lp->items[$learnpath_item_id]->current_score,
198 198
         );
199 199
         return $return;
200 200
     }
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 	 */
21 21
 	public function GetTimeSpentOnPlatform($user_id_field_name, $user_id_value) {
22 22
 		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
23
-		if($user_id instanceof WSError) {
23
+		if ($user_id instanceof WSError) {
24 24
 			return $user_id;
25 25
 		} else {
26 26
             return Tracking::get_time_spent_on_the_platform($user_id);
@@ -38,11 +38,11 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	public function GetTimeSpentOnCourse($user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value) {
40 40
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
41
-        if($user_id instanceof WSError) {
41
+        if ($user_id instanceof WSError) {
42 42
             return $user_id;
43 43
         }
44 44
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
45
-        if($course_id instanceof WSError) {
45
+        if ($course_id instanceof WSError) {
46 46
             return $course_id;
47 47
         } else {
48 48
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -61,17 +61,17 @@  discard block
 block discarded – undo
61 61
      */
62 62
     public function GetTimeSpentOnCourseInSession($user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $session_id_field_name, $session_id_value) {
63 63
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
64
-        if($user_id instanceof WSError) {
64
+        if ($user_id instanceof WSError) {
65 65
             return $user_id;
66 66
         }
67 67
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
68
-        if($course_id instanceof WSError) {
68
+        if ($course_id instanceof WSError) {
69 69
             return $course_id;
70 70
         } else {
71 71
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
72 72
         }
73 73
         $session_id = $this->getSessionId($session_id_field_name, $session_id_value);
74
-        if($session_id instanceof WSError) {
74
+        if ($session_id instanceof WSError) {
75 75
             return $session_id;
76 76
         }
77 77
         return Tracking::get_time_spent_on_the_course($user_id, $course_id, $session_id);
@@ -87,17 +87,17 @@  discard block
 block discarded – undo
87 87
      */
88 88
     public function GetLearnpathsByCourse($secret_key, $user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value) {
89 89
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
90
-        if($user_id instanceof WSError) {
90
+        if ($user_id instanceof WSError) {
91 91
             return $user_id;
92 92
         }
93 93
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
94
-        if($course_id instanceof WSError) {
94
+        if ($course_id instanceof WSError) {
95 95
             return $course_id;
96 96
         } else {
97 97
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
98 98
         }
99 99
 
100
-        $lp = new LearnpathList($user_id,$course_code);
100
+        $lp = new LearnpathList($user_id, $course_code);
101 101
         $list = $lp->list;
102 102
         $return = array();
103 103
         foreach ($list as $id => $item) {
@@ -117,11 +117,11 @@  discard block
 block discarded – undo
117 117
      */
118 118
     public function GetLearnpathProgress($secret_key, $user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $learnpath_id) {
119 119
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
120
-        if($user_id instanceof WSError) {
120
+        if ($user_id instanceof WSError) {
121 121
             return $user_id;
122 122
         }
123 123
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
124
-        if($course_id instanceof WSError) {
124
+        if ($course_id instanceof WSError) {
125 125
             return $course_id;
126 126
         } else {
127 127
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -150,11 +150,11 @@  discard block
 block discarded – undo
150 150
      */
151 151
     public function GetLearnpathHighestLessonLocation($secret_key, $user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $learnpath_id) {
152 152
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
153
-        if($user_id instanceof WSError) {
153
+        if ($user_id instanceof WSError) {
154 154
             return $user_id;
155 155
         }
156 156
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
157
-        if($course_id instanceof WSError) {
157
+        if ($course_id instanceof WSError) {
158 158
             return $course_id;
159 159
         } else {
160 160
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -179,11 +179,11 @@  discard block
 block discarded – undo
179 179
      */
180 180
     public function GetLearnpathScoreSingleItem($secret_key, $user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $learnpath_id, $learnpath_item_id) {
181 181
         $user_id = $this->getUserId($user_id_field_name, $user_id_value);
182
-        if($user_id instanceof WSError) {
182
+        if ($user_id instanceof WSError) {
183 183
             return $user_id;
184 184
         }
185 185
         $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
186
-        if($course_id instanceof WSError) {
186
+        if ($course_id instanceof WSError) {
187 187
             return $course_id;
188 188
         } else {
189 189
             $course_code = CourseManager::get_course_code_from_course_id($course_id);
@@ -213,15 +213,15 @@  discard block
 block discarded – undo
213 213
      */
214 214
     public function GetLearnpathStatusSingleItem($secret_key, $user_id_field_name, $user_id_value, $course_id_field_name, $course_id_value, $learnpath_id, $learnpath_item_id) {
215 215
         $verifKey = $this->verifyKey($secret_key);
216
-        if($verifKey instanceof WSError) {
216
+        if ($verifKey instanceof WSError) {
217 217
             $this->handleError($verifKey);
218 218
         } else {
219 219
             $user_id = $this->getUserId($user_id_field_name, $user_id_value);
220
-            if($user_id instanceof WSError) {
220
+            if ($user_id instanceof WSError) {
221 221
                 return $user_id;
222 222
             }
223 223
             $course_id = $this->getCourseId($course_id_field_name, $course_id_value);
224
-            if($course_id instanceof WSError) {
224
+            if ($course_id instanceof WSError) {
225 225
                 return $course_id;
226 226
             } else {
227 227
                 $course_code = CourseManager::get_course_code_from_course_id($course_id);
Please login to merge, or discard this patch.
main/webservices/access_url.php 3 patches
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
     }
76 76
 
77 77
     if ($debug) {
78
-        error_log("checkip " . intval($check_ip));
78
+        error_log("checkip ".intval($check_ip));
79 79
     }
80 80
 
81 81
     if ($check_ip) {
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
     '',
132 132
     'SOAP-ENC:Array',
133 133
     array(),
134
-    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:portalItem[]')),'tns:portalItem'
134
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:portalItem[]')), 'tns:portalItem'
135 135
 );
136 136
 
137 137
 $server->wsdl->addComplexType(
@@ -146,13 +146,13 @@  discard block
 block discarded – undo
146 146
 );
147 147
 
148 148
 // Register the method to expose
149
-$server->register('WSGetPortals',                   // method name
150
-    array('getPortals' => 'tns:getPortals'),    // input parameters
151
-    array('return' => 'tns:portalList'),                    // output parameters
152
-    'urn:WSAccessUrl',                               // namespace
153
-    'urn:WSAccessUrl#WSGetPortals',              // soapaction
154
-    'rpc',                                              // style
155
-    'encoded',                                          // use
149
+$server->register('WSGetPortals', // method name
150
+    array('getPortals' => 'tns:getPortals'), // input parameters
151
+    array('return' => 'tns:portalList'), // output parameters
152
+    'urn:WSAccessUrl', // namespace
153
+    'urn:WSAccessUrl#WSGetPortals', // soapaction
154
+    'rpc', // style
155
+    'encoded', // use
156 156
     'This service adds a user to portal'               // documentation
157 157
 );
158 158
 
@@ -193,13 +193,13 @@  discard block
 block discarded – undo
193 193
 );
194 194
 
195 195
 // Register the method to expose
196
-$server->register('WSAddUserToPortal',                   // method name
197
-    array('addUserToPortal' => 'tns:AddUserToPortal'),    // input parameters
198
-    array('return' => 'xsd:string'),                    // output parameters
199
-    'urn:WSAccessUrl',                               // namespace
200
-    'urn:WSAccessUrl#WSAddUserToPortal',              // soapaction
201
-    'rpc',                                              // style
202
-    'encoded',                                          // use
196
+$server->register('WSAddUserToPortal', // method name
197
+    array('addUserToPortal' => 'tns:AddUserToPortal'), // input parameters
198
+    array('return' => 'xsd:string'), // output parameters
199
+    'urn:WSAccessUrl', // namespace
200
+    'urn:WSAccessUrl#WSAddUserToPortal', // soapaction
201
+    'rpc', // style
202
+    'encoded', // use
203 203
     'This service adds a user to portal'               // documentation
204 204
 );
205 205
 
@@ -224,13 +224,13 @@  discard block
 block discarded – undo
224 224
 }
225 225
 
226 226
 // Register the method to expose
227
-$server->register('WSRemoveUserFromPortal',                      // method name
228
-    array('removeUserFromPortal' => 'tns:AddUserToPortal'),  // input parameters
229
-    array('return' => 'xsd:string'),                            // output parameters
230
-    'urn:WSAccessUrl',                                       // namespace
231
-    'urn:WSAccessUrl#WSRemoveUserFromPortal',                 // soapaction
232
-    'rpc',                                                      // style
233
-    'encoded',                                                  // use
227
+$server->register('WSRemoveUserFromPortal', // method name
228
+    array('removeUserFromPortal' => 'tns:AddUserToPortal'), // input parameters
229
+    array('return' => 'xsd:string'), // output parameters
230
+    'urn:WSAccessUrl', // namespace
231
+    'urn:WSAccessUrl#WSRemoveUserFromPortal', // soapaction
232
+    'rpc', // style
233
+    'encoded', // use
234 234
     'This service remove a user from a portal'                  // documentation
235 235
 );
236 236
 
@@ -267,13 +267,13 @@  discard block
 block discarded – undo
267 267
 );
268 268
 
269 269
 // Register the method to expose
270
-$server->register('WSGetPortalListFromUser',                      // method name
271
-    array('getPortalListFromUser' => 'tns:getPortalListFromUser'),  // input parameters
272
-    array('return' => 'tns:portalList'),                            // output parameters
273
-    'urn:WSAccessUrl',                                       // namespace
274
-    'urn:WSAccessUrl#WSGetPortalListFromUser',                 // soapaction
275
-    'rpc',                                                      // style
276
-    'encoded',                                                  // use
270
+$server->register('WSGetPortalListFromUser', // method name
271
+    array('getPortalListFromUser' => 'tns:getPortalListFromUser'), // input parameters
272
+    array('return' => 'tns:portalList'), // output parameters
273
+    'urn:WSAccessUrl', // namespace
274
+    'urn:WSAccessUrl#WSGetPortalListFromUser', // soapaction
275
+    'rpc', // style
276
+    'encoded', // use
277 277
     'This service remove a user from a portal'                  // documentation
278 278
 );
279 279
 
@@ -311,13 +311,13 @@  discard block
 block discarded – undo
311 311
 );
312 312
 
313 313
 // Register the method to expose
314
-$server->register('WSGetPortalListFromCourse',                      // method name
315
-    array('getPortalListFromCourse' => 'tns:getPortalListFromCourse'),  // input parameters
316
-    array('return' => 'tns:portalList'),                            // output parameters
317
-    'urn:WSAccessUrl',                                       // namespace
318
-    'urn:WSAccessUrl#getPortalListFromCourse',                 // soapaction
319
-    'rpc',                                                      // style
320
-    'encoded',                                                  // use
314
+$server->register('WSGetPortalListFromCourse', // method name
315
+    array('getPortalListFromCourse' => 'tns:getPortalListFromCourse'), // input parameters
316
+    array('return' => 'tns:portalList'), // output parameters
317
+    'urn:WSAccessUrl', // namespace
318
+    'urn:WSAccessUrl#getPortalListFromCourse', // soapaction
319
+    'rpc', // style
320
+    'encoded', // use
321 321
     'This service remove a user from a portal'                  // documentation
322 322
 );
323 323
 
@@ -361,13 +361,13 @@  discard block
 block discarded – undo
361 361
 );
362 362
 
363 363
 // Register the method to expose
364
-$server->register('WSAddCourseToPortal',                   // method name
365
-    array('addCourseToPortal' => 'tns:addCourseToPortal'),    // input parameters
366
-    array('return' => 'xsd:string'),                    // output parameters
367
-    'urn:WSAccessUrl',                               // namespace
368
-    'urn:WSAccessUrl#WSAddCourseToPortal',              // soapaction
369
-    'rpc',                                              // style
370
-    'encoded',                                          // use
364
+$server->register('WSAddCourseToPortal', // method name
365
+    array('addCourseToPortal' => 'tns:addCourseToPortal'), // input parameters
366
+    array('return' => 'xsd:string'), // output parameters
367
+    'urn:WSAccessUrl', // namespace
368
+    'urn:WSAccessUrl#WSAddCourseToPortal', // soapaction
369
+    'rpc', // style
370
+    'encoded', // use
371 371
     'This service adds a course to portal'               // documentation
372 372
 );
373 373
 
@@ -394,13 +394,13 @@  discard block
 block discarded – undo
394 394
 }
395 395
 
396 396
 // Register the method to expose
397
-$server->register('WSRemoveCourseFromPortal',                      // method name
398
-    array('removeCourseFromPortal' => 'tns:addCourseToPortal'),  // input parameters
399
-    array('return' => 'xsd:string'),                            // output parameters
400
-    'urn:WSAccessUrl',                                       // namespace
401
-    'urn:WSAccessUrl#WSRemoveCourseFromPortal',                 // soapaction
402
-    'rpc',                                                      // style
403
-    'encoded',                                                  // use
397
+$server->register('WSRemoveCourseFromPortal', // method name
398
+    array('removeCourseFromPortal' => 'tns:addCourseToPortal'), // input parameters
399
+    array('return' => 'xsd:string'), // output parameters
400
+    'urn:WSAccessUrl', // namespace
401
+    'urn:WSAccessUrl#WSRemoveCourseFromPortal', // soapaction
402
+    'rpc', // style
403
+    'encoded', // use
404 404
     'This service remove a course from a portal'                  // documentation
405 405
 );
406 406
 
Please login to merge, or discard this patch.
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -58,19 +58,22 @@  discard block
 block discarded – undo
58 58
         list($ip1, $ip2) = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
59 59
         $ip = trim($ip1);
60 60
     }
61
-    if ($debug)
62
-        error_log("ip: $ip");
61
+    if ($debug) {
62
+            error_log("ip: $ip");
63
+    }
63 64
     // Check if a file that limits access from webservices exists and contains
64 65
     // the restraining check
65 66
     if (is_file('webservice-auth-ip.conf.php')) {
66 67
         include 'webservice-auth-ip.conf.php';
67
-        if ($debug)
68
-            error_log("webservice-auth-ip.conf.php file included");
68
+        if ($debug) {
69
+                    error_log("webservice-auth-ip.conf.php file included");
70
+        }
69 71
         if (!empty($ws_auth_ip)) {
70 72
             $check_ip = true;
71 73
             $ip_matches = api_check_ip_in_range($ip, $ws_auth_ip);
72
-            if ($debug)
73
-                error_log("ip_matches: $ip_matches");
74
+            if ($debug) {
75
+                            error_log("ip_matches: $ip_matches");
76
+            }
74 77
         }
75 78
     }
76 79
 
@@ -87,8 +90,9 @@  discard block
 block discarded – undo
87 90
 
88 91
     $result = api_is_valid_secret_key($secret_key, $security_key);
89 92
     //error_log($secret_key.'-'.$security_key);
90
-    if ($debug)
91
-        error_log('WSHelperVerifyKey result: '.intval($result));
93
+    if ($debug) {
94
+            error_log('WSHelperVerifyKey result: '.intval($result));
95
+    }
92 96
     return $result;
93 97
 }
94 98
 
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -20,6 +20,9 @@
 block discarded – undo
20 20
 
21 21
 define('WS_ERROR_SECRET_KEY', 1);
22 22
 
23
+/**
24
+ * @param integer $code
25
+ */
23 26
 function return_error($code) {
24 27
     $fault = null;
25 28
     switch ($code) {
Please login to merge, or discard this patch.
main/webservices/client_soap.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 $soap_error = $client->getError();
34 34
 
35 35
 if (!empty($soap_error)) {
36
-    $error_message = 'Nusoap object creation failed: ' . $soap_error;
36
+    $error_message = 'Nusoap object creation failed: '.$soap_error;
37 37
     throw new Exception($error_message);
38 38
 }
39 39
 $client->setDebugLevel(10000);
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 $ip_address = "127.0.0.1";
46 46
 
47 47
 //Secret key
48
-$secret_key = sha1($ip_address.$security_key);// Hash of the combination of IP Address + Chamilo security key
48
+$secret_key = sha1($ip_address.$security_key); // Hash of the combination of IP Address + Chamilo security key
49 49
 //$secret_key = sha1($security_key);
50 50
 
51 51
 //Creating a random user_id, this values need to be provided from your system
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
 if ($err) {
95 95
     // Display the error
96
-    echo '<h2>Constructor error</h2><pre>' . $err . '</pre>';
96
+    echo '<h2>Constructor error</h2><pre>'.$err.'</pre>';
97 97
 }
98 98
 
99 99
 
@@ -325,14 +325,14 @@  discard block
 block discarded – undo
325 325
 
326 326
 if ($err) {
327 327
     // Display the error
328
-    echo '<h2>Constructor error</h2><pre>' . $err . '</pre>';
328
+    echo '<h2>Constructor error</h2><pre>'.$err.'</pre>';
329 329
 }
330 330
 
331 331
 
332 332
 //1. Create user webservice
333 333
 $result = $client->call(
334 334
     'WSGetPortals',
335
-    array('getPortals' => [    'secret_key'                => $secret_key])
335
+    array('getPortals' => ['secret_key'                => $secret_key])
336 336
 );
337 337
 
338 338
 $result = $client->call(
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
 );
364 364
 
365 365
 
366
-var_dump($user_id);exit;
366
+var_dump($user_id); exit;
367 367
 
368 368
 
369 369
 
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
     $err = $client->getError();
383 383
     if ($err) {
384 384
         // Display the error
385
-        echo '<h2>Error</h2><pre>' . $err . '</pre>';
385
+        echo '<h2>Error</h2><pre>'.$err.'</pre>';
386 386
     } else {
387 387
         // Display the result
388 388
         echo '<h2>There are no errors</h2>';
Please login to merge, or discard this patch.
main/webservices/cm_soap_course.php 1 patch
Indentation   +195 added lines, -195 removed lines patch added patch discarded remove patch
@@ -9,255 +9,255 @@  discard block
 block discarded – undo
9 9
 $s = WSCMSoapServer::singleton();
10 10
 
11 11
 $s->wsdl->addComplexType(
12
-	'course_id',
13
-	'complexType',
14
-	'struct',
15
-	'all',
16
-	'',
17
-	array(
18
-		'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
19
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string')
20
-	)
12
+    'course_id',
13
+    'complexType',
14
+    'struct',
15
+    'all',
16
+    '',
17
+    array(
18
+        'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
19
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string')
20
+    )
21 21
 );
22 22
 
23 23
 $s->wsdl->addComplexType(
24
-	'course_result',
25
-	'complexType',
26
-	'struct',
27
-	'all',
28
-	'',
29
-	array(
30
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
31
-		'result' => array('name' => 'result', 'type' => 'tns:result')
32
-	)
24
+    'course_result',
25
+    'complexType',
26
+    'struct',
27
+    'all',
28
+    '',
29
+    array(
30
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
31
+        'result' => array('name' => 'result', 'type' => 'tns:result')
32
+    )
33 33
 );
34 34
 
35 35
 $s->wsdl->addComplexType(
36
-	'course_result_array',
37
-	'complexType',
38
-	'array',
39
-	'',
40
-	'SOAP-ENC:Array',
41
-	array(),
42
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_result[]')),
43
-	'tns:course_result'
36
+    'course_result_array',
37
+    'complexType',
38
+    'array',
39
+    '',
40
+    'SOAP-ENC:Array',
41
+    array(),
42
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_result[]')),
43
+    'tns:course_result'
44 44
 );
45 45
 
46 46
 $s->register(
47
-	'WSCMCourse.DeleteCourse',
48
-	array('secret_key' => 'xsd:string', 'course_id_field_name' => 'xsd:string', 'course_id_value' => 'xsd:string')
47
+    'WSCMCourse.DeleteCourse',
48
+    array('secret_key' => 'xsd:string', 'course_id_field_name' => 'xsd:string', 'course_id_value' => 'xsd:string')
49 49
 );
50 50
 
51 51
 $s->register(
52
-	'WSCMCourse.DeleteCourses',
53
-	array('secret_key' => 'xsd:string', 'courses' => 'tns:course_id[]'),
54
-	array('return' => 'tns:course_result_array')
52
+    'WSCMCourse.DeleteCourses',
53
+    array('secret_key' => 'xsd:string', 'courses' => 'tns:course_id[]'),
54
+    array('return' => 'tns:course_result_array')
55 55
 );
56 56
 
57 57
 $s->register(
58
-	'WSCMCourse.CreateCourse',
59
-	array(
60
-		'secret_key' => 'xsd:string',
61
-		'title' => 'xsd:string',
62
-		'category_code' => 'xsd:string',
63
-		'wanted_code' => 'xsd:string',
64
-		'tutor_name' => 'xsd:string',
65
-		'course_admin_user_id_field_name' => 'xsd:string',
66
-		'course_admin_user_id_value' => 'xsd:string',
67
-		'language' => 'xsd:string',
68
-		'course_id_field_name' => 'xsd:string',
69
-		'course_id_value' => 'xsd:string',
70
-		'extras' => 'tns:extra_field[]'
71
-	),
72
-	array('return' => 'xsd:int')
58
+    'WSCMCourse.CreateCourse',
59
+    array(
60
+        'secret_key' => 'xsd:string',
61
+        'title' => 'xsd:string',
62
+        'category_code' => 'xsd:string',
63
+        'wanted_code' => 'xsd:string',
64
+        'tutor_name' => 'xsd:string',
65
+        'course_admin_user_id_field_name' => 'xsd:string',
66
+        'course_admin_user_id_value' => 'xsd:string',
67
+        'language' => 'xsd:string',
68
+        'course_id_field_name' => 'xsd:string',
69
+        'course_id_value' => 'xsd:string',
70
+        'extras' => 'tns:extra_field[]'
71
+    ),
72
+    array('return' => 'xsd:int')
73 73
 );
74 74
 
75 75
 $s->wsdl->addComplexType(
76
-	'course_create',
77
-	'complexType',
78
-	'struct',
79
-	'all',
80
-	'',
81
-	array(
82
-		'title' => array('name' => 'title', 'type' => 'xsd:string'),
83
-		'category_code' => array('name' => 'category_code', 'type' => 'xsd:string'),
84
-		'wanted_code' => array('name' => 'wanted_code', 'type' => 'xsd:int'),
85
-		'tutor_name' => array('name' => 'tutor_name', 'type' => 'xsd:string'),
86
-		'course_admin_user_id_field_name' => array('name' => 'course_admin_user_id_field_name', 'type' => 'xsd:string'),
87
-		'course_admin_user_id_value' => array('name' => 'course_admin_user_id_value', 'type' => 'xsd:string'),
88
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
89
-		'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
90
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
91
-		'extras' => array('name' => 'extras', 'type' => 'tns:extra_field[]')
92
-	)
76
+    'course_create',
77
+    'complexType',
78
+    'struct',
79
+    'all',
80
+    '',
81
+    array(
82
+        'title' => array('name' => 'title', 'type' => 'xsd:string'),
83
+        'category_code' => array('name' => 'category_code', 'type' => 'xsd:string'),
84
+        'wanted_code' => array('name' => 'wanted_code', 'type' => 'xsd:int'),
85
+        'tutor_name' => array('name' => 'tutor_name', 'type' => 'xsd:string'),
86
+        'course_admin_user_id_field_name' => array('name' => 'course_admin_user_id_field_name', 'type' => 'xsd:string'),
87
+        'course_admin_user_id_value' => array('name' => 'course_admin_user_id_value', 'type' => 'xsd:string'),
88
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
89
+        'course_id_field_name' => array('name' => 'course_id_field_name', 'type' => 'xsd:string'),
90
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
91
+        'extras' => array('name' => 'extras', 'type' => 'tns:extra_field[]')
92
+    )
93 93
 );
94 94
 
95 95
 $s->wsdl->addComplexType(
96
-	'course_create_result',
97
-	'complexType',
98
-	'struct',
99
-	'all',
100
-	'',
101
-	array(
102
-		'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
103
-		'course_id_generated' => array('name' => 'course_id_generated', 'type' => 'xsd:int'),
104
-		'result' => array('name' => 'result', 'type' => 'tns:result')
105
-	)
96
+    'course_create_result',
97
+    'complexType',
98
+    'struct',
99
+    'all',
100
+    '',
101
+    array(
102
+        'course_id_value' => array('name' => 'course_id_value', 'type' => 'xsd:string'),
103
+        'course_id_generated' => array('name' => 'course_id_generated', 'type' => 'xsd:int'),
104
+        'result' => array('name' => 'result', 'type' => 'tns:result')
105
+    )
106 106
 );
107 107
 
108 108
 $s->wsdl->addComplexType(
109
-	'course_create_result_array',
110
-	'complexType',
111
-	'array',
112
-	'',
113
-	'SOAP-ENC:Array',
114
-	array(),
115
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_create_result[]')),
116
-	'tns:course_create_result'
109
+    'course_create_result_array',
110
+    'complexType',
111
+    'array',
112
+    '',
113
+    'SOAP-ENC:Array',
114
+    array(),
115
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_create_result[]')),
116
+    'tns:course_create_result'
117 117
 );
118 118
 
119 119
 $s->register(
120
-	'WSCMCourse.CreateCourses',
121
-	array(
122
-		'secret_key' => 'xsd:string',
123
-		'courses' => 'tns:course_create[]'
124
-	),
125
-	array('return' => 'tns:course_create_result_array')
120
+    'WSCMCourse.CreateCourses',
121
+    array(
122
+        'secret_key' => 'xsd:string',
123
+        'courses' => 'tns:course_create[]'
124
+    ),
125
+    array('return' => 'tns:course_create_result_array')
126 126
 );
127 127
 
128 128
 $s->register(
129
-	'WSCMCourse.EditCourse',
130
-	array(
131
-		'secret_key' => 'xsd:string',
132
-		'course_id_field_name' => 'xsd:string',
133
-		'course_id_value' => 'xsd:string',
134
-		'title' => 'xsd:string',
135
-		'category_code' => 'xsd:string',
136
-		'department_name' => 'xsd:string',
137
-		'department_url' => 'xsd:string',
138
-		'language' => 'xsd:string',
139
-		'visibility' => 'xsd:int',
140
-		'subscribe' => 'xsd:int',
141
-		'unsubscribe' => 'xsd:int',
142
-		'visual_code' => 'xsd:string',
143
-		'extras' => 'tns:extra_field[]'
144
-	)
129
+    'WSCMCourse.EditCourse',
130
+    array(
131
+        'secret_key' => 'xsd:string',
132
+        'course_id_field_name' => 'xsd:string',
133
+        'course_id_value' => 'xsd:string',
134
+        'title' => 'xsd:string',
135
+        'category_code' => 'xsd:string',
136
+        'department_name' => 'xsd:string',
137
+        'department_url' => 'xsd:string',
138
+        'language' => 'xsd:string',
139
+        'visibility' => 'xsd:int',
140
+        'subscribe' => 'xsd:int',
141
+        'unsubscribe' => 'xsd:int',
142
+        'visual_code' => 'xsd:string',
143
+        'extras' => 'tns:extra_field[]'
144
+    )
145 145
 );
146 146
 
147 147
 $s->wsdl->addComplexType(
148
-	'course',
149
-	'complexType',
150
-	'struct',
151
-	'all',
152
-	'',
153
-	array(
154
-		'id' => array('name' => 'id', 'type' => 'xsd:int'),
155
-		'code' => array('name' => 'code', 'type' => 'xsd:string'),
156
-		'title' => array('name' => 'title', 'type' => 'xsd:string'),
157
-		'language' => array('name' => 'language', 'type' => 'xsd:string'),
158
-		'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
159
-		'category_name' => array('name' => 'category_name', 'type' => 'xsd:string'),
160
-		'number_students' => array('name' => 'number_students', 'type' => 'xsd:int'),
161
-		'external_course_id' => array('name' => 'external_course_id', 'type' => 'xsd:string'),
162
-	)
148
+    'course',
149
+    'complexType',
150
+    'struct',
151
+    'all',
152
+    '',
153
+    array(
154
+        'id' => array('name' => 'id', 'type' => 'xsd:int'),
155
+        'code' => array('name' => 'code', 'type' => 'xsd:string'),
156
+        'title' => array('name' => 'title', 'type' => 'xsd:string'),
157
+        'language' => array('name' => 'language', 'type' => 'xsd:string'),
158
+        'visibility' => array('name' => 'visibility', 'type' => 'xsd:int'),
159
+        'category_name' => array('name' => 'category_name', 'type' => 'xsd:string'),
160
+        'number_students' => array('name' => 'number_students', 'type' => 'xsd:int'),
161
+        'external_course_id' => array('name' => 'external_course_id', 'type' => 'xsd:string'),
162
+    )
163 163
 );
164 164
 
165 165
 $s->wsdl->addComplexType(
166
-	'course_array',
167
-	'complexType',
168
-	'array',
169
-	'',
170
-	'SOAP-ENC:Array',
171
-	array(),
172
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course[]')),
173
-	'tns:course'
166
+    'course_array',
167
+    'complexType',
168
+    'array',
169
+    '',
170
+    'SOAP-ENC:Array',
171
+    array(),
172
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course[]')),
173
+    'tns:course'
174 174
 );
175 175
 
176 176
 $s->register(
177
-	'WSCMCourse.ListCourses',
178
-	array(
179
-		'secret_key' => 'xsd:string',
180
-		'course_id_field_name' => 'xsd:string'
181
-	),
182
-	array('return' => 'tns:course_array')
177
+    'WSCMCourse.ListCourses',
178
+    array(
179
+        'secret_key' => 'xsd:string',
180
+        'course_id_field_name' => 'xsd:string'
181
+    ),
182
+    array('return' => 'tns:course_array')
183 183
 );
184 184
 
185 185
 $s->register(
186
-	'WSCMCourse.SubscribeUserToCourse',
187
-	array(
188
-		'secret_key' => 'xsd:string',
189
-		'course_id_field_name' => 'xsd:string',
190
-		'course_id_value' => 'xsd:string',
191
-		'user_id_field_name' => 'xsd:string',
192
-		'user_id_value' => 'xsd:string',
193
-		'status' => 'xsd:int'
194
-	)
186
+    'WSCMCourse.SubscribeUserToCourse',
187
+    array(
188
+        'secret_key' => 'xsd:string',
189
+        'course_id_field_name' => 'xsd:string',
190
+        'course_id_value' => 'xsd:string',
191
+        'user_id_field_name' => 'xsd:string',
192
+        'user_id_value' => 'xsd:string',
193
+        'status' => 'xsd:int'
194
+    )
195 195
 );
196 196
 
197 197
 $s->register(
198
-	'WSCMCourse.UnsubscribeUserFromCourse',
199
-	array(
200
-		'secret_key' => 'xsd:string',
201
-		'course_id_field_name' => 'xsd:string',
202
-		'course_id_value' => 'xsd:string',
203
-		'user_id_field_name' => 'xsd:string',
204
-		'user_id_value' => 'xsd:string'
205
-	)
198
+    'WSCMCourse.UnsubscribeUserFromCourse',
199
+    array(
200
+        'secret_key' => 'xsd:string',
201
+        'course_id_field_name' => 'xsd:string',
202
+        'course_id_value' => 'xsd:string',
203
+        'user_id_field_name' => 'xsd:string',
204
+        'user_id_value' => 'xsd:string'
205
+    )
206 206
 );
207 207
 
208 208
 $s->wsdl->addComplexType(
209
-	'course_description',
210
-	'complexType',
211
-	'struct',
212
-	'all',
213
-	'',
214
-	array(
215
-		'course_desc_id' => array('name' => 'course_desc_id', 'type' => 'xsd:int'),
216
-		'course_desc_title' => array('name' => 'course_desc_title', 'type' => 'xsd:string'),
217
-		'course_desc_content' => array('name' => 'course_desc_content', 'type' => 'xsd:string')
218
-	)
209
+    'course_description',
210
+    'complexType',
211
+    'struct',
212
+    'all',
213
+    '',
214
+    array(
215
+        'course_desc_id' => array('name' => 'course_desc_id', 'type' => 'xsd:int'),
216
+        'course_desc_title' => array('name' => 'course_desc_title', 'type' => 'xsd:string'),
217
+        'course_desc_content' => array('name' => 'course_desc_content', 'type' => 'xsd:string')
218
+    )
219 219
 );
220 220
 
221 221
 $s->wsdl->addComplexType(
222
-	'course_description_array',
223
-	'complexType',
224
-	'array',
225
-	'',
226
-	'SOAP-ENC:Array',
227
-	array(),
228
-	array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_description[]')),
229
-	'tns:course_description'
222
+    'course_description_array',
223
+    'complexType',
224
+    'array',
225
+    '',
226
+    'SOAP-ENC:Array',
227
+    array(),
228
+    array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:course_description[]')),
229
+    'tns:course_description'
230 230
 );
231 231
 
232 232
 $s->register(
233
-	'WSCMCourse.GetCourseDescriptions',
234
-	array(
235
-		'secret_key' => 'xsd:string',
236
-		'course_id_field_name' => 'xsd:string',
237
-		'course_id_value' => 'xsd:string'
238
-	),
239
-	array('return' => 'tns:course_description_array')
233
+    'WSCMCourse.GetCourseDescriptions',
234
+    array(
235
+        'secret_key' => 'xsd:string',
236
+        'course_id_field_name' => 'xsd:string',
237
+        'course_id_value' => 'xsd:string'
238
+    ),
239
+    array('return' => 'tns:course_description_array')
240 240
 );
241 241
 
242 242
 $s->register(
243
-	'WSCMCourse.EditCourseDescription',
244
-	array(
245
-		'secret_key' => 'xsd:string',
246
-		'course_id_field_name' => 'xsd:string',
247
-		'course_id_value' => 'xsd:string',
248
-		'course_desc_id' => 'xsd:int',
249
-		'course_desc_title' => 'xsd:string',
250
-		'course_desc_content' => 'xsd:string'
251
-	)
243
+    'WSCMCourse.EditCourseDescription',
244
+    array(
245
+        'secret_key' => 'xsd:string',
246
+        'course_id_field_name' => 'xsd:string',
247
+        'course_id_value' => 'xsd:string',
248
+        'course_desc_id' => 'xsd:int',
249
+        'course_desc_title' => 'xsd:string',
250
+        'course_desc_content' => 'xsd:string'
251
+    )
252 252
 );
253 253
 
254 254
 $s->register(
255
-	'WSCMCourse.unreadMessage',
256
-	array(
257
-		'username' => 'xsd:string',
258
-		'password' => 'xsd:string',
259
-	),
260
-	array('return' => 'xsd:string'),
255
+    'WSCMCourse.unreadMessage',
256
+    array(
257
+        'username' => 'xsd:string',
258
+        'password' => 'xsd:string',
259
+    ),
260
+    array('return' => 'xsd:string'),
261 261
         'urn:WSCMService',
262 262
         '',
263 263
         '',
@@ -268,12 +268,12 @@  discard block
 block discarded – undo
268 268
 
269 269
 
270 270
 $s->register(
271
-	'WSCMCourse.getIdMessage',
272
-	array(
273
-		'username' => 'xsd:string',
274
-		'password' => 'xsd:string',
275
-	),
276
-	array('return' => 'xsd:string'),
271
+    'WSCMCourse.getIdMessage',
272
+    array(
273
+        'username' => 'xsd:string',
274
+        'password' => 'xsd:string',
275
+    ),
276
+    array('return' => 'xsd:string'),
277 277
         'urn:WSCMService',
278 278
         '',
279 279
         '',
Please login to merge, or discard this patch.
main/webservices/cm_webservice_forum.php 2 patches
Braces   +24 added lines, -16 removed lines patch added patch discarded remove patch
@@ -32,8 +32,9 @@  discard block
 block discarded – undo
32 32
                 }
33 33
             }
34 34
             return $foruns_id;
35
-        } else
36
-            return get_lang('InvalidId');
35
+        } else {
36
+                    return get_lang('InvalidId');
37
+        }
37 38
     }
38 39
 
39 40
     public function get_forum_title($username, $password, $course_code, $forum_id)
@@ -54,8 +55,9 @@  discard block
 block discarded – undo
54 55
 
55 56
             $forum_title = utf8_decode($forum_info['forum_title']);
56 57
             return $forum_title;
57
-        } else
58
-            return get_lang('InvalidId');
58
+        } else {
59
+                    return get_lang('InvalidId');
60
+        }
59 61
     }
60 62
 
61 63
     public function get_forum_threads_id($username, $password, $course_code, $forum_id)
@@ -73,8 +75,9 @@  discard block
 block discarded – undo
73 75
 
74 76
             return $threads_id;
75 77
 
76
-        } else
77
-            return get_lang('InvalidId');
78
+        } else {
79
+                    return get_lang('InvalidId');
80
+        }
78 81
     }
79 82
 
80 83
     public function get_forum_thread_data($username, $password, $course_code, $thread_id, $field)
@@ -115,8 +118,9 @@  discard block
 block discarded – undo
115 118
 
116 119
             return $thread_info[$field_table];
117 120
 
118
-        } else
119
-            return get_lang('InvalidId');
121
+        } else {
122
+                    return get_lang('InvalidId');
123
+        }
120 124
     }
121 125
 
122 126
     public function get_forum_thread_title($username, $password, $course_code, $thread_id)
@@ -139,8 +143,9 @@  discard block
 block discarded – undo
139 143
 
140 144
             return $thread_info[$field_table];
141 145
 
142
-        } else
143
-            return get_lang('InvalidId');
146
+        } else {
147
+                    return get_lang('InvalidId');
148
+        }
144 149
     }
145 150
 
146 151
 
@@ -184,8 +189,9 @@  discard block
 block discarded – undo
184 189
                 }
185 190
             }
186 191
             return $posts_id;
187
-        } else
188
-            return get_lang('InvalidId');
192
+        } else {
193
+                    return get_lang('InvalidId');
194
+        }
189 195
     }
190 196
 
191 197
     public function get_post_data($username, $password, $course_code, $post_id, $field)
@@ -226,8 +232,9 @@  discard block
 block discarded – undo
226 232
                     $field_table = "title";
227 233
             }
228 234
             return (htmlcode) ? html_entity_decode($post_info[$field_table]) : $post_info[$field_table];
229
-        } else
230
-            return get_lang('InvalidId');
235
+        } else {
236
+                    return get_lang('InvalidId');
237
+        }
231 238
     }
232 239
 
233 240
     public function send_post($username, $password, $course_code, $forum_id, $thread_id, $title, $content)
@@ -269,8 +276,9 @@  discard block
 block discarded – undo
269 276
 
270 277
             //send_notification_mails($thread_id, $values);
271 278
 
272
-        } else
273
-            return get_lang('InvalidId');
279
+        } else {
280
+                    return get_lang('InvalidId');
281
+        }
274 282
 
275 283
     }
276 284
 
Please login to merge, or discard this patch.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
 
20 20
     public function get_foruns_id($username, $password, $course_code)
21 21
     {
22
-        if($this->verifyUserPass($username, $password) == "valid")
22
+        if ($this->verifyUserPass($username, $password) == "valid")
23 23
         {
24 24
             $course_db = CourseManager::get_course_information($course_code);
25
-            $foruns_info = get_forums($id='', $course_db['code']);
25
+            $foruns_info = get_forums($id = '', $course_db['code']);
26 26
             $foruns_id = '#';
27 27
             foreach ($foruns_info as $forum)
28 28
             {
29
-                if( isset($forum['forum_id']))
29
+                if (isset($forum['forum_id']))
30 30
                 {
31 31
                     $foruns_id .= $forum['forum_id']."#";
32 32
                 }
@@ -38,18 +38,18 @@  discard block
 block discarded – undo
38 38
 
39 39
     public function get_forum_title($username, $password, $course_code, $forum_id)
40 40
     {
41
-        if($this->verifyUserPass($username, $password) == "valid")
41
+        if ($this->verifyUserPass($username, $password) == "valid")
42 42
         {
43 43
             $course_db = CourseManager::get_course_information($course_code);
44 44
             $table_forums = Database :: get_course_table(TABLE_FORUM, $course_db['db_name']);
45 45
             $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
46 46
 
47
-            $sql="SELECT * FROM ".$table_forums." forums, ".$table_item_property." item_properties
47
+            $sql = "SELECT * FROM ".$table_forums." forums, ".$table_item_property." item_properties
48 48
                             WHERE item_properties.tool='".TOOL_FORUM."'
49 49
                             AND item_properties.ref='".Database::escape_string($forum_id)."'
50 50
                             AND forums.forum_id='".Database::escape_string($forum_id)."'";
51
-            $result=Database::query($sql);
52
-            $forum_info=Database::fetch_array($result);
51
+            $result = Database::query($sql);
52
+            $forum_info = Database::fetch_array($result);
53 53
             $forum_info['approval_direct_post'] = 0; // we can't anymore change this option, so it should always be activated
54 54
 
55 55
             $forum_title = utf8_decode($forum_info['forum_title']);
@@ -60,12 +60,12 @@  discard block
 block discarded – undo
60 60
 
61 61
     public function get_forum_threads_id($username, $password, $course_code, $forum_id)
62 62
     {
63
-        if($this->verifyUserPass($username, $password) == "valid") {
63
+        if ($this->verifyUserPass($username, $password) == "valid") {
64 64
             $threads_info = get_threads($forum_id, $course_code);
65 65
             $threads_id = '#';
66 66
             foreach ($threads_info as $thread)
67 67
             {
68
-                if( isset($thread['thread_id']))
68
+                if (isset($thread['thread_id']))
69 69
                 {
70 70
                     $threads_id .= $thread['thread_id']."#";
71 71
                 }
@@ -79,18 +79,18 @@  discard block
 block discarded – undo
79 79
 
80 80
     public function get_forum_thread_data($username, $password, $course_code, $thread_id, $field)
81 81
     {
82
-        if($this->verifyUserPass($username, $password) == "valid")
82
+        if ($this->verifyUserPass($username, $password) == "valid")
83 83
         {
84 84
             $course_db = CourseManager::get_course_information($course_code);
85 85
             $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
86 86
             $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD, $course_db['db_name']);
87 87
 
88
-            $sql="SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
88
+            $sql = "SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
89 89
                             WHERE item_properties.tool='".TOOL_FORUM_THREAD."'
90 90
                             AND item_properties.ref='".Database::escape_string($thread_id)."'
91 91
                             AND threads.thread_id='".Database::escape_string($thread_id)."'";
92
-            $result=Database::query($sql);
93
-            $thread_info=Database::fetch_array($result);
92
+            $result = Database::query($sql);
93
+            $thread_info = Database::fetch_array($result);
94 94
 
95 95
             switch ($field)
96 96
             {
@@ -121,18 +121,18 @@  discard block
 block discarded – undo
121 121
 
122 122
     public function get_forum_thread_title($username, $password, $course_code, $thread_id)
123 123
     {
124
-        if($this->verifyUserPass($username, $password) == "valid")
124
+        if ($this->verifyUserPass($username, $password) == "valid")
125 125
         {
126 126
             $course_db = CourseManager::get_course_information($course_code);
127 127
             $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY, $course_db['db_name']);
128 128
             $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD, $course_db['db_name']);
129 129
 
130
-            $sql="SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
130
+            $sql = "SELECT * FROM ".$table_threads." threads, ".$table_item_property." item_properties
131 131
                             WHERE item_properties.tool='".TOOL_FORUM_THREAD."'
132 132
                             AND item_properties.ref='".Database::escape_string($thread_id)."'
133 133
                             AND threads.thread_id='".Database::escape_string($thread_id)."'";
134
-            $result=Database::query($sql);
135
-            $thread_info=Database::fetch_array($result);
134
+            $result = Database::query($sql);
135
+            $thread_info = Database::fetch_array($result);
136 136
 
137 137
             $htmlcode = true;
138 138
             $field_table = "thread_title";
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 
147 147
     public function get_posts_id($username, $password, $course_code, $thread_id)
148 148
     {
149
-        if($this->verifyUserPass($username, $password) == "valid")
149
+        if ($this->verifyUserPass($username, $password) == "valid")
150 150
         {
151 151
             $course_db = CourseManager::get_course_information($course_code);
152 152
 
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
             $table_posts = Database :: get_course_table(TABLE_FORUM_POST, $course_db['db_name']);
155 155
 
156 156
             // note: change these SQL so that only the relevant fields of the user table are used
157
-            if (api_is_allowed_to_edit(null,true)) {
157
+            if (api_is_allowed_to_edit(null, true)) {
158 158
                 $sql = "SELECT * FROM $table_posts posts
159 159
                                     LEFT JOIN  $table_users users
160 160
                                             ON posts.poster_id=users.user_id
@@ -169,16 +169,16 @@  discard block
 block discarded – undo
169 169
                                     AND posts.visible='1'
170 170
                                     ORDER BY posts.post_id ASC";
171 171
             }
172
-            $result=Database::query($sql);
173
-            while ($row=Database::fetch_array($result)) {
174
-                $posts_info[]=$row;
172
+            $result = Database::query($sql);
173
+            while ($row = Database::fetch_array($result)) {
174
+                $posts_info[] = $row;
175 175
             }
176 176
 
177 177
             $posts_id = '#';
178 178
 
179 179
             foreach ($posts_info as $post)
180 180
             {
181
-                if( isset($post['post_id']))
181
+                if (isset($post['post_id']))
182 182
                 {
183 183
                     $posts_id .= $post['post_id']."#";
184 184
                 }
@@ -190,16 +190,16 @@  discard block
 block discarded – undo
190 190
 
191 191
     public function get_post_data($username, $password, $course_code, $post_id, $field)
192 192
     {
193
-        if($this->verifyUserPass($username, $password) == "valid")
193
+        if ($this->verifyUserPass($username, $password) == "valid")
194 194
         {
195 195
             $course_db = CourseManager::get_course_information($course_code);
196 196
 
197 197
             $table_posts 	= Database :: get_course_table(TABLE_FORUM_POST, $course_db['db_name']);
198 198
             $table_users 	= Database :: get_main_table(TABLE_MAIN_USER);
199 199
 
200
-            $sql="SELECT * FROM ".$table_posts."posts, ".$table_users." users WHERE posts.poster_id=users.user_id AND posts.post_id='".Database::escape_string($post_id)."'";
201
-            $result=Database::query($sql);
202
-            $post_info =Database::fetch_array($result);
200
+            $sql = "SELECT * FROM ".$table_posts."posts, ".$table_users." users WHERE posts.poster_id=users.user_id AND posts.post_id='".Database::escape_string($post_id)."'";
201
+            $result = Database::query($sql);
202
+            $post_info = Database::fetch_array($result);
203 203
 
204 204
             $htmlcode = false;
205 205
             switch ($field)
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 
233 233
     public function send_post($username, $password, $course_code, $forum_id, $thread_id, $title, $content)
234 234
     {
235
-        if($this->verifyUserPass($username, $password) == "valid")
235
+        if ($this->verifyUserPass($username, $password) == "valid")
236 236
         {
237 237
             $em = Database::getManager();
238 238
             $course_db = CourseManager::get_course_information($course_code);
@@ -241,9 +241,9 @@  discard block
 block discarded – undo
241 241
             $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD, $course_db['db_name']);
242 242
             $forum_table_attachment = Database :: get_course_table(TABLE_FORUM_ATTACHMENT, $course_db['db_name']);
243 243
             $table_posts = Database :: get_course_table(TABLE_FORUM_POST, $course_db['db_name']);
244
-            $post_date=date('Y-m-d H:i:s');
245
-            $visible=1;
246
-            $has_attachment=false;
244
+            $post_date = date('Y-m-d H:i:s');
245
+            $visible = 1;
246
+            $has_attachment = false;
247 247
             $my_post = '';
248 248
             $post_notification = '';
249 249
 
Please login to merge, or discard this patch.
main/webservices/user_info.soap.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
         'all',
27 27
         '',
28 28
         array(
29
-          'name'=>'code'  , 'type'=>'xsd:string',
30
-          'name'=>'title'  , 'type'=>'xsd:string',
31
-          'name'=>'url'    , 'type'=>'xsd:string',
32
-          'name'=>'teacher', 'type'=>'xsd:string',
33
-          'name'=>'language','type'=>'xsd:string',
29
+            'name'=>'code'  , 'type'=>'xsd:string',
30
+            'name'=>'title'  , 'type'=>'xsd:string',
31
+            'name'=>'url'    , 'type'=>'xsd:string',
32
+            'name'=>'teacher', 'type'=>'xsd:string',
33
+            'name'=>'language','type'=>'xsd:string',
34 34
         )
35 35
 );
36 36
 
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 // Register the method to expose
52 52
 $server->register('WSCourseListOfUser',   // method name
53 53
     array('username' => 'xsd:string',
54
-          'signature' => 'xsd:string'),         // input parameters
54
+            'signature' => 'xsd:string'),         // input parameters
55 55
     array('return' => 'xsd:Array'),             // output parameters
56 56
     'urn:WSUserInfo',                           // namespace
57 57
     'urn:WSUserInfo#WSUserInfo',          // soapaction
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     $list = UserManager::get_api_keys($user_id, 'dokeos');
78 78
     $key = '';
79 79
     foreach ($list as $key) {
80
-    	break;
80
+        break;
81 81
     }
82 82
 
83 83
     $local_key = $username.$key;
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 // Register the method to expose
130 130
 $server->register('WSEventsList',       // method name
131 131
     array('username' => 'xsd:string',
132
-          'signature' => 'xsd:string',
133
-          'datestart' => 'xsd:int',
134
-          'dateend'   => 'xsd:int'),          // input parameters
132
+            'signature' => 'xsd:string',
133
+            'datestart' => 'xsd:int',
134
+            'dateend'   => 'xsd:int'),          // input parameters
135 135
     array('return' => 'xsd:Array'),           // output parameters
136 136
     'urn:WSUserInfo',                         // namespace
137 137
     'urn:WSUserInfo#WSEventsList',      // soapaction
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
     $list = UserManager::get_api_keys($user_id, 'dokeos');
160 160
     $key = '';
161 161
     foreach ($list as $key) {
162
-    	break;
162
+        break;
163 163
     }
164 164
 
165 165
     $local_key = $username.$key;
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
         'all',
27 27
         '',
28 28
         array(
29
-          'name'=>'code'  , 'type'=>'xsd:string',
30
-          'name'=>'title'  , 'type'=>'xsd:string',
31
-          'name'=>'url'    , 'type'=>'xsd:string',
29
+          'name'=>'code', 'type'=>'xsd:string',
30
+          'name'=>'title', 'type'=>'xsd:string',
31
+          'name'=>'url', 'type'=>'xsd:string',
32 32
           'name'=>'teacher', 'type'=>'xsd:string',
33
-          'name'=>'language','type'=>'xsd:string',
33
+          'name'=>'language', 'type'=>'xsd:string',
34 34
         )
35 35
 );
36 36
 
@@ -49,14 +49,14 @@  discard block
 block discarded – undo
49 49
 );
50 50
 
51 51
 // Register the method to expose
52
-$server->register('WSCourseListOfUser',   // method name
52
+$server->register('WSCourseListOfUser', // method name
53 53
     array('username' => 'xsd:string',
54
-          'signature' => 'xsd:string'),         // input parameters
55
-    array('return' => 'xsd:Array'),             // output parameters
56
-    'urn:WSUserInfo',                           // namespace
57
-    'urn:WSUserInfo#WSUserInfo',          // soapaction
58
-    'rpc',                                      // style
59
-    'encoded',                                  // use
54
+          'signature' => 'xsd:string'), // input parameters
55
+    array('return' => 'xsd:Array'), // output parameters
56
+    'urn:WSUserInfo', // namespace
57
+    'urn:WSUserInfo#WSUserInfo', // soapaction
58
+    'rpc', // style
59
+    'encoded', // use
60 60
     'This service returns a list of courses'    // documentation
61 61
 );
62 62
 
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
     'all',
105 105
     '',
106 106
     array(
107
-        'name'=>'datestart','type'=>'xsd:string',
108
-        'name'=>'dateend','type'=>'xsd:string',
109
-        'name'=>'title','type'=>'xsd:string',
110
-        'name'=>'link','type'=>'xsd:string',
111
-        'name'=>'coursetitle','type'=>'xsd:string',
107
+        'name'=>'datestart', 'type'=>'xsd:string',
108
+        'name'=>'dateend', 'type'=>'xsd:string',
109
+        'name'=>'title', 'type'=>'xsd:string',
110
+        'name'=>'link', 'type'=>'xsd:string',
111
+        'name'=>'coursetitle', 'type'=>'xsd:string',
112 112
     )
113 113
 );
114 114
 
@@ -127,16 +127,16 @@  discard block
 block discarded – undo
127 127
 );
128 128
 
129 129
 // Register the method to expose
130
-$server->register('WSEventsList',       // method name
130
+$server->register('WSEventsList', // method name
131 131
     array('username' => 'xsd:string',
132 132
           'signature' => 'xsd:string',
133 133
           'datestart' => 'xsd:int',
134
-          'dateend'   => 'xsd:int'),          // input parameters
135
-    array('return' => 'xsd:Array'),           // output parameters
136
-    'urn:WSUserInfo',                         // namespace
137
-    'urn:WSUserInfo#WSEventsList',      // soapaction
138
-    'rpc',                                    // style
139
-    'encoded',                                // use
134
+          'dateend'   => 'xsd:int'), // input parameters
135
+    array('return' => 'xsd:Array'), // output parameters
136
+    'urn:WSUserInfo', // namespace
137
+    'urn:WSUserInfo#WSEventsList', // soapaction
138
+    'rpc', // style
139
+    'encoded', // use
140 140
     'This service returns a list of events of the courses the given user is subscribed to'      // documentation
141 141
 );
142 142
 
@@ -171,8 +171,8 @@  discard block
 block discarded – undo
171 171
 
172 172
     $user_id = UserManager::get_user_id_from_username($username);
173 173
     if ($user_id === false) { return $events_list; } // Error in user id recovery.
174
-    $ds = substr($datestart,0,4).'-'.substr($datestart,4,2).'-'.substr($datestart,6,2).' 00:00:00';
175
-    $de = substr($dateend,0,4).'-'.substr($dateend,4,2).'-'.substr($dateend,6,2).' 00:00:00';
174
+    $ds = substr($datestart, 0, 4).'-'.substr($datestart, 4, 2).'-'.substr($datestart, 6, 2).' 00:00:00';
175
+    $de = substr($dateend, 0, 4).'-'.substr($dateend, 4, 2).'-'.substr($dateend, 6, 2).' 00:00:00';
176 176
     $events_list = Agenda::get_personal_agenda_items_between_dates($user_id, $ds, $de);
177 177
     return $events_list;
178 178
 }
Please login to merge, or discard this patch.
main/webservices/soap.php 2 patches
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -11,84 +11,84 @@  discard block
 block discarded – undo
11 11
  * SOAP error handler. Handles an error sending a SOAP fault
12 12
  */
13 13
 class WSSoapErrorHandler implements WSErrorHandler {
14
-	/**
15
-	 * Handles the error by sending a SOAP fault through the server
16
-	 *
17
-	 * @param WSError Error to handle
18
-	 */
19
-	public function handle($error) {
20
-		$server = WSSoapServer::singleton();
21
-		$server->fault(strval($error->code), $error->message);
22
-	}
14
+    /**
15
+     * Handles the error by sending a SOAP fault through the server
16
+     *
17
+     * @param WSError Error to handle
18
+     */
19
+    public function handle($error) {
20
+        $server = WSSoapServer::singleton();
21
+        $server->fault(strval($error->code), $error->message);
22
+    }
23 23
 }
24 24
 
25 25
 /**
26 26
  * SOAP server wrapper implementing a Singleton
27 27
  */
28 28
 class WSSoapServer {
29
-	/**
30
-	 * SOAP server instance
31
-	 *
32
-	 * @var soap_server
33
-	 */
34
-	private static $_instance;
29
+    /**
30
+     * SOAP server instance
31
+     *
32
+     * @var soap_server
33
+     */
34
+    private static $_instance;
35 35
 
36
-	/**
37
-	 * Private constructor
38
-	 */
39
-	private function __construct() {
40
-	}
36
+    /**
37
+     * Private constructor
38
+     */
39
+    private function __construct() {
40
+    }
41 41
 
42
-	/**
43
-	 * Singleton method
44
-	 */
45
-	public static function singleton() {
46
-		if(!isset(self::$_instance)) {
47
-			self::$_instance = new soap_server();
48
-			// Set the error handler
49
-			WSError::setErrorHandler(new WSSoapErrorHandler());
50
-			// Configure the service
51
-			self::$_instance->configureWSDL('WSService', 'urn:WSService');
52
-		}
42
+    /**
43
+     * Singleton method
44
+     */
45
+    public static function singleton() {
46
+        if(!isset(self::$_instance)) {
47
+            self::$_instance = new soap_server();
48
+            // Set the error handler
49
+            WSError::setErrorHandler(new WSSoapErrorHandler());
50
+            // Configure the service
51
+            self::$_instance->configureWSDL('WSService', 'urn:WSService');
52
+        }
53 53
 
54
-		return self::$_instance;
55
-	}
54
+        return self::$_instance;
55
+    }
56 56
 }
57 57
 
58 58
 $s = WSSoapServer::singleton();
59 59
 
60 60
 $s->wsdl->addComplexType(
61
-	'result',
62
-	'complexType',
63
-	'struct',
64
-	'all',
65
-	'',
66
-	array(
67
-		'code' => array('name' => 'code', 'type' => 'xsd:int'),
68
-		'message' => array('name' => 'message', 'type' => 'xsd:string')
69
-	)
61
+    'result',
62
+    'complexType',
63
+    'struct',
64
+    'all',
65
+    '',
66
+    array(
67
+        'code' => array('name' => 'code', 'type' => 'xsd:int'),
68
+        'message' => array('name' => 'message', 'type' => 'xsd:string')
69
+    )
70 70
 );
71 71
 
72 72
 $s->wsdl->addComplexType(
73
-  'extras',
74
-  'complexType',
75
-  'struct',
76
-  'all',
77
-  '',
78
-  array(
79
-          'field_name' => array('name' => 'field_name', 'type' => 'xsd:string'),
80
-          'field_value' => array('name' => 'field_value', 'type' => 'xsd:string')
81
-       )
73
+    'extras',
74
+    'complexType',
75
+    'struct',
76
+    'all',
77
+    '',
78
+    array(
79
+            'field_name' => array('name' => 'field_name', 'type' => 'xsd:string'),
80
+            'field_value' => array('name' => 'field_value', 'type' => 'xsd:string')
81
+        )
82 82
 );
83 83
 
84 84
 $s->wsdl->addComplexType(
85
-  'extra_field',
86
-  'complexType',
87
-  'array',
88
-  '',
89
-  'SOAP-ENC:Array',
90
-  array(),
91
-  array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),'tns:extras'
85
+    'extra_field',
86
+    'complexType',
87
+    'array',
88
+    '',
89
+    'SOAP-ENC:Array',
90
+    array(),
91
+    array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),'tns:extras'
92 92
 );
93 93
 
94 94
 /*
@@ -106,9 +106,9 @@  discard block
 block discarded – undo
106 106
 */
107 107
 
108 108
 $s->register(
109
-	'WS.test',
110
-	array(),
111
-	array('return' => 'xsd:string')
109
+    'WS.test',
110
+    array(),
111
+    array('return' => 'xsd:string')
112 112
 );
113 113
 
114 114
 require_once(dirname(__FILE__).'/soap_user.php');
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 	 * Singleton method
44 44
 	 */
45 45
 	public static function singleton() {
46
-		if(!isset(self::$_instance)) {
46
+		if (!isset(self::$_instance)) {
47 47
 			self::$_instance = new soap_server();
48 48
 			// Set the error handler
49 49
 			WSError::setErrorHandler(new WSSoapErrorHandler());
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
   '',
89 89
   'SOAP-ENC:Array',
90 90
   array(),
91
-  array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType' => 'tns:extras[]')),'tns:extras'
91
+  array(array('ref'=>'SOAP-ENC:arrayType', 'wsdl:arrayType' => 'tns:extras[]')), 'tns:extras'
92 92
 );
93 93
 
94 94
 /*
Please login to merge, or discard this patch.