Completed
Push — 1.10.x ( ad23de...73a570 )
by Yannick
448:11 queued 407:15
created
main/gradebook/lib/flatview_data_generator.class.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
             isset($this->params['only_subcat']) &&
115 115
             $this->params['only_subcat'] == $this->category->get_id()
116 116
         ) {
117
-            $main_weight  = $this->category->get_weight();
117
+            $main_weight = $this->category->get_weight();
118 118
             $grade_model_id = $this->category->get_grade_model_id();
119 119
         } else {
120
-            $main_cat  = Category::load($parent_id, null, null);
120
+            $main_cat = Category::load($parent_id, null, null);
121 121
             $main_weight = $main_cat[0]->get_weight();
122 122
             $grade_model_id = $main_cat[0]->get_grade_model_id();
123 123
         }
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
                     $list = [];
200 200
                     $list['items'] = $finalList;
201 201
                     $list['header'] = '<center>'.$mainHeader.'</center>';
202
-                    $headers[]= $list;
202
+                    $headers[] = $list;
203 203
                 } else {
204 204
                     $headers[] = '<center>'.$mainHeader.'</center>';
205 205
                 }
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
                 (isset($this->params['only_total_category']) &&
210 210
                     $this->params['only_total_category'] == false)
211 211
             ) {
212
-                for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) {
212
+                for ($count = 0; ($count < $items_count) && ($items_start + $count < count($this->evals_links)); $count++) {
213 213
                     /** @var AbstractLink $item */
214 214
                     $item = $this->evals_links[$count + $items_start];
215 215
                     $weight = round(100 * $item->get_weight() / $main_weight, 1);
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
                     !in_array($item->get_id(), $evaluationsAdded)
228 228
                 ) {
229 229
                     $weight = round(100 * $item->get_weight() / $main_weight, 1);
230
-                    $headers[] = $item->get_name() . ' ' . $weight . ' % ';
230
+                    $headers[] = $item->get_name().' '.$weight.' % ';
231 231
                 }
232 232
             }
233 233
         }
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
         if (!isset($items_count)) {
267 267
             $items_count = count($this->evals_links) - $items_start;
268 268
         }
269
-        for ($count=0; ($count < $items_count ) && ($items_start + $count < count($this->evals_links)); $count++) {
269
+        for ($count = 0; ($count < $items_count) && ($items_start + $count < count($this->evals_links)); $count++) {
270 270
             $item = $this->evals_links [$count + $items_start];
271 271
             $headers[] = $item->get_name();
272 272
         }
@@ -293,13 +293,13 @@  discard block
 block discarded – undo
293 293
     ) {
294 294
         // Do some checks on users/items counts, redefine if invalid values
295 295
         if (!isset($users_count)) {
296
-            $users_count = count ($this->users) - $users_start;
296
+            $users_count = count($this->users) - $users_start;
297 297
         }
298 298
         if ($users_count < 0) {
299 299
             $users_count = 0;
300 300
         }
301 301
         if (!isset($items_count)) {
302
-            $items_count = count ($this->evals) + count ($this->links) - $items_start;
302
+            $items_count = count($this->evals) + count($this->links) - $items_start;
303 303
         }
304 304
         if ($items_count < 0) {
305 305
             $items_count = 0;
@@ -312,10 +312,10 @@  discard block
 block discarded – undo
312 312
 
313 313
         // sort users array
314 314
         if ($users_sorting & self :: FVDG_SORT_LASTNAME) {
315
-            usort($userTable, array('FlatViewDataGenerator','sort_by_last_name'));
315
+            usort($userTable, array('FlatViewDataGenerator', 'sort_by_last_name'));
316 316
 
317 317
         } elseif ($users_sorting & self :: FVDG_SORT_FIRSTNAME) {
318
-            usort($userTable, array('FlatViewDataGenerator','sort_by_first_name'));
318
+            usort($userTable, array('FlatViewDataGenerator', 'sort_by_first_name'));
319 319
         }
320 320
 
321 321
         if ($users_sorting & self :: FVDG_SORT_DESC) {
@@ -356,10 +356,10 @@  discard block
 block discarded – undo
356 356
         $parent_id = $this->category->get_parent_id();
357 357
 
358 358
         if ($parent_id == 0 or $this->params['only_subcat'] == $this->category->get_id()) {
359
-            $main_weight  = $this->category->get_weight();
359
+            $main_weight = $this->category->get_weight();
360 360
             $grade_model_id = $this->category->get_grade_model_id();
361 361
         } else {
362
-            $main_cat  = Category::load($parent_id, null, null);
362
+            $main_cat = Category::load($parent_id, null, null);
363 363
             $main_weight = $main_cat[0]->get_weight();
364 364
             $grade_model_id = $main_cat[0]->get_grade_model_id();
365 365
         }
@@ -471,11 +471,11 @@  discard block
 block discarded – undo
471 471
                     $divide = $score[1] == 0 ? 1 : $score[1];
472 472
 
473 473
                     $sub_cat_percentage = $sum_categories_weight_array[$sub_cat->get_id()];
474
-                    $item_value  = $score[0]/$divide*$main_weight;
474
+                    $item_value = $score[0] / $divide * $main_weight;
475 475
 
476 476
                     // Fixing total when using one or multiple gradebooks
477
-                    $percentage = $sub_cat->get_weight()/($sub_cat_percentage) * $sub_cat_percentage/$this->category->get_weight();
478
-                    $item_value = $percentage*$item_value;
477
+                    $percentage = $sub_cat->get_weight() / ($sub_cat_percentage) * $sub_cat_percentage / $this->category->get_weight();
478
+                    $item_value = $percentage * $item_value;
479 479
                     $item_total += $sub_cat->get_weight();
480 480
                     /*
481 481
                         if ($convert_using_the_global_weight) {
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
521 521
                 if ($convert_using_the_global_weight) {
522 522
                     //$item_total = $main_weight;
523 523
                 }
524
-            } else  {
524
+            } else {
525 525
                 // All evaluations
526 526
                 $result = $this->parseEvaluations(
527 527
                     $user_id,
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
             // Sub cat weight
629 629
             //$sub_cat_percentage = $sum_categories_weight_array[$item->get_category_id()];
630 630
 
631
-            $item_value = isset($score[0]) ? $score[0]/$divide : 0;
631
+            $item_value = isset($score[0]) ? $score[0] / $divide : 0;
632 632
 
633 633
             // Fixing total when using one or multiple gradebooks.
634 634
             if (empty($parentCategoryIdFilter)) {
@@ -710,11 +710,11 @@  discard block
 block discarded – undo
710 710
         $data = array();
711 711
 
712 712
         foreach ($selected_users as $user) {
713
-            $row = array ();
714
-            for ($count=0;$count < count($this->evals_links); $count++) {
713
+            $row = array();
714
+            for ($count = 0; $count < count($this->evals_links); $count++) {
715 715
                 $item = $this->evals_links [$count];
716 716
                 $score = $item->calc_score($user[0]);
717
-                $porcent_score = isset($score[1]) &&  $score[1] > 0 ? ($score[0]*100)/$score[1] :0;
717
+                $porcent_score = isset($score[1]) && $score[1] > 0 ? ($score[0] * 100) / $score[1] : 0;
718 718
                 $row[$item->get_name()] = $porcent_score;
719 719
             }
720 720
             $data[$user[0]] = $row;
@@ -726,7 +726,7 @@  discard block
 block discarded – undo
726 726
             $tmp = array();
727 727
             foreach ($items as $item => $value) {
728 728
                 $tmp[] = $item;
729
-                if (in_array($item,$tmp)) {
729
+                if (in_array($item, $tmp)) {
730 730
                     $data_by_item[$item][$uid] = $value;
731 731
                 }
732 732
             }
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
         */
738 738
         $result = array();
739 739
         foreach ($data_by_item as $k => $v) {
740
-            $average = round(array_sum($v)/count($v));
740
+            $average = round(array_sum($v) / count($v));
741 741
             arsort($v);
742 742
             $maximum = array_shift($v);
743 743
             $minimum = array_pop($v);
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
                 $minimum = 0;
747 747
             }
748 748
 
749
-            $summary= array(
749
+            $summary = array(
750 750
                 'max' => $maximum,
751 751
                 'min' => $minimum,
752 752
                 'avg' => $average
@@ -763,32 +763,32 @@  discard block
 block discarded – undo
763 763
     public function get_data_to_graph()
764 764
     {
765 765
         // do some checks on users/items counts, redefine if invalid values
766
-        $usertable = array ();
766
+        $usertable = array();
767 767
         foreach ($this->users as $user) {
768 768
             $usertable[] = $user;
769 769
         }
770 770
         // sort users array
771
-        usort($usertable, array ('FlatViewDataGenerator','sort_by_first_name'));
771
+        usort($usertable, array('FlatViewDataGenerator', 'sort_by_first_name'));
772 772
 
773
-        $data = array ();
773
+        $data = array();
774 774
 
775 775
         $selected_users = $usertable;
776 776
         foreach ($selected_users as $user) {
777
-            $row = array ();
778
-            $row[] = $user[0];    // user id
777
+            $row = array();
778
+            $row[] = $user[0]; // user id
779 779
             $item_value = 0;
780 780
             $item_total = 0;
781 781
 
782
-            for ($count=0;$count < count($this->evals_links); $count++) {
782
+            for ($count = 0; $count < count($this->evals_links); $count++) {
783 783
                 $item = $this->evals_links[$count];
784 784
                 $score = $item->calc_score($user[0]);
785 785
 
786
-                $divide =( ($score[1])==0 ) ? 1 : $score[1];
787
-                $item_value += $score[0]/$divide*$item->get_weight();
786
+                $divide = (($score[1]) == 0) ? 1 : $score[1];
787
+                $item_value += $score[0] / $divide * $item->get_weight();
788 788
                 $item_total += $item->get_weight();
789 789
 
790 790
 
791
-                $score_denom = ($score[1]==0) ? 1 : $score[1];
791
+                $score_denom = ($score[1] == 0) ? 1 : $score[1];
792 792
                 $score_final = ($score[0] / $score_denom) * 100;
793 793
                 $row[] = $score_final;
794 794
             }
@@ -814,15 +814,15 @@  discard block
 block discarded – undo
814 814
             $usertable[] = $user;
815 815
         }
816 816
         // sort users array
817
-        usort($usertable, array ('FlatViewDataGenerator','sort_by_first_name'));
817
+        usort($usertable, array('FlatViewDataGenerator', 'sort_by_first_name'));
818 818
 
819 819
         // generate actual data array
820 820
         $scoredisplay = ScoreDisplay :: instance();
821 821
         $data = array();
822 822
         $selected_users = $usertable;
823 823
         foreach ($selected_users as $user) {
824
-            $row = array ();
825
-            $row[] = $user[0];    // user id
824
+            $row = array();
825
+            $row[] = $user[0]; // user id
826 826
             $item_value = 0;
827 827
             $item_total = 0;
828 828
             $final_score = 0;
@@ -843,8 +843,8 @@  discard block
 block discarded – undo
843 843
                     $divide = $score[1] == 0 ? 1 : $score[1];
844 844
 
845 845
                     //$sub_cat_percentage = $sum_categories_weight_array[$sub_cat->get_id()];
846
-                    $item_value     = $score[0]/$divide*$main_weight;
847
-                    $item_total        += $sub_cat->get_weight();
846
+                    $item_value = $score[0] / $divide * $main_weight;
847
+                    $item_total += $sub_cat->get_weight();
848 848
 
849 849
                     $row[] = array(
850 850
                         $item_value,
@@ -861,23 +861,23 @@  discard block
 block discarded – undo
861 861
                     trim($scoredisplay->display_score($total_score, SCORE_CUSTOM, null, true))
862 862
                 );
863 863
             } else {
864
-                for ($count=0;$count < count($this->evals_links); $count++) {
864
+                for ($count = 0; $count < count($this->evals_links); $count++) {
865 865
                     $item = $this->evals_links [$count];
866 866
                     $score = $item->calc_score($user[0]);
867 867
                     $divide = ($score[1]) == 0 ? 1 : $score[1];
868 868
                     $item_value += $score[0] / $divide * $item->get_weight();
869
-                    $item_total+=$item->get_weight();
870
-                    $score_denom=($score[1]==0) ? 1 : $score[1];
869
+                    $item_total += $item->get_weight();
870
+                    $score_denom = ($score[1] == 0) ? 1 : $score[1];
871 871
                     $score_final = ($score[0] / $score_denom) * 100;
872
-                    $row[] = array ($score_final, trim($scoredisplay->display_score($score, SCORE_CUSTOM,null, true)));
872
+                    $row[] = array($score_final, trim($scoredisplay->display_score($score, SCORE_CUSTOM, null, true)));
873 873
 
874 874
                 }
875
-                $total_score=array($item_value,$item_total);
875
+                $total_score = array($item_value, $item_total);
876 876
                 $score_final = ($item_value / $item_total) * 100;
877 877
                 if ($displayWarning) {
878
-                    Display::display_warning_message( Display::display_warning_message($total_score[1]));
878
+                    Display::display_warning_message(Display::display_warning_message($total_score[1]));
879 879
                 }
880
-                $row[] =array ($score_final, trim($scoredisplay->display_score($total_score, SCORE_CUSTOM, null, true)));
880
+                $row[] = array($score_final, trim($scoredisplay->display_score($total_score, SCORE_CUSTOM, null, true)));
881 881
             }
882 882
 
883 883
             $data[] = $row;
Please login to merge, or discard this patch.
main/admin/class_edit.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 api_protect_admin_script();
20 20
 
21 21
 // Setting breadcrumbs.
22
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
23
-$interbreadcrumb[] = array ('url' => 'class_list.php', 'name' => get_lang('AdminClasses'));
22
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
23
+$interbreadcrumb[] = array('url' => 'class_list.php', 'name' => get_lang('AdminClasses'));
24 24
 
25 25
 
26 26
 // Setting the name of the tool.
@@ -30,10 +30,10 @@  discard block
 block discarded – undo
30 30
 $class_id = intval($_GET['idclass']);
31 31
 $class = ClassManager :: get_class_info($class_id);
32 32
 $form = new FormValidator('edit_class', 'post', 'class_edit.php?idclass='.$class_id);
33
-$form->addText('name',get_lang('ClassName'));
33
+$form->addText('name', get_lang('ClassName'));
34 34
 $form->addButtonUpdate(get_lang('Ok'));
35 35
 $form->setDefaults(array('name'=>$class['name']));
36
-if($form->validate())
36
+if ($form->validate())
37 37
 {
38 38
     $values = $form->exportValues();
39 39
     ClassManager :: set_name($values['name'], $class_id);
Please login to merge, or discard this patch.
main/admin/grade_models.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 $htmlHeadXtra[] = api_get_jqgrid_js();
21 21
 
22 22
 // setting breadcrumbs
23
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
23
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
24 24
 
25 25
 $action = isset($_GET['action']) ? $_GET['action'] : null;
26 26
 
@@ -28,16 +28,16 @@  discard block
 block discarded – undo
28 28
 $token = Security::get_token();
29 29
 
30 30
 if ($action == 'add') {
31
-    $interbreadcrumb[]=array('url' => 'grade_models.php','name' => get_lang('GradeModel'));
32
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add'));
31
+    $interbreadcrumb[] = array('url' => 'grade_models.php', 'name' => get_lang('GradeModel'));
32
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add'));
33 33
 } elseif ($action == 'edit') {
34
-    $interbreadcrumb[]=array('url' => 'grade_models.php','name' => get_lang('GradeModel'));
35
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit'));
34
+    $interbreadcrumb[] = array('url' => 'grade_models.php', 'name' => get_lang('GradeModel'));
35
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
36 36
 } else {
37
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('GradeModel'));
37
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('GradeModel'));
38 38
 }
39 39
 
40
-$htmlHeadXtra[]= '<script>
40
+$htmlHeadXtra[] = '<script>
41 41
 
42 42
 function plusItem(item) {
43 43
         if (item != 1) {
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
77 77
 
78 78
 //Column config
79 79
 $column_model   = array(
80
-                        array('name'=>'name',           'index'=>'name',        'width'=>'80',   'align'=>'left'),
81
-                        array('name'=>'description',    'index'=>'description', 'width'=>'500',  'align'=>'left','sortable'=>'false'),
82
-                        array('name'=>'actions',        'index'=>'actions',     'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
80
+                        array('name'=>'name', 'index'=>'name', 'width'=>'80', 'align'=>'left'),
81
+                        array('name'=>'description', 'index'=>'description', 'width'=>'500', 'align'=>'left', 'sortable'=>'false'),
82
+                        array('name'=>'actions', 'index'=>'actions', 'width'=>'100', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false')
83 83
                        );
84 84
 //Autowidth
85 85
 $extra_params['autowidth'] = 'true';
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 
89 89
 //With this function we can add actions to the jgrid (edit, delete, etc)
90 90
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
91
-                         return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
92
-                         '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>'.
91
+                         return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
92
+                         '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'.
93 93
                          '\';
94 94
                  }';
95 95
 ?>
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 $(function() {
98 98
 <?php
99 99
     // grid definition see the $obj->display() function
100
-    echo Display::grid_js('grade_model',  $url, $columns, $column_model, $extra_params, array(), $action_links,true);
100
+    echo Display::grid_js('grade_model', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
101 101
 ?>
102 102
 });
103 103
 </script>
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
             $obj->display();
126 126
         } else {
127 127
             echo '<div class="actions">';
128
-            echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
128
+            echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
129 129
             echo '</div>';
130 130
             $form->addElement('hidden', 'sec_token');
131 131
             $form->setConstants(array('sec_token' => $token));
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
             $obj->display();
148 148
         } else {
149 149
             echo '<div class="actions">';
150
-            echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
150
+            echo '<a href="'.api_get_self().'">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
151 151
             echo '</div>';
152 152
             $form->addElement('hidden', 'sec_token');
153 153
             $form->setConstants(array('sec_token' => $token));
Please login to merge, or discard this patch.
main/admin/ldap_import_students.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  * Code
10 10
  */
11 11
 // resetting the course id
12
-$cidReset=true;
12
+$cidReset = true;
13 13
 require_once('../inc/global.inc.php');
14 14
 // setting the section (for the tabs)
15 15
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -18,11 +18,11 @@  discard block
 block discarded – undo
18 18
 api_protect_admin_script();
19 19
 require('../auth/ldap/authldap.php');
20 20
 
21
-$annee_base=date('Y');
21
+$annee_base = date('Y');
22 22
 
23 23
 $tool_name = get_lang('LDAPImport');
24 24
 // setting breadcrumbs
25
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
25
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
26 26
 
27 27
 $htmlHeadXtra[] = '<script language="JavaScript" type="text/javascript">
28 28
 var buttoncheck = 1;
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
 $annee = $_GET['annee'];
50 50
 $composante = $_GET['composante'];
51
-$etape =  $_GET['etape'];
51
+$etape = $_GET['etape'];
52 52
 $course = $_POST['course'];
53 53
 
54 54
 
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	echo '</div>';
199 199
 }
200 200
 */
201
-elseif(!empty($annee) && empty($course))
201
+elseif (!empty($annee) && empty($course))
202 202
 {
203 203
 	Display::display_header($tool_name);
204 204
 	echo '<div style="align:center">';
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
207 207
 	echo '<select name="course">';
208 208
 	$courses = CourseManager::get_courses_list();
209
-	foreach($courses as $row)
209
+	foreach ($courses as $row)
210 210
 	{
211 211
 		echo '<option value="'.$row['code'].'">'.api_htmlentities($row['title']).'</option>';
212 212
 	}
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 
240 240
 		$info = ldap_get_entries($ds, $sr);
241 241
 
242
-		for ($key = 0; $key < $info["count"]; $key ++) {
242
+		for ($key = 0; $key < $info["count"]; $key++) {
243 243
 			$nom_form[] = $info[$key]["sn"][0];
244 244
 			$prenom_form[] = $info[$key]["givenname"][0];
245 245
 			$email_form[] = $info[$key]["mail"][0];
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 		asort($nom_form);
260 260
 		reset($nom_form);
261 261
 
262
-		$statut=5;
262
+		$statut = 5;
263 263
 		include ('ldap_form_add_users_group.php');
264 264
 	} else {
265 265
 		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
@@ -270,25 +270,25 @@  discard block
 block discarded – undo
270 270
     echo '</div>';
271 271
 
272 272
 }
273
-elseif (!empty($annee) && !empty($course) && ($_POST['confirmed']=='yes'))
273
+elseif (!empty($annee) && !empty($course) && ($_POST['confirmed'] == 'yes'))
274 274
 {
275
-	$id=$_POST['username_form'];
276
-	$UserList=array();
275
+	$id = $_POST['username_form'];
276
+	$UserList = array();
277 277
 	$userid_match_login = array();
278 278
 	foreach ($id as $form_index=>$user_id)
279 279
 	{
280
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
280
+		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
281 281
 		{
282 282
 			$tmp = ldap_add_user($user_id);
283
-			$UserList[]= $tmp;
283
+			$UserList[] = $tmp;
284 284
 			$userid_match_login[$tmp] = $user_id;
285 285
 		}
286 286
 	}
287 287
 	if (!empty($_POST['course']))
288 288
 	{
289
-		foreach($UserList as $user_id)
289
+		foreach ($UserList as $user_id)
290 290
 		{
291
-			CourseManager::add_user_to_course($user_id,$_POST['course']);
291
+			CourseManager::add_user_to_course($user_id, $_POST['course']);
292 292
 		}
293 293
 		header('Location: course_information.php?code='.Security::remove_XSS($_POST['course']));
294 294
 	}
@@ -314,8 +314,8 @@  discard block
 block discarded – undo
314 314
 	else
315 315
 	{
316 316
 		Display::display_header($tool_name);
317
-		$message=get_lang('NoUserAdded');
318
-		Display :: display_normal_message($message,false);
317
+		$message = get_lang('NoUserAdded');
318
+		Display :: display_normal_message($message, false);
319 319
 	}
320 320
 	echo '<br /><br />';
321 321
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
Please login to merge, or discard this patch.
main/admin/access_url_add_usergroup_to_url.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
 $tbl_course = Database:: get_main_table(TABLE_MAIN_COURSE);
31 31
 
32 32
 $tool_name = get_lang('AddUserGroupToURL');
33
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
34
-$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
33
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
34
+$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
35 35
 
36 36
 Display::display_header($tool_name);
37 37
 
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
46 46
 
47 47
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
48 48
     $form_sent = $_POST['form_sent'];
49
-    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array() ;
50
-    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
49
+    $userGroups = is_array($_POST['user_group_list']) ? $_POST['user_group_list'] : array();
50
+    $urlList = is_array($_POST['url_list']) ? $_POST['url_list'] : array();
51 51
     $firstLetterUserGroup = $_POST['first_letter_user_group'];
52 52
 
53 53
     if ($form_sent == 1) {
Please login to merge, or discard this patch.
main/admin/legal_add.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -25,13 +25,13 @@  discard block
 block discarded – undo
25 25
 if ($form->validate()) {
26 26
 	$check = Security::check_token('post');
27 27
 	if ($check) {
28
-		$values  = $form->getSubmitValues();
29
-		$lang 	 = $values['language'];
28
+		$values = $form->getSubmitValues();
29
+		$lang = $values['language'];
30 30
 		//language id
31 31
 		$lang = api_get_language_id($lang);
32 32
 
33 33
 		if (isset($values['type'])) {
34
-			$type 	 = $values['type'];
34
+			$type = $values['type'];
35 35
 		} else {
36 36
 			$type = 0;
37 37
 		}
@@ -47,13 +47,13 @@  discard block
 block discarded – undo
47 47
 		}
48 48
 		$navigator_info = api_get_navigator();
49 49
 
50
-		if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
50
+		if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
51 51
 			if (isset($values['preview'])) {
52
-				$submit	='preview';
52
+				$submit	= 'preview';
53 53
 			} elseif (isset($values['save'])) {
54
-				$submit	='save';
54
+				$submit	= 'save';
55 55
 			} elseif (isset($values['back'])) {
56
-				$submit	='back';
56
+				$submit	= 'back';
57 57
 			}
58 58
 		} else {
59 59
 			$submit  = $values['send'];
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 				exit;
67 67
 			} elseif ($submit == 'save') {
68 68
 				$insert_result = LegalManager::add($lang, $content, $type, $changes);
69
-				if ($insert_result ) {
69
+				if ($insert_result) {
70 70
 					$message = get_lang('TermAndConditionSaved');
71 71
 				} else {
72 72
 					$message = get_lang('TermAndConditionNotSaved');
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 				$tok = Security::get_token();
76 76
 				header('Location: legal_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
77 77
 				exit();
78
-			} elseif ($submit=='preview') {
78
+			} elseif ($submit == 'preview') {
79 79
 				$defaults['type'] = $type;
80 80
 				$defaults['content'] = $content;
81 81
 				$defaults['changes'] = $changes;
@@ -83,16 +83,16 @@  discard block
 block discarded – undo
83 83
 				$term_preview['type'] = intval($_POST['type']);
84 84
 			} else {
85 85
 				$my_lang = $_POST['language'];
86
-				if (isset($_POST['language'])){
86
+				if (isset($_POST['language'])) {
87 87
 					$all_langs = api_get_languages();
88
-					if (in_array($my_lang, $all_langs['folder'])){
88
+					if (in_array($my_lang, $all_langs['folder'])) {
89 89
 						$language = api_get_language_id($my_lang);
90 90
 						$term_preview = LegalManager::get_last_condition($language);
91 91
 						$defaults = $term_preview;
92 92
 						if (!$term_preview) {
93 93
 							// there are not terms and conditions
94
-							$term_preview['type']=-1;
95
-							$defaults['type']=0;
94
+							$term_preview['type'] = -1;
95
+							$defaults['type'] = 0;
96 96
 						}
97 97
 					}
98 98
 				}
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 }
109 109
 $token = Security::get_token();
110 110
 
111
-$form->addElement('hidden','sec_token');
111
+$form->addElement('hidden', 'sec_token');
112 112
 //$form->setConstants(array('sec_token' => $token));
113 113
 $defaults['sec_token'] = $token;
114 114
 $form->addElement('header', get_lang('DisplayTermsConditions'));
@@ -116,24 +116,24 @@  discard block
 block discarded – undo
116 116
 if (isset($_POST['language'])) {
117 117
 
118 118
 	$form->addElement('static', Security::remove_XSS($_POST['language']));
119
-	$form->addElement('hidden', 'language',Security::remove_XSS($_POST['language']));
119
+	$form->addElement('hidden', 'language', Security::remove_XSS($_POST['language']));
120 120
 	$form->addHtmlEditor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250'));
121 121
 
122
-	$form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0');
123
-	$form->addElement('radio', 'type', '', get_lang('PageLink') ,'1');
124
-	$form->addElement('textarea', 'changes', get_lang('ExplainChanges'),array('width'=>'20'));
122
+	$form->addElement('radio', 'type', '', get_lang('HTMLText'), '0');
123
+	$form->addElement('radio', 'type', '', get_lang('PageLink'), '1');
124
+	$form->addElement('textarea', 'changes', get_lang('ExplainChanges'), array('width'=>'20'));
125 125
 
126 126
 	$preview = LegalManager::show_last_condition($term_preview);
127 127
 
128
-	if ($term_preview['type']!=-1) {
129
-		$form->addElement('label', get_lang('Preview'),  $preview);
128
+	if ($term_preview['type'] != -1) {
129
+		$form->addElement('label', get_lang('Preview'), $preview);
130 130
 	}
131 131
 
132 132
 	// Submit & preview button
133 133
     $navigator_info = api_get_navigator();
134 134
 
135 135
     //ie6 fix
136
-	if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
136
+	if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
137 137
 		$buttons = '<div class="row" align="center">
138 138
 				<div class="formw">
139 139
 				<input type="submit" name="back"  value="'.get_lang('Back').'"/>
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 				<input type="submit" name="save"  value="'.get_lang('Save').'"/>
142 142
 				</div>
143 143
 			</div>';
144
-			$form->addElement('html',$buttons);
144
+			$form->addElement('html', $buttons);
145 145
 	} else {
146 146
         $buttons = '<div class="row" align="center">
147 147
 					<div class="formw">
@@ -150,16 +150,16 @@  discard block
 block discarded – undo
150 150
 					<button type="submit" class="save" 	 name="send" value="save">'.get_lang('Save').'</button>
151 151
 					</div>
152 152
 				</div>';
153
-		$form->addElement('html',$buttons);
153
+		$form->addElement('html', $buttons);
154 154
 	}
155 155
 } else {
156
-	$form->addElement('select_language', 'language', get_lang('Language'),null,array());
156
+	$form->addElement('select_language', 'language', get_lang('Language'), null, array());
157 157
 	$form->addElement('button', 'send', get_lang('Load'));
158 158
 
159 159
 }
160 160
 
161 161
 $tool_name = get_lang('AddTermsAndConditions');
162
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
162
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
163 163
 Display :: display_header($tool_name);
164 164
 
165 165
 echo '<script>
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 
173 173
 // action menu
174 174
 echo '<div class="actions">';
175
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/legal_list.php">'.Display::return_icon('search.gif',get_lang('EditTermsAndConditions'),'').get_lang('AllVersions').'</a>';
175
+echo '<a href="'.api_get_path(WEB_CODE_PATH).'admin/legal_list.php">'.Display::return_icon('search.gif', get_lang('EditTermsAndConditions'), '').get_lang('AllVersions').'</a>';
176 176
 echo '</div>';
177 177
 
178 178
 if (isset ($_GET['action'])) {
Please login to merge, or discard this patch.
main/admin/configure_plugin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 $message = null;
29 29
 $content = null;
30 30
 
31
-$currentUrl = api_get_self() . "?name=$pluginName";
31
+$currentUrl = api_get_self()."?name=$pluginName";
32 32
 
33 33
 if (isset($pluginInfo['settings_form'])) {
34 34
     $form = $pluginInfo['settings_form'];
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
         foreach ($values as $key => $value) {
66 66
             api_add_setting(
67
-                $value, Database::escape_string($pluginName . '_' . $key),
67
+                $value, Database::escape_string($pluginName.'_'.$key),
68 68
                 $pluginName,
69 69
                 'setting',
70 70
                 'Plugins',
@@ -99,11 +99,11 @@  discard block
 block discarded – undo
99 99
 }
100 100
 
101 101
 $interbreadcrumb[] = array(
102
-    'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
102
+    'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
103 103
     'name' => get_lang('PlatformAdmin')
104 104
 );
105 105
 $interbreadcrumb[] = array(
106
-    'url' => api_get_path(WEB_CODE_PATH) . 'admin/settings.php?category=Plugins',
106
+    'url' => api_get_path(WEB_CODE_PATH).'admin/settings.php?category=Plugins',
107 107
     'name' => get_lang('Plugins')
108 108
 );
109 109
 
Please login to merge, or discard this patch.
main/admin/course_request_rejected.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
114 114
     $from = intval($from);
115 115
     $number_of_items = intval($number_of_items);
116 116
     $column = intval($column);
117
-    $direction = !in_array(strtolower(trim($direction)), ['asc','desc']) ? 'asc' : $direction;
117
+    $direction = !in_array(strtolower(trim($direction)), ['asc', 'desc']) ? 'asc' : $direction;
118 118
 
119 119
     $sql = "SELECT
120 120
                 id AS col0,
Please login to merge, or discard this patch.
main/admin/sub_language_ajax.inc.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
 
10 10
 api_protect_admin_script();
11 11
 
12
-$new_language        = Security::remove_XSS($_REQUEST['new_language']);
13
-$language_variable    = Security::remove_XSS($_REQUEST['variable_language']);
14
-$file_id            = intval($_REQUEST['file_id']);
12
+$new_language = Security::remove_XSS($_REQUEST['new_language']);
13
+$language_variable = Security::remove_XSS($_REQUEST['variable_language']);
14
+$file_id = intval($_REQUEST['file_id']);
15 15
 /**
16 16
  * Code
17 17
  */
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
27 27
 
28 28
     //update variable language
29 29
     // Replace double quotes to avoid parse errors
30
-    $new_language = str_replace('"', '\"',$new_language);
30
+    $new_language = str_replace('"', '\"', $new_language);
31 31
     // Replace new line signs to avoid parse errors - see #6773
32
-    $new_language = str_replace("\n","\\n",$new_language);
33
-    $all_file_of_directory[$language_variable]="\"".$new_language."\";";
32
+    $new_language = str_replace("\n", "\\n", $new_language);
33
+    $all_file_of_directory[$language_variable] = "\"".$new_language."\";";
34 34
     $result_array = array();
35 35
 
36 36
     foreach ($all_file_of_directory as $key_value=>$value_info) {
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     if (!empty($result_array)) {
41 41
         foreach ($result_array as $key => $result) {
42 42
             if ($result == false) {
43
-                $variables_with_problems .=$key.' <br />';
43
+                $variables_with_problems .= $key.' <br />';
44 44
             }
45 45
         }
46 46
     }
Please login to merge, or discard this patch.