Completed
Push — 1.10.x ( 320abc...039d05 )
by José
151:51 queued 109:10
created
main/blog/blog.php 1 patch
Indentation   +288 added lines, -288 removed lines patch added patch discarded remove patch
@@ -41,181 +41,181 @@  discard block
 block discarded – undo
41 41
 $safe_task_description  = isset($_POST['task_description']) ? Security::remove_XSS($_POST['task_description']) : null;
42 42
 
43 43
 if (!empty($_POST['new_post_submit'])) {
44
-	Blog:: create_post(
45
-		$_POST['title'],
46
-		$_POST['full_text'],
47
-		$_POST['post_file_comment'],
48
-		$blog_id
49
-	);
50
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded'));
44
+    Blog:: create_post(
45
+        $_POST['title'],
46
+        $_POST['full_text'],
47
+        $_POST['post_file_comment'],
48
+        $blog_id
49
+    );
50
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogAdded'));
51 51
 }
52 52
 if (!empty($_POST['edit_post_submit'])) {
53
-	Blog:: edit_post(
54
-		$_POST['post_id'],
55
-		$_POST['title'],
56
-		$_POST['full_text'],
57
-		$blog_id
58
-	);
59
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited'));
53
+    Blog:: edit_post(
54
+        $_POST['post_id'],
55
+        $_POST['title'],
56
+        $_POST['full_text'],
57
+        $blog_id
58
+    );
59
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogEdited'));
60 60
 }
61 61
 
62 62
 if (!empty($_POST['new_comment_submit'])) {
63
-	Blog:: create_comment(
64
-		$_POST['title'],
65
-		$_POST['comment'],
66
-		$_POST['post_file_comment'],
67
-		$blog_id,
68
-		$_GET['post_id'],
69
-		$_POST['comment_parent_id']
70
-	);
71
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded'));
63
+    Blog:: create_comment(
64
+        $_POST['title'],
65
+        $_POST['comment'],
66
+        $_POST['post_file_comment'],
67
+        $blog_id,
68
+        $_GET['post_id'],
69
+        $_POST['comment_parent_id']
70
+    );
71
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentAdded'));
72 72
 }
73 73
 
74 74
 if (!empty($_POST['new_task_submit'])) {
75 75
 
76
-	Blog:: create_task(
77
-		$blog_id,
78
-		$safe_task_name,
79
-		$safe_task_description,
80
-		(isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null),
81
-		(isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null),
82
-		(isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null),
83
-		(isset($_POST['task_color']) ? $_POST['task_color'] : null)
84
-	);
85
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated'));
76
+    Blog:: create_task(
77
+        $blog_id,
78
+        $safe_task_name,
79
+        $safe_task_description,
80
+        (isset($_POST['chkArticleDelete']) ? $_POST['chkArticleDelete'] : null),
81
+        (isset($_POST['chkArticleEdit']) ? $_POST['chkArticleEdit'] : null),
82
+        (isset($_POST['chkCommentsDelete']) ? $_POST['chkCommentsDelete'] : null),
83
+        (isset($_POST['task_color']) ? $_POST['task_color'] : null)
84
+    );
85
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskCreated'));
86 86
 }
87 87
 
88 88
 if (isset($_POST['edit_task_submit'])) {
89
-	Blog:: edit_task(
90
-		$_POST['blog_id'],
91
-		$_POST['task_id'],
92
-		$safe_task_name,
93
-		$safe_task_description,
94
-		$_POST['chkArticleDelete'],
95
-		$_POST['chkArticleEdit'],
96
-		$_POST['chkCommentsDelete'],
97
-		$_POST['task_color']
98
-	);
99
-	$return_message = array(
100
-		'type' => 'confirmation',
101
-		'message' => get_lang('TaskEdited')
102
-	);
89
+    Blog:: edit_task(
90
+        $_POST['blog_id'],
91
+        $_POST['task_id'],
92
+        $safe_task_name,
93
+        $safe_task_description,
94
+        $_POST['chkArticleDelete'],
95
+        $_POST['chkArticleEdit'],
96
+        $_POST['chkCommentsDelete'],
97
+        $_POST['task_color']
98
+    );
99
+    $return_message = array(
100
+        'type' => 'confirmation',
101
+        'message' => get_lang('TaskEdited')
102
+    );
103 103
 }
104 104
 
105 105
 if (!empty($_POST['assign_task_submit'])) {
106
-	Blog:: assign_task(
107
-		$blog_id,
108
-		$_POST['task_user_id'],
109
-		$_POST['task_task_id'],
110
-		$_POST['task_day']
111
-	);
112
-	$return_message = array(
113
-		'type' => 'confirmation',
114
-		'message' => get_lang('TaskAssigned')
115
-	);
106
+    Blog:: assign_task(
107
+        $blog_id,
108
+        $_POST['task_user_id'],
109
+        $_POST['task_task_id'],
110
+        $_POST['task_day']
111
+    );
112
+    $return_message = array(
113
+        'type' => 'confirmation',
114
+        'message' => get_lang('TaskAssigned')
115
+    );
116 116
 }
117 117
 
118 118
 if (isset($_POST['assign_task_edit_submit'])) {
119
-	Blog:: edit_assigned_task(
120
-		$blog_id,
121
-		$_POST['task_user_id'],
122
-		$_POST['task_task_id'],
123
-		$_POST['task_day'],
124
-		$_POST['old_user_id'],
125
-		$_POST['old_task_id'],
126
-		$_POST['old_target_date']
127
-	);
128
-	$return_message = array(
129
-		'type' => 'confirmation',
130
-		'message' => get_lang('AssignedTaskEdited')
131
-	);
119
+    Blog:: edit_assigned_task(
120
+        $blog_id,
121
+        $_POST['task_user_id'],
122
+        $_POST['task_task_id'],
123
+        $_POST['task_day'],
124
+        $_POST['old_user_id'],
125
+        $_POST['old_task_id'],
126
+        $_POST['old_target_date']
127
+    );
128
+    $return_message = array(
129
+        'type' => 'confirmation',
130
+        'message' => get_lang('AssignedTaskEdited')
131
+    );
132 132
 }
133 133
 if (!empty($_POST['new_task_execution_submit'])) {
134
-	Blog:: create_comment(
135
-		$safe_comment_title,
136
-		$safe_comment_text,
137
-		$blog_id,
138
-		(int)$_GET['post_id'],
139
-		$_POST['comment_parent_id'],
140
-		$_POST['task_id']
141
-	);
142
-	$return_message = array(
143
-		'type' => 'confirmation',
144
-		'message' => get_lang('CommentCreated')
145
-	);
134
+    Blog:: create_comment(
135
+        $safe_comment_title,
136
+        $safe_comment_text,
137
+        $blog_id,
138
+        (int)$_GET['post_id'],
139
+        $_POST['comment_parent_id'],
140
+        $_POST['task_id']
141
+    );
142
+    $return_message = array(
143
+        'type' => 'confirmation',
144
+        'message' => get_lang('CommentCreated')
145
+    );
146 146
 }
147 147
 if (!empty($_POST['register'])) {
148
-	if (is_array($_POST['user'])) {
149
-		foreach ($_POST['user'] as $index => $user_id) {
150
-			Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
151
-		}
152
-	}
148
+    if (is_array($_POST['user'])) {
149
+        foreach ($_POST['user'] as $index => $user_id) {
150
+            Blog :: set_user_subscribed((int)$_GET['blog_id'], $user_id);
151
+        }
152
+    }
153 153
 }
154 154
 if (!empty($_POST['unregister'])) {
155
-	if (is_array($_POST['user'])) {
156
-		foreach ($_POST['user'] as $index => $user_id) {
157
-			Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
158
-		}
159
-	}
155
+    if (is_array($_POST['user'])) {
156
+        foreach ($_POST['user'] as $index => $user_id) {
157
+            Blog :: set_user_unsubscribed((int)$_GET['blog_id'], $user_id);
158
+        }
159
+    }
160 160
 }
161 161
 if (!empty($_GET['register'])) {
162
-	Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
163
-	$return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
164
-	$flag = 1;
162
+    Blog :: set_user_subscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
163
+    $return_message = array('type' => 'confirmation', 'message' => get_lang('UserRegistered'));
164
+    $flag = 1;
165 165
 }
166 166
 if (!empty($_GET['unregister'])) {
167
-	Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
167
+    Blog :: set_user_unsubscribed((int)$_GET['blog_id'], (int)$_GET['user_id']);
168 168
 }
169 169
 
170 170
 if (isset($_GET['action']) && $_GET['action'] == 'manage_tasks') {
171
-	if (isset($_GET['do']) && $_GET['do'] == 'delete') {
172
-		Blog :: delete_task($blog_id, (int)$_GET['task_id']);
173
-		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
174
-	}
175
-
176
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') {
177
-		Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
178
-		$return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted'));
179
-	}
171
+    if (isset($_GET['do']) && $_GET['do'] == 'delete') {
172
+        Blog :: delete_task($blog_id, (int)$_GET['task_id']);
173
+        $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskDeleted'));
174
+    }
175
+
176
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_assignment') {
177
+        Blog :: delete_assigned_task($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
178
+        $return_message = array('type' => 'confirmation', 'message' => get_lang('TaskAssignmentDeleted'));
179
+    }
180 180
 }
181 181
 
182 182
 if (isset($_GET['action']) && $_GET['action'] == 'view_post') {
183
-	$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
184
-
185
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')	{
186
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
187
-			Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
188
-			$return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
189
-		} else {
190
-			$error = true;
191
-			$message = get_lang('ActionNotAllowed');
192
-		}
193
-	}
194
-
195
-	if (isset($_GET['do']) && $_GET['do'] == 'delete_article')	{
196
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
197
-			Blog :: delete_post($blog_id, (int)$_GET['article_id']);
198
-			$action = ''; // Article is gone, go to blog home
199
-			$return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
200
-		} else {
201
-			$error = true;
202
-			$message = get_lang('ActionNotAllowed');
203
-		}
204
-	}
205
-	if (isset($_GET['do']) && $_GET['do'] == 'rate') {
206
-		if (isset($_GET['type']) && $_GET['type'] == 'post') {
207
-			if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
208
-				Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
209
-				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
210
-			}
211
-		}
212
-		if (isset($_GET['type']) && $_GET['type'] == 'comment') {
213
-			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
214
-				Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
215
-				$return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
216
-			}
217
-		}
218
-	}
183
+    $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
184
+
185
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_comment')	{
186
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
187
+            Blog :: delete_comment($blog_id, (int)$_GET['post_id'],(int)$_GET['comment_id']);
188
+            $return_message = array('type' => 'confirmation', 'message' => get_lang('CommentDeleted'));
189
+        } else {
190
+            $error = true;
191
+            $message = get_lang('ActionNotAllowed');
192
+        }
193
+    }
194
+
195
+    if (isset($_GET['do']) && $_GET['do'] == 'delete_article')	{
196
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) {
197
+            Blog :: delete_post($blog_id, (int)$_GET['article_id']);
198
+            $action = ''; // Article is gone, go to blog home
199
+            $return_message = array('type' => 'confirmation', 'message' => get_lang('BlogDeleted'));
200
+        } else {
201
+            $error = true;
202
+            $message = get_lang('ActionNotAllowed');
203
+        }
204
+    }
205
+    if (isset($_GET['do']) && $_GET['do'] == 'rate') {
206
+        if (isset($_GET['type']) && $_GET['type'] == 'post') {
207
+            if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) {
208
+                Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']);
209
+                $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
210
+            }
211
+        }
212
+        if (isset($_GET['type']) && $_GET['type'] == 'comment') {
213
+            if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
214
+                Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']);
215
+                $return_message = array('type' => 'confirmation', 'message' => get_lang('RatingAdded'));
216
+            }
217
+        }
218
+    }
219 219
 }
220 220
 /*
221 221
 	DISPLAY
@@ -223,67 +223,67 @@  discard block
 block discarded – undo
223 223
 
224 224
 // Set breadcrumb
225 225
 switch ($action) {
226
-	case 'new_post' :
227
-		$nameTools = get_lang('NewPost');
226
+    case 'new_post' :
227
+        $nameTools = get_lang('NewPost');
228 228
         $interbreadcrumb[] = array(
229 229
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
230 230
             "name" => Blog:: get_blog_title($blog_id),
231 231
         );
232
-		Display :: display_header($nameTools, 'Blogs');
233
-		break;
234
-	case 'manage_tasks' :
235
-		$nameTools = get_lang('TaskManager');
232
+        Display :: display_header($nameTools, 'Blogs');
233
+        break;
234
+    case 'manage_tasks' :
235
+        $nameTools = get_lang('TaskManager');
236 236
         $interbreadcrumb[] = array(
237 237
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
238 238
             "name" => Blog:: get_blog_title($blog_id),
239 239
         );
240
-		Display :: display_header($nameTools, 'Blogs');
241
-		break;
242
-	case 'manage_members' :
243
-		$nameTools = get_lang('MemberManager');
240
+        Display :: display_header($nameTools, 'Blogs');
241
+        break;
242
+    case 'manage_members' :
243
+        $nameTools = get_lang('MemberManager');
244 244
         $interbreadcrumb[] = array(
245 245
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
246 246
             "name" => Blog:: get_blog_title($blog_id),
247 247
         );
248
-		Display :: display_header($nameTools, 'Blogs');
249
-		break;
250
-	case 'manage_rights' :
251
-		$nameTools = get_lang('RightsManager');
248
+        Display :: display_header($nameTools, 'Blogs');
249
+        break;
250
+    case 'manage_rights' :
251
+        $nameTools = get_lang('RightsManager');
252 252
         $interbreadcrumb[] = array(
253 253
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
254 254
             'name' => Blog:: get_blog_title($blog_id),
255 255
         );
256
-		Display :: display_header($nameTools, 'Blogs');
257
-		break;
258
-	case 'view_search_result' :
259
-		$nameTools = get_lang('SearchResults');
256
+        Display :: display_header($nameTools, 'Blogs');
257
+        break;
258
+    case 'view_search_result' :
259
+        $nameTools = get_lang('SearchResults');
260 260
         $interbreadcrumb[] = array(
261 261
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
262 262
             'name' => Blog:: get_blog_title($blog_id),
263 263
         );
264
-		Display :: display_header($nameTools, 'Blogs');
265
-		break;
266
-	case 'execute_task' :
267
-		$nameTools = get_lang('ExecuteThisTask');
264
+        Display :: display_header($nameTools, 'Blogs');
265
+        break;
266
+    case 'execute_task' :
267
+        $nameTools = get_lang('ExecuteThisTask');
268 268
         $interbreadcrumb[] = array(
269 269
             'url' => "blog.php?blog_id=$blog_id&".api_get_cidreq(),
270 270
             'name' => Blog:: get_blog_title($blog_id),
271 271
         );
272
-		Display :: display_header($nameTools, 'Blogs');
273
-		break;
274
-	default :
275
-		$nameTools = Blog :: get_blog_title($blog_id);
276
-		Display :: display_header($nameTools, 'Blogs');
272
+        Display :: display_header($nameTools, 'Blogs');
273
+        break;
274
+    default :
275
+        $nameTools = Blog :: get_blog_title($blog_id);
276
+        Display :: display_header($nameTools, 'Blogs');
277 277
 }
278 278
 
279 279
 // feedback messages
280 280
 if (!empty($return_message)) {
281
-	if ($return_message['type'] == 'confirmation') {
282
-		Display::display_confirmation_message($return_message['message']);
283
-	}
284
-	if ($return_message['type'] == 'error') {
285
-		Display::display_error_message($return_message['message']);
286
-	}
281
+    if ($return_message['type'] == 'confirmation') {
282
+        Display::display_confirmation_message($return_message['message']);
283
+    }
284
+    if ($return_message['type'] == 'error') {
285
+        Display::display_error_message($return_message['message']);
286
+    }
287 287
 }
288 288
 
289 289
 // actions
@@ -350,12 +350,12 @@  discard block
 block discarded – undo
350 350
 		<?php
351 351
 
352 352
 if (isset($error)) {
353
-	Display :: display_error_message($message);
353
+    Display :: display_error_message($message);
354 354
 }
355 355
 
356 356
 if (isset($flag) && $flag == '1') {
357
-	$action = "manage_tasks";
358
-	Blog :: display_assign_task_form($blog_id);
357
+    $action = "manage_tasks";
358
+    Blog :: display_assign_task_form($blog_id);
359 359
 }
360 360
 
361 361
 $user_task = false;
@@ -363,12 +363,12 @@  discard block
 block discarded – undo
363 363
 $course_id = api_get_course_int_id();
364 364
 
365 365
 if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) {
366
-	$task_id = (int)$_GET['task_id'];
366
+    $task_id = (int)$_GET['task_id'];
367 367
 } else {
368
-	$task_id = 0;
369
-	$tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);
368
+    $task_id = 0;
369
+    $tbl_blogs_tasks_rel_user = Database :: get_course_table(TABLE_BLOGS_TASKS_REL_USER);
370 370
 
371
-	$sql = "SELECT COUNT(*) as number
371
+    $sql = "SELECT COUNT(*) as number
372 372
 			FROM ".$tbl_blogs_tasks_rel_user."
373 373
 			WHERE
374 374
 			    c_id = $course_id AND
@@ -376,120 +376,120 @@  discard block
 block discarded – undo
376 376
 				user_id = ".api_get_user_id()." AND
377 377
 				task_id = ".$task_id;
378 378
 
379
-	$result = Database::query($sql);
380
-	$row = Database::fetch_array($result);
379
+    $result = Database::query($sql);
380
+    $row = Database::fetch_array($result);
381 381
 
382
-	if ($row['number'] == 1)
383
-		$user_task = true;
382
+    if ($row['number'] == 1)
383
+        $user_task = true;
384 384
 }
385 385
 
386 386
 switch ($action) {
387
-	case 'new_post':
388
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
389
-			// we show the form if
390
-			// 1. no post data
391
-			// 2. there is post data and the required field is empty
392
-			if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) {
393
-				// if there is post data there is certainly an error in the form
394
-				if ($_POST) {
395
-					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
396
-				}
397
-			Blog :: display_form_new_post($blog_id);
398
-		} else {
399
-				if (isset($_GET['filter']) && !empty($_GET['filter'])) {
400
-					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
401
-				} else {
402
-					Blog :: display_blog_posts($blog_id);
403
-				}
404
-			}
405
-		} else {
406
-			api_not_allowed();
407
-		}
408
-		break;
409
-	case 'view_post' :
410
-		Blog :: display_post($blog_id, intval($_GET['post_id']));
411
-		break;
412
-	case 'edit_post' :
413
-		$task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
414
-
415
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) {
416
-			// we show the form if
417
-			// 1. no post data
418
-			// 2. there is post data and the required field is empty
419
-			if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
420
-				// if there is post data there is certainly an error in the form
421
-				if ($_POST) {
422
-					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
423
-				}
387
+    case 'new_post':
388
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
389
+            // we show the form if
390
+            // 1. no post data
391
+            // 2. there is post data and the required field is empty
392
+            if (!$_POST OR (!empty($_POST) AND empty($_POST['title']))) {
393
+                // if there is post data there is certainly an error in the form
394
+                if ($_POST) {
395
+                    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
396
+                }
397
+            Blog :: display_form_new_post($blog_id);
398
+        } else {
399
+                if (isset($_GET['filter']) && !empty($_GET['filter'])) {
400
+                    Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
401
+                } else {
402
+                    Blog :: display_blog_posts($blog_id);
403
+                }
404
+            }
405
+        } else {
406
+            api_not_allowed();
407
+        }
408
+        break;
409
+    case 'view_post' :
410
+        Blog :: display_post($blog_id, intval($_GET['post_id']));
411
+        break;
412
+    case 'edit_post' :
413
+        $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0;
414
+
415
+        if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) {
416
+            // we show the form if
417
+            // 1. no post data
418
+            // 2. there is post data and the required field is empty
419
+            if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
420
+                // if there is post data there is certainly an error in the form
421
+                if ($_POST) {
422
+                    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
423
+                }
424 424
                 Blog :: display_form_edit_post($blog_id, intval($_GET['post_id']));
425
-			} else {
426
-				if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
427
-					Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
428
-				} else {
429
-					Blog :: display_blog_posts($blog_id);
430
-				}
431
-			}
432
-		} else {
433
-			api_not_allowed();
434
-		}
435
-
436
-		break;
437
-	case 'manage_members' :
438
-		if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
439
-			Blog :: display_form_user_subscribe($blog_id);
440
-			echo '<br /><br />';
441
-			Blog :: display_form_user_unsubscribe($blog_id);
442
-		} else {
443
-			api_not_allowed();
425
+            } else {
426
+                if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
427
+                    Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
428
+                } else {
429
+                    Blog :: display_blog_posts($blog_id);
430
+                }
431
+            }
432
+        } else {
433
+            api_not_allowed();
434
+        }
435
+
436
+        break;
437
+    case 'manage_members' :
438
+        if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
439
+            Blog :: display_form_user_subscribe($blog_id);
440
+            echo '<br /><br />';
441
+            Blog :: display_form_user_unsubscribe($blog_id);
442
+        } else {
443
+            api_not_allowed();
444 444
         }
445 445
 
446
-		break;
447
-	case 'manage_rights' :
448
-		Blog :: display_form_user_rights($blog_id);
449
-		break;
450
-	case 'manage_tasks' :
451
-		if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
452
-			if (isset($_GET['do']) && $_GET['do'] == 'add') {
453
-				Blog:: display_new_task_form($blog_id);
454
-			}
455
-			if (isset($_GET['do']) && $_GET['do'] == 'assign') {
456
-				Blog:: display_assign_task_form($blog_id);
457
-			}
458
-			if (isset($_GET['do']) && $_GET['do'] == 'edit') {
459
-				Blog:: display_edit_task_form(
460
-					$blog_id,
461
-					intval($_GET['task_id'])
462
-				);
463
-			}
464
-			if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
465
-				Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
466
-			}
467
-			Blog :: display_task_list($blog_id);
468
-			echo '<br /><br />';
469
-			Blog :: display_assigned_task_list($blog_id);
470
-			echo '<br /><br />';
471
-		}
472
-		else
473
-			api_not_allowed();
474
-
475
-		break;
476
-	case 'execute_task' :
477
-		if (isset ($_GET['post_id']))
478
-			Blog :: display_post($blog_id, intval($_GET['post_id']));
479
-		else
480
-			Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
481
-
482
-		break;
483
-	case 'view_search_result' :
484
-		Blog :: display_search_results($blog_id, Database::escape_string($_GET['q']));
485
-		break;
486
-	case '' :
487
-	default :
488
-		if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
489
-			Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
490
-		} else {
491
-			Blog :: display_blog_posts($blog_id);
492
-		}
446
+        break;
447
+    case 'manage_rights' :
448
+        Blog :: display_form_user_rights($blog_id);
449
+        break;
450
+    case 'manage_tasks' :
451
+        if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
452
+            if (isset($_GET['do']) && $_GET['do'] == 'add') {
453
+                Blog:: display_new_task_form($blog_id);
454
+            }
455
+            if (isset($_GET['do']) && $_GET['do'] == 'assign') {
456
+                Blog:: display_assign_task_form($blog_id);
457
+            }
458
+            if (isset($_GET['do']) && $_GET['do'] == 'edit') {
459
+                Blog:: display_edit_task_form(
460
+                    $blog_id,
461
+                    intval($_GET['task_id'])
462
+                );
463
+            }
464
+            if (isset($_GET['do']) && $_GET['do'] == 'edit_assignment') {
465
+                Blog :: display_edit_assigned_task_form($blog_id, intval($_GET['task_id']), intval($_GET['user_id']));
466
+            }
467
+            Blog :: display_task_list($blog_id);
468
+            echo '<br /><br />';
469
+            Blog :: display_assigned_task_list($blog_id);
470
+            echo '<br /><br />';
471
+        }
472
+        else
473
+            api_not_allowed();
474
+
475
+        break;
476
+    case 'execute_task' :
477
+        if (isset ($_GET['post_id']))
478
+            Blog :: display_post($blog_id, intval($_GET['post_id']));
479
+        else
480
+            Blog :: display_select_task_post($blog_id, intval($_GET['task_id']));
481
+
482
+        break;
483
+    case 'view_search_result' :
484
+        Blog :: display_search_results($blog_id, Database::escape_string($_GET['q']));
485
+        break;
486
+    case '' :
487
+    default :
488
+        if (isset ($_GET['filter']) && !empty ($_GET['filter'])) {
489
+            Blog :: display_day_results($blog_id, Database::escape_string($_GET['filter']));
490
+        } else {
491
+            Blog :: display_blog_posts($blog_id);
492
+        }
493 493
 }
494 494
 ?>
495 495
 </div>
Please login to merge, or discard this patch.
main/webservices/courses_list.soap.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -28,11 +28,11 @@  discard block
 block discarded – undo
28 28
         'all',
29 29
         '',
30 30
         array(
31
-          'name'=>'code'  , 'type'=>'xsd:string',
32
-          'name'=>'title'  , 'type'=>'xsd:string',
33
-          'name'=>'url'    , 'type'=>'xsd:string',
34
-          'name'=>'teacher', 'type'=>'xsd:string',
35
-          'name'=>'language','type'=>'xsd:string',
31
+            'name'=>'code'  , 'type'=>'xsd:string',
32
+            'name'=>'title'  , 'type'=>'xsd:string',
33
+            'name'=>'url'    , 'type'=>'xsd:string',
34
+            'name'=>'teacher', 'type'=>'xsd:string',
35
+            'name'=>'language','type'=>'xsd:string',
36 36
         )
37 37
 );
38 38
 
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 // Register the method to expose
54 54
 $server->register('WSCourseList',         // method name
55 55
     array('username' => 'xsd:string',
56
-          'signature' => 'xsd:string',
57
-          'visibilities' => 'xsd:string'),      // input parameters
56
+            'signature' => 'xsd:string',
57
+            'visibilities' => 'xsd:string'),      // input parameters
58 58
     array('return' => 'xsd:Array'),             // output parameters
59 59
     'urn:WSCourseList',                         // namespace
60 60
     'urn:WSCourseList#WSCourseList',      // soapaction
@@ -97,19 +97,19 @@  discard block
 block discarded – undo
97 97
 
98 98
     $courses_list = array();
99 99
 
100
-	if (!is_array($visibilities)) {
101
-		$visibilities = split(',', $visibilities);
102
-	}
103
-	foreach ($visibilities as $visibility) {
104
-		if (!in_array($visibility, array_keys($vis))) {
105
-   			return array('error_msg' => 'Security check failed');
106
-		}
107
-		$courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
108
-		foreach ($courses_list_tmp as $index => $course) {
109
-			$course_info = CourseManager::get_course_information($course['code']);
110
-			$courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
111
-		}
112
-	}
100
+    if (!is_array($visibilities)) {
101
+        $visibilities = split(',', $visibilities);
102
+    }
103
+    foreach ($visibilities as $visibility) {
104
+        if (!in_array($visibility, array_keys($vis))) {
105
+                return array('error_msg' => 'Security check failed');
106
+        }
107
+        $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
108
+        foreach ($courses_list_tmp as $index => $course) {
109
+            $course_info = CourseManager::get_course_information($course['code']);
110
+            $courses_list[] = array('code' => $course['code'], 'title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
111
+        }
112
+    }
113 113
     return $courses_list;
114 114
 }
115 115
 
Please login to merge, or discard this patch.
main/webservices/webservice.php 1 patch
Indentation   +220 added lines, -220 removed lines patch added patch discarded remove patch
@@ -11,237 +11,237 @@
 block discarded – undo
11 11
  */
12 12
 class WSError
13 13
 {
14
-	/**
15
-	 * Error handler. This needs to be a class that implements the interface WSErrorHandler
16
-	 *
17
-	 * @var WSErrorHandler
18
-	 */
19
-	protected static $_handler;
20
-
21
-	/**
22
-	 * Error code
23
-	 *
24
-	 * @var int
25
-	 */
26
-	public $code;
27
-
28
-	/**
29
-	 * Error message
30
-	 *
31
-	 * @var string
32
-	 */
33
-	public $message;
34
-
35
-	/**
36
-	 * Constructor
37
-	 *
38
-	 * @param int Error code
39
-	 * @param string Error message
40
-	 */
41
-	public function __construct($code, $message) {
42
-		$this->code = $code;
43
-		$this->message = $message;
44
-	}
45
-
46
-	/**
47
-	 * Sets the error handler
48
-	 *
49
-	 * @param WSErrorHandler Error handler
50
-	 */
51
-	public static function setErrorHandler($handler) {
52
-		if($handler instanceof WSErrorHandler) {
53
-			self::$_handler = $handler;
54
-		}
55
-	}
56
-
57
-	/**
58
-	 * Returns the error handler
59
-	 *
60
-	 * @return WSErrorHandler Error handler
61
-	 */
62
-	public static function getErrorHandler() {
63
-		return self::$_handler;
64
-	}
65
-
66
-	/**
67
-	 * Transforms the error into an array
68
-	 *
69
-	 * @return array Associative array with code and message
70
-	 */
71
-	public function toArray() {
72
-		return array('code' => $this->code, 'message' => $this->message);
73
-	}
14
+    /**
15
+     * Error handler. This needs to be a class that implements the interface WSErrorHandler
16
+     *
17
+     * @var WSErrorHandler
18
+     */
19
+    protected static $_handler;
20
+
21
+    /**
22
+     * Error code
23
+     *
24
+     * @var int
25
+     */
26
+    public $code;
27
+
28
+    /**
29
+     * Error message
30
+     *
31
+     * @var string
32
+     */
33
+    public $message;
34
+
35
+    /**
36
+     * Constructor
37
+     *
38
+     * @param int Error code
39
+     * @param string Error message
40
+     */
41
+    public function __construct($code, $message) {
42
+        $this->code = $code;
43
+        $this->message = $message;
44
+    }
45
+
46
+    /**
47
+     * Sets the error handler
48
+     *
49
+     * @param WSErrorHandler Error handler
50
+     */
51
+    public static function setErrorHandler($handler) {
52
+        if($handler instanceof WSErrorHandler) {
53
+            self::$_handler = $handler;
54
+        }
55
+    }
56
+
57
+    /**
58
+     * Returns the error handler
59
+     *
60
+     * @return WSErrorHandler Error handler
61
+     */
62
+    public static function getErrorHandler() {
63
+        return self::$_handler;
64
+    }
65
+
66
+    /**
67
+     * Transforms the error into an array
68
+     *
69
+     * @return array Associative array with code and message
70
+     */
71
+    public function toArray() {
72
+        return array('code' => $this->code, 'message' => $this->message);
73
+    }
74 74
 }
75 75
 
76 76
 /**
77 77
  * Interface that must be implemented by any error handler
78 78
  */
79 79
 interface WSErrorHandler {
80
-	/**
81
-	 * Handle method
82
-	 *
83
-	 * @param WSError Error
84
-	 */
85
-	public function handle($error);
80
+    /**
81
+     * Handle method
82
+     *
83
+     * @param WSError Error
84
+     */
85
+    public function handle($error);
86 86
 }
87 87
 
88 88
 /**
89 89
  * Main class of the webservice. Webservice classes extend this class
90 90
  */
91 91
 class WS {
92
-	/**
93
-	 * Chamilo configuration
94
-	 *
95
-	 * @var array
96
-	 */
97
-	protected $_configuration;
98
-
99
-	/**
100
-	 * Constructor
101
-	 */
102
-	public function __construct() {
103
-		$this->_configuration = $GLOBALS['_configuration'];
104
-	}
105
-
106
-	/**
107
-	 * Verifies the API key
108
-	 *
109
-	 * @param string Secret key
110
-	 * @return mixed WSError in case of failure, null in case of success
111
-	 */
112
-	protected function verifyKey($secret_key) {
113
-		$ip = trim($_SERVER['REMOTE_ADDR']);
114
-		// if we are behind a reverse proxy, assume it will send the
115
-		// HTTP_X_FORWARDED_FOR header and use this IP instead
116
-		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
117
-			list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
118
-			$ip = trim($ip1);
119
-		}
120
-		$security_key = $ip.$this->_configuration['security_key'];
121
-
122
-		if(!api_is_valid_secret_key($secret_key, $security_key)) {
123
-			return new WSError(1, "API key is invalid");
124
-		} else {
125
-			return null;
126
-		}
127
-	}
128
-
129
-	/**
130
-	 * Gets the real user id based on the user id field name and value.
131
-	 * Note that if the user id field name is "chamilo_user_id", it will use the user id
132
-	 * in the system database
133
-	 *
134
-	 * @param string User id field name
135
-	 * @param string User id value
136
-	 * @return mixed System user id if the user was found, WSError otherwise
137
-	 */
138
-	protected function getUserId($user_id_field_name, $user_id_value) {
139
-		if($user_id_field_name == "chamilo_user_id") {
140
-			if(UserManager::is_user_id_valid(intval($user_id_value))) {
141
-				return intval($user_id_value);
142
-			} else {
143
-				return new WSError(100, "User not found");
144
-			}
145
-		} else {
146
-			$user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
147
-			if($user_id == 0) {
148
-				return new WSError(100, "User not found");
149
-			} else {
150
-				return $user_id;
151
-			}
152
-		}
153
-	}
154
-
155
-	/**
156
-	 * Gets the real course id based on the course id field name and value.
157
-	 * Note that if the course id field name is "chamilo_course_id", it will use the course id
158
-	 * in the system database
159
-	 *
160
-	 * @param string Course id field name
161
-	 * @param string Course id value
162
-	 * @return mixed System course id if the course was found, WSError otherwise
163
-	 */
164
-	protected function getCourseId($course_id_field_name, $course_id_value)
165
-	{
166
-		if ($course_id_field_name == "chamilo_course_id") {
167
-			if (CourseManager::get_course_code_from_course_id(
168
-					intval($course_id_value)
169
-				) != null
170
-			) {
171
-				return intval($course_id_value);
172
-			} else {
173
-				return new WSError(200, "Course not found");
174
-			}
175
-		} else {
176
-			$courseId = CourseManager::get_course_code_from_original_id(
177
-				$course_id_value,
178
-				$course_id_field_name
179
-			);
180
-			if (!empty($courseId)) {
181
-				return $courseId;
182
-			} else {
183
-				return new WSError(200, "Course not found");
184
-			}
185
-		}
186
-	}
187
-
188
-	/**
189
-	 * Gets the real session id based on the session id field name and value.
190
-	 * Note that if the session id field name is "chamilo_session_id", it will use the session id
191
-	 * in the system database
192
-	 *
193
-	 * @param string Session id field name
194
-	 * @param string Session id value
195
-	 * @return mixed System session id if the session was found, WSError otherwise
196
-	 */
197
-	protected function getSessionId($session_id_field_name, $session_id_value)
198
-	{
199
-		if ($session_id_field_name == "chamilo_session_id") {
200
-			$session = SessionManager::fetch((int)$session_id_value);
201
-			if (!empty($session)) {
202
-				return intval($session_id_value);
203
-			} else {
204
-				return new WSError(300, "Session not found");
205
-			}
206
-		} else {
207
-			$session_id = SessionManager::getSessionIdFromOriginalId(
208
-				$session_id_value,
209
-				$session_id_field_name
210
-			);
211
-			if ($session_id == 0) {
212
-				return new WSError(300, "Session not found");
213
-			} else {
214
-				return $session_id;
215
-			}
216
-		}
217
-	}
218
-
219
-	/**
220
-	 * Handles an error by calling the WSError error handler
221
-	 *
222
-	 * @param WSError Error
223
-	 */
224
-	protected function handleError($error) {
225
-		$handler = WSError::getErrorHandler();
226
-		$handler->handle($error);
227
-	}
228
-
229
-	/**
230
-	 * Gets a successful result
231
-	 *
232
-	 * @return array Array with a code of 0 and a message 'Operation was successful'
233
-	 */
234
-	protected function getSuccessfulResult() {
235
-		return array('code' => 0, 'message' => 'Operation was successful');
236
-	}
237
-
238
-	/**
239
-	 * Test function. Returns the string success
240
-	 *
241
-	 * @return string Success
242
-	 */
243
-	public function test() {
244
-		return "success";
245
-	}
92
+    /**
93
+     * Chamilo configuration
94
+     *
95
+     * @var array
96
+     */
97
+    protected $_configuration;
98
+
99
+    /**
100
+     * Constructor
101
+     */
102
+    public function __construct() {
103
+        $this->_configuration = $GLOBALS['_configuration'];
104
+    }
105
+
106
+    /**
107
+     * Verifies the API key
108
+     *
109
+     * @param string Secret key
110
+     * @return mixed WSError in case of failure, null in case of success
111
+     */
112
+    protected function verifyKey($secret_key) {
113
+        $ip = trim($_SERVER['REMOTE_ADDR']);
114
+        // if we are behind a reverse proxy, assume it will send the
115
+        // HTTP_X_FORWARDED_FOR header and use this IP instead
116
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
117
+            list($ip1,$ip2) = preg_split('/,/',$_SERVER['HTTP_X_FORWARDED_FOR']);
118
+            $ip = trim($ip1);
119
+        }
120
+        $security_key = $ip.$this->_configuration['security_key'];
121
+
122
+        if(!api_is_valid_secret_key($secret_key, $security_key)) {
123
+            return new WSError(1, "API key is invalid");
124
+        } else {
125
+            return null;
126
+        }
127
+    }
128
+
129
+    /**
130
+     * Gets the real user id based on the user id field name and value.
131
+     * Note that if the user id field name is "chamilo_user_id", it will use the user id
132
+     * in the system database
133
+     *
134
+     * @param string User id field name
135
+     * @param string User id value
136
+     * @return mixed System user id if the user was found, WSError otherwise
137
+     */
138
+    protected function getUserId($user_id_field_name, $user_id_value) {
139
+        if($user_id_field_name == "chamilo_user_id") {
140
+            if(UserManager::is_user_id_valid(intval($user_id_value))) {
141
+                return intval($user_id_value);
142
+            } else {
143
+                return new WSError(100, "User not found");
144
+            }
145
+        } else {
146
+            $user_id = UserManager::get_user_id_from_original_id($user_id_value, $user_id_field_name);
147
+            if($user_id == 0) {
148
+                return new WSError(100, "User not found");
149
+            } else {
150
+                return $user_id;
151
+            }
152
+        }
153
+    }
154
+
155
+    /**
156
+     * Gets the real course id based on the course id field name and value.
157
+     * Note that if the course id field name is "chamilo_course_id", it will use the course id
158
+     * in the system database
159
+     *
160
+     * @param string Course id field name
161
+     * @param string Course id value
162
+     * @return mixed System course id if the course was found, WSError otherwise
163
+     */
164
+    protected function getCourseId($course_id_field_name, $course_id_value)
165
+    {
166
+        if ($course_id_field_name == "chamilo_course_id") {
167
+            if (CourseManager::get_course_code_from_course_id(
168
+                    intval($course_id_value)
169
+                ) != null
170
+            ) {
171
+                return intval($course_id_value);
172
+            } else {
173
+                return new WSError(200, "Course not found");
174
+            }
175
+        } else {
176
+            $courseId = CourseManager::get_course_code_from_original_id(
177
+                $course_id_value,
178
+                $course_id_field_name
179
+            );
180
+            if (!empty($courseId)) {
181
+                return $courseId;
182
+            } else {
183
+                return new WSError(200, "Course not found");
184
+            }
185
+        }
186
+    }
187
+
188
+    /**
189
+     * Gets the real session id based on the session id field name and value.
190
+     * Note that if the session id field name is "chamilo_session_id", it will use the session id
191
+     * in the system database
192
+     *
193
+     * @param string Session id field name
194
+     * @param string Session id value
195
+     * @return mixed System session id if the session was found, WSError otherwise
196
+     */
197
+    protected function getSessionId($session_id_field_name, $session_id_value)
198
+    {
199
+        if ($session_id_field_name == "chamilo_session_id") {
200
+            $session = SessionManager::fetch((int)$session_id_value);
201
+            if (!empty($session)) {
202
+                return intval($session_id_value);
203
+            } else {
204
+                return new WSError(300, "Session not found");
205
+            }
206
+        } else {
207
+            $session_id = SessionManager::getSessionIdFromOriginalId(
208
+                $session_id_value,
209
+                $session_id_field_name
210
+            );
211
+            if ($session_id == 0) {
212
+                return new WSError(300, "Session not found");
213
+            } else {
214
+                return $session_id;
215
+            }
216
+        }
217
+    }
218
+
219
+    /**
220
+     * Handles an error by calling the WSError error handler
221
+     *
222
+     * @param WSError Error
223
+     */
224
+    protected function handleError($error) {
225
+        $handler = WSError::getErrorHandler();
226
+        $handler->handle($error);
227
+    }
228
+
229
+    /**
230
+     * Gets a successful result
231
+     *
232
+     * @return array Array with a code of 0 and a message 'Operation was successful'
233
+     */
234
+    protected function getSuccessfulResult() {
235
+        return array('code' => 0, 'message' => 'Operation was successful');
236
+    }
237
+
238
+    /**
239
+     * Test function. Returns the string success
240
+     *
241
+     * @return string Success
242
+     */
243
+    public function test() {
244
+        return "success";
245
+    }
246 246
 }
247 247
 
Please login to merge, or discard this patch.
main/webservices/webservice_course.php 1 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/courses_list.rest.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -22,32 +22,32 @@  discard block
 block discarded – undo
22 22
  */
23 23
 function courses_list($security_key, $visibilities = 'public') {
24 24
 
25
-	global $_configuration;
25
+    global $_configuration;
26 26
 
27
-   	// Check if this script is launch by server and if security key is ok.
28
-   	if ($security_key != $_configuration['security_key']) {
29
-   		return array('error_msg' => 'Security check failed');
30
-   	}
27
+        // Check if this script is launch by server and if security key is ok.
28
+        if ($security_key != $_configuration['security_key']) {
29
+            return array('error_msg' => 'Security check failed');
30
+        }
31 31
 
32
-	$vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
32
+    $vis = array('public' => '3', 'public-registered' => '2', 'private' => '1', 'closed' => '0');
33 33
 
34
-	$courses_list = array();
34
+    $courses_list = array();
35 35
 
36
-	if (!is_array($visibilities)) {
37
-		$tmp = $visibilities;
38
-		$visibilities = array($tmp);
39
-	}
40
-	foreach ($visibilities as $visibility) {
41
-		if (!in_array($visibility, array_keys($vis))) {
42
-   			return array('error_msg' => 'Security check failed');
43
-		}
44
-		$courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
45
-		foreach ($courses_list_tmp as $index => $course) {
46
-			$course_info = CourseManager::get_course_information($course['code']);
47
-			$courses_list[$course['code']] = array('title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
48
-		}
49
-	}
50
-	return $courses_list;
36
+    if (!is_array($visibilities)) {
37
+        $tmp = $visibilities;
38
+        $visibilities = array($tmp);
39
+    }
40
+    foreach ($visibilities as $visibility) {
41
+        if (!in_array($visibility, array_keys($vis))) {
42
+                return array('error_msg' => 'Security check failed');
43
+        }
44
+        $courses_list_tmp = CourseManager::get_courses_list(null, null, null, null, $vis[$visibility]);
45
+        foreach ($courses_list_tmp as $index => $course) {
46
+            $course_info = CourseManager::get_course_information($course['code']);
47
+            $courses_list[$course['code']] = array('title' => api_utf8_encode($course_info['title']), 'url' => api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/', 'teacher' => api_utf8_encode($course_info['tutor_name']), 'language' => $course_info['course_language']);
48
+        }
49
+    }
50
+    return $courses_list;
51 51
 }
52 52
 
53 53
 header('Content-Type: text/xml; charset=utf-8');
@@ -55,17 +55,17 @@  discard block
 block discarded – undo
55 55
 echo '<courseslist>';
56 56
 
57 57
 if (empty($_POST['security-key']) || empty($_POST['visibility'])) {
58
-	echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>';
58
+    echo '<errormsg>Invalid parameters, this script expects a security-key and a visibility parameters</errormsg>';
59 59
 } else {
60
-	$courses_list = courses_list($_POST['security-key'], $_POST['visibility']);
61
-	foreach ($courses_list as $code => $cd) {
62
-		echo '<course>';
63
-		echo '<code>' , $code , '</code>';
64
-		echo '<title>' , $cd['title'] , '</title>';
65
-		echo '<url>' , $cd['url'] , '</url>';
66
-		echo '<teacher>' , $cd['teacher'] , '</teacher>';
67
-		echo '<language>' , $cd['language'] , '</language>';
68
-		echo '</course>';
69
-	}
60
+    $courses_list = courses_list($_POST['security-key'], $_POST['visibility']);
61
+    foreach ($courses_list as $code => $cd) {
62
+        echo '<course>';
63
+        echo '<code>' , $code , '</code>';
64
+        echo '<title>' , $cd['title'] , '</title>';
65
+        echo '<url>' , $cd['url'] , '</url>';
66
+        echo '<teacher>' , $cd['teacher'] , '</teacher>';
67
+        echo '<language>' , $cd['language'] , '</language>';
68
+        echo '</course>';
69
+    }
70 70
 }
71 71
 echo '</courseslist>';
Please login to merge, or discard this patch.
main/coursecopy/recycle_course.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 $result = $objExercise->read($exercise_id);
18 18
 
19 19
 if (!$result) {
20
-	api_not_allowed(true);
20
+    api_not_allowed(true);
21 21
 }
22 22
 
23 23
 $interbreadcrumb[] = array(
Please login to merge, or discard this patch.
main/document/save_pixlr.php 1 patch
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -17,18 +17,18 @@  discard block
 block discarded – undo
17 17
 api_block_anonymous_users();
18 18
 
19 19
 if ($_user['user_id']!= api_get_user_id() || api_get_user_id()==0 || $_user['user_id']==0) {
20
-	api_not_allowed();
21
-	die();
20
+    api_not_allowed();
21
+    die();
22 22
 }
23 23
 
24 24
 if(!isset($_GET['title']) || !isset($_GET['type']) || !isset($_GET['image'])) {
25
-	api_not_allowed();
26
-	die();
25
+    api_not_allowed();
26
+    die();
27 27
 }
28 28
 
29 29
 if(!isset($_SESSION['paint_dir']) || !isset($_SESSION['whereami']) ){
30
-	api_not_allowed();
31
-	die();
30
+    api_not_allowed();
31
+    die();
32 32
 }
33 33
 
34 34
 //pixlr return
@@ -72,22 +72,22 @@  discard block
 block discarded – undo
72 72
 $filename = disable_dangerous_file($filename);
73 73
 
74 74
 if (strlen(trim($filename))==0) {
75
-	 echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
76
-	 exit;
75
+        echo "The title is empty";//if title is empty, headers Content-Type = application/octet-stream, then not create a new title here please
76
+        exit;
77 77
 }
78 78
 
79 79
 //check file_get_contents
80 80
 if ($contents === false) {
81
-	echo "I cannot read: ".$urlcontents;
81
+    echo "I cannot read: ".$urlcontents;
82 82
     exit;
83 83
 }
84 84
 
85 85
 // Extension security
86 86
 if($extension!= 'jpg' && $extension!= 'png' && $extension!= 'pxd'){
87
-	die();
87
+    die();
88 88
 }
89 89
 if($extension=='pxd') {
90
-	echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
90
+    echo "pxd file type does not supported";// not secure because check security headers and finfo() return  Content-Type = application/octet-stream
91 91
     exit;
92 92
 }
93 93
 
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
 $headers = get_headers($urlcontents, 1);
96 96
 $content_type = explode("/", $headers['Content-Type']);
97 97
 if ($content_type[0] != "image") {
98
-	echo "Invalid file type";
99
-	exit;
98
+    echo "Invalid file type";
99
+    exit;
100 100
 }
101 101
 
102 102
 //Verify that the file is an image. Fileinfo method
@@ -114,49 +114,49 @@  discard block
 block discarded – undo
114 114
 $title = $title.'.'.$extension;
115 115
 
116 116
 if($currentTool=='document/createpaint'){
117
-	//check save as and prevent rewrite an older file with same name
118
-	if (0 != $groupId){
117
+    //check save as and prevent rewrite an older file with same name
118
+    if (0 != $groupId){
119 119
         $group_properties  = GroupManager :: get_group_properties($groupId);
120 120
         $groupPath = $group_properties['directory'];
121
-	} else {
122
-		$groupPath ='';
123
-	}
124
-
125
-	if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
126
-		$i = 1;
127
-		while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
128
-		$paintFileName = $filename . '_' . $i . '.'.$extension;
129
-		$title = $filename . '_' . $i . '.'.$extension;
130
-	}
131
-
132
-	//
133
-	$documentPath = $saveDir.'/'.$paintFileName;
134
-	//add new document to disk
135
-	file_put_contents( $documentPath, $contents );
136
-	//add document to database
137
-	$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
138
-	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
121
+    } else {
122
+        $groupPath ='';
123
+    }
124
+
125
+    if (file_exists($saveDir.'/'.$filename.'.'.$extension)){
126
+        $i = 1;
127
+        while (file_exists($saveDir.'/'.$filename.'_'.$i.'.'.$extension)) $i++;
128
+        $paintFileName = $filename . '_' . $i . '.'.$extension;
129
+        $title = $filename . '_' . $i . '.'.$extension;
130
+    }
131
+
132
+    //
133
+    $documentPath = $saveDir.'/'.$paintFileName;
134
+    //add new document to disk
135
+    file_put_contents( $documentPath, $contents );
136
+    //add document to database
137
+    $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
138
+    api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
139 139
 
140 140
 }elseif($currentTool=='document/editpaint'){
141 141
 
142
-	$documentPath = $saveDir.'/'.$paintFileName;
143
-	//add new document to disk
144
-	file_put_contents( $documentPath, $contents );
145
-
146
-	//check path
147
-	if(!isset($_SESSION['paint_file'])){
148
-		api_not_allowed();
149
-		die();
150
-	}
151
-	if($_SESSION['paint_file']==$paintFileName){
152
-		$document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
153
-		update_existing_document($_course, $document_id, filesize($documentPath), null);
154
-		api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
155
-	}else{
156
-		//add a new document
157
-		$doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
158
-		api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
159
-	}
142
+    $documentPath = $saveDir.'/'.$paintFileName;
143
+    //add new document to disk
144
+    file_put_contents( $documentPath, $contents );
145
+
146
+    //check path
147
+    if(!isset($_SESSION['paint_file'])){
148
+        api_not_allowed();
149
+        die();
150
+    }
151
+    if($_SESSION['paint_file']==$paintFileName){
152
+        $document_id = DocumentManager::get_document_id($_course, $relativeUrlPath.'/'.$paintFileName);
153
+        update_existing_document($_course, $document_id, filesize($documentPath), null);
154
+        api_item_property_update($_course, TOOL_DOCUMENT, $document_id, 'DocumentUpdated', $_user['user_id'], $groupId, null, null, null, $current_session_id);
155
+    }else{
156
+        //add a new document
157
+        $doc_id = add_document($_course, $relativeUrlPath.'/'.$paintFileName, 'file', filesize($documentPath), $title);
158
+        api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
159
+    }
160 160
 }
161 161
 
162 162
 
@@ -171,12 +171,12 @@  discard block
 block discarded – undo
171 171
 unset($_SESSION['temp_realpath_image']);
172 172
 
173 173
 if (!isset($_SESSION['exit_pixlr'])) {
174
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
175
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
176
-	api_not_allowed(true);
174
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php';
175
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
176
+    api_not_allowed(true);
177 177
 } else {
178
-	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
179
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
180
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
181
-	unset($_SESSION['exit_pixlr']);
178
+    echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
179
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
180
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
181
+    unset($_SESSION['exit_pixlr']);
182 182
 }
Please login to merge, or discard this patch.
main/document/document_quota.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         }
86 86
     }
87 87
     if ($quota_bytes != 0) {
88
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
88
+        $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
89 89
     }
90 90
 
91 91
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
         }
104 104
         $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
105 105
 
106
-   }
106
+    }
107 107
 }
108 108
 
109 109
 $quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;
Please login to merge, or discard this patch.
main/document/create_document.php 1 patch
Indentation   +168 added lines, -168 removed lines patch added patch discarded remove patch
@@ -77,13 +77,13 @@  discard block
 block discarded – undo
77 77
 $is_certificate_mode = false;
78 78
 
79 79
 if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') {
80
-	$is_certificate_mode = true;
80
+    $is_certificate_mode = true;
81 81
 }
82 82
 
83 83
 if ($is_certificate_mode) {
84
-	$nameTools = get_lang('CreateCertificate');
84
+    $nameTools = get_lang('CreateCertificate');
85 85
 } else {
86
-	$nameTools = get_lang('CreateDocument');
86
+    $nameTools = get_lang('CreateDocument');
87 87
 }
88 88
 
89 89
 /*	Constants and variables */
@@ -136,26 +136,26 @@  discard block
 block discarded – undo
136 136
 
137 137
 // Please, do not modify this dirname formatting
138 138
 if (strstr($dir, '..')) {
139
-	$dir = '/';
139
+    $dir = '/';
140 140
 }
141 141
 
142 142
 if ($dir[0] == '.') {
143
-	$dir = substr($dir, 1);
143
+    $dir = substr($dir, 1);
144 144
 }
145 145
 
146 146
 if ($dir[0] != '/') {
147
-	$dir = '/'.$dir;
147
+    $dir = '/'.$dir;
148 148
 }
149 149
 
150 150
 if ($dir[strlen($dir) - 1] != '/') {
151
-	$dir .= '/';
151
+    $dir .= '/';
152 152
 }
153 153
 
154 154
 if ($is_certificate_mode) {
155
-	$document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
156
-	$document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
157
-	$folder_id = $document_data['id'];
158
-	$dir = '/certificates/';
155
+    $document_id 	= DocumentManager::get_document_id(api_get_course_info(), '/certificates');
156
+    $document_data 	= DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
157
+    $folder_id = $document_data['id'];
158
+    $dir = '/certificates/';
159 159
 }
160 160
 
161 161
 $doc_tree  = explode('/', $dir);
@@ -166,16 +166,16 @@  discard block
 block discarded – undo
166 166
 
167 167
     // Level correction for group documents.
168 168
     if (!empty($group_properties['directory'])) {
169
-    	$count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
169
+        $count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
170 170
     }
171 171
 }
172 172
 $relative_url = '';
173 173
 for ($i = 0; $i < ($count_dir); $i++) {
174
-	$relative_url .= '../';
174
+    $relative_url .= '../';
175 175
 }
176 176
 
177 177
 if ($relative_url== '') {
178
-	$relative_url = '/';
178
+    $relative_url = '/';
179 179
 }
180 180
 
181 181
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -187,11 +187,11 @@  discard block
 block discarded – undo
187 187
     'cols-size' => [2, 10, 0],
188 188
     'FullPage' => true,
189 189
     'InDocument' => true,
190
-	'CreateDocumentDir'    => $relative_url,
191
-	'CreateDocumentWebDir' => (empty($group_properties['directory']))
192
-                        		? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
193
-                        		: api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
194
-	'BaseHref'             => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
190
+    'CreateDocumentDir'    => $relative_url,
191
+    'CreateDocumentWebDir' => (empty($group_properties['directory']))
192
+                                ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
193
+                                : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
194
+    'BaseHref'             => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
195 195
 );
196 196
 
197 197
 if ($is_certificate_mode) {
@@ -203,36 +203,36 @@  discard block
 block discarded – undo
203 203
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
204 204
 
205 205
 if (!is_dir($filepath)) {
206
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
207
-	$dir = '/';
206
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
207
+    $dir = '/';
208 208
 }
209 209
 
210 210
 $to_group_id = 0;
211 211
 
212 212
 if (!$is_certificate_mode) {
213
-	if (api_is_in_group()) {
214
-		$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
215
-		$noPHP_SELF = true;
216
-		$to_group_id = api_get_group_id();
217
-		$path = explode('/', $dir);
218
-		if ('/'.$path[1] != $group_properties['directory']) {
219
-			api_not_allowed(true);
220
-		}
221
-	}
222
-	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
213
+    if (api_is_in_group()) {
214
+        $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
215
+        $noPHP_SELF = true;
216
+        $to_group_id = api_get_group_id();
217
+        $path = explode('/', $dir);
218
+        if ('/'.$path[1] != $group_properties['directory']) {
219
+            api_not_allowed(true);
220
+        }
221
+    }
222
+    $interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
223 223
 } else {
224
-	$interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
224
+    $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
225 225
 }
226 226
 
227 227
 if (!$is_allowed_in_course) {
228
-	api_not_allowed(true);
228
+    api_not_allowed(true);
229 229
 }
230 230
 
231 231
 if (!($is_allowed_to_edit ||
232 232
     $_SESSION['group_member_with_upload_rights'] ||
233 233
     DocumentManager::is_my_shared_folder($userId, $dir, api_get_session_id()))
234 234
 ) {
235
-	api_not_allowed(true);
235
+    api_not_allowed(true);
236 236
 }
237 237
 
238 238
 /*	Header */
@@ -240,10 +240,10 @@  discard block
 block discarded – undo
240 240
 
241 241
 $display_dir = $dir;
242 242
 if (isset($group_properties)) {
243
-	$display_dir = explode('/', $dir);
244
-	unset($display_dir[0]);
245
-	unset($display_dir[1]);
246
-	$display_dir = implode('/', $display_dir);
243
+    $display_dir = explode('/', $dir);
244
+    unset($display_dir[0]);
245
+    unset($display_dir[1]);
246
+    $display_dir = implode('/', $display_dir);
247 247
 }
248 248
 
249 249
 $select_cat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : null;
@@ -260,9 +260,9 @@  discard block
 block discarded – undo
260 260
 $form->addElement('header', $nameTools);
261 261
 
262 262
 if ($is_certificate_mode) {//added condition for certicate in gradebook
263
-	$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
264
-	if (isset($_GET['selectcat'])) {
265
-		$form->addElement('hidden','selectcat', $select_cat);
263
+    $form->addElement('hidden','certificate','true',array('id'=>'certificate'));
264
+    if (isset($_GET['selectcat'])) {
265
+        $form->addElement('hidden','selectcat', $select_cat);
266 266
     }
267 267
 }
268 268
 
@@ -297,12 +297,12 @@  discard block
 block discarded – undo
297 297
 if ($is_certificate_mode) {
298 298
     $form->addText('title', get_lang('CertificateName'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
299 299
 } else {
300
-	$form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
300
+    $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
301 301
 }
302 302
 
303 303
 // Show read-only box only in groups
304 304
 if (!empty($groupId)) {
305
-	$group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
305
+    $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
306 306
 }
307 307
 $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
308 308
 $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
@@ -317,14 +317,14 @@  discard block
 block discarded – undo
317 317
 // new document created
318 318
 
319 319
 if (!$is_certificate_mode &&
320
-	!DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
320
+    !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
321 321
 ) {
322
-	$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
322
+    $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
323 323
 
324
-	//$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
324
+    //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
325 325
         $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) );
326
-	// Following two conditions copied from document.inc.php::build_directory_selector()
327
-	$folder_titles = array();
326
+    // Following two conditions copied from document.inc.php::build_directory_selector()
327
+    $folder_titles = array();
328 328
 
329 329
     if (is_array($folders)) {
330 330
         $escaped_folders = array();
@@ -362,22 +362,22 @@  discard block
 block discarded – undo
362 362
         }
363 363
     }
364 364
 
365
-	if (empty($group_dir)) {
366
-		$parent_select -> addOption(get_lang('HomeDirectory'), '/');
367
-		if (is_array($folders)) {
368
-			foreach ($folders as & $folder) {
369
-				//Hide some folders
370
-				if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
365
+    if (empty($group_dir)) {
366
+        $parent_select -> addOption(get_lang('HomeDirectory'), '/');
367
+        if (is_array($folders)) {
368
+            foreach ($folders as & $folder) {
369
+                //Hide some folders
370
+                if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
371 371
                     continue;
372
-				}
373
-				//Admin setting for Hide/Show the folders of all users
374
-				if (api_get_setting('show_users_folders') == 'false' &&
372
+                }
373
+                //Admin setting for Hide/Show the folders of all users
374
+                if (api_get_setting('show_users_folders') == 'false' &&
375 375
                     (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
376 376
                 ){
377
-					continue;
378
-				}
379
-				//Admin setting for Hide/Show Default folders to all users
380
-				if (api_get_setting('show_default_folders') == 'false' &&
377
+                    continue;
378
+                }
379
+                //Admin setting for Hide/Show Default folders to all users
380
+                if (api_get_setting('show_default_folders') == 'false' &&
381 381
                     (
382 382
                         $folder == '/images' ||
383 383
                         $folder == '/flash' ||
@@ -387,80 +387,80 @@  discard block
 block discarded – undo
387 387
                         $folder == '/video/flv'
388 388
                     )
389 389
                 ){
390
-					continue;
391
-				}
392
-				//Admin setting for Hide/Show chat history folder
393
-				if (api_get_setting('show_chat_folder') == 'false' &&
390
+                    continue;
391
+                }
392
+                //Admin setting for Hide/Show chat history folder
393
+                if (api_get_setting('show_chat_folder') == 'false' &&
394 394
                     $folder=='/chat_files'
395 395
                 ){
396
-					continue;
397
-				}
396
+                    continue;
397
+                }
398 398
 
399
-				$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
400
-				$path_parts = explode('/', $folder);
401
-				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
399
+                $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
400
+                $path_parts = explode('/', $folder);
401
+                $folder_titles[$folder] = cut($folder_titles[$folder], 80);
402 402
                 $space_counter =count($path_parts) - 2;
403 403
                 if ($space_counter > 0) {
404 404
                     $label = str_repeat('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$folder_titles[$folder];
405 405
                 } else {
406 406
                     $label = ' &mdash; '.$folder_titles[$folder];
407 407
                 }
408
-				$parent_select -> addOption($label, $folder);
409
-				if ($selected != '') {
410
-					$parent_select->setSelected($folder);
411
-				}
412
-			}
413
-		}
414
-	} else {
415
-		foreach ($folders as & $folder) {
416
-			$selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
417
-			$label = $folder_titles[$folder];
418
-			if ($folder == $group_dir) {
419
-				$label = '/ ('.get_lang('HomeDirectory').')';
420
-			} else {
421
-				$path_parts = explode('/', str_replace($group_dir, '', $folder));
422
-				$label = cut($label, 80);
423
-				$label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
424
-			}
425
-			$parent_select -> addOption($label, $folder);
426
-			if ($selected != '') {
427
-				$parent_select->setSelected($folder);
428
-			}
429
-		}
430
-	}
408
+                $parent_select -> addOption($label, $folder);
409
+                if ($selected != '') {
410
+                    $parent_select->setSelected($folder);
411
+                }
412
+            }
413
+        }
414
+    } else {
415
+        foreach ($folders as & $folder) {
416
+            $selected = (substr($dir,0,-1)==$folder) ? ' selected="selected"' : '';
417
+            $label = $folder_titles[$folder];
418
+            if ($folder == $group_dir) {
419
+                $label = '/ ('.get_lang('HomeDirectory').')';
420
+            } else {
421
+                $path_parts = explode('/', str_replace($group_dir, '', $folder));
422
+                $label = cut($label, 80);
423
+                $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2).' &mdash; '.$label;
424
+            }
425
+            $parent_select -> addOption($label, $folder);
426
+            if ($selected != '') {
427
+                $parent_select->setSelected($folder);
428
+            }
429
+        }
430
+    }
431 431
 }
432 432
 
433 433
 $form->addHidden('dirValue', '');
434 434
 
435 435
 if ($is_certificate_mode) {
436
-	$form->addButtonCreate(get_lang('CreateCertificate'));
436
+    $form->addButtonCreate(get_lang('CreateCertificate'));
437 437
 } else {
438
-	$form->addButtonCreate(get_lang('CreateDoc'));
438
+    $form->addButtonCreate(get_lang('CreateDoc'));
439 439
 }
440 440
 
441 441
 $form->setDefaults($defaults);
442 442
 
443 443
 // If form validates -> save the new document
444 444
 if ($form->validate()) {
445
-	$values = $form->exportValues();
446
-	$readonly = isset($values['readonly']) ? 1 : 0;
447
-	$values['title'] = trim($values['title']);
445
+    $values = $form->exportValues();
446
+    $readonly = isset($values['readonly']) ? 1 : 0;
447
+    $values['title'] = trim($values['title']);
448 448
     
449 449
     if (!empty($values['dirValue'])) {
450 450
         $dir = $values['dirValue'];
451 451
     }
452 452
 
453 453
     if ($dir[strlen($dir) - 1] != '/') {
454
-		$dir .= '/';
455
-	}
454
+        $dir .= '/';
455
+    }
456 456
     $filepath = $filepath.$dir;
457 457
 
458 458
     // Setting the filename
459
-	$filename = $values['title'];
460
-	$filename = addslashes(trim($filename));
461
-	$filename = Security::remove_XSS($filename);
462
-	$filename = api_replace_dangerous_char($filename);
463
-	$filename = disable_dangerous_file($filename);
459
+    $filename = $values['title'];
460
+    $filename = addslashes(trim($filename));
461
+    $filename = Security::remove_XSS($filename);
462
+    $filename = api_replace_dangerous_char($filename);
463
+    $filename = disable_dangerous_file($filename);
464 464
     $filename .= DocumentManager::getDocumentSuffix(
465 465
         $_course,
466 466
         api_get_session_id(),
@@ -468,14 +468,14 @@  discard block
 block discarded – undo
468 468
     );
469 469
 
470 470
     // Setting the title
471
-	$title = $values['title'];
471
+    $title = $values['title'];
472 472
 
473 473
     // Setting the extension
474
-	$extension = 'html';
474
+    $extension = 'html';
475 475
 
476
-	$content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
476
+    $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
477 477
 
478
-	/*if (strpos($content, '/css/frames.css') == false) {
478
+    /*if (strpos($content, '/css/frames.css') == false) {
479 479
 		$content = str_replace('</head>', '<link rel="stylesheet" href="./css/frames.css" type="text/css" /><style> body{margin:50px;}</style></head>', $content);
480 480
 	}*/
481 481
 
@@ -488,12 +488,12 @@  discard block
 block discarded – undo
488 488
         exit;
489 489
     }
490 490
 
491
-	if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
492
-		$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
491
+    if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
492
+        $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
493 493
 
494
-		fputs($fp, $content);
495
-		fclose($fp);
496
-		chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
494
+        fputs($fp, $content);
495
+        fclose($fp);
496
+        chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
497 497
 
498 498
         /*
499 499
 		if (!is_dir($filepath.'css')) {
@@ -511,8 +511,8 @@  discard block
 block discarded – undo
511 511
 			api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $userId, null, null, null, null, $current_session_id);
512 512
 		}*/
513 513
 
514
-		$file_size = filesize($filepath.$filename.'.'.$extension);
515
-		$save_file_path = $dir.$filename.'.'.$extension;
514
+        $file_size = filesize($filepath.$filename.'.'.$extension);
515
+        $save_file_path = $dir.$filename.'.'.$extension;
516 516
 
517 517
         $document_id = add_document(
518 518
             $_course,
@@ -524,8 +524,8 @@  discard block
 block discarded – undo
524 524
             $readonly
525 525
         );
526 526
 
527
-		if ($document_id) {
528
-			api_item_property_update(
527
+        if ($document_id) {
528
+            api_item_property_update(
529 529
                 $_course,
530 530
                 TOOL_DOCUMENT,
531 531
                 $document_id,
@@ -537,13 +537,13 @@  discard block
 block discarded – undo
537 537
                 null,
538 538
                 $current_session_id
539 539
             );
540
-			// Update parent folders
541
-			item_property_update_on_folder($_course, $dir, $userId);
542
-			$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
543
-			$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
540
+            // Update parent folders
541
+            item_property_update_on_folder($_course, $dir, $userId);
542
+            $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
543
+            $new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
544 544
             $new_title = htmlspecialchars($new_title);
545
-			if ($new_comment || $new_title) {
546
-				$ct = '';
545
+            if ($new_comment || $new_title) {
546
+                $ct = '';
547 547
                 $params = [];
548 548
                 if ($new_comment) {
549 549
                     $params['comment'] = $new_comment;
@@ -558,38 +558,38 @@  discard block
 block discarded – undo
558 558
                         ['c_id = ? AND id = ?' => [$course_id, $document_id]]
559 559
                     );
560 560
                 }
561
-			}
562
-			$dir= substr($dir,0,-1);
563
-			$selectcat = '';
564
-			if (isset($_REQUEST['selectcat']))
565
-				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
566
-			$certificate_condition = '';
567
-			if ($is_certificate_mode) {
568
-				$df = DocumentManager::get_default_certificate_id($_course['code']);
561
+            }
562
+            $dir= substr($dir,0,-1);
563
+            $selectcat = '';
564
+            if (isset($_REQUEST['selectcat']))
565
+                $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
566
+            $certificate_condition = '';
567
+            if ($is_certificate_mode) {
568
+                $df = DocumentManager::get_default_certificate_id($_course['code']);
569 569
                 if (!isset($df)) {
570 570
                     DocumentManager::attach_gradebook_certificate ($_course['code'],$document_id);
571
-				}
572
-				$certificate_condition = '&certificate=true&curdirpath=/certificates';
573
-			}
574
-
575
-			header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
576
-			exit();
577
-		} else {
578
-			Display :: display_header($nameTools, 'Doc');
579
-			Display :: display_error_message(get_lang('Impossible'));
580
-			Display :: display_footer();
581
-		}
582
-	} else {
583
-		Display :: display_header($nameTools, 'Doc');
584
-		Display :: display_error_message(get_lang('Impossible'));
585
-		Display :: display_footer();
586
-	}
571
+                }
572
+                $certificate_condition = '&certificate=true&curdirpath=/certificates';
573
+            }
574
+
575
+            header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
576
+            exit();
577
+        } else {
578
+            Display :: display_header($nameTools, 'Doc');
579
+            Display :: display_error_message(get_lang('Impossible'));
580
+            Display :: display_footer();
581
+        }
582
+    } else {
583
+        Display :: display_header($nameTools, 'Doc');
584
+        Display :: display_error_message(get_lang('Impossible'));
585
+        Display :: display_footer();
586
+    }
587 587
 } else {
588
-	// Copied from document.php
589
-	$dir_array = explode('/', $dir);
590
-	$array_len = count($dir_array);
588
+    // Copied from document.php
589
+    $dir_array = explode('/', $dir);
590
+    $array_len = count($dir_array);
591 591
 
592
-	// Breadcrumb for the current directory root path
592
+    // Breadcrumb for the current directory root path
593 593
     if (!empty($document_data)) {
594 594
         if (empty($document_data['parents'])) {
595 595
             $interbreadcrumb[] = array(
@@ -606,31 +606,31 @@  discard block
 block discarded – undo
606 606
         }
607 607
     }
608 608
 
609
-	Display :: display_header($nameTools, "Doc");
610
-	// actions
609
+    Display :: display_header($nameTools, "Doc");
610
+    // actions
611 611
 
612
-	// link back to the documents overview
613
-	if ($is_certificate_mode) {
614
-		$actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
612
+    // link back to the documents overview
613
+    if ($is_certificate_mode) {
614
+        $actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
615 615
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
616 616
         } else {
617
-		$actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
617
+        $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
618 618
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
619 619
         }
620 620
         
621 621
         echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
622 622
                 
623 623
 
624
-	if ($is_certificate_mode) {
625
-		$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
624
+    if ($is_certificate_mode) {
625
+        $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
626 626
 
627
-		$str_info = '';
628
-		foreach ($all_information_by_create_certificate[0] as $info_value) {
629
-			$str_info.=$info_value.'<br/>';
630
-		}
631
-		$create_certificate = get_lang('CreateCertificateWithTags');
632
-		Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
633
-	}
627
+        $str_info = '';
628
+        foreach ($all_information_by_create_certificate[0] as $info_value) {
629
+            $str_info.=$info_value.'<br/>';
630
+        }
631
+        $create_certificate = get_lang('CreateCertificateWithTags');
632
+        Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
633
+    }
634 634
     // HTML-editor
635 635
     echo '<div class="row" style="overflow:hidden">
636 636
             <div id="template_col" class="col-md-2">
@@ -647,5 +647,5 @@  discard block
 block discarded – undo
647 647
                 '.$form->returnForm().'
648 648
             </div>
649 649
           </div>';
650
-	Display :: display_footer();
650
+    Display :: display_footer();
651 651
 }
Please login to merge, or discard this patch.