@@ -18,30 +18,30 @@ discard block |
||
18 | 18 | if (api_is_student() && !api_get_setting('student_page_after_login') == '') { |
19 | 19 | $redirect_url = html_entity_decode(api_get_setting('student_page_after_login')); |
20 | 20 | if ($redirect_url[0] == "/") { |
21 | - $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url; |
|
21 | + $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url; |
|
22 | 22 | } |
23 | 23 | } |
24 | 24 | if (api_is_teacher() && !api_get_setting('teacher_page_after_login') == '') { |
25 | 25 | $redirect_url = html_entity_decode(api_get_setting('teacher_page_after_login')); |
26 | 26 | if ($redirect_url[0] == "/") { |
27 | - $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url; |
|
27 | + $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url; |
|
28 | 28 | } |
29 | 29 | } |
30 | 30 | if (api_is_drh() && !api_get_setting('drh_page_after_login') == '') { |
31 | 31 | $redirect_url = html_entity_decode(api_get_setting('drh_page_after_login')); |
32 | 32 | if ($redirect_url[0] == "/") { |
33 | - $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url; |
|
33 | + $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url; |
|
34 | 34 | } |
35 | 35 | } |
36 | 36 | if (api_is_session_admin() && !api_get_setting('sessionadmin_page_after_login') == '') { |
37 | 37 | $redirect_url = html_entity_decode(api_get_setting('sessionadmin_page_after_login')); |
38 | 38 | if ($redirect_url[0] == "/") { |
39 | - $redirect_url = substr(api_get_path(WEB_PATH), 0, -1) . $redirect_url; |
|
39 | + $redirect_url = substr(api_get_path(WEB_PATH), 0, -1).$redirect_url; |
|
40 | 40 | } |
41 | 41 | } |
42 | 42 | |
43 | 43 | if (!empty($redirect_url)) { |
44 | - header('Location: ' . $redirect_url . $param); |
|
44 | + header('Location: '.$redirect_url.$param); |
|
45 | 45 | exit(); |
46 | 46 | } |
47 | 47 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | if (CustomPages::enabled()) { |
50 | 50 | CustomPages::display(CustomPages::INDEX_LOGGED); |
51 | 51 | } |
52 | - header('location: ' . api_get_path(WEB_PATH) . api_get_setting('page_after_login') . $param); |
|
52 | + header('location: '.api_get_path(WEB_PATH).api_get_setting('page_after_login').$param); |
|
53 | 53 | exit(); |
54 | 54 | } |
55 | 55 | } |
@@ -23,7 +23,7 @@ |
||
23 | 23 | if (isset($condition['conditional_function']) && $condition['conditional_function']($user) == false) { |
24 | 24 | $_SESSION['conditional_login']['uid'] = $user['user_id']; |
25 | 25 | $_SESSION['conditional_login']['can_login'] = false; |
26 | - header("Location:". $condition['url']); |
|
26 | + header("Location:".$condition['url']); |
|
27 | 27 | exit(); |
28 | 28 | } |
29 | 29 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | return false; |
116 | 116 | } |
117 | 117 | $this->path = preg_match(VALID_WEB_PATH, $path) ? (api_is_internal_path($path) ? api_get_path(TO_SYS, $path) : $path) : $path; |
118 | - $this->set_image_wrapper(); //Creates image obj |
|
118 | + $this->set_image_wrapper(); //Creates image obj |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | abstract function set_image_wrapper(); |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | if ($this->debug) error_log('Image::set_image_wrapper loaded'); |
158 | 158 | try { |
159 | 159 | if (file_exists($this->path)) { |
160 | - $this->image = new Imagick($this->path); |
|
160 | + $this->image = new Imagick($this->path); |
|
161 | 161 | |
162 | 162 | if ($this->image) { |
163 | 163 | $this->fill_image_info(); //Fills height, width and type |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | } else { |
166 | 166 | if ($this->debug) error_log('Image::image does not exist'); |
167 | 167 | } |
168 | - } catch(ImagickException $e) { |
|
168 | + } catch (ImagickException $e) { |
|
169 | 169 | if ($this->debug) error_log($e->getMessage()); |
170 | 170 | } |
171 | 171 | } |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | |
187 | 187 | public function get_image_size() |
188 | 188 | { |
189 | - $imagesize = array('width'=>0,'height'=>0); |
|
189 | + $imagesize = array('width'=>0, 'height'=>0); |
|
190 | 190 | if ($this->image_validated) { |
191 | 191 | $imagesize = $this->image->getImageGeometry(); |
192 | 192 | } |
@@ -203,8 +203,8 @@ discard block |
||
203 | 203 | $height = $thumbh; |
204 | 204 | } else { |
205 | 205 | $scale = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0; |
206 | - $width = (int)($this->width * $scale); |
|
207 | - $height = (int)($this->height * $scale); |
|
206 | + $width = (int) ($this->width * $scale); |
|
207 | + $height = (int) ($this->height * $scale); |
|
208 | 208 | } |
209 | 209 | $result = $this->image->resizeImage($width, $height, $this->filter, 1); |
210 | 210 | $this->width = $thumbw; |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | $result = false; |
251 | 251 | try { |
252 | 252 | $result = $this->image->writeImage($file); |
253 | - } catch(ImagickException $e) { |
|
253 | + } catch (ImagickException $e) { |
|
254 | 254 | if ($this->debug) error_log($e->getMessage()); |
255 | 255 | } |
256 | 256 | |
@@ -311,9 +311,9 @@ discard block |
||
311 | 311 | |
312 | 312 | public function get_image_size() |
313 | 313 | { |
314 | - $return_array = array('width'=>0,'height'=>0); |
|
314 | + $return_array = array('width'=>0, 'height'=>0); |
|
315 | 315 | if ($this->image_validated) { |
316 | - $return_array = array('width'=>$this->width,'height'=>$this->height); |
|
316 | + $return_array = array('width'=>$this->width, 'height'=>$this->height); |
|
317 | 317 | } |
318 | 318 | return $return_array; |
319 | 319 | } |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | public function fill_image_info() |
322 | 322 | { |
323 | 323 | if (file_exists($this->path)) { |
324 | - $image_info = getimagesize($this->path); |
|
324 | + $image_info = getimagesize($this->path); |
|
325 | 325 | $this->width = $image_info[0]; |
326 | 326 | $this->height = $image_info[1]; |
327 | 327 | $this->type = $image_info[2]; |
@@ -341,11 +341,11 @@ discard block |
||
341 | 341 | $height = $thumbh; |
342 | 342 | } else { |
343 | 343 | $scale = min($thumbw / $this->width, $thumbh / $this->height); |
344 | - $width = (int)($this->width * $scale); |
|
345 | - $height = (int)($this->height * $scale); |
|
344 | + $width = (int) ($this->width * $scale); |
|
345 | + $height = (int) ($this->height * $scale); |
|
346 | 346 | } |
347 | - $deltaw = (int)(($thumbw - $width) / 2); |
|
348 | - $deltah = (int)(($thumbh - $height) / 2); |
|
347 | + $deltaw = (int) (($thumbw - $width) / 2); |
|
348 | + $deltah = (int) (($thumbh - $height) / 2); |
|
349 | 349 | $dst_img = @ImageCreateTrueColor($thumbw, $thumbh); |
350 | 350 | @imagealphablending($dst_img, false); |
351 | 351 | @imagesavealpha($dst_img, true); |
@@ -360,8 +360,8 @@ discard block |
||
360 | 360 | $height = $thumbh; |
361 | 361 | } else { |
362 | 362 | $scale = ($this->width > 0 && $this->height > 0) ? min($thumbw / $this->width, $thumbh / $this->height) : 0; |
363 | - $width = (int)($this->width * $scale); |
|
364 | - $height = (int)($this->height * $scale); |
|
363 | + $width = (int) ($this->width * $scale); |
|
364 | + $height = (int) ($this->height * $scale); |
|
365 | 365 | } |
366 | 366 | $deltaw = 0; |
367 | 367 | $deltah = 0; |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | public function send_image($file = '', $compress = -1, $convert_file_to = null) |
420 | 420 | { |
421 | 421 | if (!$this->image_validated) return false; |
422 | - $compress = (int)$compress; |
|
422 | + $compress = (int) $compress; |
|
423 | 423 | $type = $this->type; |
424 | 424 | if (!empty($convert_file_to) && in_array($convert_file_to, $this->allowed_extensions)) { |
425 | 425 | $type = $convert_file_to; |
@@ -463,11 +463,11 @@ discard block |
||
463 | 463 | * so that we can use black (0,0,0) as transparent, which is what |
464 | 464 | * the image is filled with when created. |
465 | 465 | */ |
466 | - $transparent = imagecolorallocate($dest_img, 0,0,0); |
|
466 | + $transparent = imagecolorallocate($dest_img, 0, 0, 0); |
|
467 | 467 | imagealphablending($dest_img, false); |
468 | 468 | imagesavealpha($dest_img, true); |
469 | 469 | imagecolortransparent($dest_img, $transparent); |
470 | - imagecopy($dest_img, $this->bg, 0,0, 0, 0,imagesx($this->bg), imagesx($this->bg)); |
|
470 | + imagecopy($dest_img, $this->bg, 0, 0, 0, 0, imagesx($this->bg), imagesx($this->bg)); |
|
471 | 471 | imagefilter($dest_img, IMG_FILTER_GRAYSCALE); |
472 | 472 | $this->bg = $dest_img; |
473 | 473 |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | function delete_specific_field($id) |
43 | 43 | { |
44 | 44 | $table_sf = Database:: get_main_table(TABLE_MAIN_SPECIFIC_FIELD); |
45 | - $id = (int)$id; |
|
45 | + $id = (int) $id; |
|
46 | 46 | if (!is_numeric($id)) { |
47 | 47 | return false; |
48 | 48 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | function edit_specific_field($id, $name) |
61 | 61 | { |
62 | 62 | $table_sf = Database:: get_main_table(TABLE_MAIN_SPECIFIC_FIELD); |
63 | - $id = (int)$id; |
|
63 | + $id = (int) $id; |
|
64 | 64 | if (!is_numeric($id)) { |
65 | 65 | return false; |
66 | 66 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | public function __construct() |
29 | 29 | { |
30 | - $this->table = Database::get_course_table(TABLE_TIMELINE); |
|
30 | + $this->table = Database::get_course_table(TABLE_TIMELINE); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function get_all($where_conditions = array()) |
48 | 48 | { |
49 | - return Database::select('*',$this->table, array('where'=>$where_conditions,'order' =>'headline ASC')); |
|
49 | + return Database::select('*', $this->table, array('where'=>$where_conditions, 'order' =>'headline ASC')); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | // action links |
58 | 58 | $html = '<div class="actions">'; |
59 | 59 | //$html .= '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>'; |
60 | - $html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'),'','32').'</a>'; |
|
60 | + $html .= '<a href="'.api_get_self().'?action=add">'.Display::return_icon('add.png', get_lang('Add'), '', '32').'</a>'; |
|
61 | 61 | $html .= '</div>'; |
62 | 62 | $html .= Display::grid_html('timelines'); |
63 | 63 | return $html; |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | } |
245 | 245 | unset($item['end_date']); |
246 | 246 | // Assets |
247 | - $item['asset'] = array( 'media' => $item['media'], |
|
247 | + $item['asset'] = array('media' => $item['media'], |
|
248 | 248 | 'credit' => $item['media_credit'], |
249 | 249 | 'caption' => $item['media_caption'], |
250 | 250 | ); |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $table_user = Database :: get_main_table(TABLE_MAIN_USER); |
81 | 81 | $sql = "SELECT * FROM $table_class_user cu, $table_user u WHERE cu.class_id = '".$class_id."' AND cu.user_id = u.user_id"; |
82 | 82 | $res = Database::query($sql); |
83 | - $users = array (); |
|
83 | + $users = array(); |
|
84 | 84 | while ($user = Database::fetch_array($res, 'ASSOC')) { |
85 | 85 | $users[] = $user; |
86 | 86 | } |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS); |
118 | 118 | $courses = ClassManager :: get_courses($class_id); |
119 | 119 | if (count($courses) != 0) { |
120 | - $course_codes = array (); |
|
120 | + $course_codes = array(); |
|
121 | 121 | foreach ($courses as $index => $course) { |
122 | 122 | $course_codes[] = $course['course_code']; |
123 | 123 | $sql = "SELECT DISTINCT user_id FROM $table_class_user t1, $table_course_class t2 WHERE t1.class_id=t2.class_id AND course_code = '".$course['course_code']."' AND user_id = $user_id AND t2.class_id<>'$class_id'"; |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | $table_course = Database :: get_main_table(TABLE_MAIN_COURSE); |
143 | 143 | $sql = "SELECT * FROM $table_class_course cc, $table_course c WHERE cc.class_id = '".$class_id."' AND cc.course_code = c.code"; |
144 | 144 | $res = Database::query($sql); |
145 | - $courses = array (); |
|
145 | + $courses = array(); |
|
146 | 146 | while ($course = Database::fetch_array($res, 'ASSOC')) { |
147 | 147 | $courses[] = $course; |
148 | 148 | } |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | $table_course_class = Database :: get_main_table(TABLE_MAIN_COURSE_CLASS); |
218 | 218 | $sql = "SELECT cl.* FROM $table_class cl, $table_course_class cc WHERE cc.course_code = '".Database::escape_string($course_code)."' AND cc.class_id = cl.id"; |
219 | 219 | $res = Database::query($sql); |
220 | - $classes = array (); |
|
220 | + $classes = array(); |
|
221 | 221 | while ($class = Database::fetch_array($res, 'ASSOC')) { |
222 | 222 | $classes[] = $class; |
223 | 223 | } |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | $last_modified = 0; |
212 | 212 | $return = 0; |
213 | 213 | if (is_dir($dir)) { |
214 | - while(($entry = $dir->read()) !== false) |
|
214 | + while (($entry = $dir->read()) !== false) |
|
215 | 215 | { |
216 | 216 | if ($entry != '.' && $entry != '..') |
217 | 217 | continue; |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | 'props.session_id' |
285 | 285 | ); |
286 | 286 | |
287 | - $visibility_rule = ' props.visibility ' . ($can_see_invisible ? '<> 2' : '= 1'); |
|
287 | + $visibility_rule = ' props.visibility '.($can_see_invisible ? '<> 2' : '= 1'); |
|
288 | 288 | |
289 | 289 | $sql = "SELECT SUM(table1.size) FROM ( |
290 | 290 | SELECT size |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $count = intval($count); |
80 | 80 | $from = intval($from); |
81 | 81 | |
82 | - $sql .= " ORDER BY $column $direction"; |
|
82 | + $sql .= " ORDER BY $column $direction"; |
|
83 | 83 | $sql .= " LIMIT $count, $from "; |
84 | 84 | |
85 | 85 | $result = Database::query($sql); |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | static function deactivate_zombies($ceiling) |
94 | 94 | { |
95 | 95 | $zombies = self::list_zombies($ceiling); |
96 | - $ids = array(); |
|
97 | - foreach($zombies as $zombie) { |
|
96 | + $ids = array(); |
|
97 | + foreach ($zombies as $zombie) { |
|
98 | 98 | $ids[] = $zombie['user_id']; |
99 | 99 | } |
100 | 100 | UserManager::deactivate_users($ids); |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | } |
168 | 168 | |
169 | 169 | $action = $this->get_action(); |
170 | - $f = array($this, 'action_' . $action); |
|
170 | + $f = array($this, 'action_'.$action); |
|
171 | 171 | if (is_callable($f)) { |
172 | 172 | return call_user_func($f, $ids); |
173 | 173 | } |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | $text = get_lang('No'); |
293 | 293 | } |
294 | 294 | |
295 | - $result = Display::return_icon($image . '.png', $text); |
|
295 | + $result = Display::return_icon($image.'.png', $text); |
|
296 | 296 | return $result; |
297 | 297 | } |
298 | 298 |