Completed
Push — 1.11.x ( 04eda1...44c218 )
by José
105:08 queued 67:27
created
main/gradebook/lib/fe/usertable.class.php 3 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 */
19 19
 	public function UserTable($userid, $evals = array(), $links = array(), $addparams = null)
20 20
 	{
21
-		parent :: __construct ('userlist', null, null, 0);
21
+		parent :: __construct('userlist', null, null, 0);
22 22
 		$this->userid = $userid;
23 23
 		$this->datagen = new UserDataGenerator($userid, $evals, $links);
24 24
 		if (isset($addparams)) {
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 		// generate the data to display
88 88
 		$sortable_data = array();
89 89
 		foreach ($data_array as $data) {
90
-			if ($data[2]!="") {//filter by course removed
91
-				$row = array ();
90
+			if ($data[2] != "") {//filter by course removed
91
+				$row = array();
92 92
 				$row[] = $this->build_type_column($data[0]);
93 93
 				$row[] = $this->build_name_link($data[0]);
94 94
 				$row[] = $data[2];
@@ -123,15 +123,15 @@  discard block
 block discarded – undo
123 123
 			// evaluation
124 124
 			case 'E' :
125 125
 				return ' '
126
-				. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
126
+				. '<a href="gradebook_view_result.php?selecteval='.$item->get_id().'">'
127 127
 				. $item->get_name()
128 128
 				. '</a>';
129 129
 			// link
130 130
 			case 'L' :
131
-				return '&nbsp;<a href="' . $item->get_link() . '">'
131
+				return '&nbsp;<a href="'.$item->get_link().'">'
132 132
 				. $item->get_name()
133 133
 				. '</a>'
134
-				. '&nbsp;[' . $item->get_type_name() . ']';
134
+				. '&nbsp;['.$item->get_type_name().']';
135 135
 		}
136 136
 	}
137 137
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -95,8 +95,9 @@
 block discarded – undo
95 95
 				$row[] = $data[3];
96 96
 				$row[] = $data[4];
97 97
 				$row[] = $data[5];
98
-				if ($scoredisplay->is_custom())
99
-					$row[] = $data[6];
98
+				if ($scoredisplay->is_custom()) {
99
+									$row[] = $data[6];
100
+				}
100 101
 				$sortable_data[] = $row;
101 102
 			}
102 103
 		}
Please login to merge, or discard this patch.
Indentation   +116 added lines, -116 removed lines patch added patch discarded remove patch
@@ -10,128 +10,128 @@
 block discarded – undo
10 10
  */
11 11
 class UserTable extends SortableTable
12 12
 {
13
-	private $userid;
14
-	private $datagen;
13
+    private $userid;
14
+    private $datagen;
15 15
 
16
-	/**
17
-	 * Constructor
18
-	 */
19
-	public function __construct($userid, $evals = array(), $links = array(), $addparams = null)
20
-	{
21
-		parent :: __construct ('userlist', null, null, 0);
22
-		$this->userid = $userid;
23
-		$this->datagen = new UserDataGenerator($userid, $evals, $links);
24
-		if (isset($addparams)) {
25
-			$this->set_additional_parameters($addparams);
26
-		}
27
-		$column = 0;
28
-		$this->set_header($column++, get_lang('Type'));
29
-		$this->set_header($column++, get_lang('Evaluation'));
30
-		$this->set_header($column++, get_lang('Course'));
31
-		$this->set_header($column++, get_lang('Category'));
32
-		$this->set_header($column++, get_lang('EvaluationAverage'));
33
-		$this->set_header($column++, get_lang('Result'));
16
+    /**
17
+     * Constructor
18
+     */
19
+    public function __construct($userid, $evals = array(), $links = array(), $addparams = null)
20
+    {
21
+        parent :: __construct ('userlist', null, null, 0);
22
+        $this->userid = $userid;
23
+        $this->datagen = new UserDataGenerator($userid, $evals, $links);
24
+        if (isset($addparams)) {
25
+            $this->set_additional_parameters($addparams);
26
+        }
27
+        $column = 0;
28
+        $this->set_header($column++, get_lang('Type'));
29
+        $this->set_header($column++, get_lang('Evaluation'));
30
+        $this->set_header($column++, get_lang('Course'));
31
+        $this->set_header($column++, get_lang('Category'));
32
+        $this->set_header($column++, get_lang('EvaluationAverage'));
33
+        $this->set_header($column++, get_lang('Result'));
34 34
 
35
-		$scoredisplay = ScoreDisplay :: instance();
36
-		if ($scoredisplay->is_custom()) {
37
-			$this->set_header($column++, get_lang('Display'));
38
-		}
39
-	}
35
+        $scoredisplay = ScoreDisplay :: instance();
36
+        if ($scoredisplay->is_custom()) {
37
+            $this->set_header($column++, get_lang('Display'));
38
+        }
39
+    }
40 40
 
41
-	/**
42
-	 * Function used by SortableTable to get total number of items in the table
43
-	 */
44
-	function get_total_number_of_items()
45
-	{
46
-		return $this->datagen->get_total_items_count();
47
-	}
41
+    /**
42
+     * Function used by SortableTable to get total number of items in the table
43
+     */
44
+    function get_total_number_of_items()
45
+    {
46
+        return $this->datagen->get_total_items_count();
47
+    }
48 48
 
49
-	/**
50
-	 * Function used by SortableTable to generate the data to display
51
-	 */
52
-	public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
53
-	{
54
-		$scoredisplay = ScoreDisplay :: instance();
49
+    /**
50
+     * Function used by SortableTable to generate the data to display
51
+     */
52
+    public function get_table_data($from = 1, $per_page = null, $column = null, $direction = null, $sort = null)
53
+    {
54
+        $scoredisplay = ScoreDisplay :: instance();
55 55
 
56
-		// determine sorting type
57
-		switch ($this->column) {
58
-			// Type
59
-			case 0:
60
-				$sorting = UserDataGenerator :: UDG_SORT_TYPE;
61
-				break;
62
-			case 1:
63
-				$sorting = UserDataGenerator :: UDG_SORT_NAME;
64
-				break;
65
-			case 2:
66
-				$sorting = UserDataGenerator :: UDG_SORT_COURSE;
67
-				break;
68
-			case 3:
69
-				$sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
70
-				break;
71
-			case 4:
72
-				$sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
73
-				break;
74
-			case 5:
75
-				$sorting = UserDataGenerator :: UDG_SORT_SCORE;
76
-				break;
77
-			case 6:
78
-				$sorting = UserDataGenerator :: UDG_SORT_MASK;
79
-				break;
80
-		}
81
-		if ($this->direction == 'DESC') {
82
-			$sorting |= UserDataGenerator :: UDG_SORT_DESC;
83
-		} else {
84
-			$sorting |= UserDataGenerator :: UDG_SORT_ASC;
85
-		}
86
-		$data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
87
-		// generate the data to display
88
-		$sortable_data = array();
89
-		foreach ($data_array as $data) {
90
-			if ($data[2]!="") {//filter by course removed
91
-				$row = array ();
92
-				$row[] = $this->build_type_column($data[0]);
93
-				$row[] = $this->build_name_link($data[0]);
94
-				$row[] = $data[2];
95
-				$row[] = $data[3];
96
-				$row[] = $data[4];
97
-				$row[] = $data[5];
98
-				if ($scoredisplay->is_custom())
99
-					$row[] = $data[6];
100
-				$sortable_data[] = $row;
101
-			}
102
-		}
56
+        // determine sorting type
57
+        switch ($this->column) {
58
+            // Type
59
+            case 0:
60
+                $sorting = UserDataGenerator :: UDG_SORT_TYPE;
61
+                break;
62
+            case 1:
63
+                $sorting = UserDataGenerator :: UDG_SORT_NAME;
64
+                break;
65
+            case 2:
66
+                $sorting = UserDataGenerator :: UDG_SORT_COURSE;
67
+                break;
68
+            case 3:
69
+                $sorting = UserDataGenerator :: UDG_SORT_CATEGORY;
70
+                break;
71
+            case 4:
72
+                $sorting = UserDataGenerator :: UDG_SORT_AVERAGE;
73
+                break;
74
+            case 5:
75
+                $sorting = UserDataGenerator :: UDG_SORT_SCORE;
76
+                break;
77
+            case 6:
78
+                $sorting = UserDataGenerator :: UDG_SORT_MASK;
79
+                break;
80
+        }
81
+        if ($this->direction == 'DESC') {
82
+            $sorting |= UserDataGenerator :: UDG_SORT_DESC;
83
+        } else {
84
+            $sorting |= UserDataGenerator :: UDG_SORT_ASC;
85
+        }
86
+        $data_array = $this->datagen->get_data($sorting, $from, $this->per_page);
87
+        // generate the data to display
88
+        $sortable_data = array();
89
+        foreach ($data_array as $data) {
90
+            if ($data[2]!="") {//filter by course removed
91
+                $row = array ();
92
+                $row[] = $this->build_type_column($data[0]);
93
+                $row[] = $this->build_name_link($data[0]);
94
+                $row[] = $data[2];
95
+                $row[] = $data[3];
96
+                $row[] = $data[4];
97
+                $row[] = $data[5];
98
+                if ($scoredisplay->is_custom())
99
+                    $row[] = $data[6];
100
+                $sortable_data[] = $row;
101
+            }
102
+        }
103 103
 
104
-		return $sortable_data;
105
-	}
104
+        return $sortable_data;
105
+    }
106 106
 
107
-	/**
108
-	 * @param $item
109
-	 * @return string
110
-	 */
111
-	private function build_type_column($item)
112
-	{
113
-		return GradebookUtils::build_type_icon_tag($item->get_icon_name());
114
-	}
107
+    /**
108
+     * @param $item
109
+     * @return string
110
+     */
111
+    private function build_type_column($item)
112
+    {
113
+        return GradebookUtils::build_type_icon_tag($item->get_icon_name());
114
+    }
115 115
 
116
-	/**
117
-	 * @param $item
118
-	 * @return string
119
-	 */
120
-	private function build_name_link($item)
121
-	{
122
-		switch ($item->get_item_type()) {
123
-			// evaluation
124
-			case 'E' :
125
-				return '&nbsp;'
126
-				. '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
127
-				. $item->get_name()
128
-				. '</a>';
129
-			// link
130
-			case 'L' :
131
-				return '&nbsp;<a href="' . $item->get_link() . '">'
132
-				. $item->get_name()
133
-				. '</a>'
134
-				. '&nbsp;[' . $item->get_type_name() . ']';
135
-		}
136
-	}
116
+    /**
117
+     * @param $item
118
+     * @return string
119
+     */
120
+    private function build_name_link($item)
121
+    {
122
+        switch ($item->get_item_type()) {
123
+            // evaluation
124
+            case 'E' :
125
+                return '&nbsp;'
126
+                . '<a href="gradebook_view_result.php?selecteval=' . $item->get_id() . '">'
127
+                . $item->get_name()
128
+                . '</a>';
129
+            // link
130
+            case 'L' :
131
+                return '&nbsp;<a href="' . $item->get_link() . '">'
132
+                . $item->get_name()
133
+                . '</a>'
134
+                . '&nbsp;[' . $item->get_type_name() . ']';
135
+        }
136
+    }
137 137
 }
Please login to merge, or discard this patch.
main/gradebook/lib/fe/evalform.class.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
             'onchange' => 'document.add_users_to_evaluation.submit()'
92 92
         ));
93 93
         $select->addOption('', '');
94
-        for ($i = 65; $i <= 90; $i ++) {
94
+        for ($i = 65; $i <= 90; $i++) {
95 95
             $letter = chr($i);
96 96
             if (isset($this->extra) && $this->extra == $letter) {
97 97
                 $select->addOption($letter, $letter, 'selected');
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
         ));
107 107
         foreach ($this->evaluation_object->get_not_subscribed_students() as $user) {
108 108
             if ((!isset($this->extra)) || empty($this->extra) || api_strtoupper(api_substr($user[1], 0, 1)) == $this->extra) {
109
-                $select->addoption($user[1] . ' ' . $user[2] . ' (' . $user[3] . ')', $user[0]);
109
+                $select->addoption($user[1].' '.$user[2].' ('.$user[3].')', $user[0]);
110 110
             }
111 111
         }
112 112
         $this->addButtonCreate(get_lang('AddUserToEval'), 'submit_button');
@@ -134,21 +134,21 @@  discard block
 block discarded – undo
134 134
         if (api_is_western_name_order()) {
135 135
             $renderer->setHeaderTemplate(
136 136
                     '<tr>
137
-    		       <th>' . get_lang('OfficialCode') . '</th>
138
-    		      <th>' . get_lang('UserName') . '</th>
139
-    		      <th>' . get_lang('FirstName') . '</th>
140
-    		      <th>' . get_lang('LastName') . '</th>
141
-    		      <th>' . get_lang('Qualify') . '</th>
137
+    		       <th>' . get_lang('OfficialCode').'</th>
138
+    		      <th>' . get_lang('UserName').'</th>
139
+    		      <th>' . get_lang('FirstName').'</th>
140
+    		      <th>' . get_lang('LastName').'</th>
141
+    		      <th>' . get_lang('Qualify').'</th>
142 142
     		   </tr>'
143 143
             );
144 144
         } else {
145 145
             $renderer->setHeaderTemplate(
146 146
                     '<tr>
147
-                   <th>' . get_lang('OfficialCode') . '</th>
148
-                  <th>' . get_lang('UserName') . '</th>
149
-                  <th>' . get_lang('LastName') . '</th>
150
-                  <th>' . get_lang('FirstName') . '</th>
151
-                  <th>' . get_lang('Qualify') . '</th>
147
+                   <th>' . get_lang('OfficialCode').'</th>
148
+                  <th>' . get_lang('UserName').'</th>
149
+                  <th>' . get_lang('LastName').'</th>
150
+                  <th>' . get_lang('FirstName').'</th>
151
+                  <th>' . get_lang('Qualify').'</th>
152 152
                </tr>'
153 153
             );
154 154
         }
@@ -174,33 +174,33 @@  discard block
 block discarded – undo
174 174
             $result = $result_and_user['result'];
175 175
 
176 176
             $renderer = &$this->defaultRenderer();
177
-            $this->addText('score[' . $result->get_id() . ']', $this->build_stud_label($user['user_id'], $user['username'], $user['lastname'], $user['firstname']), false, array('class' => "span2",
177
+            $this->addText('score['.$result->get_id().']', $this->build_stud_label($user['user_id'], $user['username'], $user['lastname'], $user['firstname']), false, array('class' => "span2",
178 178
                 'maxlength' => 5));
179 179
 
180
-            $this->addRule('score[' . $result->get_id() . ']', get_lang('OnlyNumbers'), 'numeric');
180
+            $this->addRule('score['.$result->get_id().']', get_lang('OnlyNumbers'), 'numeric');
181 181
             $this->addRule(array(
182
-                'score[' . $result->get_id() . ']', 'maxvalue'), get_lang('OverMax'), 'compare', '<=');
182
+                'score['.$result->get_id().']', 'maxvalue'), get_lang('OverMax'), 'compare', '<=');
183 183
             $this->addRule(array(
184
-                'score[' . $result->get_id() . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
185
-            $defaults['score[' . $result->get_id() . ']'] = $result->get_score();
184
+                'score['.$result->get_id().']', 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
185
+            $defaults['score['.$result->get_id().']'] = $result->get_score();
186 186
 
187 187
             if (api_is_western_name_order()) {
188
-                $user_info = '<td align="left" >' . $user['firstname'] . '</td>';
189
-                $user_info .= '<td align="left" >' . $user['lastname'] . '</td>';
188
+                $user_info = '<td align="left" >'.$user['firstname'].'</td>';
189
+                $user_info .= '<td align="left" >'.$user['lastname'].'</td>';
190 190
             } else {
191
-                $user_info = '<td align="left" >' . $user['lastname'] . '</td>';
192
-                $user_info .= '<td align="left" >' . $user['firstname'] . '</td>';
191
+                $user_info = '<td align="left" >'.$user['lastname'].'</td>';
192
+                $user_info .= '<td align="left" >'.$user['firstname'].'</td>';
193 193
             }
194 194
 
195 195
             $template = '<tr>
196
-		      <td align="left" >' . $user['official_code'] . '</td>
197
-		      <td align="left" >' . $user['username'] . '</td>
198
-		      ' . $user_info . '
199
-		       <td align="left">{element} / ' . $this->evaluation_object->get_max() . '
196
+		      <td align="left" >' . $user['official_code'].'</td>
197
+		      <td align="left" >' . $user['username'].'</td>
198
+		      ' . $user_info.'
199
+		       <td align="left">{element} / ' . $this->evaluation_object->get_max().'
200 200
 		         <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
201 201
 		      </td>
202 202
 		   </tr>';
203
-            $renderer->setElementTemplate($template, 'score[' . $result->get_id() . ']');
203
+            $renderer->setElementTemplate($template, 'score['.$result->get_id().']');
204 204
         }
205 205
         $this->setDefaults($defaults);
206 206
         $this->addButtonSave(get_lang('EditResult'), 'submit');
@@ -215,15 +215,15 @@  discard block
 block discarded – undo
215 215
     {
216 216
         $renderer = & $this->defaultRenderer();
217 217
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
218
-        $this->addElement('static', null, null, '"' . $this->evaluation_object->get_name() . '" ');
219
-        $this->addElement('static', null, null, get_lang('MoveTo') . ' : ');
218
+        $this->addElement('static', null, null, '"'.$this->evaluation_object->get_name().'" ');
219
+        $this->addElement('static', null, null, get_lang('MoveTo').' : ');
220 220
         $select = $this->addElement('select', 'move_cat', null, null);
221 221
         $line = '';
222 222
         foreach ($this->evaluation_object->get_target_categories() as $cat) {
223 223
             for ($i = 0; $i < $cat[2]; $i++) {
224 224
                 $line .= '&mdash;';
225 225
             }
226
-            $select->addoption($line . ' ' . $cat[1], $cat[0]);
226
+            $select->addoption($line.' '.$cat[1], $cat[0]);
227 227
             $line = '';
228 228
         }
229 229
         $this->addButtonSave(get_lang('Ok'), 'submit');
@@ -253,21 +253,21 @@  discard block
 block discarded – undo
253 253
         if (api_is_western_name_order()) {
254 254
             $renderer->setHeaderTemplate(
255 255
                     '<tr>
256
-                   <th>' . get_lang('OfficialCode') . '</th>
257
-                  <th>' . get_lang('UserName') . '</th>
258
-                  <th>' . get_lang('FirstName') . '</th>
259
-                  <th>' . get_lang('LastName') . '</th>
260
-                  <th>' . get_lang('Qualify') . '</th>
256
+                   <th>' . get_lang('OfficialCode').'</th>
257
+                  <th>' . get_lang('UserName').'</th>
258
+                  <th>' . get_lang('FirstName').'</th>
259
+                  <th>' . get_lang('LastName').'</th>
260
+                  <th>' . get_lang('Qualify').'</th>
261 261
                </tr>'
262 262
             );
263 263
         } else {
264 264
             $renderer->setHeaderTemplate(
265 265
                     '<tr>
266
-                   <th>' . get_lang('OfficialCode') . '</th>
267
-                  <th>' . get_lang('UserName') . '</th>
268
-                  <th>' . get_lang('LastName') . '</th>
269
-                  <th>' . get_lang('FirstName') . '</th>
270
-                  <th>' . get_lang('Qualify') . '</th>
266
+                   <th>' . get_lang('OfficialCode').'</th>
267
+                  <th>' . get_lang('UserName').'</th>
268
+                  <th>' . get_lang('LastName').'</th>
269
+                  <th>' . get_lang('FirstName').'</th>
270
+                  <th>' . get_lang('Qualify').'</th>
271 271
                </tr>'
272 272
             );
273 273
         }
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
         $firstUser = true;
276 276
         foreach ($tblusers as $user) {
277 277
 
278
-            $element_name = 'score[' . $user[0] . ']';
278
+            $element_name = 'score['.$user[0].']';
279 279
 
280 280
             $scoreColumnProperties = array('maxlength' => 5);
281 281
             if ($firstUser) {
@@ -290,19 +290,19 @@  discard block
 block discarded – undo
290 290
             $this->addRule(array($element_name, 'minvalue'), get_lang('UnderMin'), 'compare', '>=');
291 291
 
292 292
             if (api_is_western_name_order()) {
293
-                $user_info = '<td align="left" >' . $user[3] . '</td>';
294
-                $user_info .= '<td align="left" >' . $user[2] . '</td>';
293
+                $user_info = '<td align="left" >'.$user[3].'</td>';
294
+                $user_info .= '<td align="left" >'.$user[2].'</td>';
295 295
             } else {
296
-                $user_info = '<td align="left" >' . $user[2] . '</td>';
297
-                $user_info .= '<td align="left" >' . $user[3] . '</td>';
296
+                $user_info = '<td align="left" >'.$user[2].'</td>';
297
+                $user_info .= '<td align="left" >'.$user[3].'</td>';
298 298
             }
299 299
             $nr_users++;
300 300
 
301 301
             $template = '<tr>
302
-		      <td align="left" >' . $user[4] . '</td>
303
-		      <td align="left" >' . $user[1] . '</td>
304
-		      ' . $user_info . '
305
-		       <td align="left">{element} / ' . $this->evaluation_object->get_max() . '
302
+		      <td align="left" >' . $user[4].'</td>
303
+		      <td align="left" >' . $user[1].'</td>
304
+		      ' . $user_info.'
305
+		       <td align="left">{element} / ' . $this->evaluation_object->get_max().'
306 306
 		         <!-- BEGIN error --><br /><span style="color: #ff0000;font-size:10px">{error}</span><!-- END error -->
307 307
 		      </td>
308 308
             </tr>';
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
         $renderer->setCustomElementTemplate('<span>{element}</span> ');
337 337
         $this->addElement('label', get_lang('User'), $userinfo['complete_name']);
338 338
 
339
-        $this->addText('score', array(get_lang('Score'), null, '/ ' . $this->evaluation_object->get_max()), false, array(
339
+        $this->addText('score', array(get_lang('Score'), null, '/ '.$this->evaluation_object->get_max()), false, array(
340 340
             'size' => '4',
341 341
             'class' => 'span1',
342 342
             'maxlength' => '5'
@@ -471,7 +471,7 @@  discard block
 block discarded – undo
471 471
             }
472 472
         }
473 473
 
474
-        $this->addText('weight_mask', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">' . $all_categories[0]->get_weight() . '</span>] '), true, array(
474
+        $this->addText('weight_mask', array(get_lang('Weight'), null, ' [0 .. <span id="max_weight">'.$all_categories[0]->get_weight().'</span>] '), true, array(
475 475
             'size' => '4',
476 476
             'maxlength' => '5',
477 477
             'class' => 'span1'
@@ -543,11 +543,11 @@  discard block
 block discarded – undo
543 543
             $link = LinkFactory :: get_evaluation_link($this->evaluation_object->get_id());
544 544
             $doc_url = $link->get_view_url($id);
545 545
             if ($doc_url != null) {
546
-                $opendocurl_start .= '<a href="' . $doc_url . '" target="_blank">';
546
+                $opendocurl_start .= '<a href="'.$doc_url.'" target="_blank">';
547 547
                 $opendocurl_end = '</a>';
548 548
             }
549 549
         }
550
-        return $opendocurl_start . api_get_person_name($firstname, $lastname) . ' (' . $username . ')' . $opendocurl_end;
550
+        return $opendocurl_start.api_get_person_name($firstname, $lastname).' ('.$username.')'.$opendocurl_end;
551 551
     }
552 552
 
553 553
     function sort_by_user($item1, $item2)
Please login to merge, or discard this patch.
main/gradebook/lib/scoredisplay.class.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     /**
35 35
      * Compare the custom display of 2 scores, can be useful in sorting
36 36
      */
37
-    public static function compare_scores_by_custom_display ($score1, $score2)
37
+    public static function compare_scores_by_custom_display($score1, $score2)
38 38
     {
39 39
         if (!isset($score1)) {
40 40
             return (isset($score2) ? 1 : 0);
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             if ($custom1 == $custom2) {
48 48
                 return 0;
49 49
             } else {
50
-                return (($score1[0]/$score1[1]) < ($score2[0]/$score2[1]) ? -1 : 1);
50
+                return (($score1[0] / $score1[1]) < ($score2[0] / $score2[1]) ? -1 : 1);
51 51
             }
52 52
         }
53 53
     }
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         //Setting custom enabled
80 80
         $value = api_get_setting('gradebook_score_display_custom');
81 81
         $value = $value['my_display_custom'];
82
-        $this->custom_enabled  = $value == 'true' ? true : false;
82
+        $this->custom_enabled = $value == 'true' ? true : false;
83 83
 
84 84
         if ($this->custom_enabled) {
85 85
             $params = array('category = ?' =>  array('Gradebook'));
@@ -96,10 +96,10 @@  discard block
 block discarded – undo
96 96
                 sort($portal_displays);
97 97
             }
98 98
             $this->custom_display = $portal_displays;
99
-            if (count($this->custom_display)>0) {
99
+            if (count($this->custom_display) > 0) {
100 100
                 $value = api_get_setting('gradebook_score_display_upperlimit');
101 101
                 $value = $value['my_display_upperlimit'];
102
-                $this->upperlimit_included  = $value == 'true' ? true : false;
102
+                $this->upperlimit_included = $value == 'true' ? true : false;
103 103
                 $this->custom_display_conv = $this->convert_displays($this->custom_display);
104 104
             }
105 105
         }
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
             //Load course settings
111 111
             if ($this->custom_enabled) {
112 112
                 $this->custom_display = $this->get_custom_displays();
113
-                if (count($this->custom_display)> 0) {
113
+                if (count($this->custom_display) > 0) {
114 114
                     $this->custom_display_conv = $this->convert_displays($this->custom_display);
115 115
                 }
116 116
             }
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
         }
183 183
 
184 184
         $sql = 'SELECT id FROM '.$tbl_gradebook_category.'
185
-                WHERE course_code = "'.$curr_course_code.'" '. $session_condition;
185
+                WHERE course_code = "'.$curr_course_code.'" '.$session_condition;
186 186
         $rs  = Database::query($sql);
187 187
         $category_id = 0;
188 188
         if (Database::num_rows($rs) > 0) {
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
         );
252 252
 
253 253
         $tbl_display = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_SCORE_DISPLAY);
254
-        foreach($display as $value => $text) {
254
+        foreach ($display as $value => $text) {
255 255
             $params = array(
256 256
                 'score' => $value,
257 257
                 'display' => $text,
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
         $my_score = $score == 0 ? 1 : $score;
308 308
 
309 309
         if ($type == SCORE_BAR) {
310
-            $percentage = $my_score[0]/$my_score[1]*100;
310
+            $percentage = $my_score[0] / $my_score[1] * 100;
311 311
 
312 312
             return Display::bar_progress($percentage);
313 313
         }
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
             case SCORE_PERCENT :                        // XX %
349 349
                 return $this->display_as_percent($score);
350 350
             case SCORE_DIV_PERCENT :                    // X / Y (XX %)
351
-                return $this->display_as_div($score).' (' . $this->display_as_percent($score) . ')';
351
+                return $this->display_as_div($score).' ('.$this->display_as_percent($score).')';
352 352
             case SCORE_AVERAGE :                        // XX %
353 353
                 return $this->display_as_percent($score);
354 354
             case SCORE_DECIMAL :                        // 0.50  (X/Y)
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
                 if (!empty($custom)) {
359 359
                     $custom = ' - '.$custom;
360 360
                 }
361
-                return $this->display_as_div($score).' (' . $this->display_as_percent($score) . ')'.$custom;
361
+                return $this->display_as_div($score).' ('.$this->display_as_percent($score).')'.$custom;
362 362
             case SCORE_DIV_SIMPLE_WITH_CUSTOM :         // X - Good!
363 363
                 $custom = $this->display_custom($score);
364 364
 
@@ -410,9 +410,9 @@  discard block
 block discarded – undo
410 410
      */
411 411
     private function display_as_decimal($score)
412 412
     {
413
-        $score_denom = ($score[1]==0) ? 1 : $score[1];
413
+        $score_denom = ($score[1] == 0) ? 1 : $score[1];
414 414
 
415
-        return $this->format_score($score[0]/$score_denom);
415
+        return $this->format_score($score[0] / $score_denom);
416 416
     }
417 417
 
418 418
     /**
@@ -420,9 +420,9 @@  discard block
 block discarded – undo
420 420
      */
421 421
     private function display_as_percent($score)
422 422
     {
423
-        $score_denom = ($score[1]==0) ? 1 : $score[1];
423
+        $score_denom = ($score[1] == 0) ? 1 : $score[1];
424 424
 
425
-        return $this->format_score($score[0]/$score_denom*100) . ' %';
425
+        return $this->format_score($score[0] / $score_denom * 100).' %';
426 426
     }
427 427
 
428 428
     /**
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
         } else {
439 439
             $score[0] = isset($score[0]) ? $this->format_score($score[0]) : 0;
440 440
             $score[1] = isset($score[1]) ? $this->format_score($score[1]) : 0;
441
-            return  $score[0] . ' / ' . $score[1];
441
+            return  $score[0].' / '.$score[1];
442 442
         }
443 443
     }
444 444
 
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
      */
449 449
     private function display_custom($score)
450 450
     {
451
-        $my_score_denom= ($score[1]==0) ? 1 : $score[1];
451
+        $my_score_denom = ($score[1] == 0) ? 1 : $score[1];
452 452
         $scaledscore = $score[0] / $my_score_denom;
453 453
         if ($this->upperlimit_included) {
454 454
             foreach ($this->custom_display_conv as $displayitem) {
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
                 ORDER BY score';
513 513
         $result = Database::query($sql);
514 514
 
515
-        return Database::store_result($result,'ASSOC');
515
+        return Database::store_result($result, 'ASSOC');
516 516
     }
517 517
 
518 518
     /**
Please login to merge, or discard this patch.
main/gradebook/lib/gradebook_data_generator.class.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
42 42
         if (count($allcats) > 0) {
43 43
             // get sub categories id
44 44
             $tabCategories = array();
45
-            for ($i=0; $i < count($allcats); $i++) {
45
+            for ($i = 0; $i < count($allcats); $i++) {
46 46
                 $tabCategories[] = $allcats[$i]->get_id();
47 47
             }
48 48
             // dont display links that belongs to a sub category
49 49
             $tabLinkToDisplay = array();
50
-            for ($i=0; $i < count($alllinks); $i++) {
50
+            for ($i = 0; $i < count($alllinks); $i++) {
51 51
                 if (!in_array($alllinks[$i]->get_category_id(), $tabCategories)) {
52 52
                     $tabLinkToDisplay[] = $alllinks[$i];
53 53
                 }
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
         //$status = CourseManager::get_user_in_course_status(api_get_user_id(), api_get_course_id());
90 90
         // do some checks on count, redefine if invalid value
91 91
         if (!isset($count)) {
92
-            $count = count ($this->items) - $start;
92
+            $count = count($this->items) - $start;
93 93
         }
94 94
         if ($count < 0) {
95 95
             $count = 0;
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
         $display = $scoreDisplay->display_score($score, SCORE_DIV, SCORE_BOTH, true);
247 247
         $type = $item->get_item_type();
248 248
         if ($type == 'L' && get_class($item) == 'ExerciseLink') {
249
-            $display  = ExerciseLib::show_score($score[0], $score[1], false);
249
+            $display = ExerciseLib::show_score($score[0], $score[1], false);
250 250
         }
251 251
 
252 252
         return array(
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
         $type = $item->get_item_type();
269 269
 
270 270
         if ($type == 'L' && get_class($item) == 'ExerciseLink') {
271
-            $display  = ExerciseLib::show_score($score[0], $score[1], false);
271
+            $display = ExerciseLib::show_score($score[0], $score[1], false);
272 272
         }
273 273
 
274 274
         return array(
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 
362 362
                 $type = $item->get_item_type();
363 363
                 if ($type == 'L' && get_class($item) == 'ExerciseLink') {
364
-                    $display  = ExerciseLib::show_score($score[0], $score[1], false);
364
+                    $display = ExerciseLib::show_score($score[0], $score[1], false);
365 365
                 }
366 366
 
367 367
                 return array(
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
     public function sort_by_type($item1, $item2)
443 443
     {
444 444
         if ($item1->get_item_type() == $item2->get_item_type()) {
445
-            return $this->sort_by_name($item1,$item2);
445
+            return $this->sort_by_name($item1, $item2);
446 446
         } else {
447 447
             return ($item1->get_item_type() < $item2->get_item_type() ? -1 : 1);
448 448
         }
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
     {
458 458
         $result = api_strcmp($item1->get_description(), $item2->get_description());
459 459
         if ($result == 0) {
460
-            return $this->sort_by_name($item1,$item2);
460
+            return $this->sort_by_name($item1, $item2);
461 461
         }
462 462
         return $result;
463 463
     }
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
     public function sort_by_weight($item1, $item2)
471 471
     {
472 472
         if ($item1->get_weight() == $item2->get_weight()) {
473
-            return $this->sort_by_name($item1,$item2);
473
+            return $this->sort_by_name($item1, $item2);
474 474
         } else {
475 475
             return ($item1->get_weight() < $item2->get_weight() ? -1 : 1);
476 476
         }
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
         }
502 502
 
503 503
         if ($timestamp1 == $timestamp2) {
504
-            return $this->sort_by_name($item1,$item2);
504
+            return $this->sort_by_name($item1, $item2);
505 505
         } else {
506 506
             return ($timestamp1 < $timestamp2 ? -1 : 1);
507 507
         }
Please login to merge, or discard this patch.
main/gradebook/lib/be/exerciselink.class.php 2 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -194,13 +194,13 @@  discard block
 block discarded – undo
194 194
         in exercice/exercice.php, look for note-query-exe-results marker*/
195 195
         $session_id = api_get_session_id();
196 196
         $courseId = $this->getCourseId();
197
-	    $exercise = new Exercise($courseId);
197
+        $exercise = new Exercise($courseId);
198 198
         $exercise->read($this->get_ref_id());
199 199
 
200 200
         if (!$this->is_hp) {
201 201
 
202
-		if ($exercise->exercise_was_added_in_lp == false) {
203
-			$sql = "SELECT * FROM $tblStats
202
+        if ($exercise->exercise_was_added_in_lp == false) {
203
+            $sql = "SELECT * FROM $tblStats
204 204
 			        WHERE
205 205
 			            exe_exo_id = ".intval($this->get_ref_id())." AND
206 206
 			            orig_lp_id = 0 AND
@@ -209,15 +209,15 @@  discard block
 block discarded – undo
209 209
 			            session_id = $session_id AND
210 210
                                     c_id = $courseId 
211 211
                                 ";
212
-		    } else {
213
-		        $lpId = null;
214
-		        if (!empty($exercise->lpList)) {
215
-		            // Taking only the first LP
216
-		            $lpId = current($exercise->lpList);
217
-		            $lpId = $lpId['lp_id'];
218
-		        }
219
-
220
-		        $sql = "SELECT * FROM $tblStats
212
+            } else {
213
+                $lpId = null;
214
+                if (!empty($exercise->lpList)) {
215
+                    // Taking only the first LP
216
+                    $lpId = current($exercise->lpList);
217
+                    $lpId = $lpId['lp_id'];
218
+                }
219
+
220
+                $sql = "SELECT * FROM $tblStats
221 221
 		                WHERE
222 222
 		                    exe_exo_id = ".intval($this->get_ref_id())." AND
223 223
 		                    orig_lp_id = $lpId AND
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 		                    session_id = $session_id AND
226 226
                                     c_id = $courseId 
227 227
                                 ";
228
-		    }
228
+            }
229 229
 
230 230
             if (!empty($stud_id) && $type != 'ranking') {
231 231
                 $sql .= " AND exe_user_id = $stud_id ";
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 
52 52
         $result = Database::query($sql);
53 53
         $cats = array();
54
-        while ($data=Database::fetch_array($result)) {
55
-            $cats[] = array ($data['id'], $data['title']);
54
+        while ($data = Database::fetch_array($result)) {
55
+            $cats[] = array($data['id'], $data['title']);
56 56
         }
57 57
 
58 58
         return $cats;
@@ -116,15 +116,15 @@  discard block
 block discarded – undo
116 116
         $cats = array();
117 117
         if (isset($result)) {
118 118
             if (Database::num_rows($result) > 0) {
119
-                while ($data=Database::fetch_array($result)) {
120
-                    $cats[] = array ($data['id'], $data['title']);
119
+                while ($data = Database::fetch_array($result)) {
120
+                    $cats[] = array($data['id'], $data['title']);
121 121
                 }
122 122
             }
123 123
         }
124 124
 
125 125
         if (isset($result2)) {
126 126
             if (Database::num_rows($result2) > 0) {
127
-                while ($row=Database::fetch_array($result2)) {
127
+                while ($row = Database::fetch_array($result2)) {
128 128
                     /*$path = $data['path'];
129 129
                     $fname = GetQuizName($path,$documentPath);
130 130
         			$cats[] = array ($data['id'], $fname);*/
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
170 170
                 WHERE
171 171
                     session_id = $session_id AND
172 172
                     c_id = $course_id AND
173
-                    exe_exo_id   = ".(int)$this->get_ref_id();
173
+                    exe_exo_id   = ".(int) $this->get_ref_id();
174 174
         $result = Database::query($sql);
175
-        $number=Database::fetch_row($result);
175
+        $number = Database::fetch_row($result);
176 176
         return ($number[0] != 0);
177 177
     }
178 178
 
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
         } else {
255 255
             // all students -> get average
256 256
             // normal way of getting the info
257
-            $students = array();  // user list, needed to make sure we only
257
+            $students = array(); // user list, needed to make sure we only
258 258
             // take first attempts into account
259 259
             $student_count = 0;
260 260
             $sum = 0;
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
                         /*if (empty($count)) {
290 290
                             return null;
291 291
                         }*/
292
-                        return array($sumResult/$count , $weight);
292
+                        return array($sumResult / $count, $weight);
293 293
                         break;
294 294
                     case 'ranking':
295 295
                         return AbstractLink::getCurrentUserRanking($stud_id, $students);
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
         $session_id = api_get_session_id();
320 320
 
321 321
         $url = api_get_path(WEB_CODE_PATH).'gradebook/exercise_jump.php?session_id='.$session_id.'&cidReq='.$this->get_course_code().'&gradebook=view&exerciseId='.$this->get_ref_id().'&type='.$this->get_type();
322
-        if ((!api_is_allowed_to_edit() && $this->calc_score(api_get_user_id()) == null) || $status_user!=1) {
322
+        if ((!api_is_allowed_to_edit() && $this->calc_score(api_get_user_id()) == null) || $status_user != 1) {
323 323
             $url .= '&amp;doexercise='.$this->get_ref_id();
324 324
         }
325 325
 
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
     public function is_valid_link()
365 365
     {
366 366
         $sql = 'SELECT count(id) from '.$this->get_exercise_table().'
367
-                WHERE c_id = '.$this->course_id.' AND id = '.(int)$this->get_ref_id().' ';
367
+                WHERE c_id = '.$this->course_id.' AND id = '.(int) $this->get_ref_id().' ';
368 368
         $result = Database::query($sql);
369 369
         $number = Database::fetch_row($result);
370 370
 
Please login to merge, or discard this patch.
main/gradebook/lib/be/abstractlink.class.php 2 patches
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -138,22 +138,22 @@  discard block
 block discarded – undo
138 138
         return $this->visible;
139 139
     }
140 140
 
141
-    public function set_id ($id)
141
+    public function set_id($id)
142 142
     {
143 143
         $this->id = $id;
144 144
     }
145 145
 
146
-    public function set_type ($type)
146
+    public function set_type($type)
147 147
     {
148 148
         $this->type = $type;
149 149
     }
150 150
 
151
-    public function set_ref_id ($ref_id)
151
+    public function set_ref_id($ref_id)
152 152
     {
153 153
         $this->ref_id = $ref_id;
154 154
     }
155 155
 
156
-    public function set_user_id ($user_id)
156
+    public function set_user_id($user_id)
157 157
     {
158 158
         $this->user_id = $user_id;
159 159
     }
@@ -231,29 +231,29 @@  discard block
 block discarded – undo
231 231
         $sql = 'SELECT * FROM '.$tbl_grade_links;
232 232
         $paramcount = 0;
233 233
         if (isset ($id)) {
234
-            $sql.= ' WHERE id = '.intval($id);
235
-            $paramcount ++;
234
+            $sql .= ' WHERE id = '.intval($id);
235
+            $paramcount++;
236 236
         }
237 237
         if (isset ($type)) {
238 238
             if ($paramcount != 0) $sql .= ' AND';
239 239
             else $sql .= ' WHERE';
240 240
             $sql .= ' type = '.intval($type);
241
-            $paramcount ++;
241
+            $paramcount++;
242 242
         }
243 243
         if (isset ($ref_id)) {
244 244
             if ($paramcount != 0) $sql .= ' AND';
245 245
             else $sql .= ' WHERE';
246 246
             $sql .= ' ref_id = '.intval($ref_id);
247
-            $paramcount ++;
247
+            $paramcount++;
248 248
         }
249 249
         if (isset ($user_id)) {
250 250
             if ($paramcount != 0) {
251 251
                 $sql .= ' AND';
252
-            }else {
252
+            } else {
253 253
                 $sql .= ' WHERE';
254 254
             }
255 255
             $sql .= ' user_id = '.intval($user_id);
256
-            $paramcount ++;
256
+            $paramcount++;
257 257
         }
258 258
         if (isset ($course_code)) {
259 259
             if ($paramcount != 0) {
@@ -262,16 +262,16 @@  discard block
 block discarded – undo
262 262
                 $sql .= ' WHERE';
263 263
             }
264 264
             $sql .= " course_code = '".Database::escape_string($course_code)."'";
265
-            $paramcount ++;
265
+            $paramcount++;
266 266
         }
267 267
         if (isset ($category_id)) {
268 268
             if ($paramcount != 0) {
269 269
                 $sql .= ' AND';
270
-            }else {
270
+            } else {
271 271
                 $sql .= ' WHERE';
272 272
             }
273 273
             $sql .= ' category_id = '.intval($category_id);
274
-            $paramcount ++;
274
+            $paramcount++;
275 275
         }
276 276
         if (isset ($visible)) {
277 277
             if ($paramcount != 0) {
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
             $session_id = api_get_session_id();
312 312
 
313 313
             $link->set_session_id($session_id);
314
-            $links[]=$link;
314
+            $links[] = $link;
315 315
         }
316 316
         return $links;
317 317
     }
@@ -402,12 +402,12 @@  discard block
 block discarded – undo
402 402
         $dateobject = AbstractLink::load($idevaluation, null, null, null, null);
403 403
         $current_date_server = api_get_utc_datetime();
404 404
         $arreval = get_object_vars($dateobject[0]);
405
-        $description_log = isset($arreval['description']) ? $arreval['description']:'';
405
+        $description_log = isset($arreval['description']) ? $arreval['description'] : '';
406 406
         if (empty($nameLog)) {
407 407
             if (isset($_POST['name_link'])) {
408 408
                 $name_log = isset($_POST['name_link']) ? $_POST['name_link'] : $arreval['course_code'];
409
-            } elseif (isset($_POST['link_' . $idevaluation]) && $_POST['link_' . $idevaluation]) {
410
-                $name_log = $_POST['link_' . $idevaluation];
409
+            } elseif (isset($_POST['link_'.$idevaluation]) && $_POST['link_'.$idevaluation]) {
410
+                $name_log = $_POST['link_'.$idevaluation];
411 411
             } else {
412 412
                 $name_log = $arreval['course_code'];
413 413
             }
@@ -452,10 +452,10 @@  discard block
 block discarded – undo
452 452
         $targets = array();
453 453
         $level = 0;
454 454
 
455
-        $crscats = Category::load(null,null,$this->get_course_code(),0);
455
+        $crscats = Category::load(null, null, $this->get_course_code(), 0);
456 456
         foreach ($crscats as $cat) {
457
-            $targets[] = array($cat->get_id(), $cat->get_name(), $level+1);
458
-            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
457
+            $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
458
+            $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
459 459
         }
460 460
 
461 461
         return $targets;
@@ -466,10 +466,10 @@  discard block
 block discarded – undo
466 466
      */
467 467
     private function add_target_subcategories($targets, $level, $catid)
468 468
     {
469
-        $subcats = Category::load(null,null,null,$catid);
469
+        $subcats = Category::load(null, null, null, $catid);
470 470
         foreach ($subcats as $cat) {
471
-            $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
472
-            $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
471
+            $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
472
+            $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
473 473
         }
474 474
         return $targets;
475 475
     }
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
      * To keep consistency, do not call this method but LinkFactory::find_links instead.
494 494
      * @todo can be written more efficiently using a new (but very complex) sql query
495 495
      */
496
-    public function find_links ($name_mask,$selectcat)
496
+    public function find_links($name_mask, $selectcat)
497 497
     {
498 498
         $rootcat = Category::load($selectcat);
499 499
         $links = $rootcat[0]->get_links((api_is_allowed_to_edit() ? null : api_get_user_id()), true);
Please login to merge, or discard this patch.
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -235,21 +235,27 @@  discard block
 block discarded – undo
235 235
             $paramcount ++;
236 236
         }
237 237
         if (isset ($type)) {
238
-            if ($paramcount != 0) $sql .= ' AND';
239
-            else $sql .= ' WHERE';
238
+            if ($paramcount != 0) {
239
+                $sql .= ' AND';
240
+            } else {
241
+                $sql .= ' WHERE';
242
+            }
240 243
             $sql .= ' type = '.intval($type);
241 244
             $paramcount ++;
242 245
         }
243 246
         if (isset ($ref_id)) {
244
-            if ($paramcount != 0) $sql .= ' AND';
245
-            else $sql .= ' WHERE';
247
+            if ($paramcount != 0) {
248
+                $sql .= ' AND';
249
+            } else {
250
+                $sql .= ' WHERE';
251
+            }
246 252
             $sql .= ' ref_id = '.intval($ref_id);
247 253
             $paramcount ++;
248 254
         }
249 255
         if (isset ($user_id)) {
250 256
             if ($paramcount != 0) {
251 257
                 $sql .= ' AND';
252
-            }else {
258
+            } else {
253 259
                 $sql .= ' WHERE';
254 260
             }
255 261
             $sql .= ' user_id = '.intval($user_id);
@@ -267,7 +273,7 @@  discard block
 block discarded – undo
267 273
         if (isset ($category_id)) {
268 274
             if ($paramcount != 0) {
269 275
                 $sql .= ' AND';
270
-            }else {
276
+            } else {
271 277
                 $sql .= ' WHERE';
272 278
             }
273 279
             $sql .= ' category_id = '.intval($category_id);
Please login to merge, or discard this patch.
main/gradebook/lib/be/gradebookitem.class.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@
 block discarded – undo
8 8
  */
9 9
 interface GradebookItem
10 10
 {
11
-	public function get_item_type();
12
-	public function get_id();
13
-	public function get_name();
14
-	public function get_description();
15
-	public function get_course_code();
16
-	public function get_weight();
17
-	public function get_date();
18
-	public function is_visible();
19
-	public function get_icon_name();
20
-	public function getStudentList();
21
-	public function setStudentList($list);
22
-	public function calc_score($stud_id = null, $type = null);
11
+    public function get_item_type();
12
+    public function get_id();
13
+    public function get_name();
14
+    public function get_description();
15
+    public function get_course_code();
16
+    public function get_weight();
17
+    public function get_date();
18
+    public function is_visible();
19
+    public function get_icon_name();
20
+    public function getStudentList();
21
+    public function setStudentList($list);
22
+    public function calc_score($stud_id = null, $type = null);
23 23
 }
Please login to merge, or discard this patch.
main/gradebook/lib/be/category.class.php 4 patches
Indentation   -2 removed lines patch added patch discarded remove patch
@@ -1571,7 +1571,6 @@  discard block
 block discarded – undo
1571 1571
      * @param string $course_code Course code (optional)
1572 1572
      * @param int    $session_id Session ID (optional)
1573 1573
      * @param bool   $order
1574
-
1575 1574
      * @return array Array of subcategories
1576 1575
      */
1577 1576
     public function get_subcategories($stud_id = null, $course_code = null, $session_id = null, $order = null)
@@ -1850,7 +1849,6 @@  discard block
 block discarded – undo
1850 1849
      * This function, locks a category , only one who can unlock it is
1851 1850
      * the platform administrator.
1852 1851
      * @param int locked 1 or unlocked 0
1853
-
1854 1852
      * @return bool
1855 1853
      * */
1856 1854
     public function lock($locked)
Please login to merge, or discard this patch.
Spacing   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
      */
200 200
     public function set_session_id($session_id = 0)
201 201
     {
202
-        $this->session_id = (int)$session_id;
202
+        $this->session_id = (int) $session_id;
203 203
     }
204 204
 
205 205
     /**
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
         $skills = $this->get_skills();
289 289
         $skill_select = array();
290 290
         if (!empty($skills)) {
291
-            foreach($skills as $skill) {
291
+            foreach ($skills as $skill) {
292 292
                 $skill_select[$skill['id']] = $skill['name'];
293 293
             }
294 294
         }
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
      */
323 323
     public static function load_session_categories($id = null, $session_id = null)
324 324
     {
325
-        if (isset($id) && (int)$id === 0) {
325
+        if (isset($id) && (int) $id === 0) {
326 326
             $cats = array();
327 327
             $cats[] = Category::create_root_category();
328 328
             return $cats;
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
         if (!empty($session_id)) {
336 336
             $tbl_grade_categories = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_CATEGORY);
337 337
             $sql = 'SELECT id, course_code
338
-                    FROM '.$tbl_grade_categories. '
338
+                    FROM '.$tbl_grade_categories.'
339 339
                     WHERE session_id = '.$session_id;
340 340
             $result_session = Database::query($sql);
341 341
             if (Database::num_rows($result_session) > 0) {
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
     ) {
376 376
         //if the category given is explicitly 0 (not null), then create
377 377
         // a root category object (in memory)
378
-        if (isset($id) && (int)$id === 0) {
378
+        if (isset($id) && (int) $id === 0) {
379 379
             $cats = array();
380 380
             $cats[] = Category::create_root_category();
381 381
 
@@ -386,8 +386,8 @@  discard block
 block discarded – undo
386 386
         $sql = 'SELECT * FROM '.$tbl_grade_categories;
387 387
         $paramcount = 0;
388 388
         if (isset($id)) {
389
-            $sql.= ' WHERE id = '.intval($id);
390
-            $paramcount ++;
389
+            $sql .= ' WHERE id = '.intval($id);
390
+            $paramcount++;
391 391
         }
392 392
 
393 393
         if (isset($user_id)) {
@@ -423,10 +423,10 @@  discard block
 block discarded – undo
423 423
             if (empty($session_id)) {
424 424
                 $sql .= ' AND (session_id IS NULL OR session_id = 0) ';
425 425
             } else {
426
-                $sql .= ' AND session_id = '.(int)$session_id.' ';
426
+                $sql .= ' AND session_id = '.(int) $session_id.' ';
427 427
             }
428 428
             //}
429
-            $paramcount ++;
429
+            $paramcount++;
430 430
         }
431 431
 
432 432
         if (isset($parent_id)) {
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
                             $default_weight = $default_weight_setting;
599 599
                         }
600 600
                         foreach ($components as $component) {
601
-                            $gradebook =  new Gradebook();
601
+                            $gradebook = new Gradebook();
602 602
                             $params = array();
603 603
 
604 604
                             $params['name'] = $component['acronym'];
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
                 }
616 616
             }
617 617
 
618
-            $gradebook= new Gradebook();
618
+            $gradebook = new Gradebook();
619 619
             $gradebook->update_skills_to_gradebook($this->id, $this->get_skills(false));
620 620
 
621 621
             return $id;
@@ -680,7 +680,7 @@  discard block
 block discarded – undo
680 680
                         $params['description']      = $component['title'];
681 681
                         $params['user_id']          = api_get_user_id();
682 682
                         $params['parent_id']        = $this->id;
683
-                        $params['weight']           = $component['percentage']/100*$default_weight;
683
+                        $params['weight']           = $component['percentage'] / 100 * $default_weight;
684 684
                         $params['session_id']       = api_get_session_id();
685 685
                         $params['course_code']      = $this->get_course_code();
686 686
 
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
             }
691 691
         }
692 692
 
693
-        $gradebook= new Gradebook();
693
+        $gradebook = new Gradebook();
694 694
         $gradebook->update_skills_to_gradebook(
695 695
             $this->id,
696 696
             $this->get_skills(false),
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
710 710
         if (!empty($links)) {
711 711
             foreach ($links as $link_item) {
712 712
                 if (isset($link_item)) {
713
-                    $new_item_weight =  $new_weight * $link_item->get_weight() / $old_weight;
713
+                    $new_item_weight = $new_weight * $link_item->get_weight() / $old_weight;
714 714
                     $link_item->set_weight($new_item_weight);
715 715
                     $link_item->save();
716 716
                 }
@@ -751,7 +751,7 @@  discard block
 block discarded – undo
751 751
                     visible=3';
752 752
         $res = Database::query($sql);
753 753
         $option = Database::fetch_array($res, 'ASSOC');
754
-        if ($option['num']>=1) {
754
+        if ($option['num'] >= 1) {
755 755
             return '&nbsp;&nbsp;<span class="resource-deleted">(&nbsp;'.get_lang('ResourceDeleted').'&nbsp;)</span>';
756 756
         } else {
757 757
             return false;
@@ -812,9 +812,9 @@  discard block
 block discarded – undo
812 812
             $sql .= ' AND user_id = '.api_get_user_id();
813 813
         }
814 814
         if (!isset ($parent)) {
815
-            $sql.= ' AND parent_id is null';
815
+            $sql .= ' AND parent_id is null';
816 816
         } else {
817
-            $sql.= ' AND parent_id = '.intval($parent);
817
+            $sql .= ' AND parent_id = '.intval($parent);
818 818
         }
819 819
 
820 820
         $result = Database::query($sql);
@@ -912,7 +912,7 @@  discard block
 block discarded – undo
912 912
                     }
913 913
 
914 914
                     if (isset($score) && !empty($score[1]) && !empty($catweight)) {
915
-                        $ressum += $score[0]/$score[1] * $catweight;
915
+                        $ressum += $score[0] / $score[1] * $catweight;
916 916
                     }
917 917
                 }
918 918
             }
@@ -1001,7 +1001,7 @@  discard block
 block discarded – undo
1001 1001
                     }
1002 1002
 
1003 1003
                     if (isset($score) && !empty($score[1]) && !empty($catweight)) {
1004
-                        $ressum += $score[0]/$score[1] * $catweight;
1004
+                        $ressum += $score[0] / $score[1] * $catweight;
1005 1005
 
1006 1006
                         if ($ressum > $bestResult) {
1007 1007
                             $bestResult = $ressum;
@@ -1140,7 +1140,7 @@  discard block
 block discarded – undo
1140 1140
                 // session, we don't check his registration to these, but this
1141 1141
                 // could be an improvement
1142 1142
                 if (!empty($session_id)) {
1143
-                    $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id = ".(int)$session_id;
1143
+                    $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id = ".(int) $session_id;
1144 1144
                 } else {
1145 1145
                     $sql .= " AND course_code = '".Database::escape_string($course_code)."' AND session_id is null OR session_id=0";
1146 1146
                 }
@@ -1164,9 +1164,9 @@  discard block
 block discarded – undo
1164 1164
                 // could be an improvement
1165 1165
                 $sql .= " AND course_code  = '".Database::escape_string($course_code)."'";
1166 1166
                 if (!empty($session_id)) {
1167
-                    $sql .= " AND session_id = ".(int)$session_id;
1167
+                    $sql .= " AND session_id = ".(int) $session_id;
1168 1168
                 } else {
1169
-                    $sql .="AND session_id IS NULL OR session_id=0";
1169
+                    $sql .= "AND session_id IS NULL OR session_id=0";
1170 1170
                 }
1171 1171
             } else {
1172 1172
                 $sql .= ' AND course_code IN
@@ -1180,10 +1180,10 @@  discard block
 block discarded – undo
1180 1180
                     )';
1181 1181
             }
1182 1182
         }elseif (api_is_platform_admin()) {
1183
-            if (isset($session_id) && $session_id!=0) {
1184
-                $sql.=' AND session_id='.intval($session_id);
1183
+            if (isset($session_id) && $session_id != 0) {
1184
+                $sql .= ' AND session_id='.intval($session_id);
1185 1185
             } else {
1186
-                $sql.=' AND coalesce(session_id,0)=0';
1186
+                $sql .= ' AND coalesce(session_id,0)=0';
1187 1187
             }
1188 1188
         }
1189 1189
         $result = Database::query($sql);
@@ -1191,7 +1191,7 @@  discard block
 block discarded – undo
1191 1191
 
1192 1192
         // course independent categories
1193 1193
         if (empty($course_code)) {
1194
-            $cats = Category::get_independent_categories_with_result_for_student (0, $stud_id, $cats);
1194
+            $cats = Category::get_independent_categories_with_result_for_student(0, $stud_id, $cats);
1195 1195
         }
1196 1196
 
1197 1197
         return $cats;
@@ -1206,7 +1206,7 @@  discard block
 block discarded – undo
1206 1206
     public function get_root_categories_for_teacher($user_id, $course_code = null, $session_id = null)
1207 1207
     {
1208 1208
         if ($user_id == null) {
1209
-            return Category::load(null,null,$course_code,0,null,$session_id);
1209
+            return Category::load(null, null, $course_code, 0, null, $session_id);
1210 1210
         }
1211 1211
 
1212 1212
         $courseTable = Database :: get_main_table(TABLE_MAIN_COURSE);
@@ -1218,7 +1218,7 @@  discard block
 block discarded – undo
1218 1218
         if (!empty($course_code)) {
1219 1219
             $sql .= " AND course_code = '".Database::escape_string($course_code)."' ";
1220 1220
             if (!empty($session_id)) {
1221
-                $sql .= " AND session_id = ".(int)$session_id;
1221
+                $sql .= " AND session_id = ".(int) $session_id;
1222 1222
             }
1223 1223
         } else {
1224 1224
             $sql .= ' AND course_code in
@@ -1234,7 +1234,7 @@  discard block
 block discarded – undo
1234 1234
         $cats = Category::create_category_objects_from_sql_result($result);
1235 1235
         // course independent categories
1236 1236
         if (isset($course_code)) {
1237
-            $indcats = Category::load(null,$user_id,$course_code,0,null,$session_id);
1237
+            $indcats = Category::load(null, $user_id, $course_code, 0, null, $session_id);
1238 1238
             $cats = array_merge($cats, $indcats);
1239 1239
         }
1240 1240
 
@@ -1277,20 +1277,20 @@  discard block
 block discarded – undo
1277 1277
             $targets[] = $root;
1278 1278
 
1279 1279
             if (isset($this->course_code) && !empty($this->course_code)) {
1280
-                $crscats = Category::load(null,null,$this->course_code,0);
1280
+                $crscats = Category::load(null, null, $this->course_code, 0);
1281 1281
                 foreach ($crscats as $cat) {
1282 1282
                     if ($this->can_be_moved_to_cat($cat)) {
1283
-                        $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
1284
-                        $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
1283
+                        $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
1284
+                        $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
1285 1285
                     }
1286 1286
                 }
1287 1287
             }
1288 1288
 
1289
-            $indcats = Category::load(null,$user,0,0);
1289
+            $indcats = Category::load(null, $user, 0, 0);
1290 1290
             foreach ($indcats as $cat) {
1291 1291
                 if ($this->can_be_moved_to_cat($cat)) {
1292
-                    $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
1293
-                    $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
1292
+                    $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
1293
+                    $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
1294 1294
                 }
1295 1295
             }
1296 1296
 
@@ -1303,11 +1303,11 @@  discard block
 block discarded – undo
1303 1303
      */
1304 1304
     private function add_target_subcategories($targets, $level, $catid)
1305 1305
     {
1306
-        $subcats = Category::load(null,null,null,$catid);
1306
+        $subcats = Category::load(null, null, null, $catid);
1307 1307
         foreach ($subcats as $cat) {
1308 1308
             if ($this->can_be_moved_to_cat($cat)) {
1309
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
1310
-                $targets = $this->add_target_subcategories($targets, $level+1, $cat->get_id());
1309
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
1310
+                $targets = $this->add_target_subcategories($targets, $level + 1, $cat->get_id());
1311 1311
             }
1312 1312
         }
1313 1313
 
@@ -1320,7 +1320,7 @@  discard block
 block discarded – undo
1320 1320
      * Impossible when origin and target are the same... children won't be processed
1321 1321
      * either. (a category can't be moved to one of its own children)
1322 1322
      */
1323
-    private function can_be_moved_to_cat ($cat)
1323
+    private function can_be_moved_to_cat($cat)
1324 1324
     {
1325 1325
         return $cat->get_id() != $this->get_id();
1326 1326
     }
@@ -1349,7 +1349,7 @@  discard block
 block discarded – undo
1349 1349
     {
1350 1350
         $cats = Category::load(null, null, null, $this->id, null);
1351 1351
         $evals = Evaluation::load(null, null, null, $this->id, null);
1352
-        $links = LinkFactory::load(null,null,null,null,null,$this->id,null);
1352
+        $links = LinkFactory::load(null, null, null, null, null, $this->id, null);
1353 1353
 
1354 1354
         foreach ($cats as $cat) {
1355 1355
             $cat->set_course_code($this->get_course_code());
@@ -1382,15 +1382,15 @@  discard block
 block discarded – undo
1382 1382
             $user = (api_is_platform_admin() ? null : api_get_user_id());
1383 1383
             $cats = Category::get_root_categories_for_teacher($user);
1384 1384
             foreach ($cats as $cat) {
1385
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
1386
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(),null);
1385
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
1386
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), null);
1387 1387
             }
1388 1388
         } else {
1389 1389
             // student
1390 1390
             $cats = Category::get_root_categories_for_student(api_get_user_id());
1391 1391
             foreach ($cats as $cat) {
1392
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
1393
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(), 1);
1392
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
1393
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), 1);
1394 1394
             }
1395 1395
         }
1396 1396
 
@@ -1400,14 +1400,14 @@  discard block
 block discarded – undo
1400 1400
     /**
1401 1401
      * Internal function used by get_tree()
1402 1402
      */
1403
-    private function add_subtree ($targets, $level, $catid, $visible)
1403
+    private function add_subtree($targets, $level, $catid, $visible)
1404 1404
     {
1405
-        $subcats = Category::load(null,null,null,$catid,$visible);
1405
+        $subcats = Category::load(null, null, null, $catid, $visible);
1406 1406
 
1407 1407
         if (!empty($subcats)) {
1408 1408
             foreach ($subcats as $cat) {
1409
-                $targets[] = array ($cat->get_id(), $cat->get_name(), $level+1);
1410
-                $targets = Category::add_subtree($targets, $level+1, $cat->get_id(),$visible);
1409
+                $targets[] = array($cat->get_id(), $cat->get_name(), $level + 1);
1410
+                $targets = Category::add_subtree($targets, $level + 1, $cat->get_id(), $visible);
1411 1411
             }
1412 1412
         }
1413 1413
 
@@ -1418,7 +1418,7 @@  discard block
 block discarded – undo
1418 1418
      * Generate an array of courses that a teacher hasn't created a category for.
1419 1419
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
1420 1420
      */
1421
-    public function get_not_created_course_categories ($user_id)
1421
+    public function get_not_created_course_categories($user_id)
1422 1422
     {
1423 1423
         $tbl_main_courses = Database :: get_main_table(TABLE_MAIN_COURSE);
1424 1424
         $tbl_main_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -1440,9 +1440,9 @@  discard block
 block discarded – undo
1440 1440
                 )';
1441 1441
         $result = Database::query($sql);
1442 1442
 
1443
-        $cats=array();
1444
-        while ($data=Database::fetch_array($result)) {
1445
-            $cats[] = array ($data['code'], $data['title']);
1443
+        $cats = array();
1444
+        while ($data = Database::fetch_array($result)) {
1445
+            $cats[] = array($data['code'], $data['title']);
1446 1446
         }
1447 1447
 
1448 1448
         return $cats;
@@ -1452,7 +1452,7 @@  discard block
 block discarded – undo
1452 1452
      * Generate an array of all courses that a teacher is admin of.
1453 1453
      * @return array 2-dimensional array - every element contains 2 subelements (code, title)
1454 1454
      */
1455
-    public function get_all_courses ($user_id)
1455
+    public function get_all_courses($user_id)
1456 1456
     {
1457 1457
         $tbl_main_courses = Database :: get_main_table(TABLE_MAIN_COURSE);
1458 1458
         $tbl_main_course_user = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
@@ -1466,7 +1466,7 @@  discard block
 block discarded – undo
1466 1466
         $result = Database::query($sql);
1467 1467
         $cats = array();
1468 1468
         while ($data = Database::fetch_array($result)) {
1469
-            $cats[] = array ($data['code'], $data['title']);
1469
+            $cats[] = array($data['code'], $data['title']);
1470 1470
         }
1471 1471
 
1472 1472
         return $cats;
@@ -1479,7 +1479,7 @@  discard block
 block discarded – undo
1479 1479
     {
1480 1480
         $cats = Category::load(null, null, null, $this->id, null);
1481 1481
         $evals = Evaluation::load(null, null, null, $this->id, null);
1482
-        $links = LinkFactory::load(null,null,null,null,null,$this->id,null);
1482
+        $links = LinkFactory::load(null, null, null, null, null, $this->id, null);
1483 1483
         if (!empty($cats)) {
1484 1484
             foreach ($cats as $cat) {
1485 1485
                 $cat->set_visible($this->is_visible());
@@ -1834,7 +1834,7 @@  discard block
 block discarded – undo
1834 1834
      * @param string $name_mask search string
1835 1835
      * @return array category objects matching the search criterium
1836 1836
      */
1837
-    public function find_category($name_mask,$allcat)
1837
+    public function find_category($name_mask, $allcat)
1838 1838
     {
1839 1839
         $foundcats = array();
1840 1840
         foreach ($allcat as $search_cat) {
@@ -1877,9 +1877,9 @@  discard block
 block discarded – undo
1877 1877
                 }
1878 1878
             }
1879 1879
 
1880
-            $link_to_lock= $this->get_links();
1880
+            $link_to_lock = $this->get_links();
1881 1881
             if (!empty($link_to_lock)) {
1882
-                foreach ($link_to_lock as $item ) {
1882
+                foreach ($link_to_lock as $item) {
1883 1883
                     $item->lock($locked);
1884 1884
                 }
1885 1885
             }
@@ -1968,7 +1968,7 @@  discard block
 block discarded – undo
1968 1968
                 return [
1969 1969
                     'badge_link' => Display::url(
1970 1970
                         get_lang('DownloadBadges'),
1971
-                        api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
1971
+                        api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
1972 1972
                         array(
1973 1973
                             'target' => '_blank',
1974 1974
                             'class' => 'btn btn-default'
@@ -2002,7 +2002,7 @@  discard block
 block discarded – undo
2002 2002
             $fileWasGenerated = $certificate_obj->html_file_is_generated();
2003 2003
 
2004 2004
             if (!empty($fileWasGenerated)) {
2005
-                $url = api_get_path(WEB_PATH) . 'certificates/index.php?id=' . $my_certificate['id'];
2005
+                $url = api_get_path(WEB_PATH).'certificates/index.php?id='.$my_certificate['id'];
2006 2006
 
2007 2007
                 $certificates = Display::url(
2008 2008
                     Display::returnFontAwesomeIcon('download').' '.get_lang('DownloadCertificate'),
@@ -2025,7 +2025,7 @@  discard block
 block discarded – undo
2025 2025
 
2026 2026
                 $hideExportLink = api_get_setting('hide_certificate_export_link');
2027 2027
                 $hideExportLinkStudent = api_get_setting('hide_certificate_export_link_students');
2028
-                if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true') ) {
2028
+                if ($hideExportLink === 'true' || (api_is_student() && $hideExportLinkStudent === 'true')) {
2029 2029
                     $exportToPDF = null;
2030 2030
                 }
2031 2031
 
@@ -2038,7 +2038,7 @@  discard block
 block discarded – undo
2038 2038
                 if ($skillToolEnabled && $userHasSkills) {
2039 2039
                     $html['badge_link'] = Display::url(
2040 2040
                         get_lang('DownloadBadges'),
2041
-                        api_get_path(WEB_CODE_PATH) . "gradebook/get_badges.php?user=$user_id",
2041
+                        api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
2042 2042
                         array(
2043 2043
                             'target' => '_blank',
2044 2044
                             'class' => 'btn btn-default'
@@ -2098,7 +2098,7 @@  discard block
 block discarded – undo
2098 2098
                     $certificate_obj = new Certificate($value_certificate['id']);
2099 2099
                     $certificate_obj->generate(array('hide_print_button' => true));
2100 2100
                     if ($certificate_obj->html_file_is_generated()) {
2101
-                        $certificate_path_list[]= $certificate_obj->html_file;
2101
+                        $certificate_path_list[] = $certificate_obj->html_file;
2102 2102
                     }
2103 2103
                 }
2104 2104
             }
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1179,7 +1179,7 @@
 block discarded – undo
1179 1179
                             cu.status = '.COURSEMANAGER.'
1180 1180
                     )';
1181 1181
             }
1182
-        }elseif (api_is_platform_admin()) {
1182
+        } elseif (api_is_platform_admin()) {
1183 1183
             if (isset($session_id) && $session_id!=0) {
1184 1184
                 $sql.=' AND session_id='.intval($session_id);
1185 1185
             } else {
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1545,7 +1545,7 @@
 block discarded – undo
1545 1545
      * Retrieve all categories inside a course independent category
1546 1546
      * that should be visible to a student.
1547 1547
      * @param integer $cat_id parent category
1548
-     * @param $stud_id student id
1548
+     * @param integer $stud_id student id
1549 1549
      * @param $cats optional: if defined, the categories will be added to this array
1550 1550
      */
1551 1551
     public function get_independent_categories_with_result_for_student($cat_id, $stud_id, $cats = array())
Please login to merge, or discard this patch.
main/gradebook/lib/be/attendancelink.class.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
             }
165 165
 		} else {
166 166
             // all students -> get average
167
-            $students = array();  // user list, needed to make sure we only
167
+            $students = array(); // user list, needed to make sure we only
168 168
             // take first attempts into account
169 169
             $rescount = 0;
170 170
             $sum = 0;
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 		$this->get_attendance_data();
240 240
 		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
241 241
 		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
242
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
242
+		if (isset($attendance_qualify_title) && $attendance_qualify_title != '') {
243 243
 			return $this->attendance_data['attendance_qualify_title'];
244 244
 		} else {
245 245
 			return $attendance_title;
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
280 280
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
281 281
 		$result = Database::query($sql);
282
-		$row = Database::fetch_array($result,'ASSOC');
282
+		$row = Database::fetch_array($result, 'ASSOC');
283 283
 		$attendance_id = $row['id'];
284 284
 		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&session_id='.$session_id.'&cidReq='.$this->get_course_code();
285 285
 
Please login to merge, or discard this patch.
Indentation   +202 added lines, -202 removed lines patch added patch discarded remove patch
@@ -8,48 +8,48 @@  discard block
 block discarded – undo
8 8
  */
9 9
 class AttendanceLink extends AbstractLink
10 10
 {
11
-	private $attendance_table = null;
12
-	private $itemprop_table = null;
11
+    private $attendance_table = null;
12
+    private $itemprop_table = null;
13 13
 
14
-	/**
15
-	 * Constructor
16
-	 */
17
-	public function __construct()
18
-	{
19
-		parent::__construct();
20
-		$this->set_type(LINK_ATTENDANCE);
21
-	}
14
+    /**
15
+     * Constructor
16
+     */
17
+    public function __construct()
18
+    {
19
+        parent::__construct();
20
+        $this->set_type(LINK_ATTENDANCE);
21
+    }
22 22
 
23
-	/**
24
-	 * @return string
25
-	 */
26
-	public function get_type_name()
27
-	{
28
-		return get_lang('Attendance');
29
-	}
23
+    /**
24
+     * @return string
25
+     */
26
+    public function get_type_name()
27
+    {
28
+        return get_lang('Attendance');
29
+    }
30 30
 
31
-	/**
32
-	 * @return bool
33
-	 */
34
-	public function is_allowed_to_change_name()
35
-	{
36
-		return false;
37
-	}
31
+    /**
32
+     * @return bool
33
+     */
34
+    public function is_allowed_to_change_name()
35
+    {
36
+        return false;
37
+    }
38 38
 
39
-	/**
40
-	 * Generate an array of attendances that a teacher hasn't created a link for.
41
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
42
-	 * @todo seems to be depracated
43
-	 */
44
-	public function get_not_created_links()
45
-	{
46
-		return false;
47
-		if (empty($this->course_code)) {
48
-			die('Error in get_not_created_links() : course code not set');
49
-		}
50
-		$tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
39
+    /**
40
+     * Generate an array of attendances that a teacher hasn't created a link for.
41
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
42
+     * @todo seems to be depracated
43
+     */
44
+    public function get_not_created_links()
45
+    {
46
+        return false;
47
+        if (empty($this->course_code)) {
48
+            die('Error in get_not_created_links() : course code not set');
49
+        }
50
+        $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
51 51
 
52
-		$sql = 'SELECT att.id, att.name, att.attendance_qualify_title
52
+        $sql = 'SELECT att.id, att.name, att.attendance_qualify_title
53 53
 				FROM '.$this->get_attendance_table().' att
54 54
 				WHERE
55 55
 					att.c_id = '.$this->course_id.' AND
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 							course_code = "'.Database::escape_string($this->get_course_code()).'"
61 61
 					)
62 62
 				AND att.session_id='.api_get_session_id().'';
63
-		$result = Database::query($sql);
63
+        $result = Database::query($sql);
64 64
 
65 65
         $cats = array();
66 66
         while ($data = Database::fetch_array($result)) {
@@ -71,13 +71,13 @@  discard block
 block discarded – undo
71 71
             }
72 72
         }
73 73
 
74
-		return $cats;
75
-	}
74
+        return $cats;
75
+    }
76 76
 
77
-	/**
78
-	 * Generate an array of all attendances available.
79
-	 * @return array 2-dimensional array - every element contains 2 subelements (id, name)
80
-	 */
77
+    /**
78
+     * Generate an array of all attendances available.
79
+     * @return array 2-dimensional array - every element contains 2 subelements (id, name)
80
+     */
81 81
     public function get_all_links()
82 82
     {
83 83
         if (empty($this->course_code)) {
@@ -104,55 +104,55 @@  discard block
 block discarded – undo
104 104
         $my_cats = isset($cats) ? $cats : null;
105 105
 
106 106
         return $my_cats;
107
-	}
107
+    }
108 108
 
109
-	/**
110
-	 * Has anyone done this exercise yet ?
111
-	 */
112
-	public function has_results()
113
-	{
114
-		$tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
115
-		$session_id = api_get_session_id();
116
-		$sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
109
+    /**
110
+     * Has anyone done this exercise yet ?
111
+     */
112
+    public function has_results()
113
+    {
114
+        $tbl_attendance_result = Database :: get_course_table(TABLE_ATTENDANCE_RESULT);
115
+        $session_id = api_get_session_id();
116
+        $sql = 'SELECT count(*) AS number FROM '.$tbl_attendance_result."
117 117
 				WHERE
118 118
 					session_id = $session_id AND
119 119
 					c_id = '.$this->course_id.' AND
120 120
 					attendance_id = '".intval($this->get_ref_id())."'";
121
-		$result = Database::query($sql);
122
-		$number = Database::fetch_row($result);
121
+        $result = Database::query($sql);
122
+        $number = Database::fetch_row($result);
123 123
 
124
-		return $number[0] != 0;
125
-	}
124
+        return $number[0] != 0;
125
+    }
126 126
 
127
-	/**
128
-	 * @param int $stud_id
129
-	 * @return array|null
130
-	 */
131
-	public function calc_score($stud_id = null, $type = null)
132
-	{
133
-		$tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
134
-		$session_id = api_get_session_id();
127
+    /**
128
+     * @param int $stud_id
129
+     * @return array|null
130
+     */
131
+    public function calc_score($stud_id = null, $type = null)
132
+    {
133
+        $tbl_attendance_result = Database::get_course_table(TABLE_ATTENDANCE_RESULT);
134
+        $session_id = api_get_session_id();
135 135
 
136
-		// get attendance qualify max
137
-		$sql = 'SELECT att.attendance_qualify_max
136
+        // get attendance qualify max
137
+        $sql = 'SELECT att.attendance_qualify_max
138 138
 		        FROM '.$this->get_attendance_table().' att
139 139
   				WHERE
140 140
   					att.c_id = '.$this->course_id.' AND
141 141
   					att.id = '.intval($this->get_ref_id()).' AND
142 142
   					att.session_id='.intval($session_id).'';
143
-		$query = Database::query($sql);
144
-		$attendance = Database::fetch_array($query, 'ASSOC');
143
+        $query = Database::query($sql);
144
+        $attendance = Database::fetch_array($query, 'ASSOC');
145 145
 
146
-		// Get results
147
-		$sql = 'SELECT *
146
+        // Get results
147
+        $sql = 'SELECT *
148 148
 		        FROM '.$tbl_attendance_result.'
149 149
   	    		WHERE c_id = '.$this->course_id.' AND attendance_id = '.intval($this->get_ref_id());
150
-		if (isset($stud_id)) {
151
-			$sql .= ' AND user_id = '.intval($stud_id);
152
-		}
153
-		$scores = Database::query($sql);
154
-		// for 1 student
155
-		if (isset($stud_id)) {
150
+        if (isset($stud_id)) {
151
+            $sql .= ' AND user_id = '.intval($stud_id);
152
+        }
153
+        $scores = Database::query($sql);
154
+        // for 1 student
155
+        if (isset($stud_id)) {
156 156
             if ($data = Database::fetch_array($scores, 'ASSOC')) {
157 157
                 return array(
158 158
                     $data['score'],
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
                 //We sent the 0/attendance_qualify_max instead of null for correct calculations
163 163
                 return array(0, $attendance['attendance_qualify_max']);
164 164
             }
165
-		} else {
165
+        } else {
166 166
             // all students -> get average
167 167
             $students = array();  // user list, needed to make sure we only
168 168
             // take first attempts into account
@@ -171,144 +171,144 @@  discard block
 block discarded – undo
171 171
             $sumResult = 0;
172 172
             $bestResult = 0;
173 173
 
174
-			while ($data = Database::fetch_array($scores)) {
175
-				if (!(array_key_exists($data['user_id'], $students))) {
176
-					if ($attendance['attendance_qualify_max'] != 0) {
177
-						$students[$data['user_id']] = $data['score'];
178
-						$rescount++;
179
-						$sum += $data['score'] / $attendance['attendance_qualify_max'];
180
-						$sumResult += $data['score'];
181
-						if ($data['score'] > $bestResult) {
182
-							$bestResult = $data['score'];
183
-						}
184
-						$weight = $attendance['attendance_qualify_max'];
185
-					}
186
-				}
187
-			}
174
+            while ($data = Database::fetch_array($scores)) {
175
+                if (!(array_key_exists($data['user_id'], $students))) {
176
+                    if ($attendance['attendance_qualify_max'] != 0) {
177
+                        $students[$data['user_id']] = $data['score'];
178
+                        $rescount++;
179
+                        $sum += $data['score'] / $attendance['attendance_qualify_max'];
180
+                        $sumResult += $data['score'];
181
+                        if ($data['score'] > $bestResult) {
182
+                            $bestResult = $data['score'];
183
+                        }
184
+                        $weight = $attendance['attendance_qualify_max'];
185
+                    }
186
+                }
187
+            }
188 188
 
189
-			if ($rescount == 0) {
190
-				return null;
191
-			} else {
192
-				switch ($type) {
193
-					case 'best':
194
-						return array($bestResult, $weight);
195
-						break;
196
-					case 'average':
197
-						return array($sumResult / $rescount, $weight);
198
-						break;
199
-					case 'ranking':
200
-						return AbstractLink::getCurrentUserRanking($stud_id, $students);
201
-						break;
202
-					default:
203
-						return array($sum, $rescount);
204
-						break;
205
-				}
206
-			}
207
-		}
208
-	}
189
+            if ($rescount == 0) {
190
+                return null;
191
+            } else {
192
+                switch ($type) {
193
+                    case 'best':
194
+                        return array($bestResult, $weight);
195
+                        break;
196
+                    case 'average':
197
+                        return array($sumResult / $rescount, $weight);
198
+                        break;
199
+                    case 'ranking':
200
+                        return AbstractLink::getCurrentUserRanking($stud_id, $students);
201
+                        break;
202
+                    default:
203
+                        return array($sum, $rescount);
204
+                        break;
205
+                }
206
+            }
207
+        }
208
+    }
209 209
 
210
-	/**
211
-	 * Lazy load function to get the database table of the student publications
212
-	 */
213
-	private function get_attendance_table()
214
-	{
215
-		$this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
216
-		return $this->attendance_table;
217
-	}
210
+    /**
211
+     * Lazy load function to get the database table of the student publications
212
+     */
213
+    private function get_attendance_table()
214
+    {
215
+        $this->attendance_table = Database::get_course_table(TABLE_ATTENDANCE);
216
+        return $this->attendance_table;
217
+    }
218 218
 
219
-	public function needs_name_and_description()
220
-	{
221
-		return false;
222
-	}
219
+    public function needs_name_and_description()
220
+    {
221
+        return false;
222
+    }
223 223
 
224
-	public function needs_max()
225
-	{
226
-		return false;
227
-	}
224
+    public function needs_max()
225
+    {
226
+        return false;
227
+    }
228 228
 
229
-	public function needs_results()
230
-	{
231
-		return false;
232
-	}
229
+    public function needs_results()
230
+    {
231
+        return false;
232
+    }
233 233
 
234
-	/**
235
-	 * @return string
236
-	 */
237
-	public function get_name()
238
-	{
239
-		$this->get_attendance_data();
240
-		$attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
241
-		$attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
242
-		if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
243
-			return $this->attendance_data['attendance_qualify_title'];
244
-		} else {
245
-			return $attendance_title;
246
-		}
247
-	}
234
+    /**
235
+     * @return string
236
+     */
237
+    public function get_name()
238
+    {
239
+        $this->get_attendance_data();
240
+        $attendance_title = isset($this->attendance_data['name']) ? $this->attendance_data['name'] : '';
241
+        $attendance_qualify_title = isset($this->attendance_data['attendance_qualify_title']) ? $this->attendance_data['attendance_qualify_title'] : '';
242
+        if ( isset($attendance_qualify_title) && $attendance_qualify_title != '') {
243
+            return $this->attendance_data['attendance_qualify_title'];
244
+        } else {
245
+            return $attendance_title;
246
+        }
247
+    }
248 248
 
249
-	/**
250
-	 * @return string
251
-	 */
252
-	public function get_description()
253
-	{
254
-		return '';
255
-	}
249
+    /**
250
+     * @return string
251
+     */
252
+    public function get_description()
253
+    {
254
+        return '';
255
+    }
256 256
 
257
-	/**
258
-	 * Check if this still links to an exercise
259
-	 */
260
-	public function is_valid_link()
261
-	{
262
-		$session_id = api_get_session_id();
263
-		$sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
257
+    /**
258
+     * Check if this still links to an exercise
259
+     */
260
+    public function is_valid_link()
261
+    {
262
+        $session_id = api_get_session_id();
263
+        $sql = 'SELECT count(att.id) FROM '.$this->get_attendance_table().' att
264 264
         		 WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
265
-		$result = Database::query($sql);
266
-		$number = Database::fetch_row($result);
267
-		return ($number[0] != 0);
268
-	}
265
+        $result = Database::query($sql);
266
+        $number = Database::fetch_row($result);
267
+        return ($number[0] != 0);
268
+    }
269 269
 
270
-	public function get_test_id()
271
-	{
272
-		return 'DEBUG:ID';
273
-	}
270
+    public function get_test_id()
271
+    {
272
+        return 'DEBUG:ID';
273
+    }
274 274
 
275
-	public function get_link()
276
-	{
277
-		//it was extracts the attendance id
278
-		$session_id = api_get_session_id();
279
-		$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
275
+    public function get_link()
276
+    {
277
+        //it was extracts the attendance id
278
+        $session_id = api_get_session_id();
279
+        $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
280 280
     			WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
281
-		$result = Database::query($sql);
282
-		$row = Database::fetch_array($result,'ASSOC');
283
-		$attendance_id = $row['id'];
284
-		$url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
281
+        $result = Database::query($sql);
282
+        $row = Database::fetch_array($result,'ASSOC');
283
+        $attendance_id = $row['id'];
284
+        $url = api_get_path(WEB_PATH).'main/attendance/index.php?action=attendance_sheet_list&gradebook=view&attendance_id='.$attendance_id.'&'.api_get_cidreq_params($this->get_course_code(), $session_id);
285 285
 
286
-		return $url;
287
-	}
286
+        return $url;
287
+    }
288 288
 
289
-	/**
290
-	 * @return array|bool
291
-	 */
292
-	private function get_attendance_data()
293
-	{
294
-		$tbl_name = $this->get_attendance_table();
295
-		$session_id = api_get_session_id();
296
-		if ($tbl_name == '') {
297
-			return false;
298
-		} elseif (!isset($this->attendance_data)) {
299
-			$sql = 'SELECT * FROM '.$this->get_attendance_table().' att
289
+    /**
290
+     * @return array|bool
291
+     */
292
+    private function get_attendance_data()
293
+    {
294
+        $tbl_name = $this->get_attendance_table();
295
+        $session_id = api_get_session_id();
296
+        if ($tbl_name == '') {
297
+            return false;
298
+        } elseif (!isset($this->attendance_data)) {
299
+            $sql = 'SELECT * FROM '.$this->get_attendance_table().' att
300 300
 					WHERE att.c_id = '.$this->course_id.' AND att.id = '.intval($this->get_ref_id()).' ';
301
-			$query = Database::query($sql);
302
-			$this->attendance_data = Database::fetch_array($query);
303
-		}
304
-		return $this->attendance_data;
305
-	}
301
+            $query = Database::query($sql);
302
+            $this->attendance_data = Database::fetch_array($query);
303
+        }
304
+        return $this->attendance_data;
305
+    }
306 306
 
307
-	/**
308
-	 * @return string
309
-	 */
310
-	public function get_icon_name()
311
-	{
312
-		return 'attendance';
313
-	}
307
+    /**
308
+     * @return string
309
+     */
310
+    public function get_icon_name()
311
+    {
312
+        return 'attendance';
313
+    }
314 314
 }
Please login to merge, or discard this patch.