Completed
Pull Request — 1.11.x (#1615)
by José
26:50
created
main/gradebook/gradebook_scoring_system.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
     api_not_allowed();
14 14
 }
15 15
 
16
-$htmlHeadXtra[]= '<script>
16
+$htmlHeadXtra[] = '<script>
17 17
 function plusItem(item) {
18 18
     document.getElementById(item).style.display = "inline";
19 19
     document.getElementById("plus-"+item).style.display = "none";
@@ -45,10 +45,10 @@  discard block
 block discarded – undo
45 45
 );
46 46
 
47 47
 $select_cat = intval($_GET['selectcat']);
48
-$displayscore= ScoreDisplay :: instance();
48
+$displayscore = ScoreDisplay :: instance();
49 49
 $customdisplays = $displayscore->get_custom_score_display_settings();
50 50
 
51
-$nr_items = (count($customdisplays) != '0' )? count($customdisplays) : '1';
51
+$nr_items = (count($customdisplays) != '0') ? count($customdisplays) : '1';
52 52
 $scoreform = new ScoreDisplayForm(
53 53
     'scoring_system_form',
54 54
     api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
@@ -57,18 +57,18 @@  discard block
 block discarded – undo
57 57
 if ($scoreform->validate()) {
58 58
     $value_export = '';
59 59
     $value_export = $scoreform->exportValues();
60
-    $value_export = isset($value_export) ? $scoreform->exportValues(): '';
60
+    $value_export = isset($value_export) ? $scoreform->exportValues() : '';
61 61
     $values = $value_export;
62 62
 
63 63
     // create new array of custom display settings
64 64
     // this loop also checks if all score ranges are unique
65 65
 
66
-    $scoringdisplay= array ();
66
+    $scoringdisplay = array();
67 67
     $ranges_ok = true;
68
-    $endscore= isset($values['endscore']) ? $values['endscore'] : null;
69
-    $displaytext=isset($values['displaytext']) ? $values['displaytext'] : null;
70
-    for ($counter= 1; $ranges_ok && $counter <= 20; $counter++) {
71
-        $setting= array ();
68
+    $endscore = isset($values['endscore']) ? $values['endscore'] : null;
69
+    $displaytext = isset($values['displaytext']) ? $values['displaytext'] : null;
70
+    for ($counter = 1; $ranges_ok && $counter <= 20; $counter++) {
71
+        $setting = array();
72 72
         $setting['score'] = $endscore[$counter];
73 73
         $setting['display'] = $displaytext[$counter];
74 74
         if (!empty($setting['score'])) {
@@ -77,12 +77,12 @@  discard block
 block discarded – undo
77 77
                     $ranges_ok = false;
78 78
                 }
79 79
             }
80
-            $scoringdisplay[]= $setting;
80
+            $scoringdisplay[] = $setting;
81 81
         }
82 82
     }
83 83
 
84 84
     if (!$ranges_ok) {
85
-        header('Location: ' . api_get_self() . '?nouniqueranges=&selectcat=' . $select_cat.'&'.api_get_cidreq());
85
+        header('Location: '.api_get_self().'?nouniqueranges=&selectcat='.$select_cat.'&'.api_get_cidreq());
86 86
         exit;
87 87
     }
88 88
 
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
 $this_section = SECTION_COURSES;
103 103
 Display :: display_header(get_lang('ScoreEdit'));
104 104
 
105
-if (((isset($_GET['isStudentView']) && $_GET['isStudentView']=='false') ||
106
-    (isset($_GET['selectcat']) && ($_SESSION['studentview']=='teacherview')))
105
+if (((isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') ||
106
+    (isset($_GET['selectcat']) && ($_SESSION['studentview'] == 'teacherview')))
107 107
 ) {
108 108
     if (isset ($_GET['scoringupdated'])) {
109 109
         Display::display_confirmation_message(get_lang('ScoringUpdated'), false);
Please login to merge, or discard this patch.
main/gradebook/gradebook_edit_all.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 
80 80
 $submitted = isset($_POST['submitted']) ? $_POST['submitted'] : '';
81 81
 if ($submitted == 1) {
82
-    Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')) . '<br /><br />';
82
+    Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')).'<br /><br />';
83 83
     if (isset($_POST['evaluation'])) {
84 84
         $eval_log = new Evaluation();
85 85
     }
Please login to merge, or discard this patch.
main/gradebook/my_certificates.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
         'actions',
37 37
         Display::toolbarButton(
38 38
             get_lang('SearchCertificates'),
39
-            api_get_path(WEB_CODE_PATH) . "gradebook/search.php",
39
+            api_get_path(WEB_CODE_PATH)."gradebook/search.php",
40 40
             'search',
41 41
             'info'
42 42
         )
Please login to merge, or discard this patch.
main/gradebook/user_stats.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 if (!$isDrhOfCourse) {
17 17
     GradebookUtils::block_students();
18 18
 }
19
-$interbreadcrumb[]= array (
19
+$interbreadcrumb[] = array(
20 20
     'url' => $_SESSION['gradebook_dest'],
21 21
     'name' => get_lang('Gradebook'
22 22
 ));
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
27 27
 $alllinks = $category[0]->get_links($my_user_id, true);
28 28
 
29 29
 if ($_GET['selectcat'] != null) {
30
-    $addparams= array (
30
+    $addparams = array(
31 31
         'userid' => $my_user_id,
32 32
         'selectcat' => Security::remove_XSS($_GET['selectcat'])
33 33
     );
34 34
 } else {
35
-    $addparams= array (
35
+    $addparams = array(
36 36
         'userid' => $my_user_id,
37 37
         'selecteval' => Security::remove_XSS($_GET['selecteval'])
38 38
     );
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         $newarray[] = array_slice($data, 1);
50 50
     }
51 51
     $userinfo = api_get_user_info($my_user_id);
52
-    $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')';
52
+    $html .= get_lang('Results').' : '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).' ('.api_convert_and_format_date(null, DATE_FORMAT_SHORT).' '.api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).')';
53 53
 
54 54
     if ($displayscore->is_custom()) {
55 55
         $header_names = array(
@@ -95,23 +95,23 @@  discard block
 block discarded – undo
95 95
 $actions = '<div class="actions">';
96 96
 
97 97
 if (isset($_GET['selectcat'])) {
98
-    $interbreadcrumb[]= array ('url' => 'gradebook_flatview.php?selectcat=' . Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
99
-    $actions.= '<a href=gradebook_flatview.php?selectcat=' .Security::remove_XSS($_GET['selectcat']) . '>' . Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'),'',ICON_SIZE_MEDIUM).'</a>';
98
+    $interbreadcrumb[] = array('url' => 'gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('FlatView'));
99
+    $actions .= '<a href=gradebook_flatview.php?selectcat='.Security::remove_XSS($_GET['selectcat']).'>'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('FlatView'), '', ICON_SIZE_MEDIUM).'</a>';
100 100
 }
101 101
 
102 102
 if (isset ($_GET['selecteval'])) {
103
-    $interbreadcrumb[]= array (
104
-        'url' => 'gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']),
103
+    $interbreadcrumb[] = array(
104
+        'url' => 'gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']),
105 105
         'name' => get_lang('ViewResult'
106 106
     ));
107
-    $actions.= '<a href=gradebook_view_result.php?selecteval=' . Security::remove_XSS($_GET['selecteval']) . '>
108
-	'.Display::return_icon('back.png', get_lang('BackToEvaluation'),'',ICON_SIZE_MEDIUM).'</a>';
107
+    $actions .= '<a href=gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'>
108
+	'.Display::return_icon('back.png', get_lang('BackToEvaluation'), '', ICON_SIZE_MEDIUM).'</a>';
109 109
 }
110 110
 
111
-$actions.= '<a href="' . api_get_self() . '?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat=' . $category[0]->get_id() . '" target="_blank">
112
-' . Display::return_icon('pdf.png', get_lang('ExportPDF'),'',ICON_SIZE_MEDIUM).'</a>';
111
+$actions .= '<a href="'.api_get_self().'?exportpdf=&userid='.Security::remove_XSS($_GET['userid']).'&selectcat='.$category[0]->get_id().'" target="_blank">
112
+' . Display::return_icon('pdf.png', get_lang('ExportPDF'), '', ICON_SIZE_MEDIUM).'</a>';
113 113
 
114
-$actions.='</div>';
114
+$actions .= '</div>';
115 115
 
116 116
 Display :: display_header(get_lang('ResultsPerUser'));
117 117
 echo $actions;
Please login to merge, or discard this patch.
main/gradebook/gradebook_add_eval.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     null,
31 31
     'add_eval_form',
32 32
     null,
33
-    api_get_self() . '?selectcat=' . $select_cat.'&'.api_get_cidreq()
33
+    api_get_self().'?selectcat='.$select_cat.'&'.api_get_cidreq()
34 34
 );
35 35
 
36 36
 if ($form->validate()) {
@@ -69,23 +69,23 @@  discard block
 block discarded – undo
69 69
             //header('Location: gradebook_add_user.php?selecteval=' . $eval->get_id());
70 70
             exit;
71 71
         } else {
72
-            header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq());
72
+            header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq());
73 73
             exit;
74 74
         }
75 75
     } else {
76 76
         $val_addresult = isset($values['addresult']) ? $values['addresult'] : null;
77 77
         if ($val_addresult == 1) {
78
-            header('Location: gradebook_add_result.php?selecteval=' . $eval->get_id().'&'.api_get_cidreq());
78
+            header('Location: gradebook_add_result.php?selecteval='.$eval->get_id().'&'.api_get_cidreq());
79 79
             exit;
80 80
         } else {
81
-            header('Location: ' . Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $eval->get_category_id().'&'.api_get_cidreq());
81
+            header('Location: '.Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$eval->get_category_id().'&'.api_get_cidreq());
82 82
             exit;
83 83
         }
84 84
     }
85 85
 }
86 86
 
87 87
 $interbreadcrumb[] = array(
88
-    'url' => Security::remove_XSS($_SESSION['gradebook_dest']) . '?selectcat=' . $select_cat.'&'.api_get_cidreq(),
88
+    'url' => Security::remove_XSS($_SESSION['gradebook_dest']).'?selectcat='.$select_cat.'&'.api_get_cidreq(),
89 89
     'name' => get_lang('Gradebook'))
90 90
 ;
91 91
 $this_section = SECTION_COURSES;
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
        $("#hid_category_id option:selected").each(function () {
97 97
            var cat_id = $(this).val();
98 98
             $.ajax({
99
-                url: "' . api_get_path(WEB_AJAX_PATH) . 'gradebook.ajax.php?a=get_gradebook_weight",
99
+                url: "' . api_get_path(WEB_AJAX_PATH).'gradebook.ajax.php?a=get_gradebook_weight",
100 100
                 data: "cat_id="+cat_id,
101 101
                 success: function(return_value) {
102 102
                     if (return_value != 0 ) {
Please login to merge, or discard this patch.
main/gradebook/lib/fe/catform.class.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,15 +52,15 @@  discard block
 block discarded – undo
52 52
      */
53 53
     protected function build_move_form()
54 54
     {
55
-        $renderer =& $this->defaultRenderer();
55
+        $renderer = & $this->defaultRenderer();
56 56
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
57 57
         $this->addElement(
58 58
             'static',
59 59
             null,
60 60
             null,
61
-            '"' . $this->category_object->get_name() . '" '
61
+            '"'.$this->category_object->get_name().'" '
62 62
         );
63
-        $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
63
+        $this->addElement('static', null, null, get_lang('MoveTo').' : ');
64 64
         $select = $this->addElement('select', 'move_cat', null, null);
65 65
         $line = null;
66 66
         foreach ($this->category_object->get_target_categories() as $cat) {
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
                 $line .= '--';
69 69
             }
70 70
             if ($cat[0] != $this->category_object->get_parent_id()) {
71
-                $select->addoption($line . ' ' . $cat[1], $cat[0]);
71
+                $select->addoption($line.' '.$cat[1], $cat[0]);
72 72
             } else {
73
-                $select->addoption($line . ' ' . $cat[1], $cat[0], 'disabled');
73
+                $select->addoption($line.' '.$cat[1], $cat[0], 'disabled');
74 74
             }
75 75
             $line = '';
76 76
         }
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         $grade_model_id = $this->category_object->get_grade_model_id();
154 154
 
155 155
         if (empty($links)) {
156
-            $grade_model_id    = 0;
156
+            $grade_model_id = 0;
157 157
         }
158 158
 
159 159
         $category_name = $this->category_object->get_name();
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
                     [
243 243
                         'id' => 'skills',
244 244
                         'multiple' => 'multiple',
245
-                        'url' => api_get_path(WEB_AJAX_PATH) . 'skill.ajax.php?a=search_skills'
245
+                        'url' => api_get_path(WEB_AJAX_PATH).'skill.ajax.php?a=search_skills'
246 246
                     ]
247 247
                 );
248 248
 
@@ -400,14 +400,14 @@  discard block
 block discarded – undo
400 400
         //only return courses that are not yet created by the teacher
401 401
 
402 402
         foreach ($coursecat as $row) {
403
-            $select->addoption($row[1],$row[0]);
403
+            $select->addoption($row[1], $row[0]);
404 404
         }
405 405
         $this->setDefaults(array(
406 406
             'hid_user_id' => $this->category_object->get_user_id(),
407 407
             'hid_parent_id' => $this->category_object->get_parent_id()
408 408
         ));
409
-        $this->addElement('hidden','hid_user_id');
410
-        $this->addElement('hidden','hid_parent_id');
409
+        $this->addElement('hidden', 'hid_user_id');
410
+        $this->addElement('hidden', 'hid_parent_id');
411 411
         $this->addElement('submit', null, get_lang('Ok'));
412 412
     }
413 413
 
Please login to merge, or discard this patch.
main/gradebook/lib/be/evallink.class.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,10 +47,10 @@  discard block
 block discarded – undo
47 47
         $eval = $this->get_evaluation();
48 48
         // course/platform admin can go to the view_results page
49 49
         if (api_is_allowed_to_edit()) {
50
-            return 'gradebook_view_result.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
50
+            return 'gradebook_view_result.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
51 51
         } // students can go to the statistics page (if custom display enabled)
52 52
         elseif (ScoreDisplay :: instance()->is_custom()) {
53
-            return 'gradebook_statistics.php?' . api_get_cidreq() . '&selecteval=' . $eval->get_id();
53
+            return 'gradebook_statistics.php?'.api_get_cidreq().'&selecteval='.$eval->get_id();
54 54
         } else {
55 55
             return null;
56 56
         }
@@ -176,8 +176,8 @@  discard block
 block discarded – undo
176 176
                 $eval = new Evaluation();
177 177
                 $eval->set_category_id(-1);
178 178
                 $eval->set_date(api_get_utc_datetime()); // these values will be changed
179
-                $eval->set_weight(0);    //   when the link setter
180
-                $eval->set_visible(0);   //     is called
179
+                $eval->set_weight(0); //   when the link setter
180
+                $eval->set_visible(0); //     is called
181 181
                 $eval->set_id(-1); // a 'real' id will be set when eval is added to db
182 182
                 $eval->set_user_id($this->get_user_id());
183 183
                 $eval->set_course_code($this->get_course_code());
Please login to merge, or discard this patch.
main/gradebook/lib/be/surveylink.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 			$links[] = array(
76 76
 				$data['survey_id'],
77 77
 				api_trunc_str(
78
-					$data['code'] . ': ' . self::html_to_text($data['title']),
78
+					$data['code'].': '.self::html_to_text($data['title']),
79 79
 					80
80 80
 				)
81 81
 			);
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	/**
122 122
 	 * Has anyone done this survey yet?
123 123
 	 */
124
-	public function has_results($stud_id=null)
124
+	public function has_results($stud_id = null)
125 125
 	{
126 126
 		$ref_id = intval($this->get_ref_id());
127 127
 		$session_id = api_get_session_id();
Please login to merge, or discard this patch.
main/gradebook/lib/be/linkfactory.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
      * @param string $name_mask search string
59 59
      * @return array link objects matching the search criterium
60 60
      */
61
-    public function find_links($name_mask,$selectcat)
61
+    public function find_links($name_mask, $selectcat)
62 62
     {
63 63
         return AbstractLink::find_links($name_mask, $selectcat);
64 64
     }
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
     public static function get_all_types()
99 99
     {
100 100
         //LINK_DROPBOX,
101
-        return array (
101
+        return array(
102 102
             LINK_EXERCISE,
103 103
             //LINK_DROPBOX,
104 104
             LINK_HOTPOTATOES,
Please login to merge, or discard this patch.