@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | // sort users array |
96 | 96 | if ($sorting & self :: UDG_SORT_TYPE) { |
97 | 97 | usort($allitems, array('UserDataGenerator', 'sort_by_type')); |
98 | - }elseif ($sorting & self :: UDG_SORT_NAME) { |
|
98 | + } elseif ($sorting & self :: UDG_SORT_NAME) { |
|
99 | 99 | usort($allitems, array('UserDataGenerator', 'sort_by_name')); |
100 | 100 | } elseif ($sorting & self :: UDG_SORT_COURSE) { |
101 | 101 | usort($allitems, array('UserDataGenerator', 'sort_by_course')); |
@@ -148,8 +148,9 @@ discard block |
||
148 | 148 | $row[] = $this->build_category_name($item); |
149 | 149 | $row[] = $this->build_average_column($item, $ignore_score_color); |
150 | 150 | $row[] = $this->build_result_column($item, $ignore_score_color); |
151 | - if ($scoredisplay->is_custom()) |
|
152 | - $row[] = $this->build_mask_column($item, $ignore_score_color); |
|
151 | + if ($scoredisplay->is_custom()) { |
|
152 | + $row[] = $this->build_mask_column($item, $ignore_score_color); |
|
153 | + } |
|
153 | 154 | $data[] = $row; |
154 | 155 | } |
155 | 156 | return $data; |
@@ -750,10 +750,15 @@ |
||
750 | 750 | "; |
751 | 751 | $result = Database::query($sql); |
752 | 752 | |
753 | - if (!($res = Database::fetch_array($result))) |
|
754 | - die(get_lang('GeneralError').' (code 901)'); |
|
755 | - if ($owner == 0) return $res['uploader_id']; |
|
756 | - if ($res['uploader_id'] == $owner) return true; |
|
753 | + if (!($res = Database::fetch_array($result))) { |
|
754 | + die(get_lang('GeneralError').' (code 901)'); |
|
755 | + } |
|
756 | + if ($owner == 0) { |
|
757 | + return $res['uploader_id']; |
|
758 | + } |
|
759 | + if ($res['uploader_id'] == $owner) { |
|
760 | + return true; |
|
761 | + } |
|
757 | 762 | die(get_lang('GeneralError').' (code '.$or_die.')'); |
758 | 763 | } |
759 | 764 |
@@ -84,7 +84,12 @@ discard block |
||
84 | 84 | <div class="form-group"> |
85 | 85 | <label class="col-sm-3 control-label"><?php echo get_lang('SessionName') ?></label> |
86 | 86 | <div class="col-sm-6"> |
87 | - <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); else echo api_htmlentities($infos['name'],ENT_QUOTES,$charset); ?>"> |
|
87 | + <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) { |
|
88 | + echo api_htmlentities($name,ENT_QUOTES,$charset); |
|
89 | +} else { |
|
90 | + echo api_htmlentities($infos['name'],ENT_QUOTES,$charset); |
|
91 | +} |
|
92 | +?>"> |
|
88 | 93 | </div> |
89 | 94 | <div class="col-sm-3"></div> |
90 | 95 | </div> |
@@ -100,58 +105,184 @@ discard block |
||
100 | 105 | <div class="col-sm-6"> |
101 | 106 | <select name="day_start"> |
102 | 107 | <option value="1">01</option> |
103 | - <option value="2" <?php if($day_start == 2) echo 'selected="selected"'; ?> >02</option> |
|
104 | - <option value="3" <?php if($day_start == 3) echo 'selected="selected"'; ?> >03</option> |
|
105 | - <option value="4" <?php if($day_start == 4) echo 'selected="selected"'; ?> >04</option> |
|
106 | - <option value="5" <?php if($day_start == 5) echo 'selected="selected"'; ?> >05</option> |
|
107 | - <option value="6" <?php if($day_start == 6) echo 'selected="selected"'; ?> >06</option> |
|
108 | - <option value="7" <?php if($day_start == 7) echo 'selected="selected"'; ?> >07</option> |
|
109 | - <option value="8" <?php if($day_start == 8) echo 'selected="selected"'; ?> >08</option> |
|
110 | - <option value="9" <?php if($day_start == 9) echo 'selected="selected"'; ?> >09</option> |
|
111 | - <option value="10" <?php if($day_start == 10) echo 'selected="selected"'; ?> >10</option> |
|
112 | - <option value="11" <?php if($day_start == 11) echo 'selected="selected"'; ?> >11</option> |
|
113 | - <option value="12" <?php if($day_start == 12) echo 'selected="selected"'; ?> >12</option> |
|
114 | - <option value="13" <?php if($day_start == 13) echo 'selected="selected"'; ?> >13</option> |
|
115 | - <option value="14" <?php if($day_start == 14) echo 'selected="selected"'; ?> >14</option> |
|
116 | - <option value="15" <?php if($day_start == 15) echo 'selected="selected"'; ?> >15</option> |
|
117 | - <option value="16" <?php if($day_start == 16) echo 'selected="selected"'; ?> >16</option> |
|
118 | - <option value="17" <?php if($day_start == 17) echo 'selected="selected"'; ?> >17</option> |
|
119 | - <option value="18" <?php if($day_start == 18) echo 'selected="selected"'; ?> >18</option> |
|
120 | - <option value="19" <?php if($day_start == 19) echo 'selected="selected"'; ?> >19</option> |
|
121 | - <option value="20" <?php if($day_start == 20) echo 'selected="selected"'; ?> >20</option> |
|
122 | - <option value="21" <?php if($day_start == 21) echo 'selected="selected"'; ?> >21</option> |
|
123 | - <option value="22" <?php if($day_start == 22) echo 'selected="selected"'; ?> >22</option> |
|
124 | - <option value="23" <?php if($day_start == 23) echo 'selected="selected"'; ?> >23</option> |
|
125 | - <option value="24" <?php if($day_start == 24) echo 'selected="selected"'; ?> >24</option> |
|
126 | - <option value="25" <?php if($day_start == 25) echo 'selected="selected"'; ?> >25</option> |
|
127 | - <option value="26" <?php if($day_start == 26) echo 'selected="selected"'; ?> >26</option> |
|
128 | - <option value="27" <?php if($day_start == 27) echo 'selected="selected"'; ?> >27</option> |
|
129 | - <option value="28" <?php if($day_start == 28) echo 'selected="selected"'; ?> >28</option> |
|
130 | - <option value="29" <?php if($day_start == 29) echo 'selected="selected"'; ?> >29</option> |
|
131 | - <option value="30" <?php if($day_start == 30) echo 'selected="selected"'; ?> >30</option> |
|
132 | - <option value="31" <?php if($day_start == 31) echo 'selected="selected"'; ?> >31</option> |
|
108 | + <option value="2" <?php if($day_start == 2) { |
|
109 | + echo 'selected="selected"'; |
|
110 | +} |
|
111 | +?> >02</option> |
|
112 | + <option value="3" <?php if($day_start == 3) { |
|
113 | + echo 'selected="selected"'; |
|
114 | +} |
|
115 | +?> >03</option> |
|
116 | + <option value="4" <?php if($day_start == 4) { |
|
117 | + echo 'selected="selected"'; |
|
118 | +} |
|
119 | +?> >04</option> |
|
120 | + <option value="5" <?php if($day_start == 5) { |
|
121 | + echo 'selected="selected"'; |
|
122 | +} |
|
123 | +?> >05</option> |
|
124 | + <option value="6" <?php if($day_start == 6) { |
|
125 | + echo 'selected="selected"'; |
|
126 | +} |
|
127 | +?> >06</option> |
|
128 | + <option value="7" <?php if($day_start == 7) { |
|
129 | + echo 'selected="selected"'; |
|
130 | +} |
|
131 | +?> >07</option> |
|
132 | + <option value="8" <?php if($day_start == 8) { |
|
133 | + echo 'selected="selected"'; |
|
134 | +} |
|
135 | +?> >08</option> |
|
136 | + <option value="9" <?php if($day_start == 9) { |
|
137 | + echo 'selected="selected"'; |
|
138 | +} |
|
139 | +?> >09</option> |
|
140 | + <option value="10" <?php if($day_start == 10) { |
|
141 | + echo 'selected="selected"'; |
|
142 | +} |
|
143 | +?> >10</option> |
|
144 | + <option value="11" <?php if($day_start == 11) { |
|
145 | + echo 'selected="selected"'; |
|
146 | +} |
|
147 | +?> >11</option> |
|
148 | + <option value="12" <?php if($day_start == 12) { |
|
149 | + echo 'selected="selected"'; |
|
150 | +} |
|
151 | +?> >12</option> |
|
152 | + <option value="13" <?php if($day_start == 13) { |
|
153 | + echo 'selected="selected"'; |
|
154 | +} |
|
155 | +?> >13</option> |
|
156 | + <option value="14" <?php if($day_start == 14) { |
|
157 | + echo 'selected="selected"'; |
|
158 | +} |
|
159 | +?> >14</option> |
|
160 | + <option value="15" <?php if($day_start == 15) { |
|
161 | + echo 'selected="selected"'; |
|
162 | +} |
|
163 | +?> >15</option> |
|
164 | + <option value="16" <?php if($day_start == 16) { |
|
165 | + echo 'selected="selected"'; |
|
166 | +} |
|
167 | +?> >16</option> |
|
168 | + <option value="17" <?php if($day_start == 17) { |
|
169 | + echo 'selected="selected"'; |
|
170 | +} |
|
171 | +?> >17</option> |
|
172 | + <option value="18" <?php if($day_start == 18) { |
|
173 | + echo 'selected="selected"'; |
|
174 | +} |
|
175 | +?> >18</option> |
|
176 | + <option value="19" <?php if($day_start == 19) { |
|
177 | + echo 'selected="selected"'; |
|
178 | +} |
|
179 | +?> >19</option> |
|
180 | + <option value="20" <?php if($day_start == 20) { |
|
181 | + echo 'selected="selected"'; |
|
182 | +} |
|
183 | +?> >20</option> |
|
184 | + <option value="21" <?php if($day_start == 21) { |
|
185 | + echo 'selected="selected"'; |
|
186 | +} |
|
187 | +?> >21</option> |
|
188 | + <option value="22" <?php if($day_start == 22) { |
|
189 | + echo 'selected="selected"'; |
|
190 | +} |
|
191 | +?> >22</option> |
|
192 | + <option value="23" <?php if($day_start == 23) { |
|
193 | + echo 'selected="selected"'; |
|
194 | +} |
|
195 | +?> >23</option> |
|
196 | + <option value="24" <?php if($day_start == 24) { |
|
197 | + echo 'selected="selected"'; |
|
198 | +} |
|
199 | +?> >24</option> |
|
200 | + <option value="25" <?php if($day_start == 25) { |
|
201 | + echo 'selected="selected"'; |
|
202 | +} |
|
203 | +?> >25</option> |
|
204 | + <option value="26" <?php if($day_start == 26) { |
|
205 | + echo 'selected="selected"'; |
|
206 | +} |
|
207 | +?> >26</option> |
|
208 | + <option value="27" <?php if($day_start == 27) { |
|
209 | + echo 'selected="selected"'; |
|
210 | +} |
|
211 | +?> >27</option> |
|
212 | + <option value="28" <?php if($day_start == 28) { |
|
213 | + echo 'selected="selected"'; |
|
214 | +} |
|
215 | +?> >28</option> |
|
216 | + <option value="29" <?php if($day_start == 29) { |
|
217 | + echo 'selected="selected"'; |
|
218 | +} |
|
219 | +?> >29</option> |
|
220 | + <option value="30" <?php if($day_start == 30) { |
|
221 | + echo 'selected="selected"'; |
|
222 | +} |
|
223 | +?> >30</option> |
|
224 | + <option value="31" <?php if($day_start == 31) { |
|
225 | + echo 'selected="selected"'; |
|
226 | +} |
|
227 | +?> >31</option> |
|
133 | 228 | </select> |
134 | 229 | / |
135 | 230 | <select name="month_start"> |
136 | 231 | <option value="1">01</option> |
137 | - <option value="2" <?php if($month_start == 2) echo 'selected="selected"'; ?> >02</option> |
|
138 | - <option value="3" <?php if($month_start == 3) echo 'selected="selected"'; ?> >03</option> |
|
139 | - <option value="4" <?php if($month_start == 4) echo 'selected="selected"'; ?> >04</option> |
|
140 | - <option value="5" <?php if($month_start == 5) echo 'selected="selected"'; ?> >05</option> |
|
141 | - <option value="6" <?php if($month_start == 6) echo 'selected="selected"'; ?> >06</option> |
|
142 | - <option value="7" <?php if($month_start == 7) echo 'selected="selected"'; ?> >07</option> |
|
143 | - <option value="8" <?php if($month_start == 8) echo 'selected="selected"'; ?> >08</option> |
|
144 | - <option value="9" <?php if($month_start == 9) echo 'selected="selected"'; ?> >09</option> |
|
145 | - <option value="10" <?php if($month_start == 10) echo 'selected="selected"'; ?> >10</option> |
|
146 | - <option value="11" <?php if($month_start == 11) echo 'selected="selected"'; ?> >11</option> |
|
147 | - <option value="12" <?php if($month_start == 12) echo 'selected="selected"'; ?> >12</option> |
|
232 | + <option value="2" <?php if($month_start == 2) { |
|
233 | + echo 'selected="selected"'; |
|
234 | +} |
|
235 | +?> >02</option> |
|
236 | + <option value="3" <?php if($month_start == 3) { |
|
237 | + echo 'selected="selected"'; |
|
238 | +} |
|
239 | +?> >03</option> |
|
240 | + <option value="4" <?php if($month_start == 4) { |
|
241 | + echo 'selected="selected"'; |
|
242 | +} |
|
243 | +?> >04</option> |
|
244 | + <option value="5" <?php if($month_start == 5) { |
|
245 | + echo 'selected="selected"'; |
|
246 | +} |
|
247 | +?> >05</option> |
|
248 | + <option value="6" <?php if($month_start == 6) { |
|
249 | + echo 'selected="selected"'; |
|
250 | +} |
|
251 | +?> >06</option> |
|
252 | + <option value="7" <?php if($month_start == 7) { |
|
253 | + echo 'selected="selected"'; |
|
254 | +} |
|
255 | +?> >07</option> |
|
256 | + <option value="8" <?php if($month_start == 8) { |
|
257 | + echo 'selected="selected"'; |
|
258 | +} |
|
259 | +?> >08</option> |
|
260 | + <option value="9" <?php if($month_start == 9) { |
|
261 | + echo 'selected="selected"'; |
|
262 | +} |
|
263 | +?> >09</option> |
|
264 | + <option value="10" <?php if($month_start == 10) { |
|
265 | + echo 'selected="selected"'; |
|
266 | +} |
|
267 | +?> >10</option> |
|
268 | + <option value="11" <?php if($month_start == 11) { |
|
269 | + echo 'selected="selected"'; |
|
270 | +} |
|
271 | +?> >11</option> |
|
272 | + <option value="12" <?php if($month_start == 12) { |
|
273 | + echo 'selected="selected"'; |
|
274 | +} |
|
275 | +?> >12</option> |
|
148 | 276 | </select> |
149 | 277 | / |
150 | 278 | <select name="year_start"> |
151 | 279 | <?php |
152 | 280 | for($i=$thisYear-5;$i <= ($thisYear+5);$i++) |
153 | 281 | { ?> |
154 | - <option value="<?php echo $i; ?>" <?php if($year_start == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option> |
|
282 | + <option value="<?php echo $i; ?>" <?php if($year_start == $i) { |
|
283 | + echo 'selected="selected"'; |
|
284 | +} |
|
285 | +?> ><?php echo $i; ?></option> |
|
155 | 286 | <?php |
156 | 287 | } ?> |
157 | 288 | </select> |
@@ -163,53 +294,182 @@ discard block |
||
163 | 294 | <div class="col-sm-6"> |
164 | 295 | <select name="day_end"> |
165 | 296 | <option value="0">--</option> |
166 | - <option value="1" <?php if($day_end == 1) echo 'selected="selected"'; ?> >01</option> |
|
167 | - <option value="2" <?php if($day_end == 2) echo 'selected="selected"'; ?> >02</option> |
|
168 | - <option value="3" <?php if($day_end == 3) echo 'selected="selected"'; ?> >03</option> |
|
169 | - <option value="4" <?php if($day_end == 4) echo 'selected="selected"'; ?> >04</option> |
|
170 | - <option value="5" <?php if($day_end == 5) echo 'selected="selected"'; ?> >05</option> |
|
171 | - <option value="6" <?php if($day_end == 6) echo 'selected="selected"'; ?> >06</option> |
|
172 | - <option value="7" <?php if($day_end == 7) echo 'selected="selected"'; ?> >07</option> |
|
173 | - <option value="8" <?php if($day_end == 8) echo 'selected="selected"'; ?> >08</option> |
|
174 | - <option value="9" <?php if($day_end == 9) echo 'selected="selected"'; ?> >09</option> |
|
175 | - <option value="10" <?php if($day_end == 10) echo 'selected="selected"'; ?> >10</option> |
|
176 | - <option value="11" <?php if($day_end == 11) echo 'selected="selected"'; ?> >11</option> |
|
177 | - <option value="12" <?php if($day_end == 12) echo 'selected="selected"'; ?> >12</option> |
|
178 | - <option value="13" <?php if($day_end == 13) echo 'selected="selected"'; ?> >13</option> |
|
179 | - <option value="14" <?php if($day_end == 14) echo 'selected="selected"'; ?> >14</option> |
|
180 | - <option value="15" <?php if($day_end == 15) echo 'selected="selected"'; ?> >15</option> |
|
181 | - <option value="16" <?php if($day_end == 16) echo 'selected="selected"'; ?> >16</option> |
|
182 | - <option value="17" <?php if($day_end == 17) echo 'selected="selected"'; ?> >17</option> |
|
183 | - <option value="18" <?php if($day_end == 18) echo 'selected="selected"'; ?> >18</option> |
|
184 | - <option value="19" <?php if($day_end == 19) echo 'selected="selected"'; ?> >19</option> |
|
185 | - <option value="20" <?php if($day_end == 20) echo 'selected="selected"'; ?> >20</option> |
|
186 | - <option value="21" <?php if($day_end == 21) echo 'selected="selected"'; ?> >21</option> |
|
187 | - <option value="22" <?php if($day_end == 22) echo 'selected="selected"'; ?> >22</option> |
|
188 | - <option value="23" <?php if($day_end == 23) echo 'selected="selected"'; ?> >23</option> |
|
189 | - <option value="24" <?php if($day_end == 24) echo 'selected="selected"'; ?> >24</option> |
|
190 | - <option value="25" <?php if($day_end == 25) echo 'selected="selected"'; ?> >25</option> |
|
191 | - <option value="26" <?php if($day_end == 26) echo 'selected="selected"'; ?> >26</option> |
|
192 | - <option value="27" <?php if($day_end == 27) echo 'selected="selected"'; ?> >27</option> |
|
193 | - <option value="28" <?php if($day_end == 28) echo 'selected="selected"'; ?> >28</option> |
|
194 | - <option value="29" <?php if($day_end == 29) echo 'selected="selected"'; ?> >29</option> |
|
195 | - <option value="30" <?php if($day_end == 30) echo 'selected="selected"'; ?> >30</option> |
|
196 | - <option value="31" <?php if($day_end == 31) echo 'selected="selected"'; ?> >31</option> |
|
297 | + <option value="1" <?php if($day_end == 1) { |
|
298 | + echo 'selected="selected"'; |
|
299 | +} |
|
300 | +?> >01</option> |
|
301 | + <option value="2" <?php if($day_end == 2) { |
|
302 | + echo 'selected="selected"'; |
|
303 | +} |
|
304 | +?> >02</option> |
|
305 | + <option value="3" <?php if($day_end == 3) { |
|
306 | + echo 'selected="selected"'; |
|
307 | +} |
|
308 | +?> >03</option> |
|
309 | + <option value="4" <?php if($day_end == 4) { |
|
310 | + echo 'selected="selected"'; |
|
311 | +} |
|
312 | +?> >04</option> |
|
313 | + <option value="5" <?php if($day_end == 5) { |
|
314 | + echo 'selected="selected"'; |
|
315 | +} |
|
316 | +?> >05</option> |
|
317 | + <option value="6" <?php if($day_end == 6) { |
|
318 | + echo 'selected="selected"'; |
|
319 | +} |
|
320 | +?> >06</option> |
|
321 | + <option value="7" <?php if($day_end == 7) { |
|
322 | + echo 'selected="selected"'; |
|
323 | +} |
|
324 | +?> >07</option> |
|
325 | + <option value="8" <?php if($day_end == 8) { |
|
326 | + echo 'selected="selected"'; |
|
327 | +} |
|
328 | +?> >08</option> |
|
329 | + <option value="9" <?php if($day_end == 9) { |
|
330 | + echo 'selected="selected"'; |
|
331 | +} |
|
332 | +?> >09</option> |
|
333 | + <option value="10" <?php if($day_end == 10) { |
|
334 | + echo 'selected="selected"'; |
|
335 | +} |
|
336 | +?> >10</option> |
|
337 | + <option value="11" <?php if($day_end == 11) { |
|
338 | + echo 'selected="selected"'; |
|
339 | +} |
|
340 | +?> >11</option> |
|
341 | + <option value="12" <?php if($day_end == 12) { |
|
342 | + echo 'selected="selected"'; |
|
343 | +} |
|
344 | +?> >12</option> |
|
345 | + <option value="13" <?php if($day_end == 13) { |
|
346 | + echo 'selected="selected"'; |
|
347 | +} |
|
348 | +?> >13</option> |
|
349 | + <option value="14" <?php if($day_end == 14) { |
|
350 | + echo 'selected="selected"'; |
|
351 | +} |
|
352 | +?> >14</option> |
|
353 | + <option value="15" <?php if($day_end == 15) { |
|
354 | + echo 'selected="selected"'; |
|
355 | +} |
|
356 | +?> >15</option> |
|
357 | + <option value="16" <?php if($day_end == 16) { |
|
358 | + echo 'selected="selected"'; |
|
359 | +} |
|
360 | +?> >16</option> |
|
361 | + <option value="17" <?php if($day_end == 17) { |
|
362 | + echo 'selected="selected"'; |
|
363 | +} |
|
364 | +?> >17</option> |
|
365 | + <option value="18" <?php if($day_end == 18) { |
|
366 | + echo 'selected="selected"'; |
|
367 | +} |
|
368 | +?> >18</option> |
|
369 | + <option value="19" <?php if($day_end == 19) { |
|
370 | + echo 'selected="selected"'; |
|
371 | +} |
|
372 | +?> >19</option> |
|
373 | + <option value="20" <?php if($day_end == 20) { |
|
374 | + echo 'selected="selected"'; |
|
375 | +} |
|
376 | +?> >20</option> |
|
377 | + <option value="21" <?php if($day_end == 21) { |
|
378 | + echo 'selected="selected"'; |
|
379 | +} |
|
380 | +?> >21</option> |
|
381 | + <option value="22" <?php if($day_end == 22) { |
|
382 | + echo 'selected="selected"'; |
|
383 | +} |
|
384 | +?> >22</option> |
|
385 | + <option value="23" <?php if($day_end == 23) { |
|
386 | + echo 'selected="selected"'; |
|
387 | +} |
|
388 | +?> >23</option> |
|
389 | + <option value="24" <?php if($day_end == 24) { |
|
390 | + echo 'selected="selected"'; |
|
391 | +} |
|
392 | +?> >24</option> |
|
393 | + <option value="25" <?php if($day_end == 25) { |
|
394 | + echo 'selected="selected"'; |
|
395 | +} |
|
396 | +?> >25</option> |
|
397 | + <option value="26" <?php if($day_end == 26) { |
|
398 | + echo 'selected="selected"'; |
|
399 | +} |
|
400 | +?> >26</option> |
|
401 | + <option value="27" <?php if($day_end == 27) { |
|
402 | + echo 'selected="selected"'; |
|
403 | +} |
|
404 | +?> >27</option> |
|
405 | + <option value="28" <?php if($day_end == 28) { |
|
406 | + echo 'selected="selected"'; |
|
407 | +} |
|
408 | +?> >28</option> |
|
409 | + <option value="29" <?php if($day_end == 29) { |
|
410 | + echo 'selected="selected"'; |
|
411 | +} |
|
412 | +?> >29</option> |
|
413 | + <option value="30" <?php if($day_end == 30) { |
|
414 | + echo 'selected="selected"'; |
|
415 | +} |
|
416 | +?> >30</option> |
|
417 | + <option value="31" <?php if($day_end == 31) { |
|
418 | + echo 'selected="selected"'; |
|
419 | +} |
|
420 | +?> >31</option> |
|
197 | 421 | </select> |
198 | 422 | / |
199 | 423 | <select name="month_end"> |
200 | 424 | <option value="0">--</option> |
201 | - <option value="1" <?php if($month_end == 1) echo 'selected="selected"'; ?> >01</option> |
|
202 | - <option value="2" <?php if($month_end == 2) echo 'selected="selected"'; ?> >02</option> |
|
203 | - <option value="3" <?php if($month_end == 3) echo 'selected="selected"'; ?> >03</option> |
|
204 | - <option value="4" <?php if($month_end == 4) echo 'selected="selected"'; ?> >04</option> |
|
205 | - <option value="5" <?php if($month_end == 5) echo 'selected="selected"'; ?> >05</option> |
|
206 | - <option value="6" <?php if($month_end == 6) echo 'selected="selected"'; ?> >06</option> |
|
207 | - <option value="7" <?php if($month_end == 7) echo 'selected="selected"'; ?> >07</option> |
|
208 | - <option value="8" <?php if($month_end == 8) echo 'selected="selected"'; ?> >08</option> |
|
209 | - <option value="9" <?php if($month_end == 9) echo 'selected="selected"'; ?> >09</option> |
|
210 | - <option value="10" <?php if($month_end == 10) echo 'selected="selected"'; ?> >10</option> |
|
211 | - <option value="11" <?php if($month_end == 11) echo 'selected="selected"'; ?> >11</option> |
|
212 | - <option value="12" <?php if($month_end == 12) echo 'selected="selected"'; ?> >12</option> |
|
425 | + <option value="1" <?php if($month_end == 1) { |
|
426 | + echo 'selected="selected"'; |
|
427 | +} |
|
428 | +?> >01</option> |
|
429 | + <option value="2" <?php if($month_end == 2) { |
|
430 | + echo 'selected="selected"'; |
|
431 | +} |
|
432 | +?> >02</option> |
|
433 | + <option value="3" <?php if($month_end == 3) { |
|
434 | + echo 'selected="selected"'; |
|
435 | +} |
|
436 | +?> >03</option> |
|
437 | + <option value="4" <?php if($month_end == 4) { |
|
438 | + echo 'selected="selected"'; |
|
439 | +} |
|
440 | +?> >04</option> |
|
441 | + <option value="5" <?php if($month_end == 5) { |
|
442 | + echo 'selected="selected"'; |
|
443 | +} |
|
444 | +?> >05</option> |
|
445 | + <option value="6" <?php if($month_end == 6) { |
|
446 | + echo 'selected="selected"'; |
|
447 | +} |
|
448 | +?> >06</option> |
|
449 | + <option value="7" <?php if($month_end == 7) { |
|
450 | + echo 'selected="selected"'; |
|
451 | +} |
|
452 | +?> >07</option> |
|
453 | + <option value="8" <?php if($month_end == 8) { |
|
454 | + echo 'selected="selected"'; |
|
455 | +} |
|
456 | +?> >08</option> |
|
457 | + <option value="9" <?php if($month_end == 9) { |
|
458 | + echo 'selected="selected"'; |
|
459 | +} |
|
460 | +?> >09</option> |
|
461 | + <option value="10" <?php if($month_end == 10) { |
|
462 | + echo 'selected="selected"'; |
|
463 | +} |
|
464 | +?> >10</option> |
|
465 | + <option value="11" <?php if($month_end == 11) { |
|
466 | + echo 'selected="selected"'; |
|
467 | +} |
|
468 | +?> >11</option> |
|
469 | + <option value="12" <?php if($month_end == 12) { |
|
470 | + echo 'selected="selected"'; |
|
471 | +} |
|
472 | +?> >12</option> |
|
213 | 473 | </select> |
214 | 474 | / |
215 | 475 | <select name="year_end"> |
@@ -217,7 +477,10 @@ discard block |
||
217 | 477 | <?php |
218 | 478 | for($i=$thisYear-5;$i <= ($thisYear+5);$i++) |
219 | 479 | { ?> |
220 | - <option value="<?php echo $i; ?>" <?php if($year_end == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option> |
|
480 | + <option value="<?php echo $i; ?>" <?php if($year_end == $i) { |
|
481 | + echo 'selected="selected"'; |
|
482 | +} |
|
483 | +?> ><?php echo $i; ?></option> |
|
221 | 484 | <?php |
222 | 485 | } ?> |
223 | 486 | </select> |
@@ -238,7 +501,10 @@ discard block |
||
238 | 501 | |
239 | 502 | |
240 | 503 | <script> |
241 | -<?php if($year_start=="0000") echo "setDisable(document.form.nolimit);\r\n"; ?> |
|
504 | +<?php if($year_start=="0000") { |
|
505 | + echo "setDisable(document.form.nolimit);\r\n"; |
|
506 | +} |
|
507 | +?> |
|
242 | 508 | function setDisable(select){ |
243 | 509 | document.form.day_start.disabled = (select.checked) ? true : false; |
244 | 510 | document.form.month_start.disabled = (select.checked) ? true : false; |
@@ -74,8 +74,7 @@ discard block |
||
74 | 74 | if (empty($this->_parameters)) |
75 | 75 | { |
76 | 76 | $this->_parameters = $parameters; |
77 | - } |
|
78 | - else if (!empty($parameters)) |
|
77 | + } else if (!empty($parameters)) |
|
79 | 78 | { |
80 | 79 | $this->_parameters = array_merge($this->_parameters,$parameters); |
81 | 80 | } |
@@ -324,8 +323,7 @@ discard block |
||
324 | 323 | { |
325 | 324 | $result .= $pName .'="' . self::_oauthEscape($val) . '", '; |
326 | 325 | } |
327 | - } |
|
328 | - else |
|
326 | + } else |
|
329 | 327 | { |
330 | 328 | $result .= $pName . '="' . self::_oauthEscape($pValue) . '", '; |
331 | 329 | } |
@@ -350,14 +348,13 @@ discard block |
||
350 | 348 | if (!is_array($result[$key])) |
351 | 349 | { |
352 | 350 | $result[$key] = array($result[$key],$token); |
353 | - } |
|
354 | - else |
|
351 | + } else |
|
355 | 352 | { |
356 | 353 | array_push($result[$key],$token); |
357 | 354 | } |
355 | + } else { |
|
356 | + $result[$key]=$token; |
|
358 | 357 | } |
359 | - else |
|
360 | - $result[$key]=$token; |
|
361 | 358 | } |
362 | 359 | return $result; |
363 | 360 | } |
@@ -447,8 +444,7 @@ discard block |
||
447 | 444 | { |
448 | 445 | array_push($normalized_keys[self::_oauthEscape($paramName)], self::_oauthEscape($item)); |
449 | 446 | } |
450 | - } |
|
451 | - else |
|
447 | + } else |
|
452 | 448 | { |
453 | 449 | $normalized_keys[self::_oauthEscape($paramName)] = self::_oauthEscape($paramValue); |
454 | 450 | } |
@@ -466,8 +462,7 @@ discard block |
||
466 | 462 | { |
467 | 463 | array_push($return_array, $key . "=" . $element); |
468 | 464 | } |
469 | - } |
|
470 | - else |
|
465 | + } else |
|
471 | 466 | { |
472 | 467 | array_push($return_array, $key .'='. $val); |
473 | 468 | } |
@@ -244,14 +244,20 @@ |
||
244 | 244 | $paramcount ++; |
245 | 245 | } |
246 | 246 | if (isset($type)) { |
247 | - if ($paramcount != 0) $sql .= ' AND'; |
|
248 | - else $sql .= ' WHERE'; |
|
247 | + if ($paramcount != 0) { |
|
248 | + $sql .= ' AND'; |
|
249 | + } else { |
|
250 | + $sql .= ' WHERE'; |
|
251 | + } |
|
249 | 252 | $sql .= ' type = '.intval($type); |
250 | 253 | $paramcount ++; |
251 | 254 | } |
252 | 255 | if (isset($ref_id)) { |
253 | - if ($paramcount != 0) $sql .= ' AND'; |
|
254 | - else $sql .= ' WHERE'; |
|
256 | + if ($paramcount != 0) { |
|
257 | + $sql .= ' AND'; |
|
258 | + } else { |
|
259 | + $sql .= ' WHERE'; |
|
260 | + } |
|
255 | 261 | $sql .= ' ref_id = '.intval($ref_id); |
256 | 262 | $paramcount ++; |
257 | 263 | } |
@@ -2896,10 +2896,11 @@ |
||
2896 | 2896 | c_id = $courseId AND |
2897 | 2897 | user_id = $user_id "; |
2898 | 2898 | $result = Database::query($sql); |
2899 | - if (Database::affected_rows($result) > 0) |
|
2900 | - return true; |
|
2901 | - else |
|
2902 | - return false; |
|
2899 | + if (Database::affected_rows($result) > 0) { |
|
2900 | + return true; |
|
2901 | + } else { |
|
2902 | + return false; |
|
2903 | + } |
|
2903 | 2904 | } else { |
2904 | 2905 | // The user is not subscribed to the session, so make sure |
2905 | 2906 | // he isn't subscribed to a course in this session either |
@@ -108,7 +108,9 @@ discard block |
||
108 | 108 | //Check if the user is registered in the session otherwise we will add it |
109 | 109 | $result = SessionManager::get_users_by_session($new_session_id); |
110 | 110 | if (empty($result) || !in_array($user_id, array_keys($result))) { |
111 | - if ($debug) echo 'User added to the session'; |
|
111 | + if ($debug) { |
|
112 | + echo 'User added to the session'; |
|
113 | + } |
|
112 | 114 | //Registering user to the new session |
113 | 115 | SessionManager::subscribe_users_to_session($new_session_id,array($user_id),false); |
114 | 116 | } |
@@ -143,10 +145,11 @@ discard block |
||
143 | 145 | $list[$row['exe_id']]= $row; |
144 | 146 | } |
145 | 147 | |
146 | - if (!empty($list)) |
|
147 | - foreach ($list as $exe_id =>$data) { |
|
148 | + if (!empty($list)) { |
|
149 | + foreach ($list as $exe_id =>$data) { |
|
148 | 150 | if ($update_database) { |
149 | 151 | $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id"; |
152 | + } |
|
150 | 153 | $res = Database::query($sql); |
151 | 154 | $result_message[$TABLETRACK_EXERCICES]++; |
152 | 155 | } else { |
@@ -170,10 +173,11 @@ discard block |
||
170 | 173 | $list[$row['exe_id']]= $row; |
171 | 174 | } |
172 | 175 | |
173 | - if (!empty($list)) |
|
174 | - foreach ($list as $exe_id =>$data) { |
|
176 | + if (!empty($list)) { |
|
177 | + foreach ($list as $exe_id =>$data) { |
|
175 | 178 | if ($update_database) { |
176 | 179 | $sql = "UPDATE $TABLETRACK_EXERCICES SET session_id = '$new_session_id' WHERE exe_id = $exe_id"; |
180 | + } |
|
177 | 181 | $res = Database::query($sql); |
178 | 182 | $result_message[$TABLETRACK_EXERCICES]++; |
179 | 183 | } else { |
@@ -198,10 +202,11 @@ discard block |
||
198 | 202 | $list[$row['course_access_id']] = $row; |
199 | 203 | } |
200 | 204 | |
201 | - if (!empty($list)) |
|
202 | - foreach ($list as $id => $data) { |
|
205 | + if (!empty($list)) { |
|
206 | + foreach ($list as $id => $data) { |
|
203 | 207 | if ($update_database) { |
204 | 208 | $sql = "UPDATE $TBL_TRACK_E_COURSE_ACCESS SET session_id = $new_session_id WHERE course_access_id = $id"; |
209 | + } |
|
205 | 210 | if ($debug) { |
206 | 211 | echo $sql; |
207 | 212 | } |
@@ -220,13 +225,18 @@ discard block |
||
220 | 225 | while($row = Database::fetch_array($res,'ASSOC')) { |
221 | 226 | $list[] = $row['access_id']; |
222 | 227 | } |
223 | - if (!empty($list)) |
|
224 | - foreach ($list as $id) { |
|
228 | + if (!empty($list)) { |
|
229 | + foreach ($list as $id) { |
|
225 | 230 | if ($update_database) { |
226 | 231 | $sql = "UPDATE $TBL_TRACK_E_LAST_ACCESS SET access_session_id = $new_session_id WHERE access_id = $id"; |
227 | - if ($debug) echo $sql; |
|
232 | + } |
|
233 | + if ($debug) { |
|
234 | + echo $sql; |
|
235 | + } |
|
228 | 236 | $res = Database::query($sql); |
229 | - if ($debug) var_dump($res); |
|
237 | + if ($debug) { |
|
238 | + var_dump($res); |
|
239 | + } |
|
230 | 240 | $result_message[$TBL_TRACK_E_LAST_ACCESS]++; |
231 | 241 | } |
232 | 242 | } |
@@ -250,13 +260,18 @@ discard block |
||
250 | 260 | } |
251 | 261 | } |
252 | 262 | |
253 | - if (!empty($list)) |
|
254 | - foreach ($list as $id=>$data) { |
|
263 | + if (!empty($list)) { |
|
264 | + foreach ($list as $id=>$data) { |
|
255 | 265 | if ($update_database) { |
256 | 266 | $sql = "UPDATE $TBL_LP_VIEW SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id "; |
257 | - if ($debug) var_dump($sql); |
|
267 | + } |
|
268 | + if ($debug) { |
|
269 | + var_dump($sql); |
|
270 | + } |
|
258 | 271 | $res = Database::query($sql); |
259 | - if ($debug) var_dump($res); |
|
272 | + if ($debug) { |
|
273 | + var_dump($res); |
|
274 | + } |
|
260 | 275 | $result_message[$TBL_LP_VIEW]++; |
261 | 276 | } else { |
262 | 277 | //Getting all information of that lp_item_id |
@@ -283,10 +298,11 @@ discard block |
||
283 | 298 | $list[$row['id']] = $row; |
284 | 299 | } |
285 | 300 | } |
286 | - if (!empty($list)) |
|
287 | - foreach ($list as $id=>$data) { |
|
301 | + if (!empty($list)) { |
|
302 | + foreach ($list as $id=>$data) { |
|
288 | 303 | //Getting all information of that lp_item_id |
289 | 304 | $score = Tracking::get_avg_student_score($user_id, $origin_course_code, array($data['lp_id']), $new_session_id); |
305 | + } |
|
290 | 306 | $progress = Tracking::get_avg_student_progress($user_id, $origin_course_code, array($data['lp_id']), $new_session_id); |
291 | 307 | $result_message_compare['LP_VIEW'][$data['lp_id']] = array('score' => $score, 'progress' =>$progress); |
292 | 308 | } |
@@ -302,9 +318,13 @@ discard block |
||
302 | 318 | $id = $row['ref']; |
303 | 319 | if ($update_database) { |
304 | 320 | $sql = "UPDATE $TBL_AGENDA SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id "; |
305 | - if ($debug) var_dump($sql); |
|
321 | + if ($debug) { |
|
322 | + var_dump($sql); |
|
323 | + } |
|
306 | 324 | $res_update = Database::query($sql); |
307 | - if ($debug) var_dump($res_update); |
|
325 | + if ($debug) { |
|
326 | + var_dump($res_update); |
|
327 | + } |
|
308 | 328 | $result_message['agenda']++; |
309 | 329 | } |
310 | 330 | } |
@@ -316,22 +336,30 @@ discard block |
||
316 | 336 | //echo '<h1>Student publication</h1>'; |
317 | 337 | |
318 | 338 | $sql = "SELECT ref FROM $TBL_ITEM_PROPERTY WHERE tool = 'work' AND insert_user_id = $user_id AND c_id = $course_id"; |
319 | - if ($debug) echo $sql; |
|
339 | + if ($debug) { |
|
340 | + echo $sql; |
|
341 | + } |
|
320 | 342 | $res = Database::query($sql); |
321 | 343 | while($row = Database::fetch_array($res,'ASSOC')) { |
322 | 344 | $id = $row['ref']; |
323 | 345 | $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $id AND session_id = $origin_session_id AND c_id = $course_id"; |
324 | - if ($debug) var_dump($sql); |
|
346 | + if ($debug) { |
|
347 | + var_dump($sql); |
|
348 | + } |
|
325 | 349 | $sub_res = Database::query($sql); |
326 | 350 | if (Database::num_rows($sub_res) > 0 ) { |
327 | 351 | $data = Database::fetch_array($sub_res,'ASSOC'); |
328 | - if ($debug) var_dump($data); |
|
352 | + if ($debug) { |
|
353 | + var_dump($data); |
|
354 | + } |
|
329 | 355 | $parent_id = $data['parent_id']; |
330 | 356 | if (isset($data['parent_id']) && !empty($data['parent_id'])) { |
331 | 357 | $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION WHERE id = $parent_id AND c_id = $course_id"; |
332 | 358 | $select_res = Database::query($sql); |
333 | 359 | $parent_data = Database::fetch_array($select_res,'ASSOC'); |
334 | - if ($debug) var_dump($parent_data); |
|
360 | + if ($debug) { |
|
361 | + var_dump($parent_data); |
|
362 | + } |
|
335 | 363 | |
336 | 364 | $sys_course_path = api_get_path(SYS_COURSE_PATH); |
337 | 365 | $course_dir = $sys_course_path . $course_info['path']; |
@@ -346,7 +374,9 @@ discard block |
||
346 | 374 | $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION |
347 | 375 | WHERE description like '%$search_this%' AND url LIKE '%$search_this2%' AND session_id = $new_session_id AND c_id = $course_id |
348 | 376 | ORDER BY id desc LIMIT 1"; |
349 | - if ($debug) echo $sql; |
|
377 | + if ($debug) { |
|
378 | + echo $sql; |
|
379 | + } |
|
350 | 380 | $sub_res = Database::query($sql); |
351 | 381 | $num_rows = Database::num_rows($sub_res); |
352 | 382 | |
@@ -390,7 +420,9 @@ discard block |
||
390 | 420 | |
391 | 421 | //Creating student_publication_assignment if exists |
392 | 422 | $sql = "SELECT * FROM $TBL_STUDENT_PUBLICATION_ASSIGNMENT WHERE publication_id = $parent_id AND c_id = $course_id"; |
393 | - if ($debug) var_dump($sql); |
|
423 | + if ($debug) { |
|
424 | + var_dump($sql); |
|
425 | + } |
|
394 | 426 | $rest_select = Database::query($sql); |
395 | 427 | if (Database::num_rows($rest_select) > 0 ) { |
396 | 428 | if ($update_database) { |
@@ -402,7 +434,9 @@ discard block |
||
402 | 434 | add_to_calendar = '".$assignment_data['add_to_calendar']."', |
403 | 435 | enable_qualification = '".$assignment_data['enable_qualification']."', |
404 | 436 | publication_id = '".$new_parent_id."'"; |
405 | - if ($debug) echo $sql_add_publication; |
|
437 | + if ($debug) { |
|
438 | + echo $sql_add_publication; |
|
439 | + } |
|
406 | 440 | $rest_select = Database::query($sql_add_publication); |
407 | 441 | $id = Database::insert_id(); |
408 | 442 | |
@@ -410,11 +444,15 @@ discard block |
||
410 | 444 | "has_properties = '".$id."', |
411 | 445 | view_properties = '1' |
412 | 446 | WHERE id = ".$new_parent_id; |
413 | - if ($debug) echo $sql_update; |
|
447 | + if ($debug) { |
|
448 | + echo $sql_update; |
|
449 | + } |
|
414 | 450 | $rest_update = Database::query($sql_update); |
415 | 451 | |
416 | 452 | |
417 | - if ($debug) var_dump($sql_update); |
|
453 | + if ($debug) { |
|
454 | + var_dump($sql_update); |
|
455 | + } |
|
418 | 456 | $result_message[$TBL_STUDENT_PUBLICATION_ASSIGNMENT]++; |
419 | 457 | } |
420 | 458 | } |
@@ -455,7 +493,9 @@ discard block |
||
455 | 493 | if ($result) { |
456 | 494 | unlink($full_file_name); |
457 | 495 | $sql = "DELETE FROM $TBL_STUDENT_PUBLICATION WHERE id= ".$data['id']; |
458 | - if ($debug) var_dump($sql); |
|
496 | + if ($debug) { |
|
497 | + var_dump($sql); |
|
498 | + } |
|
459 | 499 | $result_delete = Database::query($sql); |
460 | 500 | api_item_property_update($course_info, 'work', $data['id'], 'DocumentDeleted', api_get_user_id()); |
461 | 501 | } |
@@ -471,22 +511,30 @@ discard block |
||
471 | 511 | //10. Dropbox - not neccesary to move categories (no presence of session_id) |
472 | 512 | |
473 | 513 | $sql = "SELECT id FROM $TBL_DROPBOX_FILE WHERE uploader_id = $user_id AND session_id = $origin_session_id AND c_id = $course_id"; |
474 | - if ($debug) var_dump($sql); |
|
514 | + if ($debug) { |
|
515 | + var_dump($sql); |
|
516 | + } |
|
475 | 517 | $res = Database::query($sql); |
476 | 518 | while($row = Database::fetch_array($res,'ASSOC')) { |
477 | 519 | $id = $row['id']; |
478 | 520 | if ($update_database) { |
479 | 521 | $sql = "UPDATE $TBL_DROPBOX_FILE SET session_id = $new_session_id WHERE c_id = $course_id AND id = $id"; |
480 | - if ($debug) var_dump($sql); |
|
522 | + if ($debug) { |
|
523 | + var_dump($sql); |
|
524 | + } |
|
481 | 525 | $res = Database::query($sql); |
482 | - if ($debug) var_dump($res); |
|
526 | + if ($debug) { |
|
527 | + var_dump($res); |
|
528 | + } |
|
483 | 529 | |
484 | 530 | $sql = "UPDATE $TBL_DROPBOX_POST SET session_id = $new_session_id WHERE file_id = $id"; |
485 | - if ($debug) |
|
486 | - var_dump($sql); |
|
531 | + if ($debug) { |
|
532 | + var_dump($sql); |
|
533 | + } |
|
487 | 534 | $res = Database::query($sql); |
488 | - if ($debug) |
|
489 | - var_dump($res); |
|
535 | + if ($debug) { |
|
536 | + var_dump($res); |
|
537 | + } |
|
490 | 538 | $result_message[$TBL_DROPBOX_FILE]++; |
491 | 539 | } |
492 | 540 | } |
@@ -495,23 +543,30 @@ discard block |
||
495 | 543 | |
496 | 544 | $sql = "SELECT notebook_id FROM $TBL_NOTEBOOK |
497 | 545 | WHERE user_id = $user_id AND session_id = $origin_session_id AND course = '$origin_course_code' AND c_id = $course_id"; |
498 | - if ($debug) var_dump($sql); |
|
546 | + if ($debug) { |
|
547 | + var_dump($sql); |
|
548 | + } |
|
499 | 549 | $res = Database::query($sql); |
500 | 550 | while($row = Database::fetch_array($res,'ASSOC')) { |
501 | 551 | $id = $row['notebook_id']; |
502 | 552 | if ($update_database) { |
503 | 553 | $sql = "UPDATE $TBL_NOTEBOOK SET session_id = $new_session_id WHERE c_id = $course_id AND notebook_id = $id"; |
504 | - if ($debug) var_dump($sql); |
|
554 | + if ($debug) { |
|
555 | + var_dump($sql); |
|
556 | + } |
|
505 | 557 | $res = Database::query($sql); |
506 | - if ($debug) var_dump($res); |
|
558 | + if ($debug) { |
|
559 | + var_dump($res); |
|
560 | + } |
|
507 | 561 | } |
508 | 562 | } |
509 | 563 | |
510 | 564 | if ($update_database) { |
511 | 565 | echo '<h2>'.get_lang('StatsMoved').'</h2>'; |
512 | - if (is_array($result_message)) |
|
513 | - foreach ($result_message as $table=>$times) { |
|
566 | + if (is_array($result_message)) { |
|
567 | + foreach ($result_message as $table=>$times) { |
|
514 | 568 | echo 'Table '.$table.' - '.$times.' records updated <br />'; |
569 | + } |
|
515 | 570 | } |
516 | 571 | } else { |
517 | 572 | echo '<h2>'.get_lang('UserInformationOfThisCourse').'</h2>'; |
@@ -626,10 +681,11 @@ discard block |
||
626 | 681 | } |
627 | 682 | $navigation .= ' '; |
628 | 683 | $page ++; |
629 | -if ($page < $nro_pages) |
|
684 | +if ($page < $nro_pages) { |
|
630 | 685 | $navigation .= '<a href="'.api_get_self().'?page='.$page.'">'.get_lang('Next').'</a>'; |
631 | -else |
|
686 | +} else { |
|
632 | 687 | $navigation .= get_lang('Next'); |
688 | +} |
|
633 | 689 | |
634 | 690 | echo $navigation; |
635 | 691 | $user_list = UserManager::get_user_list(array(), array(), $begin, $default); |
@@ -3416,7 +3416,7 @@ discard block |
||
3416 | 3416 | $html .= '<a class="thumbnail" href="'.$params['link'].'">'; |
3417 | 3417 | $html .= $params['icon']; |
3418 | 3418 | $html .= '</a>'; |
3419 | - }else{ |
|
3419 | + } else{ |
|
3420 | 3420 | $html .= $params['icon']; |
3421 | 3421 | } |
3422 | 3422 | $html .= '</div>'; |
@@ -3675,7 +3675,7 @@ discard block |
||
3675 | 3675 | if ($showCustomIcon === 'true' && $iconName != 'course.png') { |
3676 | 3676 | $thumbnails = $course_info['course_image']; |
3677 | 3677 | $image = $course_info['course_image_large']; |
3678 | - }else{ |
|
3678 | + } else{ |
|
3679 | 3679 | $image = Display::return_icon('session_default.png', null, null, null,null, true); |
3680 | 3680 | } |
3681 | 3681 | |
@@ -3803,7 +3803,7 @@ discard block |
||
3803 | 3803 | if ($showCustomIcon === 'true' && $iconName != 'course.png') { |
3804 | 3804 | $thumbnails = $course_info['course_image']; |
3805 | 3805 | $image = $course_info['course_image_large']; |
3806 | - }else{ |
|
3806 | + } else{ |
|
3807 | 3807 | $image = Display::return_icon('session_default.png', null, null, null,null, true); |
3808 | 3808 | } |
3809 | 3809 |
@@ -662,8 +662,9 @@ discard block |
||
662 | 662 | */ |
663 | 663 | public static function update_message($user_id, $message_id) |
664 | 664 | { |
665 | - if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) |
|
666 | - return false; |
|
665 | + if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) { |
|
666 | + return false; |
|
667 | + } |
|
667 | 668 | |
668 | 669 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
669 | 670 | $sql = "UPDATE $table_message SET msg_status = '0' |
@@ -703,8 +704,9 @@ discard block |
||
703 | 704 | */ |
704 | 705 | public static function get_message_by_user($user_id, $message_id) |
705 | 706 | { |
706 | - if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) |
|
707 | - return false; |
|
707 | + if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) { |
|
708 | + return false; |
|
709 | + } |
|
708 | 710 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
709 | 711 | $query = "SELECT * FROM $table_message |
710 | 712 | WHERE user_receiver_id=" . intval($user_id) . " AND id='" . intval($message_id) . "'"; |
@@ -829,8 +831,9 @@ discard block |
||
829 | 831 | */ |
830 | 832 | public static function exist_message($user_id, $id) |
831 | 833 | { |
832 | - if ($id != strval(intval($id)) || $user_id != strval(intval($user_id))) |
|
833 | - return false; |
|
834 | + if ($id != strval(intval($id)) || $user_id != strval(intval($user_id))) { |
|
835 | + return false; |
|
836 | + } |
|
834 | 837 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
835 | 838 | $query = "SELECT id FROM $table_message |
836 | 839 | WHERE |
@@ -861,8 +864,9 @@ discard block |
||
861 | 864 | $direction = 'DESC'; |
862 | 865 | } else { |
863 | 866 | $column = intval($column); |
864 | - if (!in_array($direction, array('ASC', 'DESC'))) |
|
865 | - $direction = 'ASC'; |
|
867 | + if (!in_array($direction, array('ASC', 'DESC'))) { |
|
868 | + $direction = 'ASC'; |
|
869 | + } |
|
866 | 870 | } |
867 | 871 | $table_message = Database::get_main_table(TABLE_MESSAGE); |
868 | 872 | $request = api_is_xml_http_request(); |