Completed
Push — 1.11.x ( 81dbf4...6ab6ac )
by José
86:12 queued 55:54
created
src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     public function createHtmlStyle()
56 56
     {
57 57
         $style = '';
58
-        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' || $this->value == '' ) {
58
+        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' || $this->value == '') {
59 59
             $cssFile = api_get_path(SYS_CSS_PATH).'themes/'.api_get_visual_theme().'/editor.css';
60 60
             if (!is_file($cssFile)) {
61 61
                 $cssFile = api_get_path(WEB_CSS_PATH).'editor.css';
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
147 147
         return [[
148 148
             'title' => get_lang('EmptyTemplate'),
149 149
             'description' => null,
150
-            'image' => api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/empty.gif',
150
+            'image' => api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/empty.gif',
151 151
             'html' => '
152 152
                 <!DOCYTPE html>
153 153
                 <html>
154 154
                     <head>
155
-                        <meta charset="' . api_get_system_encoding() . '" />
155
+                        <meta charset="' . api_get_system_encoding().'" />
156 156
                     </head>
157
-                    <body  dir="' . api_get_text_direction() . '">
157
+                    <body  dir="' . api_get_text_direction().'">
158 158
                         <p>
159 159
                             <br/>
160 160
                         </p>
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
         $search = array('{CSS}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}');
178 178
         $replace = array(
179 179
             '',
180
-            api_get_path(REL_CODE_PATH) . 'img/',
180
+            api_get_path(REL_CODE_PATH).'img/',
181 181
             api_get_path(REL_PATH),
182 182
             api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH),
183 183
             api_get_path(REL_DEFAULT_COURSE_DOCUMENT_PATH)
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
         foreach ($systemTemplates as $template) {
189 189
             $image = $template->getImage();
190 190
             $image = !empty($image) ? $image : 'empty.gif';
191
-            $image = api_get_path(WEB_APP_PATH) . 'home/default_platform_document/template_thumb/' . $image;
191
+            $image = api_get_path(WEB_APP_PATH).'home/default_platform_document/template_thumb/'.$image;
192 192
 
193 193
             /*$image = $this->urlGenerator->generate(
194 194
                 'get_document_template_action',
@@ -240,12 +240,12 @@  discard block
 block discarded – undo
240 240
             $templateItem['image'] = api_get_path(WEB_APP_PATH)
241 241
                 . 'home/default_platform_document/template_thumb/noimage.gif';
242 242
             $templateItem['html'] = file_get_contents(api_get_path(SYS_COURSE_PATH)
243
-                . $courseDirectory . '/document' . $templateData['path']);
243
+                . $courseDirectory.'/document'.$templateData['path']);
244 244
 
245 245
             $image = $template->getImage();
246 246
             if (!empty($image)) {
247 247
                 $templateItem['image'] = api_get_path(WEB_COURSE_PATH)
248
-                    . $courseDirectory . '/upload/template_thumbnails/' . $template->getImage();
248
+                    . $courseDirectory.'/upload/template_thumbnails/'.$template->getImage();
249 249
             }
250 250
 
251 251
             $templateList[] = $templateItem;
Please login to merge, or discard this patch.
main/permissions/permissions_functions.inc.php 1 patch
Spacing   +143 added lines, -143 removed lines patch added patch discarded remove patch
@@ -26,34 +26,34 @@  discard block
 block discarded – undo
26 26
     $course_id = api_get_course_int_id();
27 27
     
28 28
 	// Which database are we using (depending on the $content parameter)
29
-	if ($content=='user')
29
+	if ($content == 'user')
30 30
 	{
31
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
31
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
32 32
 		$id_field = user_id;
33 33
 	}
34
-	if ($content=='group')
34
+	if ($content == 'group')
35 35
 	{
36
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
36
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
37 37
 		$id_field = group_id;
38 38
 	}
39
-	if ($content=='role')
39
+	if ($content == 'role')
40 40
 	{
41
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
41
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
42 42
 		$id_field = role_id;
43 43
 	}
44 44
 
45 45
 	// We first delete all the existing permissions for that user/group/role
46
-	$sql="DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
47
-	$result=Database::query($sql);
46
+	$sql = "DELETE FROM $table  WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."'";
47
+	$result = Database::query($sql);
48 48
 
49 49
 	// looping through the post values to find the permission (containing the string permission* )
50 50
 	foreach ($_POST as $key => $value)
51 51
 	{
52
-		if (strstr($key,"permission*"))
52
+		if (strstr($key, "permission*"))
53 53
 		{
54
-			list($brol,$tool,$action)=explode("*",$key);
55
-			$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
56
-			$result=Database::query($sql);
54
+			list($brol, $tool, $action) = explode("*", $key);
55
+			$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($action)."')";
56
+			$result = Database::query($sql);
57 57
 		}
58 58
 	}
59 59
 	return get_lang('PermissionsStored');
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 * @author Patrick Cool <[email protected]>, Ghent University
70 70
 * @version 1.0
71 71
 */
72
-function store_one_permission($content, $action, $id, $tool,$permission) {
72
+function store_one_permission($content, $action, $id, $tool, $permission) {
73 73
 	global $rights_full;
74 74
     $course_id = api_get_course_int_id();
75 75
 	// for some reason I don't know, he can't get to the $rights_full array, so commented the following lines out.
@@ -82,35 +82,35 @@  discard block
 block discarded – undo
82 82
 
83 83
 	// Which database are we using (depending on the $content parameter)
84 84
     
85
-	if ($content=='user') {
86
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
85
+	if ($content == 'user') {
86
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
87 87
 		$id_field = user_id;
88 88
 	}
89
-	if ($content=='group')
89
+	if ($content == 'group')
90 90
 	{
91
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
91
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
92 92
 		$id_field = group_id;
93 93
 	}
94
-	if ($content=='role')
94
+	if ($content == 'role')
95 95
 	{
96
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
96
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
97 97
 		$id_field = role_id;
98 98
 	}
99 99
 
100 100
 	// grating a right
101
-	if ($action=='grant') {
102
-		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
103
-		$result=Database::query($sql);
104
-		if($result) {
105
-			$result_message=get_lang('PermissionGranted');
101
+	if ($action == 'grant') {
102
+		$sql = "INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
103
+		$result = Database::query($sql);
104
+		if ($result) {
105
+			$result_message = get_lang('PermissionGranted');
106 106
 		}
107 107
 	}
108
-	if ($action=='revoke')
108
+	if ($action == 'revoke')
109 109
 	{
110
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
111
-		$result=Database::query($sql);
112
-		if($result) {
113
-			$result_message=get_lang('PermissionRevoked');
110
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND tool='".Database::escape_string($tool)."' AND action='".Database::escape_string($permission)."'";
111
+		$result = Database::query($sql);
112
+		if ($result) {
113
+			$result_message = get_lang('PermissionRevoked');
114 114
 		}
115 115
 	}
116 116
 	return $result_message;
@@ -125,44 +125,44 @@  discard block
 block discarded – undo
125 125
 */
126 126
 function get_permissions($content, $id) {
127 127
     $course_id = api_get_course_int_id();
128
-	$currentpermissions=array();
128
+	$currentpermissions = array();
129 129
 	// Which database are we using (depending on the $content parameter)
130 130
     $course_id_condition = " c_id = $course_id AND ";
131 131
 	if ($content == 'user')
132 132
 	{
133
-		$table=Database::get_course_table(TABLE_PERMISSION_USER);
133
+		$table = Database::get_course_table(TABLE_PERMISSION_USER);
134 134
 		$id_field = 'user_id';
135 135
 	}
136 136
 	elseif ($content == 'group')
137 137
 	{
138
-		$table=Database::get_course_table(TABLE_PERMISSION_GROUP);
138
+		$table = Database::get_course_table(TABLE_PERMISSION_GROUP);
139 139
 		$id_field = 'group_id';
140 140
 	}
141 141
 	elseif ($content == 'role')
142 142
 	{
143
-		$table=Database::get_course_table(TABLE_ROLE_PERMISSION);
143
+		$table = Database::get_course_table(TABLE_ROLE_PERMISSION);
144 144
 		$id_field = 'role_id';
145 145
 	}
146 146
 	elseif ($content == 'platform_role')
147 147
 	{
148
-		$table=Database::get_main_table(TABLE_ROLE_PERMISSION);
148
+		$table = Database::get_main_table(TABLE_ROLE_PERMISSION);
149 149
 		$id_field = 'role_id';
150 150
         $course_id_condition = '';
151 151
 	}
152 152
 	elseif ($content == 'task')
153 153
 	{
154
-		$table=Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
154
+		$table = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
155 155
 		$id_field = 'task_id';
156 156
 	}
157 157
 
158 158
 	// finding all the permissions. We store this in a multidimensional array
159 159
 	// where the first dimension is the tool.
160
-	$sql="
161
-		SELECT * FROM " . $table . "
162
-		WHERE $course_id_condition " . $id_field . "='" . Database::escape_string($id) . "'";
160
+	$sql = "
161
+		SELECT * FROM " . $table."
162
+		WHERE $course_id_condition ".$id_field."='".Database::escape_string($id)."'";
163 163
 	$result = Database::query($sql);
164 164
 
165
-	while($row = Database::fetch_array($result))
165
+	while ($row = Database::fetch_array($result))
166 166
 		$currentpermissions[$row['tool']][] = $row['action'];
167 167
 
168 168
 	return $currentpermissions;
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 */
180 180
 function limited_or_full($current_permissions)
181 181
 {
182
-	if (api_get_setting('permissions')=='limited')
182
+	if (api_get_setting('permissions') == 'limited')
183 183
 	{
184 184
 		foreach ($current_permissions as $tool=>$tool_rights)
185 185
 		{
@@ -187,15 +187,15 @@  discard block
 block discarded – undo
187 187
 			// if it is visibility or move we have to grant the edit right
188 188
 			foreach ($tool_rights as $key=>$value)
189 189
 			{
190
-				if ($value=='View')
190
+				if ($value == 'View')
191 191
 				{
192 192
 					unset($current_permissions[$tool][$key]);
193 193
 				}
194
-				if ($value=='Visibility' OR $value=='Move')
194
+				if ($value == 'Visibility' OR $value == 'Move')
195 195
 				{
196
-					if (!in_array('Edit',$current_permissions[$tool]))
196
+					if (!in_array('Edit', $current_permissions[$tool]))
197 197
 					{
198
-						$current_permissions[$tool][]='Edit';
198
+						$current_permissions[$tool][] = 'Edit';
199 199
 					}
200 200
 					unset($current_permissions[$tool][$key]);
201 201
 				}
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 		}
208 208
 		return $current_permissions;
209 209
 	}
210
-	if (api_get_setting('permissions')=='full')
210
+	if (api_get_setting('permissions') == 'full')
211 211
 	{
212 212
 		return $current_permissions;
213 213
 	}
@@ -222,12 +222,12 @@  discard block
 block discarded – undo
222 222
 * @author Patrick Cool <[email protected]>, Ghent University
223 223
 * @version 1.0
224 224
 */
225
-function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions=array())
225
+function display_checkbox_matrix($permission_array, $tool, $permission, $inherited_permissions = array())
226 226
 {
227
-	$checked="";
228
-	if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
227
+	$checked = "";
228
+	if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
229 229
 	{
230
-		$checked="checked";
230
+		$checked = "checked";
231 231
 	}
232 232
 	echo "\t\t\t<input type=\"checkbox\" name=\"permission*$tool*$permission\" $checked>\n";
233 233
 
@@ -243,28 +243,28 @@  discard block
 block discarded – undo
243 243
 * @author Patrick Cool <[email protected]>, Ghent University
244 244
 * @version 1.0
245 245
 */
246
-function display_image_matrix($permission_array, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
246
+function display_image_matrix($permission_array, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
247 247
 {
248 248
 	if ($course_admin) {
249 249
 		echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
250 250
 	} else {
251
-		if (in_array($permission,$inherited_permissions[$tool])) {
251
+		if (in_array($permission, $inherited_permissions[$tool])) {
252 252
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
253 253
 		} else {
254
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool])) {
254
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool])) {
255 255
 				if ($editable) {
256
-					$url=api_get_self();
256
+					$url = api_get_self();
257 257
 					$urlparameters = '';
258
-					foreach($_GET as $key=>$value) {
259
-						$parameter[$key]=$value;
258
+					foreach ($_GET as $key=>$value) {
259
+						$parameter[$key] = $value;
260 260
 					}
261
-					$parameter['action']='revoke';
262
-					$parameter['permission']=$permission;
263
-					$parameter['tool']=$tool;
261
+					$parameter['action'] = 'revoke';
262
+					$parameter['permission'] = $permission;
263
+					$parameter['tool'] = $tool;
264 264
 					foreach ($parameter as $key=>$value) {
265
-						$urlparameters.=$key.'='.$value.'&amp;';
265
+						$urlparameters .= $key.'='.$value.'&amp;';
266 266
 					}
267
-					$url=$url.'?'.$urlparameters;
267
+					$url = $url.'?'.$urlparameters;
268 268
 
269 269
 					echo "\t\t\t <a href=\"".$url."\">";
270 270
 				}
@@ -275,20 +275,20 @@  discard block
 block discarded – undo
275 275
 			} else {
276 276
 				if ($editable)
277 277
 				{
278
-					$url=api_get_self();
278
+					$url = api_get_self();
279 279
 					$urlparameters = '';
280 280
 					foreach ($_GET as $key=>$value)
281 281
 					{
282
-						$parameter[$key]=$value;
282
+						$parameter[$key] = $value;
283 283
 					}
284
-					$parameter['action']='grant';
285
-					$parameter['permission']=$permission;
286
-					$parameter['tool']=$tool;
284
+					$parameter['action'] = 'grant';
285
+					$parameter['permission'] = $permission;
286
+					$parameter['tool'] = $tool;
287 287
 					foreach ($parameter as $key=>$value)
288 288
 					{
289
-						$urlparameters.=$key.'='.$value.'&amp;';
289
+						$urlparameters .= $key.'='.$value.'&amp;';
290 290
 					}
291
-					$url=$url.'?'.$urlparameters;
291
+					$url = $url.'?'.$urlparameters;
292 292
 
293 293
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
294 294
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 * @author Patrick Cool <[email protected]>, Ghent University
316 316
 * @version 1.0
317 317
 */
318
-function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission,$inherited_permissions=array(), $course_admin=false, $editable=true)
318
+function display_image_matrix_for_blogs($permission_array, $user_id, $tool, $permission, $inherited_permissions = array(), $course_admin = false, $editable = true)
319 319
 {
320 320
 
321 321
 	if ($course_admin)
@@ -324,32 +324,32 @@  discard block
 block discarded – undo
324 324
 	}
325 325
 	else
326 326
 	{
327
-		if (!empty($inherited_permissions) and in_array($permission,$inherited_permissions[$tool]))
327
+		if (!empty($inherited_permissions) and in_array($permission, $inherited_permissions[$tool]))
328 328
 		{
329 329
 			echo "\t\t\t<img src=\"../img/checkbox_on3.gif\" border=\"0\"/ title=\"".get_lang('PermissionGrantedByGroupOrRole')."\">";
330 330
 		}
331 331
 		else
332 332
 		{
333
-			if (is_array($permission_array[$tool]) AND in_array($permission,$permission_array[$tool]))
333
+			if (is_array($permission_array[$tool]) AND in_array($permission, $permission_array[$tool]))
334 334
 			{
335 335
 				if ($editable)
336 336
 				{
337 337
 					$url = api_get_self();
338 338
 					$urlparameters = '';
339
-					foreach($_GET as $key => $value)
339
+					foreach ($_GET as $key => $value)
340 340
 					{
341 341
 						$parameter[$key] = $value;
342 342
 					}
343
-					$parameter['action']='manage_rights';
344
-					$parameter['do']='revoke';
345
-					$parameter['permission']=$permission;
346
-					$parameter['tool']=$tool;
347
-					$parameter['user_id']=$user_id;
343
+					$parameter['action'] = 'manage_rights';
344
+					$parameter['do'] = 'revoke';
345
+					$parameter['permission'] = $permission;
346
+					$parameter['tool'] = $tool;
347
+					$parameter['user_id'] = $user_id;
348 348
 					foreach ($parameter as $key=>$value)
349 349
 					{
350
-						$urlparameters .= $key . '=' . $value . '&amp;';
350
+						$urlparameters .= $key.'='.$value.'&amp;';
351 351
 					}
352
-					$url = $url . '?' . $urlparameters;
352
+					$url = $url.'?'.$urlparameters;
353 353
 
354 354
 					echo "\t\t\t <a href=\"".$url."\">";
355 355
 				}
@@ -362,17 +362,17 @@  discard block
 block discarded – undo
362 362
 					$url = api_get_self();
363 363
 					$urlparameters = '';
364 364
 					foreach ($_GET as $key=>$value) {
365
-						$parameter[$key]=$value;
365
+						$parameter[$key] = $value;
366 366
 					}
367
-					$parameter['action']='manage_rights';
368
-					$parameter['do']='grant';
369
-					$parameter['permission']=$permission;
370
-					$parameter['tool']=$tool;
371
-					$parameter['user_id']=$user_id;
367
+					$parameter['action'] = 'manage_rights';
368
+					$parameter['do'] = 'grant';
369
+					$parameter['permission'] = $permission;
370
+					$parameter['tool'] = $tool;
371
+					$parameter['user_id'] = $user_id;
372 372
 					foreach ($parameter as $key=>$value) {
373
-						$urlparameters .= $key . '=' . $value . '&amp;';
373
+						$urlparameters .= $key.'='.$value.'&amp;';
374 374
 					}
375
-					$url=$url.'?'.$urlparameters;
375
+					$url = $url.'?'.$urlparameters;
376 376
 
377 377
 					//echo "\t\t\t <a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=grant&amp;permission=$permission&amp;tool=$tool\">";
378 378
 					echo "\t\t\t <a href=\"".$url."\">";
@@ -397,30 +397,30 @@  discard block
 block discarded – undo
397 397
 	global $setting_visualisation;
398 398
     $course_id = api_get_course_int_id();
399 399
 
400
-	$coures_roles_table=Database::get_course_table(TABLE_ROLE);
400
+	$coures_roles_table = Database::get_course_table(TABLE_ROLE);
401 401
 
402 402
 	// course roles
403
-	$sql="SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
404
-	$result=Database::query($sql);
405
-	while ($row=Database::fetch_array($result))
403
+	$sql = "SELECT * FROM $coures_roles_table WHERE c_id = $course_id ";
404
+	$result = Database::query($sql);
405
+	while ($row = Database::fetch_array($result))
406 406
 	{
407 407
 		if (in_array($row['role_id'], $current_course_roles))
408 408
 		{
409
-			$checked='checked';
410
-			$image='checkbox_on2.gif';
411
-			$action='revoke';
409
+			$checked = 'checked';
410
+			$image = 'checkbox_on2.gif';
411
+			$action = 'revoke';
412 412
 		}
413 413
 		else
414 414
 		{
415
-			$checked='';
416
-			$image='wrong.gif';
417
-			$action='grant';
415
+			$checked = '';
416
+			$image = 'wrong.gif';
417
+			$action = 'grant';
418 418
 		}
419
-		if ($setting_visualisation=='checkbox')
419
+		if ($setting_visualisation == 'checkbox')
420 420
 		{
421 421
 			echo "<input type=\"checkbox\" name=\"role*course*".$row['role_id']."\" $checked>";
422 422
 		}
423
-		if ($setting_visualisation=='image')
423
+		if ($setting_visualisation == 'image')
424 424
 		{
425 425
 			echo "<a href=\"".str_replace('&', '&amp;', $_SERVER['REQUEST_URI'])."&amp;action=$action&amp;role=".$row['role_id']."&amp;scope=course\"><img src=\"../img/".$image."\" border=\"0\"/></a>";
426 426
 		}
@@ -440,24 +440,24 @@  discard block
 block discarded – undo
440 440
 * @author Patrick Cool <[email protected]>, Ghent University
441 441
 * @version 1.0
442 442
 */
443
-function get_roles($content,$id, $scope='course') {
444
-    $course_id  = api_get_course_int_id();    
445
-	if ($content=='user') {
446
-		$table=Database::get_course_table(TABLE_ROLE_USER);
443
+function get_roles($content, $id, $scope = 'course') {
444
+    $course_id = api_get_course_int_id();    
445
+	if ($content == 'user') {
446
+		$table = Database::get_course_table(TABLE_ROLE_USER);
447 447
 		$id_field = user_id;
448 448
 	}
449
-	if ($content=='group') {
450
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
449
+	if ($content == 'group') {
450
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
451 451
 		$id_field = 'group_id';
452 452
 	}
453
-	$table_role=Database::get_course_table(TABLE_ROLE);
453
+	$table_role = Database::get_course_table(TABLE_ROLE);
454 454
 
455
-	$current_roles=array();
455
+	$current_roles = array();
456 456
 	//$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";$sql="SELECT role.role_id FROM $table role_group_user, $table_role role WHERE role_group_user.$id_field = '$id' AND role_group_user.role_id=role.role_id AND role_group_user.scope='".$scope."'";
457
-	$sql="SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
458
-	$result=Database::query($sql);
459
-	while ($row=Database::fetch_array($result)) {
460
-		$current_roles[]=$row['role_id'];
457
+	$sql = "SELECT role_id FROM $table WHERE c_id = $course_id AND $id_field = '$id' AND scope='".$scope."'";
458
+	$result = Database::query($sql);
459
+	while ($row = Database::fetch_array($result)) {
460
+		$current_roles[] = $row['role_id'];
461 461
 	}
462 462
 	return $current_roles;
463 463
 }
@@ -468,26 +468,26 @@  discard block
 block discarded – undo
468 468
 * @author Patrick Cool <[email protected]>, Ghent University
469 469
 * @version 1.0
470 470
 */
471
-function get_all_roles($content='course') {
471
+function get_all_roles($content = 'course') {
472 472
     $course_id = api_get_course_int_id();
473 473
     $course_id_condition = " WHERE c_id = $course_id ";
474 474
     
475
-	if ($content=='course')
475
+	if ($content == 'course')
476 476
 	{
477
-		$table_role=Database::get_course_table(TABLE_ROLE);
477
+		$table_role = Database::get_course_table(TABLE_ROLE);
478 478
 	}
479
-	if ($content=='platform')
479
+	if ($content == 'platform')
480 480
 	{
481
-		$table_role=Database::get_main_table(TABLE_ROLE);
481
+		$table_role = Database::get_main_table(TABLE_ROLE);
482 482
 		$course_id_condition = '';
483 483
 	}
484 484
 
485
-	$current_roles=array();
486
-	$sql="SELECT * FROM $table_role $course_id_condition ";
487
-	$result=Database::query($sql);
488
-	while ($row=Database::fetch_array($result))
485
+	$current_roles = array();
486
+	$sql = "SELECT * FROM $table_role $course_id_condition ";
487
+	$result = Database::query($sql);
488
+	while ($row = Database::fetch_array($result))
489 489
 	{
490
-		$roles[]=$row;
490
+		$roles[] = $row;
491 491
 	}
492 492
 
493 493
 	return $roles;
@@ -504,10 +504,10 @@  discard block
 block discarded – undo
504 504
 * @author Patrick Cool <[email protected]>, Ghent University
505 505
 * @version 1.0
506 506
 */
507
-function get_roles_permissions($content,$id, $scope='course') {
507
+function get_roles_permissions($content, $id, $scope = 'course') {
508 508
     $course_id = api_get_course_int_id();
509 509
 	if ($content == 'user') {
510
-		$table=Database::get_course_table(TABLE_ROLE_USER);
510
+		$table = Database::get_course_table(TABLE_ROLE_USER);
511 511
 		$id_field = 'user_id';
512 512
 	}
513 513
 
@@ -536,21 +536,21 @@  discard block
 block discarded – undo
536 536
 	$sql = "
537 537
 		SELECT *
538 538
 		FROM
539
-			" . $table . " role_group_user,
540
-			" . $table_role . " role,
541
-			" . $table_role_permissions . " role_permissions
539
+			" . $table." role_group_user,
540
+			" . $table_role." role,
541
+			" . $table_role_permissions." role_permissions
542 542
 		WHERE
543 543
 		    role_group_user.c_id = $course_id AND
544 544
 		    $role_condition
545
-			role_group_user.scope = '" . $scope . "' AND
546
-			role_group_user." . $id_field . " = '" . $id . "' AND
545
+			role_group_user.scope = '".$scope."' AND
546
+			role_group_user." . $id_field." = '".$id."' AND
547 547
 			role_group_user.role_id = role.role_id AND
548 548
 			role.role_id = role_permissions.role_id";
549 549
 
550 550
 	$result = Database::query($sql);
551 551
     $current_role_permissions = array();
552
-	while ($row=Database::fetch_array($result)) {
553
-		$current_role_permissions[$row['tool']][]=$row['action'];
552
+	while ($row = Database::fetch_array($result)) {
553
+		$current_role_permissions[$row['tool']][] = $row['action'];
554 554
     }
555 555
 	return $current_role_permissions;
556 556
 }
@@ -564,33 +564,33 @@  discard block
 block discarded – undo
564 564
 * @author Patrick Cool <[email protected]>, Ghent University
565 565
 */
566 566
 
567
-function assign_role($content, $action, $id, $role_id, $scope='course') {
567
+function assign_role($content, $action, $id, $role_id, $scope = 'course') {
568 568
     $course_id = api_get_course_int_id();
569 569
 	// Which database are we using (depending on the $content parameter)
570
-	if ($content=='user') {
571
-		$table=Database::get_course_table(TABLE_ROLE_USER);
570
+	if ($content == 'user') {
571
+		$table = Database::get_course_table(TABLE_ROLE_USER);
572 572
 		$id_field = 'user_id';
573
-	} elseif($content=='group') {
574
-		$table=Database::get_course_table(TABLE_ROLE_GROUP);
573
+	} elseif ($content == 'group') {
574
+		$table = Database::get_course_table(TABLE_ROLE_GROUP);
575 575
 		$id_field = 'group_id';
576 576
 	} else {
577 577
 		return  get_lang('Error');
578 578
 	}
579 579
 
580 580
 	// grating a right
581
-	if ($action=='grant') {
582
-		$sql="INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
583
-		$result=Database::query($sql);
581
+	if ($action == 'grant') {
582
+		$sql = "INSERT INTO $table (c_id, role_id, scope, $id_field) VALUES ($course_id, '".Database::escape_string($role_id)."','".Database::escape_string($scope)."','".Database::escape_string($id)."')";
583
+		$result = Database::query($sql);
584 584
 		if ($result) {
585
-			$result_message=get_lang('RoleGranted');
585
+			$result_message = get_lang('RoleGranted');
586 586
 		}
587 587
 	}
588 588
     
589
-	if ($action=='revoke') {
590
-		$sql="DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
591
-		$result=Database::query($sql);
589
+	if ($action == 'revoke') {
590
+		$sql = "DELETE FROM $table WHERE c_id = $course_id AND $id_field = '".Database::escape_string($id)."' AND role_id='".Database::escape_string($role_id)."'";
591
+		$result = Database::query($sql);
592 592
 		if ($result) {
593
-			$result_message=get_lang('RoleRevoked');
593
+			$result_message = get_lang('RoleRevoked');
594 594
 		}
595 595
 	}
596 596
 	return $result_message;
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 	{
608 608
 		foreach ($permissions as $permissionkey=>$permissionvalue)
609 609
 		{
610
-			$array1[$tool][]=$permissionvalue;
610
+			$array1[$tool][] = $permissionvalue;
611 611
 		}
612 612
 	}
613 613
 	return $array1;
Please login to merge, or discard this patch.
main/inc/lib/statsUtils.lib.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
             $last_day = -1;
156 156
             while ($row = Database::fetch_row($res)) {
157 157
                 $date_array = getdate($row[0]);
158
-                $display_date = $date_array['mday'] . ' ' . $MonthsShort[$date_array['mon'] - 1] . ' ' . $date_array['year'];
158
+                $display_date = $date_array['mday'].' '.$MonthsShort[$date_array['mon'] - 1].' '.$date_array['year'];
159 159
                 if ($date_array['mday'] == $last_day) {
160 160
                     $days_array[$display_date]++;
161 161
                 } else {
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
                     &nbsp;
222 222
                 </td>
223 223
                 <td width='10%'>
224
-                    <b>" . get_lang('Hits') . "</b>
224
+                    <b>".get_lang('Hits')."</b>
225 225
                 </td>
226 226
                 <td width='15%'>
227 227
                     <b>%</b>
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
                     echo "<img src='".Display::returnIconPath('bar_1m.gif')."' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
250 250
                 }
251 251
                 if ($pourcent != 100) {
252
-                    echo "<img src='".Display::returnIconPath('bar_1r.gif')."' width='" . ($maxSize - $barwidth) . "' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
252
+                    echo "<img src='".Display::returnIconPath('bar_1r.gif')."' width='".($maxSize - $barwidth)."' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />";
253 253
                 }
254 254
                 echo "<img src='".Display::returnIconPath('bar_1.gif')."' width='1' height='12' alt='$periodPiece : $cpt hits &ndash; $pourcent %' />
255 255
                     </td>
@@ -265,13 +265,13 @@  discard block
 block discarded – undo
265 265
         }
266 266
         echo "<tr bgcolor='#E6E6E6'>
267 267
                 <td width='15%' align='center'>
268
-                    " . get_lang('Total') . "
268
+                    " . get_lang('Total')."
269 269
                 </td>
270 270
                 <td align='right' width='60%'>
271 271
                     &nbsp;
272 272
                 </td>
273 273
                 <td align='center' width='10%'>
274
-                    " . $period_array['total'] . "
274
+                    " . $period_array['total']."
275 275
                 </td>
276 276
                 <td width='15%'>
277 277
                     &nbsp;
Please login to merge, or discard this patch.
main/tracking/lp_results_by_user.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	$export_to_csv = true;
27 27
 }
28 28
 
29
-if (api_is_platform_admin() ) {
29
+if (api_is_platform_admin()) {
30 30
 	$global = true;
31 31
 } else {
32 32
 	$global = false;
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 if ($global) {
36 36
 	$temp_course_list = CourseManager :: get_courses_list();
37
-	foreach($temp_course_list  as $temp_course_item) {
37
+	foreach ($temp_course_list  as $temp_course_item) {
38 38
 		$course_item = CourseManager ::get_course_information($temp_course_item['code']);
39 39
         $course_list[] = array(
40 40
             'code' => $course_item['code'],
@@ -47,14 +47,14 @@  discard block
 block discarded – undo
47 47
 }
48 48
 
49 49
 $new_course_select = array();
50
-foreach($course_list as $data) {
50
+foreach ($course_list as $data) {
51 51
     $new_course_select[$data['code']] = $data['title'];
52 52
 }
53 53
 
54 54
 $form = new FormValidator('search_simple', 'POST', '', '', null, false);
55
-$form->addElement('select','course_code',get_lang('Course'), $new_course_select);
55
+$form->addElement('select', 'course_code', get_lang('Course'), $new_course_select);
56 56
 if ($global) {
57
-	$form->addElement('hidden','view','admin');
57
+	$form->addElement('hidden', 'view', 'admin');
58 58
 } else {
59 59
 	//Get exam lists
60 60
     $course_id = api_get_course_int_id();
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	                 ORDER BY quiz.title ASC";
65 65
 	$resultExercices = Database::query($sqlExercices);
66 66
 	$exercise_list[0] = get_lang('All');
67
-	while($a_exercices = Database::fetch_array($resultExercices)) {
67
+	while ($a_exercices = Database::fetch_array($resultExercices)) {
68 68
 		$exercise_list[$a_exercices['id']] = $a_exercices['title'];
69 69
 	}
70 70
 	$form->addElement('select', 'exercise_id', get_lang('Exercise'), $exercise_list);
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
         echo '<div style="float:right"> <a href="'.api_get_self().'?export=1&score='.$filter_score.'&exercise_id='.$exercise_id.'">
89 89
                 '.Display::return_icon('csv.gif').'
90
-                &nbsp;'.get_lang('ExportAsCSV').'</a>' .
90
+                &nbsp;'.get_lang('ExportAsCSV').'</a>'.
91 91
                 '<a href="javascript: void(0);" onclick="javascript: window.print()">
92 92
                 '.Display::return_icon('printmgr.gif').'
93 93
                 &nbsp;'.get_lang('Print').'</a>
@@ -101,10 +101,10 @@  discard block
 block discarded – undo
101 101
         }
102 102
 		$menu_items[] = get_lang('ExamTracking');
103 103
 		$nb_menu_items = count($menu_items);
104
-		if($nb_menu_items>1) {
105
-			foreach($menu_items as $key=> $item) {
104
+		if ($nb_menu_items > 1) {
105
+			foreach ($menu_items as $key=> $item) {
106 106
 				echo $item;
107
-				if($key!=$nb_menu_items-1) {
107
+				if ($key != $nb_menu_items - 1) {
108 108
 					echo ' | ';
109 109
 				}
110 110
 			}
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 $session_id = 0;
129 129
 $user_list = array();
130 130
 // Getting course list
131
-foreach ($course_list  as $current_course ) {
131
+foreach ($course_list  as $current_course) {
132 132
 	$course_info = api_get_course_info($current_course['code']);
133 133
 	$_course = $course_info;
134 134
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 }
163 163
 
164 164
 if (!empty($user_list)) {
165
-    foreach($user_list as $user_id) {
165
+    foreach ($user_list as $user_id) {
166 166
         $user_data = api_get_user_info($user_id);
167 167
 		$user_list_name[$user_id] = api_get_person_name(
168 168
 			$user_data['firstname'],
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 		);
171 171
     }
172 172
 }
173
-$export_array =  array();
173
+$export_array = array();
174 174
 if (!empty($main_result)) {
175 175
 
176 176
     $html_result .= '<table  class="data_table">';
@@ -193,9 +193,9 @@  discard block
 block discarded – undo
193 193
 
194 194
             foreach ($exercises as $exercise_id => $exercise_data) {
195 195
                 $users = $exercise_data['users'];
196
-                foreach($users as $user_id => $attempts) {
196
+                foreach ($users as $user_id => $attempts) {
197 197
                     $attempt = 1;
198
-                    foreach($attempts as $exe_id => $attempt_data) {
198
+                    foreach ($attempts as $exe_id => $attempt_data) {
199 199
                         $html_result .= '<tr colspan="">';
200 200
                         $html_result .= Display::tag('td', $course_code);
201 201
                         $html_result .= Display::tag('td', $lp_list_name[$lp_id]);
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
             }
223 223
         }
224 224
     }
225
-    $html_result .='</table>';
225
+    $html_result .= '</table>';
226 226
 }
227 227
 
228 228
 if (!$export_to_csv) {
Please login to merge, or discard this patch.
main/inc/lib/search/tool_processors/link_processor.class.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
 /**
9 9
  * Code
10 10
  */
11
-include_once dirname(__FILE__) . '/../../../global.inc.php';
12
-require_once dirname(__FILE__) . '/search_processor.class.php';
11
+include_once dirname(__FILE__).'/../../../global.inc.php';
12
+require_once dirname(__FILE__).'/search_processor.class.php';
13 13
 
14 14
 /**
15 15
  * Process links before pass it to search listing scripts
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
 
105 105
             $link_id = intval($link_id);
106 106
             $sql = "SELECT insert_user_id FROM $item_property_table
107
-              		WHERE ref = $link_id AND tool = '" . TOOL_LINK . "' AND c_id = $course_id
107
+              		WHERE ref = $link_id AND tool = '".TOOL_LINK."' AND c_id = $course_id
108 108
               		LIMIT 1";
109 109
 
110 110
             $name = get_lang('Links');
111
-            $url = api_get_path(WEB_PATH) . 'main/link/link.php?cidReq=%s';
111
+            $url = api_get_path(WEB_PATH).'main/link/link.php?cidReq=%s';
112 112
             $url = sprintf($url, $course_id_alpha);
113 113
             // Get the image path
114 114
             $thumbnail = Display::returnIconPath('link.png');
Please login to merge, or discard this patch.
main/inc/lib/search/tool_processors/document_processor.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
 /**
9 9
  * Code
10 10
  */
11
-include_once dirname(__FILE__) . '/../../../global.inc.php';
12
-require_once dirname(__FILE__) . '/search_processor.class.php';
11
+include_once dirname(__FILE__).'/../../../global.inc.php';
12
+require_once dirname(__FILE__).'/search_processor.class.php';
13 13
 
14 14
 /**
15 15
  * Process documents before pass it to search listing scripts
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
             $dk_result = Database::query($sql);
83 83
 
84 84
             $sql = "SELECT insert_user_id FROM       $item_property_table
85
-                    WHERE   ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id
85
+                    WHERE   ref = $doc_id AND tool = '".TOOL_DOCUMENT."' AND c_id = $course_id
86 86
                     LIMIT 1";
87 87
             $name = '';
88 88
             if ($row = Database::fetch_array($dk_result)) {
Please login to merge, or discard this patch.
main/inc/lib/agenda.lib.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -1499,12 +1499,12 @@  discard block
 block discarded – undo
1499 1499
             }
1500 1500
 
1501 1501
             if (empty($session_id)) {
1502
-                $sessionCondition =  "
1502
+                $sessionCondition = "
1503 1503
                 (
1504 1504
                     agenda.session_id = 0 AND (ip.session_id IS NULL OR ip.session_id = 0)
1505 1505
                 ) ";
1506 1506
             } else {
1507
-                $sessionCondition =  "
1507
+                $sessionCondition = "
1508 1508
                 (
1509 1509
                     agenda.session_id = $session_id AND
1510 1510
                     ip.session_id = $session_id
@@ -1543,13 +1543,13 @@  discard block
 block discarded – undo
1543 1543
             }
1544 1544
 
1545 1545
             if (empty($session_id)) {
1546
-                $sessionCondition =  "
1546
+                $sessionCondition = "
1547 1547
                 (
1548 1548
                     agenda.session_id = 0 AND
1549 1549
                     (ip.session_id IS NULL OR ip.session_id = 0)
1550 1550
                 ) ";
1551 1551
             } else {
1552
-                $sessionCondition =  "
1552
+                $sessionCondition = "
1553 1553
                 (
1554 1554
                     agenda.session_id = $session_id AND
1555 1555
                     ip.session_id = $session_id
@@ -1601,7 +1601,7 @@  discard block
 block discarded – undo
1601 1601
             while ($row = Database::fetch_array($result, 'ASSOC')) {
1602 1602
                 $event = array();
1603 1603
                 $event['id'] = 'course_'.$row['id'];
1604
-                $event['unique_id']  = $row['iid'];
1604
+                $event['unique_id'] = $row['iid'];
1605 1605
                 // To avoid doubles
1606 1606
                 if (in_array($event['unique_id'], $eventsAdded)) {
1607 1607
                     continue;
@@ -2151,7 +2151,7 @@  discard block
 block discarded – undo
2151 2151
             );
2152 2152
 
2153 2153
             $form->addLabel('',
2154
-                '<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize'))).')');
2154
+                '<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))).')');
2155 2155
 
2156 2156
 
2157 2157
             //if ($showAttachmentForm) {
@@ -2729,8 +2729,8 @@  discard block
 block discarded – undo
2729 2729
 
2730 2730
                 $startDateTime = api_get_local_time($start->format('Y-m-d H:i:s'), $currentTimeZone, $start->format('e'));
2731 2731
                 $endDateTime = api_get_local_time($end->format('Y-m-d H:i'), $currentTimeZone, $end->format('e'));
2732
-                $title = api_convert_encoding((string)$event->summary, $charset, 'UTF-8');
2733
-                $description = api_convert_encoding((string)$event->description, $charset, 'UTF-8');
2732
+                $title = api_convert_encoding((string) $event->summary, $charset, 'UTF-8');
2733
+                $description = api_convert_encoding((string) $event->description, $charset, 'UTF-8');
2734 2734
 
2735 2735
                 $id = $this->addEvent(
2736 2736
                     $startDateTime,
@@ -2872,7 +2872,7 @@  discard block
 block discarded – undo
2872 2872
 							ORDER BY start_date ";
2873 2873
             } else {
2874 2874
                 // if the user is not an administrator of that course
2875
-                if (is_array($group_memberships) && count($group_memberships)>0) {
2875
+                if (is_array($group_memberships) && count($group_memberships) > 0) {
2876 2876
                     $sqlquery = "SELECT	agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref
2877 2877
 								FROM ".$TABLEAGENDA." agenda,
2878 2878
 									".$TABLE_ITEMPROPERTY." ip
@@ -2902,14 +2902,14 @@  discard block
 block discarded – undo
2902 2902
                 $agendaday = -1;
2903 2903
                 if ($item['start_date'] != '0000-00-00 00:00:00') {
2904 2904
                     $item['start_date'] = api_get_local_time($item['start_date']);
2905
-                    $item['start_date_tms']  = api_strtotime($item['start_date']);
2905
+                    $item['start_date_tms'] = api_strtotime($item['start_date']);
2906 2906
                     $agendaday = date("j", $item['start_date_tms']);
2907 2907
                 }
2908 2908
                 if ($item['end_date'] != '0000-00-00 00:00:00') {
2909 2909
                     $item['end_date'] = api_get_local_time($item['end_date']);
2910 2910
                 }
2911 2911
 
2912
-                $url  = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
2912
+                $url = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
2913 2913
 
2914 2914
                 $item['url'] = $url;
2915 2915
                 $item['course_name'] = $array_course_info['title'];
@@ -2921,9 +2921,9 @@  discard block
 block discarded – undo
2921 2921
         }
2922 2922
 
2923 2923
         // sorting by hour for every day
2924
-        $agendaitems = array ();
2924
+        $agendaitems = array();
2925 2925
         while (list ($agendaday, $tmpitems) = each($items)) {
2926
-            if(!isset($agendaitems[$agendaday])) {
2926
+            if (!isset($agendaitems[$agendaday])) {
2927 2927
                 $agendaitems[$agendaday] = '';
2928 2928
             }
2929 2929
             sort($tmpitems);
@@ -3097,9 +3097,9 @@  discard block
 block discarded – undo
3097 3097
             $end_year = $start_end_day_of_week['end']['year'];
3098 3098
             // in sql statements you have to use year-month-day for date calculations
3099 3099
             $start_filter = $start_year."-".$start_month."-".$start_day." 00:00:00";
3100
-            $start_filter  = api_get_utc_datetime($start_filter);
3100
+            $start_filter = api_get_utc_datetime($start_filter);
3101 3101
             $end_filter = $end_year."-".$end_month."-".$end_day." 23:59:59";
3102
-            $end_filter  = api_get_utc_datetime($end_filter);
3102
+            $end_filter = api_get_utc_datetime($end_filter);
3103 3103
             $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$user_id."' AND date>='".$start_filter."' AND date<='".$end_filter."'";
3104 3104
         }
3105 3105
         // 3. creating the SQL statement for getting the personal agenda items in DAY view
@@ -3107,18 +3107,18 @@  discard block
 block discarded – undo
3107 3107
             // we are in day view
3108 3108
             // we could use mysql date() function but this is only available from 4.1 and higher
3109 3109
             $start_filter = $year."-".$month."-".$day." 00:00:00";
3110
-            $start_filter  = api_get_utc_datetime($start_filter);
3110
+            $start_filter = api_get_utc_datetime($start_filter);
3111 3111
             $end_filter = $year."-".$month."-".$day." 23:59:59";
3112
-            $end_filter  = api_get_utc_datetime($end_filter);
3112
+            $end_filter = api_get_utc_datetime($end_filter);
3113 3113
             $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE user='".$user_id."' AND date>='".$start_filter."' AND date<='".$end_filter."'";
3114 3114
         }
3115 3115
 
3116 3116
         $result = Database::query($sql);
3117 3117
         while ($item = Database::fetch_array($result, 'ASSOC')) {
3118 3118
 
3119
-            $time_minute 	= api_convert_and_format_date($item['date'], TIME_NO_SEC_FORMAT);
3120
-            $item['date']   = api_get_local_time($item['date']);
3121
-            $item['start_date_tms']  = api_strtotime($item['date']);
3119
+            $time_minute = api_convert_and_format_date($item['date'], TIME_NO_SEC_FORMAT);
3120
+            $item['date'] = api_get_local_time($item['date']);
3121
+            $item['start_date_tms'] = api_strtotime($item['date']);
3122 3122
             $item['content'] = $item['text'];
3123 3123
 
3124 3124
             // we break the date field in the database into a date and a time part
@@ -3138,7 +3138,7 @@  discard block
 block discarded – undo
3138 3138
             $second = $agendatime[2];
3139 3139
 
3140 3140
             if ($type == 'month_view') {
3141
-                $item['calendar_type']  = 'personal';
3141
+                $item['calendar_type'] = 'personal';
3142 3142
                 $item['start_date']  	= $item['date'];
3143 3143
                 $agendaitems[$day][] 	= $item;
3144 3144
                 continue;
@@ -3163,7 +3163,7 @@  discard block
 block discarded – undo
3163 3163
                 // this is the array construction for the DAY view
3164 3164
                 $halfhour = 2 * $agendatime['0'];
3165 3165
                 if ($agendatime['1'] >= '30') {
3166
-                    $halfhour = $halfhour +1;
3166
+                    $halfhour = $halfhour + 1;
3167 3167
                 }
3168 3168
 
3169 3169
                 //Display events by list
@@ -3187,22 +3187,22 @@  discard block
 block discarded – undo
3187 3187
     {
3188 3188
         global $DaysShort, $course_path;
3189 3189
         //Handle leap year
3190
-        $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
3190
+        $numberofdays = array(0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
3191 3191
         if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
3192 3192
             $numberofdays[2] = 29;
3193 3193
         //Get the first day of the month
3194 3194
         $dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
3195 3195
         //Start the week on monday
3196 3196
         $startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6;
3197
-        $g_cc = (isset($_GET['courseCode'])?$_GET['courseCode']:'');
3197
+        $g_cc = (isset($_GET['courseCode']) ? $_GET['courseCode'] : '');
3198 3198
 
3199
-        $next_month = ($month == 1 ? 12 : $month -1);
3200
-        $prev_month = ($month == 12 ? 1 : $month +1);
3199
+        $next_month = ($month == 1 ? 12 : $month - 1);
3200
+        $prev_month = ($month == 12 ? 1 : $month + 1);
3201 3201
 
3202
-        $next_year = ($month == 1 ? $year -1 : $year);
3203
-        $prev_year = ($month == 12 ? $year +1 : $year);
3202
+        $next_year = ($month == 1 ? $year - 1 : $year);
3203
+        $prev_year = ($month == 12 ? $year + 1 : $year);
3204 3204
 
3205
-        if ($show_content)  {
3205
+        if ($show_content) {
3206 3206
             $back_url = Display::url(get_lang('Previous'), api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($g_cc)."&action=view&view=month&month=".$next_month."&year=".$next_year);
3207 3207
             $next_url = Display::url(get_lang('Next'), api_get_self()."?coursePath=".urlencode($course_path)."&courseCode=".Security::remove_XSS($g_cc)."&action=view&view=month&month=".$prev_month."&year=".$prev_year);
3208 3208
         } else {
@@ -3219,7 +3219,7 @@  discard block
 block discarded – undo
3219 3219
         $html .= '</div>';
3220 3220
         $html .= '<table id="agenda_list2" class="table table-bordered">';
3221 3221
         $html .= '<tr>';
3222
-        for ($ii = 1; $ii < 8; $ii ++) {
3222
+        for ($ii = 1; $ii < 8; $ii++) {
3223 3223
             $html .= '<td class="weekdays">'.$DaysShort[$ii % 7].'</td>';
3224 3224
         }
3225 3225
         $html .= '</tr>';
@@ -3228,7 +3228,7 @@  discard block
 block discarded – undo
3228 3228
         $today = getdate();
3229 3229
         while ($curday <= $numberofdays[$month]) {
3230 3230
             $html .= "<tr>";
3231
-            for ($ii = 0; $ii < 7; $ii ++) {
3231
+            for ($ii = 0; $ii < 7; $ii++) {
3232 3232
                 if (($curday == -1) && ($ii == $startdayofweek)) {
3233 3233
                     $curday = 1;
3234 3234
                 }
@@ -3242,21 +3242,21 @@  discard block
 block discarded – undo
3242 3242
                     $html .= "<td ".$class.">".$dayheader;
3243 3243
 
3244 3244
                     if (!empty($agendaitems[$curday])) {
3245
-                        $items =  $agendaitems[$curday];
3246
-                        $items =  msort($items, 'start_date_tms');
3245
+                        $items = $agendaitems[$curday];
3246
+                        $items = msort($items, 'start_date_tms');
3247 3247
 
3248
-                        foreach($items  as $value) {
3248
+                        foreach ($items  as $value) {
3249 3249
                             $value['title'] = Security::remove_XSS($value['title']);
3250 3250
                             $start_time = api_format_date($value['start_date'], TIME_NO_SEC_FORMAT);
3251 3251
                             $end_time = '';
3252 3252
 
3253 3253
                             if (!empty($value['end_date']) && $value['end_date'] != '0000-00-00 00:00:00') {
3254
-                                $end_time    = '-&nbsp;<i>'.api_format_date($value['end_date'], DATE_TIME_FORMAT_LONG).'</i>';
3254
+                                $end_time = '-&nbsp;<i>'.api_format_date($value['end_date'], DATE_TIME_FORMAT_LONG).'</i>';
3255 3255
                             }
3256 3256
                             $complete_time = '<i>'.api_format_date($value['start_date'], DATE_TIME_FORMAT_LONG).'</i>&nbsp;'.$end_time;
3257 3257
                             $time = '<i>'.$start_time.'</i>';
3258 3258
 
3259
-                            switch($value['calendar_type']) {
3259
+                            switch ($value['calendar_type']) {
3260 3260
                                 case 'personal':
3261 3261
                                     $bg_color = '#D0E7F4';
3262 3262
                                     $icon = Display::return_icon('user.png', get_lang('MyAgenda'), array(), ICON_SIZE_SMALL);
@@ -3308,7 +3308,7 @@  discard block
 block discarded – undo
3308 3308
                         }
3309 3309
                     }
3310 3310
                     $html .= "</td>";
3311
-                    $curday ++;
3311
+                    $curday++;
3312 3312
                 } else {
3313 3313
                     $html .= "<td></td>";
3314 3314
                 }
@@ -3329,18 +3329,18 @@  discard block
 block discarded – undo
3329 3329
      * where datestart and dateend are in yyyyMMddhhmmss format.
3330 3330
      * @TODO Implement really personal events (from user DB) and global events (from main DB)
3331 3331
      */
3332
-    public static function get_personal_agenda_items_between_dates($user_id, $date_start='', $date_end='')
3332
+    public static function get_personal_agenda_items_between_dates($user_id, $date_start = '', $date_end = '')
3333 3333
     {
3334
-        $items = array ();
3334
+        $items = array();
3335 3335
         if ($user_id != strval(intval($user_id))) { return $items; }
3336
-        if (empty($date_start)) { $date_start = date('Y-m-d H:i:s');}
3337
-        if (empty($date_end))   { $date_end = date('Y-m-d H:i:s',mktime(0, 0, 0, date("m"),   date("d"),   date("Y")+1));}
3336
+        if (empty($date_start)) { $date_start = date('Y-m-d H:i:s'); }
3337
+        if (empty($date_end)) { $date_end = date('Y-m-d H:i:s', mktime(0, 0, 0, date("m"), date("d"), date("Y") + 1)); }
3338 3338
         $expr = '/\d{4}-\d{2}-\d{2}\ \d{2}:\d{2}:\d{2}/';
3339
-        if(!preg_match($expr,$date_start)) { return $items; }
3340
-        if(!preg_match($expr,$date_end)) { return $items; }
3339
+        if (!preg_match($expr, $date_start)) { return $items; }
3340
+        if (!preg_match($expr, $date_end)) { return $items; }
3341 3341
 
3342 3342
         // get agenda-items for every course
3343
-        $courses = api_get_user_courses($user_id,false);
3343
+        $courses = api_get_user_courses($user_id, false);
3344 3344
         foreach ($courses as $id => $course) {
3345 3345
             $c = api_get_course_info_by_id($course['real_id']);
3346 3346
             //databases of the courses
@@ -3364,9 +3364,9 @@  discard block
 block discarded – undo
3364 3364
                     " ORDER BY start_date ";
3365 3365
             } else {
3366 3366
                 // if the user is not an administrator of that course, then...
3367
-                if (is_array($group_memberships) && count($group_memberships)>0)
3367
+                if (is_array($group_memberships) && count($group_memberships) > 0)
3368 3368
                 {
3369
-                    $sqlquery = "SELECT " .
3369
+                    $sqlquery = "SELECT ".
3370 3370
                         "DISTINCT agenda.*, ip.visibility, ip.to_group_id, ip.insert_user_id, ip.ref ".
3371 3371
                         " FROM ".$t_a." agenda, ".
3372 3372
                         $t_ip." ip ".
@@ -3394,13 +3394,13 @@  discard block
 block discarded – undo
3394 3394
 
3395 3395
             $result = Database::query($sqlquery);
3396 3396
             while ($item = Database::fetch_array($result)) {
3397
-                $agendaday = date("j",strtotime($item['start_date']));
3398
-                $month = date("n",strtotime($item['start_date']));
3399
-                $year = date("Y",strtotime($item['start_date']));
3397
+                $agendaday = date("j", strtotime($item['start_date']));
3398
+                $month = date("n", strtotime($item['start_date']));
3399
+                $year = date("Y", strtotime($item['start_date']));
3400 3400
                 $URL = api_get_path(WEB_PATH)."main/calendar/agenda.php?cidReq=".urlencode($course["code"])."&day=$agendaday&month=$month&year=$year#$agendaday";
3401
-                list($year,$month,$day,$hour,$min,$sec) = split('[-: ]',$item['start_date']);
3401
+                list($year, $month, $day, $hour, $min, $sec) = split('[-: ]', $item['start_date']);
3402 3402
                 $start_date = $year.$month.$day.$hour.$min;
3403
-                list($year,$month,$day,$hour,$min,$sec) = split('[-: ]',$item['end_date']);
3403
+                list($year, $month, $day, $hour, $min, $sec) = split('[-: ]', $item['end_date']);
3404 3404
                 $end_date = $year.$month.$day.$hour.$min;
3405 3405
 
3406 3406
                 $items[] = array(
@@ -3429,7 +3429,7 @@  discard block
 block discarded – undo
3429 3429
         $user = api_get_user_id();
3430 3430
         $sql = " SELECT * FROM ".$tbl_personal_agenda." WHERE id=".$id." AND user = ".$user;
3431 3431
         $result = Database::query($sql);
3432
-        if(Database::num_rows($result)==1) {
3432
+        if (Database::num_rows($result) == 1) {
3433 3433
             $item = Database::fetch_array($result);
3434 3434
         } else {
3435 3435
             $item = null;
@@ -3451,9 +3451,9 @@  discard block
 block discarded – undo
3451 3451
         // step 2: we which day this is (0=sunday, 1=monday, ...)
3452 3452
         $number_day_in_week = date('w', $random_day_in_week);
3453 3453
         // step 3: we calculate the timestamp of the monday of the week we are in
3454
-        $start_timestamp = $random_day_in_week - (($number_day_in_week -1) * 24 * 60 * 60);
3454
+        $start_timestamp = $random_day_in_week - (($number_day_in_week - 1) * 24 * 60 * 60);
3455 3455
         // step 4: we calculate the timestamp of the sunday of the week we are in
3456
-        $end_timestamp = $random_day_in_week + ((7 - $number_day_in_week +1) * 24 * 60 * 60) - 3600;
3456
+        $end_timestamp = $random_day_in_week + ((7 - $number_day_in_week + 1) * 24 * 60 * 60) - 3600;
3457 3457
         // step 5: calculating the start_day, end_day, start_month, end_month, start_year, end_year
3458 3458
         $start_day = date('j', $start_timestamp);
3459 3459
         $start_month = date('n', $start_timestamp);
Please login to merge, or discard this patch.
main/admin/specific_fields.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -15,36 +15,36 @@  discard block
 block discarded – undo
15 15
 api_protect_admin_script();
16 16
 
17 17
 // Breadcrumb
18
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
19
-$interbreadcrumb[] = array ('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
18
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
19
+$interbreadcrumb[] = array('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
20 20
 
21 21
 $libpath = api_get_path(LIBRARY_PATH);
22 22
 
23 23
 include_once $libpath.'specific_fields_manager.lib.php';
24 24
 
25 25
 // Create an add-field box
26
-$form = new FormValidator('add_field','post','','',null,false);
27
-$renderer =& $form->defaultRenderer();
26
+$form = new FormValidator('add_field', 'post', '', '', null, false);
27
+$renderer = & $form->defaultRenderer();
28 28
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
29
-$form->addElement('static','search_advanced_link',null,'<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
29
+$form->addElement('static', 'search_advanced_link', null, '<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
30 30
 
31 31
 // Create a sortable table with specific fields data
32
-$column_show = array(1,1,1);
33
-$column_order = array(3,2,1);
32
+$column_show = array(1, 1, 1);
33
+$column_order = array(3, 2, 1);
34 34
 $extra_fields = get_specific_field_list();
35 35
 $number_of_extra_fields = count($extra_fields);
36 36
 
37
-$table = new SortableTableFromArrayConfig($extra_fields,2,50,'',$column_show,$column_order);
38
-$table->set_header(0, '&nbsp;', false,null,'width="2%"', 'style="display:none"');
37
+$table = new SortableTableFromArrayConfig($extra_fields, 2, 50, '', $column_show, $column_order);
38
+$table->set_header(0, '&nbsp;', false, null, 'width="2%"', 'style="display:none"');
39 39
 $table->set_header(1, get_lang('Code'), TRUE, 'width="10%"');
40 40
 $table->set_header(2, get_lang('Name'));
41
-$table->set_header(3, get_lang('Modify'),false,'width="10%"');
41
+$table->set_header(3, get_lang('Modify'), false, 'width="10%"');
42 42
 $table->set_column_filter(3, 'edit_filter');
43 43
 
44
-function edit_filter($id,$url_params,$row) {
44
+function edit_filter($id, $url_params, $row) {
45 45
 	global $charset;
46
-	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
47
-	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
46
+	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
47
+	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
48 48
 	return $return;
49 49
 }
50 50
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 Display::display_header(get_lang('SpecificSearchFields'));
61 61
 echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
62 62
 
63
-if(!empty($_GET['message'])) {
63
+if (!empty($_GET['message'])) {
64 64
   Display::display_confirmation_message($_GET['message']);
65 65
 }
66 66
 
Please login to merge, or discard this patch.
main/admin/specific_fields_add.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -32,18 +32,18 @@  discard block
 block discarded – undo
32 32
 // Create the form
33 33
 $form = new FormValidator('specific_fields_add');
34 34
 // Field variable name
35
-$form->addElement('hidden','field_id', $fieldId);
36
-$form->addElement('text','field_name',get_lang('FieldName'));
37
-$form->applyFilter('field_name','html_filter');
38
-$form->applyFilter('field_name','trim');
35
+$form->addElement('hidden', 'field_id', $fieldId);
36
+$form->addElement('text', 'field_name', get_lang('FieldName'));
37
+$form->applyFilter('field_name', 'html_filter');
38
+$form->applyFilter('field_name', 'trim');
39 39
 $form->addRule('field_name', get_lang('ThisFieldIsRequired'), 'required');
40 40
 $form->addRule('field_name', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
41
-$form->addRule('field_name', '', 'maxlength',20);
41
+$form->addRule('field_name', '', 'maxlength', 20);
42 42
 
43 43
 // Set default values (only not empty when editing)
44 44
 $defaults = array();
45 45
 if ($fieldId) {
46
-    $form_information = get_specific_field_list(array( 'id' => $fieldId ));
46
+    $form_information = get_specific_field_list(array('id' => $fieldId));
47 47
     $defaults['field_name'] = $form_information[0]['name'];
48 48
 }
49 49
 $form->setDefaults($defaults);
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 if ($form->validate()) {
55 55
     $field = $form->exportValues();
56 56
     $field_name = $field['field_name'];
57
-    if (is_numeric($field['field_id']) && $field['field_id']<>0 && !empty($field['field_id'])) {
57
+    if (is_numeric($field['field_id']) && $field['field_id'] <> 0 && !empty($field['field_id'])) {
58 58
         edit_specific_field($field['field_id'], $field['field_name']);
59 59
         $message = get_lang('FieldEdited');
60 60
     } else {
Please login to merge, or discard this patch.