@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | /** |
39 | 39 | * Get total number of results (rows) |
40 | 40 | */ |
41 | - public function get_total_results_count () |
|
41 | + public function get_total_results_count() |
|
42 | 42 | { |
43 | 43 | return count($this->results); |
44 | 44 | } |
@@ -53,12 +53,12 @@ discard block |
||
53 | 53 | * 4 ['score'] : student's score |
54 | 54 | * 5 ['display'] : custom score display (only if custom scoring enabled) |
55 | 55 | */ |
56 | - public function get_data ($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf=false) |
|
56 | + public function get_data($sorting = 0, $start = 0, $count = null, $ignore_score_color = false, $pdf = false) |
|
57 | 57 | { |
58 | 58 | // do some checks on count, redefine if invalid value |
59 | 59 | $number_decimals = api_get_setting('gradebook_number_decimals'); |
60 | 60 | if (!isset($count)) { |
61 | - $count = count ($this->results) - $start; |
|
61 | + $count = count($this->results) - $start; |
|
62 | 62 | } |
63 | 63 | if ($count < 0) { |
64 | 64 | $count = 0; |
@@ -66,11 +66,11 @@ discard block |
||
66 | 66 | $scoredisplay = ScoreDisplay :: instance(); |
67 | 67 | // generate actual data array |
68 | 68 | $table = array(); |
69 | - foreach($this->results as $result) { |
|
69 | + foreach ($this->results as $result) { |
|
70 | 70 | $user = array(); |
71 | 71 | $info = api_get_user_info($result->get_user_id()); |
72 | 72 | $user['id'] = $result->get_user_id(); |
73 | - if ($pdf){ |
|
73 | + if ($pdf) { |
|
74 | 74 | $user['username'] = $info['username']; |
75 | 75 | } |
76 | 76 | $user['result_id'] = $result->get_id(); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | true |
93 | 93 | ) |
94 | 94 | ); |
95 | - if ($pdf && $number_decimals == null){ |
|
95 | + if ($pdf && $number_decimals == null) { |
|
96 | 96 | $user['scoreletter'] = $result->get_score(); |
97 | 97 | } |
98 | 98 | if ($scoredisplay->is_custom()) { |
@@ -132,13 +132,13 @@ discard block |
||
132 | 132 | * @param bool Whether we want to ignore the score color |
133 | 133 | * @result string The score as we want to show it |
134 | 134 | */ |
135 | - private function get_score_display ($score, $realscore, $ignore_score_color = false) |
|
135 | + private function get_score_display($score, $realscore, $ignore_score_color = false) |
|
136 | 136 | { |
137 | 137 | if ($score != null) { |
138 | 138 | $scoredisplay = ScoreDisplay :: instance(); |
139 | 139 | $type = SCORE_CUSTOM; |
140 | 140 | if ($realscore === true) { |
141 | - $type = SCORE_DIV_PERCENT ; |
|
141 | + $type = SCORE_DIV_PERCENT; |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | return $scoredisplay->display_score( |
@@ -172,10 +172,10 @@ discard block |
||
172 | 172 | } |
173 | 173 | } |
174 | 174 | |
175 | - function sort_by_mask ($item1, $item2) |
|
175 | + function sort_by_mask($item1, $item2) |
|
176 | 176 | { |
177 | - $score1 = (isset($item1['score']) ? array($item1['score'],$this->evaluation->get_max()) : null); |
|
178 | - $score2 = (isset($item2['score']) ? array($item2['score'],$this->evaluation->get_max()) : null); |
|
177 | + $score1 = (isset($item1['score']) ? array($item1['score'], $this->evaluation->get_max()) : null); |
|
178 | + $score2 = (isset($item2['score']) ? array($item2['score'], $this->evaluation->get_max()) : null); |
|
179 | 179 | return ScoreDisplay :: compare_scores_by_custom_display($score1, $score2); |
180 | 180 | } |
181 | 181 | } |
@@ -114,10 +114,10 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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; |
@@ -20,7 +20,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 | - ' <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 | + ' <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 |
||
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 |
||
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 |
||
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)); |
@@ -9,7 +9,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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>'; |
@@ -30,8 +30,8 @@ discard block |
||
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 |
||
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) { |
@@ -114,7 +114,7 @@ |
||
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, |
@@ -67,12 +67,12 @@ discard block |
||
67 | 67 | |
68 | 68 | //Column config |
69 | 69 | $column_model = array( |
70 | - array('name'=>'subject', 'index'=>'subject', 'width'=>'80', 'align'=>'left'), |
|
70 | + array('name'=>'subject', 'index'=>'subject', 'width'=>'80', 'align'=>'left'), |
|
71 | 71 | // array('name'=>'message', 'index'=>'message', 'width'=>'500', 'align'=>'left','sortable'=>'false'), |
72 | - array('name'=>'event_type_name', 'index'=>'event_type_name', 'width'=>'80', 'align'=>'left'), |
|
73 | - array('name'=>'language_id', 'index'=>'language_id', 'width'=>'80', 'align'=>'left'), |
|
74 | - array('name'=>'activated', 'index'=>'activated', 'width'=>'80', 'align'=>'left'), |
|
75 | - array('name'=>'actions', 'index'=>'actions', 'width'=>'100') |
|
72 | + array('name'=>'event_type_name', 'index'=>'event_type_name', 'width'=>'80', 'align'=>'left'), |
|
73 | + array('name'=>'language_id', 'index'=>'language_id', 'width'=>'80', 'align'=>'left'), |
|
74 | + array('name'=>'activated', 'index'=>'activated', 'width'=>'80', 'align'=>'left'), |
|
75 | + array('name'=>'actions', 'index'=>'actions', 'width'=>'100') |
|
76 | 76 | ); |
77 | 77 | //Autowidth |
78 | 78 | $extra_params['autowidth'] = 'true'; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $htmlHeadXtra[] = api_get_jqgrid_js(); |
83 | 83 | $htmlHeadXtra[] = '<script> |
84 | 84 | $(function() { |
85 | - '.Display::grid_js('event_email_template', $url,$columns,$column_model,$extra_params, array(), $action_links,true).' |
|
85 | + '.Display::grid_js('event_email_template', $url, $columns, $column_model, $extra_params, array(), $action_links, true).' |
|
86 | 86 | }); |
87 | 87 | </script>'; |
88 | 88 |
@@ -90,26 +90,26 @@ |
||
90 | 90 | { |
91 | 91 | $baseDir = api_get_path(SYS_ARCHIVE_PATH); |
92 | 92 | $uploadPath = 'pdfimport/'; |
93 | - $errors = array (); |
|
93 | + $errors = array(); |
|
94 | 94 | if (!is_dir($baseDir.$uploadPath)) { |
95 | 95 | @mkdir($baseDir.$uploadPath); |
96 | 96 | } |
97 | - if (!unzip_uploaded_file($_FILES['import_file'], $uploadPath, $baseDir, 1024*1024*1024)) { |
|
97 | + if (!unzip_uploaded_file($_FILES['import_file'], $uploadPath, $baseDir, 1024 * 1024 * 1024)) { |
|
98 | 98 | error_log('Could not unzip uploaded file in '.__FILE__.', line '.__LINE__); |
99 | 99 | return $errors; |
100 | 100 | } |
101 | 101 | $list = scandir($baseDir.$uploadPath); |
102 | 102 | $i = 0; |
103 | 103 | foreach ($list as $file) { |
104 | - if (substr($file,0,1) == '.' or !is_file($baseDir.$uploadPath.$file)) { |
|
104 | + if (substr($file, 0, 1) == '.' or !is_file($baseDir.$uploadPath.$file)) { |
|
105 | 105 | continue; |
106 | 106 | } |
107 | - $parts = preg_split('/_/',$file); |
|
107 | + $parts = preg_split('/_/', $file); |
|
108 | 108 | $course = api_get_course_info($parts[0]); |
109 | 109 | if (count($course) > 0) { |
110 | 110 | // Build file info because handle_uploaded_document() needs it (name, type, size, tmp_name) |
111 | 111 | $fileSize = filesize($baseDir.$uploadPath.$file); |
112 | - $docId = add_document($course, $subDir.'/'.$file, 'file', $fileSize, $parts[1].' '.substr($parts[2],0,-4)); |
|
112 | + $docId = add_document($course, $subDir.'/'.$file, 'file', $fileSize, $parts[1].' '.substr($parts[2], 0, -4)); |
|
113 | 113 | if ($docId > 0) { |
114 | 114 | if (!is_file($baseDir.$uploadPath.$file)) { |
115 | 115 | error_log($baseDir.$uploadPath.$file.' does not exists in '.__FILE__); |
@@ -22,16 +22,16 @@ discard block |
||
22 | 22 | |
23 | 23 | set_time_limit(0); |
24 | 24 | |
25 | -$courses = array (); |
|
25 | +$courses = array(); |
|
26 | 26 | $courses[''] = '--'; |
27 | 27 | $sql = "SELECT code,visual_code,title FROM $course_table ORDER BY visual_code"; |
28 | 28 | |
29 | 29 | global $_configuration; |
30 | 30 | |
31 | 31 | if (api_is_multiple_url_enabled()) { |
32 | - $tbl_course_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
|
32 | + $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE); |
|
33 | 33 | $access_url_id = api_get_current_access_url_id(); |
34 | - if ($access_url_id != -1){ |
|
34 | + if ($access_url_id != -1) { |
|
35 | 35 | $sql = "SELECT code,visual_code,title |
36 | 36 | FROM $course_table as c |
37 | 37 | INNER JOIN $tbl_course_rel_access_url as course_rel_url |
@@ -46,11 +46,11 @@ discard block |
||
46 | 46 | } |
47 | 47 | $form = new FormValidator('export_users'); |
48 | 48 | $form->addElement('header', $tool_name); |
49 | -$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'XML','xml'); |
|
49 | +$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'XML', 'xml'); |
|
50 | 50 | $form->addElement('radio', 'file_type', null, 'CSV', 'csv'); |
51 | 51 | $form->addElement('radio', 'file_type', null, 'XLS', 'xls'); |
52 | 52 | |
53 | -$form->addElement('checkbox', 'addcsvheader', get_lang('AddCSVHeader'), get_lang('YesAddCSVHeader'),'1'); |
|
53 | +$form->addElement('checkbox', 'addcsvheader', get_lang('AddCSVHeader'), get_lang('YesAddCSVHeader'), '1'); |
|
54 | 54 | $form->addElement('select', 'course_code', get_lang('OnlyUsersFromCourse'), $courses); |
55 | 55 | $form->addButtonExport(get_lang('Export')); |
56 | 56 | $form->setDefaults(array('file_type' => 'csv')); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | u.firstname AS FirstName, |
69 | 69 | u.email AS Email, |
70 | 70 | u.username AS UserName, |
71 | - ".(($_configuration['password_encryption']!='none')?" ":"u.password AS Password, ")." |
|
71 | + ".(($_configuration['password_encryption'] != 'none') ? " " : "u.password AS Password, ")." |
|
72 | 72 | u.auth_source AS AuthSource, |
73 | 73 | u.status AS Status, |
74 | 74 | u.official_code AS OfficialCode, |
@@ -83,10 +83,10 @@ discard block |
||
83 | 83 | $filename = 'export_users_'.$course_code.'_'.api_get_local_time(); |
84 | 84 | } else { |
85 | 85 | if (api_is_multiple_url_enabled()) { |
86 | - $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
86 | + $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); |
|
87 | 87 | $access_url_id = api_get_current_access_url_id(); |
88 | 88 | if ($access_url_id != -1) { |
89 | - $sql.= " FROM $user_table u |
|
89 | + $sql .= " FROM $user_table u |
|
90 | 90 | INNER JOIN $tbl_user_rel_access_url as user_rel_url |
91 | 91 | ON (u.user_id= user_rel_url.user_id) |
92 | 92 | WHERE access_url_id = $access_url_id |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | $filename = 'export_users_'.api_get_local_time(); |
99 | 99 | } |
100 | 100 | $data = array(); |
101 | - $extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC',false); |
|
102 | - if ($export['addcsvheader']=='1' AND $export['file_type']=='csv') { |
|
101 | + $extra_fields = UserManager::get_extra_fields(0, 0, 5, 'ASC', false); |
|
102 | + if ($export['addcsvheader'] == '1' AND $export['file_type'] == 'csv') { |
|
103 | 103 | if ($_configuration['password_encryption'] != 'none') { |
104 | 104 | $data[] = array( |
105 | 105 | 'UserId', |
@@ -127,19 +127,19 @@ discard block |
||
127 | 127 | ); |
128 | 128 | } |
129 | 129 | |
130 | - foreach($extra_fields as $extra) { |
|
131 | - $data[0][]=$extra[1]; |
|
130 | + foreach ($extra_fields as $extra) { |
|
131 | + $data[0][] = $extra[1]; |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 | |
135 | 135 | $res = Database::query($sql); |
136 | - while($user = Database::fetch_array($res,'ASSOC')) { |
|
136 | + while ($user = Database::fetch_array($res, 'ASSOC')) { |
|
137 | 137 | $student_data = UserManager:: get_extra_user_data( |
138 | 138 | $user['UserId'], |
139 | 139 | true, |
140 | 140 | false |
141 | 141 | ); |
142 | - foreach($student_data as $key=>$value) { |
|
142 | + foreach ($student_data as $key=>$value) { |
|
143 | 143 | $key = substr($key, 6); |
144 | 144 | if (is_array($value)) { |
145 | 145 | $user[$key] = $value[$key]; |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $user[$key] = $value; |
148 | 148 | } |
149 | 149 | } |
150 | - $data[] = $user ; |
|
150 | + $data[] = $user; |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | switch ($file_type) { |