Completed
Push — 1.10.x ( 3cf4d9...ad40e2 )
by Angel Fernando Quiroz
279:46 queued 241:24
created
main/inc/lib/auth.lib.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
46 46
         $special_course_list = array();
47 47
         if (Database::num_rows($result) > 0) {
48 48
             while ($result_row = Database::fetch_array($result)) {
49
-                $special_course_list[] = '"' . $result_row['item_id'] . '"';
49
+                $special_course_list[] = '"'.$result_row['item_id'].'"';
50 50
             }
51 51
         }
52 52
         $without_special_courses = '';
53 53
         if (!empty($special_course_list)) {
54
-            $without_special_courses = ' AND course.id NOT IN (' . implode(',', $special_course_list) . ')';
54
+            $without_special_courses = ' AND course.id NOT IN ('.implode(',', $special_course_list).')';
55 55
         }
56 56
 
57 57
         // Secondly we select the courses that are in a category (user_course_cat<>0) and sort these according to the sort of the category
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
70 70
                 FROM $TABLECOURS course, $TABLECOURSUSER  course_rel_user
71 71
                 WHERE
72 72
                     course.id = course_rel_user.c_id AND
73
-                    course_rel_user.relation_type<>" . COURSE_RELATION_TYPE_RRHH . " AND
74
-                    course_rel_user.user_id = '" . $user_id . "' $without_special_courses
73
+                    course_rel_user.relation_type<>".COURSE_RELATION_TYPE_RRHH." AND
74
+                    course_rel_user.user_id = '" . $user_id."' $without_special_courses
75 75
                 ORDER BY course_rel_user.sort ASC";
76 76
         $result = Database::query($sql);
77 77
         $courses = array();
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
     {
103 103
         $user_id = api_get_user_id();
104 104
         $table_category = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
105
-        $sql = "SELECT * FROM " . $table_category . "
105
+        $sql = "SELECT * FROM ".$table_category."
106 106
                 WHERE user_id=$user_id
107 107
                 ORDER BY sort ASC";
108 108
         $result = Database::query($sql);
@@ -144,13 +144,13 @@  discard block
 block discarded – undo
144 144
         $special_course_list = array();
145 145
         if (Database::num_rows($result) > 0) {
146 146
             while ($result_row = Database::fetch_array($result)) {
147
-                $special_course_list[] = '"' . $result_row['item_id'] . '"';
147
+                $special_course_list[] = '"'.$result_row['item_id'].'"';
148 148
             }
149 149
         }
150 150
 
151 151
         $without_special_courses = '';
152 152
         if (!empty($special_course_list)) {
153
-            $without_special_courses = ' AND course.id NOT IN (' . implode(',', $special_course_list) . ')';
153
+            $without_special_courses = ' AND course.id NOT IN ('.implode(',', $special_course_list).')';
154 154
         }
155 155
 
156 156
         $sql = "SELECT
@@ -161,8 +161,8 @@  discard block
 block discarded – undo
161 161
                 $TABLECOURSUSER  course_rel_user
162 162
                 WHERE
163 163
                     course.id = course_rel_user.c_id AND
164
-                    course_rel_user.user_id = '" . $user_id . "' AND
165
-                    course_rel_user.relation_type <> " . COURSE_RELATION_TYPE_RRHH . "
164
+                    course_rel_user.user_id = '".$user_id."' AND
165
+                    course_rel_user.relation_type <> " . COURSE_RELATION_TYPE_RRHH."
166 166
                     $without_special_courses
167 167
                 ORDER BY course_rel_user.user_course_cat, course_rel_user.sort ASC";
168 168
         $result = Database::query($sql);
@@ -191,11 +191,11 @@  discard block
 block discarded – undo
191 191
         $TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
192 192
         $max_sort_value = api_max_sort_value($newcategory, $current_user);
193 193
         $sql = "UPDATE $TABLECOURSUSER SET
194
-                    user_course_cat='" . $newcategory . "',
195
-                    sort='" . ($max_sort_value + 1) . "'
194
+                    user_course_cat='".$newcategory."',
195
+                    sort='" . ($max_sort_value + 1)."'
196 196
                 WHERE
197
-                    c_id ='" . $courseId . "' AND
198
-                    user_id='" . $current_user . "' AND
197
+                    c_id ='" . $courseId."' AND
198
+                    user_id='" . $current_user."' AND
199 199
                     relation_type<>" . COURSE_RELATION_TYPE_RRHH;
200 200
         $resultQuery = Database::query($sql);
201 201
 
@@ -254,18 +254,18 @@  discard block
 block discarded – undo
254 254
             $targetCourseId = $targetCourseInfo['real_id'];
255 255
 
256 256
             $sql = "UPDATE $table
257
-                    SET sort='" . $target_course['sort'] . "'
257
+                    SET sort='".$target_course['sort']."'
258 258
                     WHERE
259
-                        c_id = '" . $courseId . "' AND
260
-                        user_id = '" . $current_user_id . "' AND
259
+                        c_id = '" . $courseId."' AND
260
+                        user_id = '" . $current_user_id."' AND
261 261
                         relation_type<>" . COURSE_RELATION_TYPE_RRHH;
262 262
 
263 263
             $result1 = Database::query($sql);
264 264
 
265
-            $sql = "UPDATE $table SET sort='" . $source_course['sort'] . "'
265
+            $sql = "UPDATE $table SET sort='".$source_course['sort']."'
266 266
                     WHERE
267
-                        c_id ='" . $targetCourseId . "' AND
268
-                        user_id='" . $current_user_id . "' AND
267
+                        c_id ='" . $targetCourseId."' AND
268
+                        user_id='" . $current_user_id."' AND
269 269
                         relation_type<>" . COURSE_RELATION_TYPE_RRHH;
270 270
 
271 271
             $result2 = Database::query($sql);
@@ -309,10 +309,10 @@  discard block
 block discarded – undo
309 309
         }
310 310
 
311 311
         if (count($target_category) > 0 && count($source_category) > 0) {
312
-            $sql_update1 = "UPDATE $table_user_defined_category SET sort='" . Database::escape_string($target_category['sort']) . "'
313
-                            WHERE id='" . intval($source_category['id']) . "' AND user_id='" . $current_user_id . "'";
314
-            $sql_update2 = "UPDATE $table_user_defined_category SET sort='" . Database::escape_string($source_category['sort']) . "'
315
-                            WHERE id='" . intval($target_category['id']) . "' AND user_id='" . $current_user_id . "'";
312
+            $sql_update1 = "UPDATE $table_user_defined_category SET sort='".Database::escape_string($target_category['sort'])."'
313
+                            WHERE id='" . intval($source_category['id'])."' AND user_id='".$current_user_id."'";
314
+            $sql_update2 = "UPDATE $table_user_defined_category SET sort='".Database::escape_string($source_category['sort'])."'
315
+                            WHERE id='" . intval($target_category['id'])."' AND user_id='".$current_user_id."'";
316 316
 
317 317
             $result1 = Database::query($sql_update2);
318 318
             $result2 = Database::query($sql_update1);
@@ -331,8 +331,8 @@  discard block
 block discarded – undo
331 331
     {
332 332
         $current_user_id = api_get_user_id();
333 333
         $table_category = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
334
-        $sql = "SELECT * FROM " . $table_category . "
335
-                WHERE user_id='" . $current_user_id . "'
334
+        $sql = "SELECT * FROM ".$table_category."
335
+                WHERE user_id='" . $current_user_id."'
336 336
                 ORDER BY sort ASC";
337 337
         $result = Database::query($sql);
338 338
         while ($row = Database::fetch_array($result)) {
@@ -355,8 +355,8 @@  discard block
 block discarded – undo
355 355
         $result = false;
356 356
         $tucc = Database::get_main_table(TABLE_USER_COURSE_CATEGORY);
357 357
         $sql = "UPDATE $tucc
358
-                SET title='" . api_htmlentities($title, ENT_QUOTES, api_get_system_encoding()) . "'
359
-                WHERE id='" . $category_id . "'";
358
+                SET title='".api_htmlentities($title, ENT_QUOTES, api_get_system_encoding())."'
359
+                WHERE id='" . $category_id."'";
360 360
         $resultQuery = Database::query($sql);
361 361
         if (Database::affected_rows($resultQuery)) {
362 362
             $result = true;
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
         $category_id = intval($category_id);
378 378
         $result = false;
379 379
         $sql_delete = "DELETE FROM $tucc
380
-                      WHERE id='" . $category_id . "' and user_id='" . $current_user_id . "'";
380
+                      WHERE id='".$category_id."' and user_id='".$current_user_id."'";
381 381
         $resultQuery = Database::query($sql_delete);
382 382
        if (Database::affected_rows($resultQuery)) {
383 383
             $result = true;
@@ -385,9 +385,9 @@  discard block
 block discarded – undo
385 385
         $sql = "UPDATE $TABLECOURSUSER
386 386
                 SET user_course_cat='0'
387 387
                 WHERE
388
-                    user_course_cat='" . $category_id . "' AND
389
-                    user_id='" . $current_user_id . "' AND
390
-                    relation_type<>" . COURSE_RELATION_TYPE_RRHH . " ";
388
+                    user_course_cat='".$category_id."' AND
389
+                    user_id='" . $current_user_id."' AND
390
+                    relation_type<>" . COURSE_RELATION_TYPE_RRHH." ";
391 391
         Database::query($sql);
392 392
 
393 393
         return $result;
@@ -420,20 +420,20 @@  discard block
 block discarded – undo
420 420
         if (Database::num_rows($special_course_result) > 0) {
421 421
             $special_course_list = array();
422 422
             while ($result_row = Database::fetch_array($special_course_result)) {
423
-                $special_course_list[] = '"' . $result_row['item_id'] . '"';
423
+                $special_course_list[] = '"'.$result_row['item_id'].'"';
424 424
             }
425 425
         }
426 426
         $without_special_courses = '';
427 427
         if (!empty($special_course_list)) {
428
-            $without_special_courses = ' AND course.code NOT IN (' . implode(',', $special_course_list) . ')';
428
+            $without_special_courses = ' AND course.code NOT IN ('.implode(',', $special_course_list).')';
429 429
         }
430 430
 
431 431
         $search_term_safe = Database::escape_string($search_term);
432 432
         $sql_find = "SELECT * FROM $courseTable
433 433
                     WHERE (
434
-                            code LIKE '%" . $search_term_safe . "%' OR
435
-                            title LIKE '%" . $search_term_safe . "%' OR
436
-                            tutor_name LIKE '%" . $search_term_safe . "%'
434
+                            code LIKE '%".$search_term_safe."%' OR
435
+                            title LIKE '%" . $search_term_safe."%' OR
436
+                            tutor_name LIKE '%" . $search_term_safe."%'
437 437
                         )
438 438
                         $without_special_courses
439 439
                     ORDER BY title, visual_code ASC
@@ -450,9 +450,9 @@  discard block
 block discarded – undo
450 450
                             ON (url_rel_course.c_id = course.id)
451 451
                             WHERE
452 452
                                 access_url_id = $url_access_id AND (
453
-                                    code LIKE '%" . $search_term_safe . "%' OR
454
-                                    title LIKE '%" . $search_term_safe . "%' OR
455
-                                    tutor_name LIKE '%" . $search_term_safe . "%'
453
+                                    code LIKE '%".$search_term_safe."%' OR
454
+                                    title LIKE '%" . $search_term_safe."%' OR
455
+                                    tutor_name LIKE '%" . $search_term_safe."%'
456 456
                                 )
457 457
                                 $without_special_courses
458 458
                             ORDER BY title, visual_code ASC
@@ -513,8 +513,8 @@  discard block
 block discarded – undo
513 513
         // (s)he can only delete the course
514 514
         $sql = "SELECT * FROM $tbl_course_user
515 515
                 WHERE
516
-                    user_id='" . $current_user_id . "' AND
517
-                    c_id ='" . $courseId . "' AND
516
+                    user_id='".$current_user_id."' AND
517
+                    c_id ='" . $courseId."' AND
518 518
                     status='1' ";
519 519
         $result_check = Database::query($sql);
520 520
         $number_of_rows = Database::num_rows($result_check);
@@ -541,17 +541,17 @@  discard block
 block discarded – undo
541 541
         $result = false;
542 542
 
543 543
         // step 1: we determine the max value of the user defined course categories
544
-        $sql = "SELECT sort FROM $tucc WHERE user_id='" . $current_user_id . "' ORDER BY sort DESC";
544
+        $sql = "SELECT sort FROM $tucc WHERE user_id='".$current_user_id."' ORDER BY sort DESC";
545 545
         $rs_sort = Database::query($sql);
546 546
         $maxsort = Database::fetch_array($rs_sort);
547 547
         $nextsort = $maxsort['sort'] + 1;
548 548
 
549 549
         // step 2: we check if there is already a category with this name, if not we store it, else we give an error.
550
-        $sql = "SELECT * FROM $tucc WHERE user_id='" . $current_user_id . "' AND title='" . $category_title . "'ORDER BY sort DESC";
550
+        $sql = "SELECT * FROM $tucc WHERE user_id='".$current_user_id."' AND title='".$category_title."'ORDER BY sort DESC";
551 551
         $rs = Database::query($sql);
552 552
         if (Database::num_rows($rs) == 0) {
553 553
             $sql_insert = "INSERT INTO $tucc (user_id, title,sort)
554
-                           VALUES ('" . $current_user_id . "', '" . api_htmlentities($category_title, ENT_QUOTES, api_get_system_encoding()) . "', '" . $nextsort . "')";
554
+                           VALUES ('".$current_user_id."', '".api_htmlentities($category_title, ENT_QUOTES, api_get_system_encoding())."', '".$nextsort."')";
555 555
             $resultQuery = Database::query($sql_insert);
556 556
             if (Database::affected_rows($resultQuery)) {
557 557
                 $result = true;
@@ -628,10 +628,10 @@  discard block
 block discarded – undo
628 628
             if (isset($_POST['course_registration_code']) && $_POST['course_registration_code'] != $all_course_information['registration_code']) {
629 629
                 return false;
630 630
             }
631
-            $message = get_lang('CourseRequiresPassword') . '<br />';
631
+            $message = get_lang('CourseRequiresPassword').'<br />';
632 632
             $message .= $all_course_information['title'].' ('.$all_course_information['visual_code'].') ';
633 633
 
634
-            $action  = api_get_path(WEB_CODE_PATH) . "auth/courses.php?action=subscribe_user_with_password&sec_token=" . $_SESSION['sec_token'];
634
+            $action  = api_get_path(WEB_CODE_PATH)."auth/courses.php?action=subscribe_user_with_password&sec_token=".$_SESSION['sec_token'];
635 635
             $form = new FormValidator('subscribe_user_with_password', 'post', $action);
636 636
             $form->addElement('hidden', 'sec_token', $_SESSION['sec_token']);
637 637
             $form->addElement('hidden', 'subscribe_user_with_password', $all_course_information['code']);
Please login to merge, or discard this patch.
main/inc/lib/javascript/chat/video.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,8 +34,8 @@
 block discarded – undo
34 34
 $idUserLocal = api_get_user_id();
35 35
 $userLocal = api_get_user_info($idUserLocal, true);
36 36
 $htmlHeadXtra[] = '<script type="text/javascript" src="'
37
-    . api_get_path(WEB_PATH) . 'web/assets/SimpleWebRTC/latest.js'
38
-    . '"></script>' . "\n";
37
+    . api_get_path(WEB_PATH).'web/assets/SimpleWebRTC/latest.js'
38
+    . '"></script>'."\n";
39 39
 
40 40
 $template = new Template();
41 41
 $template->assign('room_name', $chatVideo->getRoomName());
Please login to merge, or discard this patch.
main/inc/lib/thematic.lib.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         $from = intval($from);
75 75
         $number_of_items = intval($number_of_items);
76 76
 
77
-        if (!in_array($direction, array('ASC','DESC'))) {
77
+        if (!in_array($direction, array('ASC', 'DESC'))) {
78 78
             $direction = 'ASC';
79 79
         }
80 80
 
@@ -97,24 +97,24 @@  discard block
 block discarded – undo
97 97
             $thematic[1] = '<a href="index.php?'.api_get_cidreq().'&action=thematic_details&thematic_id='.$thematic[0].'">'.
98 98
                 Security::remove_XSS($thematic[1], STUDENT).$session_star.'</a>';
99 99
             if (api_is_allowed_to_edit(null, true)) {
100
-                $actions  = '';
100
+                $actions = '';
101 101
 
102 102
                 if (api_get_session_id()) {
103 103
                     if (api_get_session_id() == $thematic[3]) {
104 104
                         $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic[0].'">'.
105
-                            Display::return_icon('lesson_plan.png',get_lang('ThematicPlan'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
105
+                            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
106 106
                         $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic[0].'">'.
107
-                            Display::return_icon('lesson_plan_calendar.png',get_lang('ThematicAdvance'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
107
+                            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
108 108
 
109 109
                         $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$thematic[0].'">'.
110
-                            Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
110
+                            Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
111 111
                         $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$thematic[0].'">'.
112
-                            Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
112
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
113 113
                     } else {
114
-                        $actions .= Display::return_icon('lesson_plan_na.png',get_lang('ThematicPlan'),'',ICON_SIZE_SMALL).'&nbsp;';
115
-                        $actions .= Display::return_icon('lesson_plan_calendar_na.png',get_lang('ThematicAdvance'),'',ICON_SIZE_SMALL).'&nbsp;';
116
-                        $actions .= Display::return_icon('edit_na.png',get_lang('Edit'),'',ICON_SIZE_SMALL);
117
-                        $actions .= Display::return_icon('delete_na.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'&nbsp;';
114
+                        $actions .= Display::return_icon('lesson_plan_na.png', get_lang('ThematicPlan'), '', ICON_SIZE_SMALL).'&nbsp;';
115
+                        $actions .= Display::return_icon('lesson_plan_calendar_na.png', get_lang('ThematicAdvance'), '', ICON_SIZE_SMALL).'&nbsp;';
116
+                        $actions .= Display::return_icon('edit_na.png', get_lang('Edit'), '', ICON_SIZE_SMALL);
117
+                        $actions .= Display::return_icon('delete_na.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'&nbsp;';
118 118
                         $actions .= Display::url(
119 119
                             Display::return_icon('cd.gif', get_lang('Copy')),
120 120
                             'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$thematic[0]
@@ -122,26 +122,26 @@  discard block
 block discarded – undo
122 122
                     }
123 123
                 } else {
124 124
                     $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$thematic[0].'">'.
125
-                        Display::return_icon('lesson_plan.png',get_lang('ThematicPlan'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
125
+                        Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
126 126
                     $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$thematic[0].'">'.
127
-                        Display::return_icon('lesson_plan_calendar.png',get_lang('ThematicAdvance'),'',ICON_SIZE_SMALL).'</a>&nbsp;';
127
+                        Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), '', ICON_SIZE_SMALL).'</a>&nbsp;';
128 128
 
129 129
                     if ($thematic[2] > 1) {
130 130
                         $actions .= '<a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$thematic[0].'">'.
131
-                            Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
131
+                            Display::return_icon('up.png', get_lang('Up'), '', ICON_SIZE_SMALL).'</a>';
132 132
                     } else {
133
-                        $actions .= Display::return_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
133
+                        $actions .= Display::return_icon('up_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
134 134
                     }
135 135
                     if ($thematic[2] < self::get_max_thematic_item()) {
136 136
                         $actions .= '<a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$thematic[0].'">'.
137
-                            Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'</a>';
137
+                            Display::return_icon('down.png', get_lang('Down'), '', ICON_SIZE_SMALL).'</a>';
138 138
                     } else {
139
-                        $actions .= Display::return_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
139
+                        $actions .= Display::return_icon('down_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
140 140
                     }
141 141
                     $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$thematic[0].'">'.
142
-                        Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
142
+                        Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
143 143
                     $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$thematic[0].'">'.
144
-                        Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
144
+                        Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
145 145
                 }
146 146
                 $thematics[] = array($thematic[0], $thematic[1], $actions);
147 147
             }
@@ -278,9 +278,9 @@  discard block
 block discarded – undo
278 278
         $res = Database::query($sql);
279 279
         if (Database::num_rows($res) > 0) {
280 280
             if (!empty($thematic_id)) {
281
-                $data = Database::fetch_array($res,'ASSOC');
281
+                $data = Database::fetch_array($res, 'ASSOC');
282 282
             } else {
283
-                while ($row = Database::fetch_array($res,'ASSOC')) {
283
+                while ($row = Database::fetch_array($res, 'ASSOC')) {
284 284
                     $data[$row['id']] = $row;
285 285
                 }
286 286
             }
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 
376 376
         if (is_array($thematic_id)) {
377 377
             foreach ($thematic_id as $id) {
378
-                $id	= intval($id);
378
+                $id = intval($id);
379 379
                 $sql = "UPDATE $tbl_thematic SET active = 0
380 380
                         WHERE c_id = $course_id AND id = $id";
381 381
                 $result = Database::query($sql);
@@ -391,8 +391,8 @@  discard block
 block discarded – undo
391 391
                     );
392 392
                 }
393 393
             }
394
-        } else  {
395
-            $thematic_id	= intval($thematic_id);
394
+        } else {
395
+            $thematic_id = intval($thematic_id);
396 396
             $sql = "UPDATE $tbl_thematic SET active = 0
397 397
                     WHERE c_id = $course_id AND id = $thematic_id";
398 398
             $result = Database::query($sql);
@@ -428,8 +428,8 @@  discard block
 block discarded – undo
428 428
         $new_thematic_id = $thematic_copy->thematic_save();
429 429
         if (!empty($new_thematic_id)) {
430 430
             $thematic_advanced = self::get_thematic_advance_by_thematic_id($thematic_id);
431
-            if(!empty($thematic_advanced)) {
432
-                foreach($thematic_advanced as $item) {
431
+            if (!empty($thematic_advanced)) {
432
+                foreach ($thematic_advanced as $item) {
433 433
                     $thematic = new Thematic();
434 434
                     $thematic->set_thematic_advance_attributes(
435 435
                         0,
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
         $column = intval($column);
493 493
         $from   = intval($from);
494 494
         $number_of_items = intval($number_of_items);
495
-        if (!in_array($direction, array('ASC','DESC'))) {
495
+        if (!in_array($direction, array('ASC', 'DESC'))) {
496 496
             $direction = 'ASC';
497 497
         }
498 498
         $data = array();
@@ -525,8 +525,8 @@  discard block
 block discarded – undo
525 525
                     $thematic_advance[1] = api_get_local_time($thematic_advance[1]);
526 526
                     $thematic_advance[1] = api_format_date($thematic_advance[1], DATE_TIME_FORMAT_LONG);
527 527
                     $actions  = '';
528
-                    $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_edit&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
529
-                    $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('delete.png',get_lang('Delete'),'',22).'</a></center>';
528
+                    $actions .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_edit&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('edit.png', get_lang('Edit'), '', 22).'</a>';
529
+                    $actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic_id.'&thematic_advance_id='.$thematic_advance[0].'">'.Display::return_icon('delete.png', get_lang('Delete'), '', 22).'</a></center>';
530 530
                     $data[] = array($i, $thematic_advance[1], $thematic_advance[2], $thematic_advance[3], $actions);
531 531
                     $i++;
532 532
                 }
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 
591 591
                 $session_star = '';
592 592
                 if (api_is_allowed_to_edit(null, true)) {
593
-                    if ($thematic_advance['session_id'] !=0) {
593
+                    if ($thematic_advance['session_id'] != 0) {
594 594
                         $session_star = api_get_session_image(api_get_session_id(), $uinfo['status']);
595 595
                     }
596 596
                 }
@@ -616,13 +616,13 @@  discard block
 block discarded – undo
616 616
 
617 617
         foreach ($data as $thematic_id => $thematic_plan_data) {
618 618
             $new_thematic_plan_data = array();
619
-            foreach($thematic_plan_data as $thematic_item) {
619
+            foreach ($thematic_plan_data as $thematic_item) {
620 620
                 $thematic_simple_list[] = $thematic_item['description_type'];
621 621
                 $new_thematic_plan_data[$thematic_item['description_type']] = $thematic_item;
622 622
             }
623 623
 
624 624
             if (!empty($thematic_simple_list)) {
625
-                foreach($thematic_simple_list as $item) {
625
+                foreach ($thematic_simple_list as $item) {
626 626
                     $default_thematic_plan_title[$item] = $new_thematic_plan_data[$item]['title'];
627 627
                 }
628 628
             }
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
                     }
639 639
                     if (!empty($data[$thematic_id][$id]['title']) && !empty($data[$thematic_id][$id]['description'])) {
640 640
                         if (api_is_allowed_to_edit(null, true)) {
641
-                            if ($data[$thematic_id][$id]['session_id'] !=0) {
641
+                            if ($data[$thematic_id][$id]['session_id'] != 0) {
642 642
                                 $session_star = api_get_session_image(api_get_session_id(), $uinfo['status']);
643 643
                             }
644 644
                         }
@@ -651,7 +651,7 @@  discard block
 block discarded – undo
651 651
             if ($no_data) {
652 652
                 $return .= '<div><em>'.get_lang('StillDoNotHaveAThematicPlan').'</em></div>';
653 653
             }
654
-            $return  .= '</div>';
654
+            $return .= '</div>';
655 655
             $final_return[$thematic_id] = $return;
656 656
         }
657 657
         return $final_return;
@@ -691,7 +691,7 @@  discard block
 block discarded – undo
691 691
                 api_get_session_id()
692 692
             );
693 693
             foreach ($list as $value) {
694
-                $elements[$value['ref']]= $value;
694
+                $elements[$value['ref']] = $value;
695 695
             }
696 696
         }
697 697
 
@@ -865,18 +865,18 @@  discard block
 block discarded – undo
865 865
             api_get_session_id()
866 866
         );
867 867
 
868
-        $thematic_plan_complete_list  = array();
868
+        $thematic_plan_complete_list = array();
869 869
         $thematic_plan_id_list = array();
870 870
 
871 871
         if (!empty($items_from_course)) {
872
-            foreach($items_from_course as $item) {
872
+            foreach ($items_from_course as $item) {
873 873
                 $thematic_plan_id_list[] = $item['ref'];
874 874
                 $thematic_plan_complete_list[$item['ref']] = $item;
875 875
             }
876 876
         }
877 877
 
878 878
         if (!empty($items_from_session)) {
879
-            foreach($items_from_session as $item) {
879
+            foreach ($items_from_session as $item) {
880 880
                 $thematic_plan_id_list[] = $item['ref'];
881 881
                 $thematic_plan_complete_list[$item['ref']] = $item;
882 882
             }
@@ -898,7 +898,7 @@  discard block
 block discarded – undo
898 898
                 if (!isset($thematic_id) && !isset($description_type)) {
899 899
                     // group all data group by thematic id
900 900
                     $tmp = array();
901
-                    while ($row = Database::fetch_array($rs,'ASSOC')) {
901
+                    while ($row = Database::fetch_array($rs, 'ASSOC')) {
902 902
                         $tmp[] = $row['thematic_id'];
903 903
                         if (in_array($row['thematic_id'], $tmp)) {
904 904
                             $row['session_id'] = $thematic_plan_complete_list[$row['id']];
@@ -906,7 +906,7 @@  discard block
 block discarded – undo
906 906
                         }
907 907
                     }
908 908
                 } else {
909
-                    while ($row = Database::fetch_array($rs,'ASSOC')) {
909
+                    while ($row = Database::fetch_array($rs, 'ASSOC')) {
910 910
                         $row['session_id'] = $thematic_plan_complete_list[$row['id']];
911 911
                         $data[] = $row;
912 912
                     }
@@ -941,8 +941,8 @@  discard block
 block discarded – undo
941 941
         );
942 942
 
943 943
         $elements_to_show = array();
944
-        foreach($list as $value) {
945
-            $elements_to_show[]= $value['ref'];
944
+        foreach ($list as $value) {
945
+            $elements_to_show[] = $value['ref'];
946 946
         }
947 947
         $condition = '';
948 948
         if (!empty($elements_to_show)) {
@@ -954,7 +954,7 @@  discard block
 block discarded – undo
954 954
                     c_id = $course_id AND
955 955
                     thematic_id = $thematic_id AND
956 956
                     description_type = '$description_type'";
957
-        $rs	 = Database::query($sql);
957
+        $rs = Database::query($sql);
958 958
 
959 959
         $affected_rows = 0;
960 960
         if (Database::num_rows($rs) > 0) {
@@ -1190,7 +1190,7 @@  discard block
 block discarded – undo
1190 1190
             $diff = array_diff($all, $a_thematic_advance_ids);
1191 1191
             if (!empty($diff)) {
1192 1192
                 $upd = "UPDATE $tbl_thematic_advance SET done_advance = 0
1193
-    			        WHERE c_id = $course_id AND id IN(".implode(',',$diff).") ";
1193
+    			        WHERE c_id = $course_id AND id IN(".implode(',', $diff).") ";
1194 1194
                 Database::query($upd);
1195 1195
             }
1196 1196
 
@@ -1304,7 +1304,7 @@  discard block
 block discarded – undo
1304 1304
             $course_code = api_get_course_id();
1305 1305
         }
1306 1306
         if (api_get_session_id()) {
1307
-            $thematic_data = $this->get_thematic_list(null, $course_code );
1307
+            $thematic_data = $this->get_thematic_list(null, $course_code);
1308 1308
         } else {
1309 1309
             $thematic_data = $this->get_thematic_list(null, $course_code, 0);
1310 1310
         }
@@ -1356,7 +1356,7 @@  discard block
 block discarded – undo
1356 1356
             }
1357 1357
             // calculate average by thematic
1358 1358
             $count_total_advances = count($advances);
1359
-            $average = round(($count_done_advances*100)/$count_total_advances);
1359
+            $average = round(($count_done_advances * 100) / $count_total_advances);
1360 1360
         }
1361 1361
 
1362 1362
         return $average;
@@ -1447,12 +1447,12 @@  discard block
 block discarded – undo
1447 1447
     public function get_default_thematic_plan_title()
1448 1448
     {
1449 1449
         $default_thematic_plan_titles = array();
1450
-        $default_thematic_plan_titles[1]= get_lang('Objectives');
1451
-        $default_thematic_plan_titles[2]= get_lang('SkillToAcquire');
1452
-        $default_thematic_plan_titles[3]= get_lang('Methodology');
1453
-        $default_thematic_plan_titles[4]= get_lang('Infrastructure');
1454
-        $default_thematic_plan_titles[5]= get_lang('Assessment');
1455
-        $default_thematic_plan_titles[6]= get_lang('Others');
1450
+        $default_thematic_plan_titles[1] = get_lang('Objectives');
1451
+        $default_thematic_plan_titles[2] = get_lang('SkillToAcquire');
1452
+        $default_thematic_plan_titles[3] = get_lang('Methodology');
1453
+        $default_thematic_plan_titles[4] = get_lang('Infrastructure');
1454
+        $default_thematic_plan_titles[5] = get_lang('Assessment');
1455
+        $default_thematic_plan_titles[6] = get_lang('Others');
1456 1456
 
1457 1457
         return $default_thematic_plan_titles;
1458 1458
     }
@@ -1464,12 +1464,12 @@  discard block
 block discarded – undo
1464 1464
     public function get_default_thematic_plan_icon()
1465 1465
     {
1466 1466
         $default_thematic_plan_icon = array();
1467
-        $default_thematic_plan_icon[1]= 'icons/32/objective.png';
1468
-        $default_thematic_plan_icon[2]= 'icons/32/skills.png';
1469
-        $default_thematic_plan_icon[3]= 'icons/32/strategy.png';
1470
-        $default_thematic_plan_icon[4]= 'icons/32/laptop.png';
1471
-        $default_thematic_plan_icon[5]= 'icons/32/assessment.png';
1472
-        $default_thematic_plan_icon[6]= 'icons/32/wizard.png';
1467
+        $default_thematic_plan_icon[1] = 'icons/32/objective.png';
1468
+        $default_thematic_plan_icon[2] = 'icons/32/skills.png';
1469
+        $default_thematic_plan_icon[3] = 'icons/32/strategy.png';
1470
+        $default_thematic_plan_icon[4] = 'icons/32/laptop.png';
1471
+        $default_thematic_plan_icon[5] = 'icons/32/assessment.png';
1472
+        $default_thematic_plan_icon[6] = 'icons/32/wizard.png';
1473 1473
 
1474 1474
         return $default_thematic_plan_icon;
1475 1475
     }
@@ -1481,11 +1481,11 @@  discard block
 block discarded – undo
1481 1481
     public function get_default_question()
1482 1482
     {
1483 1483
         $question = array();
1484
-        $question[1]= get_lang('ObjectivesQuestions');
1485
-        $question[2]= get_lang('SkillToAcquireQuestions');
1486
-        $question[3]= get_lang('MethodologyQuestions');
1487
-        $question[4]= get_lang('InfrastructureQuestions');
1488
-        $question[5]= get_lang('AssessmentQuestions');
1484
+        $question[1] = get_lang('ObjectivesQuestions');
1485
+        $question[2] = get_lang('SkillToAcquireQuestions');
1486
+        $question[3] = get_lang('MethodologyQuestions');
1487
+        $question[4] = get_lang('InfrastructureQuestions');
1488
+        $question[5] = get_lang('AssessmentQuestions');
1489 1489
 
1490 1490
         return $question;
1491 1491
     }
Please login to merge, or discard this patch.
main/inc/lib/glossary.lib.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
      * @param int $glossary_id
40 40
      * @return string The glossary description
41 41
      */
42
-    public static function get_glossary_term_by_glossary_id ($glossary_id)
42
+    public static function get_glossary_term_by_glossary_id($glossary_id)
43 43
     {
44
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
44
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
45 45
         $course_id = api_get_course_int_id();
46 46
         $sql = "SELECT description FROM $glossary_table
47 47
                 WHERE c_id = $course_id  AND glossary_id =".intval($glossary_id);
48
-        $rs=Database::query($sql);
48
+        $rs = Database::query($sql);
49 49
         if (Database::num_rows($rs) > 0) {
50 50
             $row = Database::fetch_array($rs);
51 51
 
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
      * @param string The glossary term name
62 62
      * @return string The glossary description
63 63
      */
64
-    public static function get_glossary_term_by_glossary_name ($glossary_name)
64
+    public static function get_glossary_term_by_glossary_name($glossary_name)
65 65
     {
66
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
66
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
67 67
         $session_id = api_get_session_id();
68 68
         $course_id = api_get_course_int_id();
69 69
         $sql_filter = api_get_session_condition($session_id);
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
         $course_id = api_get_course_int_id();
164 164
 
165 165
         // check if the glossary term already exists
166
-        if (GlossaryManager::glossary_exists($values['glossary_title'],$values['glossary_id'])) {
166
+        if (GlossaryManager::glossary_exists($values['glossary_title'], $values['glossary_id'])) {
167 167
             // display the feedback message
168 168
             if ($message)
169 169
                 Display::display_error_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt'));
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
         $get_max = "SELECT MAX(display_order) FROM $t_glossary
211 211
                     WHERE c_id = $course_id ";
212 212
         $res_max = Database::query($get_max);
213
-        if (Database::num_rows($res_max)==0) {
213
+        if (Database::num_rows($res_max) == 0) {
214 214
             return 0;
215 215
         }
216 216
         $row = Database::fetch_array($res_max);
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
      * @author Patrick Cool <[email protected]>, Ghent University, Belgium
232 232
      * @version januari 2009, dokeos 1.8.6
233 233
      */
234
-    public static function glossary_exists($term, $not_id='')
234
+    public static function glossary_exists($term, $not_id = '')
235 235
     {
236 236
         // Database table definition
237 237
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
                 WHERE
242 242
                     c_id = $course_id AND
243 243
                     name = '".Database::escape_string($term)."'";
244
-        if ($not_id<>'') {
244
+        if ($not_id <> '') {
245 245
             $sql .= " AND glossary_id <> '".intval($not_id)."'";
246 246
         }
247 247
         $result = Database::query($sql);
@@ -347,27 +347,27 @@  discard block
 block discarded – undo
347 347
         // action links
348 348
         echo '<div class="actions">';
349 349
 
350
-        if (api_is_allowed_to_edit(null,true)) {
350
+        if (api_is_allowed_to_edit(null, true)) {
351 351
             echo '<a href="index.php?'.api_get_cidreq().'&action=addglossary&msg=add?'.api_get_cidreq().'">'.
352
-                Display::return_icon('new_glossary_term.png',get_lang('TermAddNew'),'', ICON_SIZE_MEDIUM).'</a>';
352
+                Display::return_icon('new_glossary_term.png', get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
353 353
         }
354 354
 
355 355
         echo '<a href="index.php?'.api_get_cidreq().'&action=export">'.
356
-            Display::return_icon('export_csv.png',get_lang('ExportGlossaryAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
357
-        if (api_is_allowed_to_edit(null,true)) {
356
+            Display::return_icon('export_csv.png', get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
357
+        if (api_is_allowed_to_edit(null, true)) {
358 358
             echo '<a href="index.php?'.api_get_cidreq().'&action=import">'.
359
-                Display::return_icon('import_csv.png',get_lang('ImportGlossary'),'',ICON_SIZE_MEDIUM).'</a>';
359
+                Display::return_icon('import_csv.png', get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
360 360
         }
361 361
 
362 362
         echo '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf">'.
363
-            Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>';
363
+            Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
364 364
 
365
-        if ((isset($_SESSION['glossary_view']) && $_SESSION['glossary_view'] == 'table') or (!isset($_SESSION['glossary_view']))){
365
+        if ((isset($_SESSION['glossary_view']) && $_SESSION['glossary_view'] == 'table') or (!isset($_SESSION['glossary_view']))) {
366 366
             echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=list">'.
367
-                Display::return_icon('view_detailed.png',get_lang('ListView'),'',ICON_SIZE_MEDIUM).'</a>';
367
+                Display::return_icon('view_detailed.png', get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
368 368
         } else {
369 369
             echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=table">'.
370
-                Display::return_icon('view_text.png',get_lang('TableView'),'',ICON_SIZE_MEDIUM).'</a>';
370
+                Display::return_icon('view_text.png', get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
371 371
         }
372 372
         echo '</div>';
373 373
         if (!$_SESSION['glossary_view'] || $_SESSION['glossary_view'] == 'table') {
@@ -380,9 +380,9 @@  discard block
 block discarded – undo
380 380
             //$table->set_header(0, '', false);
381 381
             $table->set_header(0, get_lang('TermName'), true);
382 382
             $table->set_header(1, get_lang('TermDefinition'), true);
383
-            if (api_is_allowed_to_edit(null,true)) {
383
+            if (api_is_allowed_to_edit(null, true)) {
384 384
                 $table->set_header(2, get_lang('Actions'), false, 'width=90px', array('class' => 'td_actions'));
385
-                $table->set_column_filter(2, array('GlossaryManager','actions_filter'));
385
+                $table->set_column_filter(2, array('GlossaryManager', 'actions_filter'));
386 386
             }
387 387
             $table->display();
388 388
         }
@@ -399,11 +399,11 @@  discard block
 block discarded – undo
399 399
      */
400 400
     public static function display_glossary_list()
401 401
     {
402
-        $glossary_data = self::get_glossary_data(0,1000,0,'ASC');
402
+        $glossary_data = self::get_glossary_data(0, 1000, 0, 'ASC');
403 403
         foreach ($glossary_data as $key => $glossary_item) {
404 404
             $actions = '';
405
-            if (api_is_allowed_to_edit(null,true)) {
406
-                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '',$glossary_item).'</div>';
405
+            if (api_is_allowed_to_edit(null, true)) {
406
+                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '', $glossary_item).'</div>';
407 407
             }
408 408
             echo Display::panel($glossary_item[1], $glossary_item[0].' '.$actions);
409 409
         }
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
      * @author Patrick Cool <[email protected]>, Ghent University, Belgium
419 419
      * @version januari 2009, dokeos 1.8.6
420 420
      */
421
-    public static  function get_number_glossary_terms($session_id=0)
421
+    public static  function get_number_glossary_terms($session_id = 0)
422 422
     {
423 423
         // Database table definition
424 424
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
457 457
         $t_item_propery = Database :: get_course_table(TABLE_ITEM_PROPERTY);
458 458
 
459
-        if (api_is_allowed_to_edit(null,true)) {
459
+        if (api_is_allowed_to_edit(null, true)) {
460 460
             $col2 = " glossary.glossary_id	as col2, ";
461 461
         } else {
462 462
             $col2 = " ";
@@ -471,8 +471,8 @@  discard block
 block discarded – undo
471 471
             'glossary.session_id'
472 472
         );
473 473
         $column = intval($column);
474
-        if (!in_array($direction,array('DESC', 'ASC'))) {
475
-            $direction          = 'ASC';
474
+        if (!in_array($direction, array('DESC', 'ASC'))) {
475
+            $direction = 'ASC';
476 476
         }
477 477
         $from = intval($from);
478 478
         $number_of_items = intval($number_of_items);
@@ -497,15 +497,15 @@  discard block
 block discarded – undo
497 497
         while ($data = Database::fetch_array($res)) {
498 498
             // Validation when belongs to a session
499 499
             $session_img = api_get_session_image($data['session_id'], $_user['status']);
500
-            $array[0] = $data[0] . $session_img;
500
+            $array[0] = $data[0].$session_img;
501 501
 
502 502
             if (!$_SESSION['glossary_view'] || $_SESSION['glossary_view'] == 'table') {
503
-                $array[1] = str_replace(array('<p>','</p>'),array('','<br />'),$data[1]);
503
+                $array[1] = str_replace(array('<p>', '</p>'), array('', '<br />'), $data[1]);
504 504
             } else {
505 505
                 $array[1] = $data[1];
506 506
             }
507 507
 
508
-            if (api_is_allowed_to_edit(null,true)) {
508
+            if (api_is_allowed_to_edit(null, true)) {
509 509
                 $array[2] = $data[2];
510 510
             }
511 511
             $return[] = $array;
@@ -528,14 +528,14 @@  discard block
 block discarded – undo
528 528
     public static function actions_filter($glossary_id, $url_params, $row)
529 529
     {
530 530
         $glossary_id = $row[2];
531
-        $return = '<a href="'.api_get_self().'?action=edit_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
531
+        $return = '<a href="'.api_get_self().'?action=edit_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.Display::return_icon('edit.png', get_lang('Edit'), '', 22).'</a>';
532 532
         $glossary_data = GlossaryManager::get_glossary_information($glossary_id);
533 533
 
534 534
         $glossary_term = $glossary_data['glossary_title'];
535 535
 
536 536
         if (api_is_allowed_to_edit(null, true)) {
537 537
             if ($glossary_data['session_id'] == api_get_session_id()) {
538
-                $return .= '<a href="'.api_get_self().'?action=delete_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
538
+                $return .= '<a href="'.api_get_self().'?action=delete_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.Display::return_icon('delete.png', get_lang('Delete'), '', 22).'</a>';
539 539
             } else {
540 540
                 $return  = get_lang('EditionNotAvailableFromSession');
541 541
             }
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
     {
557 557
         return "<script type=\"text/javascript\">
558 558
 				function confirmation (name) {
559
-					if (confirm(\" ". get_lang("TermConfirmDelete") ." \"+ name + \" ?\"))
559
+					if (confirm(\" ". get_lang("TermConfirmDelete")." \"+ name + \" ?\"))
560 560
 						{return true;}
561 561
 					else
562 562
 						{return false;}
@@ -616,7 +616,7 @@  discard block
 block discarded – undo
616 616
         $res = Database::query($sql);
617 617
         $found = false;
618 618
         while ($row = Database::fetch_array($res)) {
619
-            if ($found && empty($next_id))	{
619
+            if ($found && empty($next_id)) {
620 620
                 $next_id = $row['glossary_id'];
621 621
                 $next_display_order = $row['display_order'];
622 622
             }
Please login to merge, or discard this patch.
main/inc/lib/internationalization.lib.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     ) {
106 106
       require_once api_get_path(SYS_CODE_PATH).'/cron/lang/langstats.class.php';
107 107
       global $langstats;
108
-      $langstats->add_use($variable,'');
108
+      $langstats->add_use($variable, '');
109 109
     }
110 110
 
111 111
     if (!isset($used_lang_vars)) {
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
     if ($use_users_timezone == 'true') {
372 372
         $userId = api_get_user_id();
373 373
         // Get the timezone based on user preference, if it exists
374
-        $timezone_user = UserManager::get_extra_user_data_by_field($userId,'timezone');
374
+        $timezone_user = UserManager::get_extra_user_data_by_field($userId, 'timezone');
375 375
         if (isset($timezone_user['timezone']) && $timezone_user['timezone'] != null) {
376 376
             $to_timezone = $timezone_user['timezone'];
377 377
         }
@@ -636,10 +636,10 @@  discard block
 block discarded – undo
636 636
         // We replace %a %A %b %B masks of date format with translated strings
637 637
         $translated = &_api_get_day_month_names($language);
638 638
         $date_format = str_replace(array('%A', '%a', '%B', '%b'),
639
-        array($translated['days_long'][(int)strftime('%w', $time )],
640
-            $translated['days_short'][(int)strftime('%w', $time)],
641
-            $translated['months_long'][(int)strftime('%m', $time) - 1],
642
-            $translated['months_short'][(int)strftime('%m', $time) - 1]),
639
+        array($translated['days_long'][(int) strftime('%w', $time)],
640
+            $translated['days_short'][(int) strftime('%w', $time)],
641
+            $translated['months_long'][(int) strftime('%m', $time) - 1],
642
+            $translated['months_short'][(int) strftime('%m', $time) - 1]),
643 643
         $date_format);
644 644
         $formatted_date = api_to_system_encoding(strftime($date_format, $time), 'UTF-8');
645 645
     }
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
         if ($seconds > $time) {
738 738
             continue;
739 739
         }
740
-        $current_value = intval($time/$seconds);
740
+        $current_value = intval($time / $seconds);
741 741
 
742 742
         if ($current_value != 1) {
743 743
             $date_str = $sec_time_plu[$i];
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
754 754
     }
755 755
 
756 756
     if (!empty($key_result)) {
757
-        if ($key_result[0] == $min_day && $key_result[1]== $min_minute) {
757
+        if ($key_result[0] == $min_day && $key_result[1] == $min_minute) {
758 758
             $key_result[1] = ' 0 '.$min_hours;
759 759
             $str_result[0] = $time_result[0].' '.$key_result[0];
760 760
             $str_result[1] = $key_result[1];
@@ -1687,7 +1687,7 @@  discard block
 block discarded – undo
1687 1687
  * @return string					Returns the encoding identificator modified in suitable for comparison way.
1688 1688
  */
1689 1689
 function api_refine_encoding_id($encoding) {
1690
-    if (is_array($encoding)){
1690
+    if (is_array($encoding)) {
1691 1691
         return array_map('api_refine_encoding_id', $encoding);
1692 1692
     }
1693 1693
     return strtoupper(str_replace('_', '-', $encoding));
Please login to merge, or discard this patch.
main/inc/lib/nanogong.lib.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 		if (api_is_allowed_to_edit()) {
125 125
 			$this->can_edit = true;
126 126
 		} else {
127
-			if ($this->user_id ==  api_get_user_id()) {
127
+			if ($this->user_id == api_get_user_id()) {
128 128
 				$this->can_edit = true;
129 129
 			}
130 130
 		}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
     {
197 197
 		$filename = null;
198 198
 		//@ugly fix
199
-		foreach($this->available_extensions as $extension) {
199
+		foreach ($this->available_extensions as $extension) {
200 200
 			$items = explode('-', $this->filename);
201 201
 			$items[5] = 'temp_exe';
202 202
 			$filename = implode('-', $items);
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
     {
221 221
 		$filename = null;
222 222
 		//@ugly fix
223
-		foreach($this->available_extensions as $extension) {
223
+		foreach ($this->available_extensions as $extension) {
224 224
 			if (is_file($this->store_path.$this->filename.'.'.$extension)) {
225 225
 				$filename = $this->filename.'.'.$extension;
226 226
 				break;
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
                             course_code = '".$this->course_info['code']."'
245 245
                         LIMIT 1";
246 246
 				$result = Database::query($sql);
247
-				$result = Database::fetch_row($result,'ASSOC');
247
+				$result = Database::fetch_row($result, 'ASSOC');
248 248
 
249 249
 				if (isset($result) && isset($result[0]) && !empty($result[0])) {
250 250
 					$filename = $result[0];
@@ -369,18 +369,18 @@  discard block
 block discarded – undo
369 369
                         $html .= '<param name="ShowSpeedButton" value="false" />';
370 370
 						//echo '<param name="StartTime" value="10.5" />';
371 371
 						//echo '<param name="EndTime" value="65" />';
372
-						$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
372
+						$html .= '<param name="AudioFormat" value="ImaADPCM" />'; // ImaADPCM (more speed), Speex (more compression)|(default Speex)
373 373
 						//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
374 374
 						//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
375 375
 						//echo '<param name="SamplingRate" value="32000" />';
376 376
 						//echo '<param name="MaxDuration" value="60" />';
377
-						$html .=  '<param name="SoundFileURL" value="'.$url.'" />';//load a file |(default "")
377
+						$html .= '<param name="SoundFileURL" value="'.$url.'" />'; //load a file |(default "")
378 378
 						$html .= '</applet>';
379 379
 					$html .= '</div>';
380 380
 				$html .= '</div>';
381 381
                 $html .= '<div id="nanogong_warning">'.Display::return_message(get_lang('BrowserDoesNotSupportNanogongPlayer'), 'warning').$download_button.'</div>';
382 382
 
383
-			} elseif(in_array($path_info['extension'],array('mp3', 'ogg','wav'))) {
383
+			} elseif (in_array($path_info['extension'], array('mp3', 'ogg', 'wav'))) {
384 384
 				$js_path = api_get_path(WEB_LIBRARY_PATH).'javascript/';
385 385
 				$html .= '<link rel="stylesheet" href="'.$js_path.'jquery-jplayer/skin/blue.monday/css/jplayer.blue.monday.css" type="text/css">';
386 386
 				$html .= '<script type="text/javascript" src="'.$js_path.'jquery-jplayer/jplayer/jquery.jplayer.min.js"></script>';
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 
429 429
 		$url_delete = api_get_path(WEB_AJAX_PATH).'nanogong.ajax.php?a=delete&'.$params;
430 430
 
431
-		$js =  '<script language="javascript">
431
+		$js = '<script language="javascript">
432 432
 
433 433
 			//lang vars
434 434
 
@@ -570,8 +570,8 @@  discard block
 block discarded – undo
570 570
 		$html = '<center>';
571 571
 
572 572
 		//Use normal upload file
573
-		$html .= Display::return_icon('microphone.png', get_lang('PressRecordButton'),'', ICON_SIZE_BIG);
574
-		$html .='<br />';
573
+		$html .= Display::return_icon('microphone.png', get_lang('PressRecordButton'), '', ICON_SIZE_BIG);
574
+		$html .= '<br />';
575 575
 
576 576
 		$html .= '<div id="nanogong_div">';
577 577
 
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 		$html .= '<param name="Color" value="#FFFFFF" />'; // default #FFFFFF
585 585
 		//echo '<param name="StartTime" value="10.5" />';
586 586
 		//echo '<param name="EndTime" value="65" />';
587
-		$html .= '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
587
+		$html .= '<param name="AudioFormat" value="ImaADPCM" />'; // ImaADPCM (more speed), Speex (more compression)|(default Speex)
588 588
 		//$html .= '<param name="AudioFormat" value="Speex" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
589 589
 
590 590
 		//echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
Please login to merge, or discard this patch.
main/inc/lib/rights.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@
 block discarded – undo
6 6
  */
7 7
 class Rights {
8 8
 	private static $rights_cache = array();
9
-	private static $rights = array (
9
+	private static $rights = array(
10 10
 		'show_tabs:reports' =>
11
-			array (
11
+			array(
12 12
 				'type' => 'const',
13 13
 				'const' => 'true' )
14 14
 		);
Please login to merge, or discard this patch.
main/inc/lib/table_sort.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 
158 158
                 $new_data_order = array();
159 159
                 if (!empty($docs_to_sort)) {
160
-                    foreach($docs_to_sort as $id => $document) {
160
+                    foreach ($docs_to_sort as $id => $document) {
161 161
                         if (isset($new_data[$id])) {
162 162
                             $new_data_order[] = $new_data[$id];
163 163
                         }
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
                 }
166 166
 
167 167
                 if (!empty($folder_to_sort)) {
168
-                    foreach($folder_to_sort as $id => $document) {
168
+                    foreach ($folder_to_sort as $id => $document) {
169 169
                         if (isset($new_data[$id])) {
170 170
                             $new_data_order[] = $new_data[$id];
171 171
                         }
Please login to merge, or discard this patch.
main/inc/lib/plugin.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
             //extra options
426 426
             $plugin_settings = api_get_settings_params(
427 427
                 array(
428
-                    "subkey = ? AND category = ? AND type = ? " => array($plugin_name, 'Plugins','setting')
428
+                    "subkey = ? AND category = ? AND type = ? " => array($plugin_name, 'Plugins', 'setting')
429 429
                 )
430 430
             );
431 431
             $settings_filtered = array();
@@ -530,7 +530,7 @@  discard block
 block discarded – undo
530 530
             if (!empty($obj->course_settings)) {
531 531
                 if (is_file(api_get_path(SYS_CODE_PATH).'img/icons/'.ICON_SIZE_SMALL.'/'.$plugin_name.'.png')) {
532 532
                     $icon = Display::return_icon(
533
-                        $plugin_name . '.png',
533
+                        $plugin_name.'.png',
534 534
                         Security::remove_XSS($pluginTitle),
535 535
                         '',
536 536
                         ICON_SIZE_SMALL
Please login to merge, or discard this patch.