@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | } |
100 | 100 | foreach ($data as $row) { |
101 | 101 | $string = implode("</td><td>", $row); |
102 | - $string = '<tr><td>' . $string . '</td></tr>'; |
|
102 | + $string = '<tr><td>'.$string.'</td></tr>'; |
|
103 | 103 | if ($encoding != 'utf-8') { |
104 | 104 | $string = api_convert_encoding($string, $encoding, $systemEncoding); |
105 | 105 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | fwrite($handle, '<'.$wrapper_tagname.'>'); |
174 | 174 | } |
175 | 175 | $s = self::_export_complex_table_xml_helper($data); |
176 | - fwrite($handle,$s); |
|
176 | + fwrite($handle, $s); |
|
177 | 177 | if (!is_null($wrapper_tagname)) { |
178 | 178 | fwrite($handle, '</'.$wrapper_tagname.'>'."\n"); |
179 | 179 | } |
@@ -195,10 +195,10 @@ discard block |
||
195 | 195 | } |
196 | 196 | $string = ''; |
197 | 197 | foreach ($data as $row) { |
198 | - $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>'; |
|
198 | + $string .= "\n".str_repeat("\t", $level).'<'.$row['name'].'>'; |
|
199 | 199 | if (is_array($row['value'])) { |
200 | - $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n"; |
|
201 | - $string .= str_repeat("\t",$level).'</'.$row['name'].'>'; |
|
200 | + $string .= self::_export_complex_table_xml_helper($row['value'], $level + 1)."\n"; |
|
201 | + $string .= str_repeat("\t", $level).'</'.$row['name'].'>'; |
|
202 | 202 | } else { |
203 | 203 | $string .= $row['value']; |
204 | 204 | $string .= '</'.$row['name'].'>'; |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @param array $data |
39 | 39 | * @param string $filename |
40 | 40 | * |
41 | - * @return mixed csv file | false if no data to export |
|
41 | + * @return false|null csv file | false if no data to export |
|
42 | 42 | */ |
43 | 43 | public static function arrayToCsv($data, $filename = 'export') |
44 | 44 | { |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | * @param string Name of common tag to place each line in |
161 | 161 | * @param string Name of the root element. A root element should always be given. |
162 | 162 | * @param string Encoding in which the data is provided |
163 | - * @return void Prompts the user for a file download |
|
163 | + * @return boolean Prompts the user for a file download |
|
164 | 164 | */ |
165 | 165 | public static function export_complex_table_xml( |
166 | 166 | $data, |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | * @param string $name |
287 | 287 | * @param string $format |
288 | 288 | * |
289 | - * @return bool |
|
289 | + * @return false|null |
|
290 | 290 | */ |
291 | 291 | public static function htmlToOdt($html, $name, $format = 'odt') |
292 | 292 | { |
@@ -115,13 +115,13 @@ discard block |
||
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
118 | - * Export tabular data to XML-file |
|
119 | - * @param array Simple array of data to put in XML |
|
120 | - * @param string Name of file to be given to the user |
|
121 | - * @param string Name of common tag to place each line in |
|
122 | - * @param string Name of the root element. A root element should always be given. |
|
123 | - * @param string Encoding in which the data is provided |
|
124 | - */ |
|
118 | + * Export tabular data to XML-file |
|
119 | + * @param array Simple array of data to put in XML |
|
120 | + * @param string Name of file to be given to the user |
|
121 | + * @param string Name of common tag to place each line in |
|
122 | + * @param string Name of the root element. A root element should always be given. |
|
123 | + * @param string Encoding in which the data is provided |
|
124 | + */ |
|
125 | 125 | public static function arrayToXml( |
126 | 126 | $data, |
127 | 127 | $filename = 'export', |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | foreach ($data as $row) { |
201 | 201 | $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>'; |
202 | 202 | if (is_array($row['value'])) { |
203 | - $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n"; |
|
203 | + $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n"; |
|
204 | 204 | $string .= str_repeat("\t",$level).'</'.$row['name'].'>'; |
205 | 205 | } else { |
206 | 206 | $string .= $row['value']; |
@@ -108,24 +108,24 @@ |
||
108 | 108 | */ |
109 | 109 | function utf8_sort($array) |
110 | 110 | { |
111 | - $old_locale = setlocale(LC_ALL, null); |
|
112 | - $code = api_get_language_isocode(); |
|
113 | - $locale_list = array($code.'.utf8', 'en.utf8','en_US.utf8','en_GB.utf8'); |
|
114 | - $try_sort = false; |
|
111 | + $old_locale = setlocale(LC_ALL, null); |
|
112 | + $code = api_get_language_isocode(); |
|
113 | + $locale_list = array($code.'.utf8', 'en.utf8','en_US.utf8','en_GB.utf8'); |
|
114 | + $try_sort = false; |
|
115 | 115 | |
116 | - foreach($locale_list as $locale) { |
|
117 | - $my_local = setlocale(LC_COLLATE, $locale); |
|
118 | - if ($my_local) { |
|
119 | - $try_sort = true; |
|
120 | - break; |
|
121 | - } |
|
122 | - } |
|
116 | + foreach($locale_list as $locale) { |
|
117 | + $my_local = setlocale(LC_COLLATE, $locale); |
|
118 | + if ($my_local) { |
|
119 | + $try_sort = true; |
|
120 | + break; |
|
121 | + } |
|
122 | + } |
|
123 | 123 | |
124 | - if ($try_sort) { |
|
125 | - uasort($array, 'strcoll'); |
|
126 | - } |
|
127 | - setlocale(LC_COLLATE, $old_locale); |
|
128 | - return $array; |
|
124 | + if ($try_sort) { |
|
125 | + uasort($array, 'strcoll'); |
|
126 | + } |
|
127 | + setlocale(LC_COLLATE, $old_locale); |
|
128 | + return $array; |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -110,10 +110,10 @@ discard block |
||
110 | 110 | { |
111 | 111 | $old_locale = setlocale(LC_ALL, null); |
112 | 112 | $code = api_get_language_isocode(); |
113 | - $locale_list = array($code.'.utf8', 'en.utf8','en_US.utf8','en_GB.utf8'); |
|
113 | + $locale_list = array($code.'.utf8', 'en.utf8', 'en_US.utf8', 'en_GB.utf8'); |
|
114 | 114 | $try_sort = false; |
115 | 115 | |
116 | - foreach($locale_list as $locale) { |
|
116 | + foreach ($locale_list as $locale) { |
|
117 | 117 | $my_local = setlocale(LC_COLLATE, $locale); |
118 | 118 | if ($my_local) { |
119 | 119 | $try_sort = true; |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | $flatten = array(); |
152 | 152 | array_walk_recursive( |
153 | 153 | $array, |
154 | - function ($value) use (&$flatten) { |
|
154 | + function($value) use (&$flatten) { |
|
155 | 155 | $flatten[] = $value; |
156 | 156 | } |
157 | 157 | ); |
@@ -219,10 +219,10 @@ |
||
219 | 219 | // action links |
220 | 220 | echo '<div class="actions">'; |
221 | 221 | if (!api_is_anonymous()) { |
222 | - if (api_get_session_id() == 0) |
|
223 | - echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' . |
|
222 | + if (api_get_session_id() == 0) { |
|
223 | + echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' . |
|
224 | 224 | Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>'; |
225 | - elseif (api_is_allowed_to_session_edit(false, true)) { |
|
225 | + } elseif (api_is_allowed_to_session_edit(false, true)) { |
|
226 | 226 | echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' . |
227 | 227 | Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>'; |
228 | 228 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | return "<script> |
30 | 30 | function confirmation (name) |
31 | 31 | { |
32 | - if (confirm(\" " . get_lang("NoteConfirmDelete") . " \"+ name + \" ?\")) |
|
32 | + if (confirm(\" " . get_lang("NoteConfirmDelete")." \"+ name + \" ?\")) |
|
33 | 33 | {return true;} |
34 | 34 | else |
35 | 35 | {return false;} |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | description AS note_comment, |
107 | 107 | session_id AS session_id |
108 | 108 | FROM $t_notebook |
109 | - WHERE c_id = $course_id AND notebook_id = '" . intval($notebook_id) . "' "; |
|
109 | + WHERE c_id = $course_id AND notebook_id = '".intval($notebook_id)."' "; |
|
110 | 110 | $result = Database::query($sql); |
111 | 111 | if (Database::num_rows($result) != 1) { |
112 | 112 | return array(); |
@@ -184,8 +184,8 @@ discard block |
||
184 | 184 | $sql = "DELETE FROM $t_notebook |
185 | 185 | WHERE |
186 | 186 | c_id = $course_id AND |
187 | - notebook_id='" . intval($notebook_id) . "' AND |
|
188 | - user_id = '" . api_get_user_id() . "'"; |
|
187 | + notebook_id='".intval($notebook_id)."' AND |
|
188 | + user_id = '" . api_get_user_id()."'"; |
|
189 | 189 | $result = Database::query($sql); |
190 | 190 | $affected_rows = Database::affected_rows($result); |
191 | 191 | if ($affected_rows != 1) { |
@@ -223,22 +223,22 @@ discard block |
||
223 | 223 | echo '<div class="actions">'; |
224 | 224 | if (!api_is_anonymous()) { |
225 | 225 | if (api_get_session_id() == 0) |
226 | - echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' . |
|
227 | - Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>'; |
|
226 | + echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'. |
|
227 | + Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>'; |
|
228 | 228 | elseif (api_is_allowed_to_session_edit(false, true)) { |
229 | - echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' . |
|
230 | - Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>'; |
|
229 | + echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'. |
|
230 | + Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>'; |
|
231 | 231 | } |
232 | 232 | } else { |
233 | - echo '<a href="javascript:void(0)">' . Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>'; |
|
233 | + echo '<a href="javascript:void(0)">'.Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>'; |
|
234 | 234 | } |
235 | 235 | |
236 | - echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=creation_date&direction=' . $link_sort_direction . '">' . |
|
237 | - Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32') . '</a>'; |
|
238 | - echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=update_date&direction=' . $link_sort_direction . '">' . |
|
239 | - Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32') . '</a>'; |
|
240 | - echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=title&direction=' . $link_sort_direction . '">' . |
|
241 | - Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32') . '</a>'; |
|
236 | + echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=creation_date&direction='.$link_sort_direction.'">'. |
|
237 | + Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32').'</a>'; |
|
238 | + echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=update_date&direction='.$link_sort_direction.'">'. |
|
239 | + Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32').'</a>'; |
|
240 | + echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=title&direction='.$link_sort_direction.'">'. |
|
241 | + Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32').'</a>'; |
|
242 | 242 | echo '</div>'; |
243 | 243 | |
244 | 244 | if (!isset($_SESSION['notebook_view']) || !in_array($_SESSION['notebook_view'], array('creation_date', 'update_date', 'title'))) { |
@@ -248,9 +248,9 @@ discard block |
||
248 | 248 | // Database table definition |
249 | 249 | $t_notebook = Database :: get_course_table(TABLE_NOTEBOOK); |
250 | 250 | if ($_SESSION['notebook_view'] == 'creation_date' || $_SESSION['notebook_view'] == 'update_date') { |
251 | - $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction "; |
|
251 | + $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction "; |
|
252 | 252 | } else { |
253 | - $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction "; |
|
253 | + $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction "; |
|
254 | 254 | } |
255 | 255 | |
256 | 256 | //condition for the session |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | $sql = "SELECT * FROM $t_notebook |
264 | 264 | WHERE |
265 | 265 | c_id = $course_id AND |
266 | - user_id = '" . api_get_user_id() . "' |
|
266 | + user_id = '".api_get_user_id()."' |
|
267 | 267 | $condition_session |
268 | 268 | $cond_extra $order_by |
269 | 269 | "; |
@@ -273,18 +273,18 @@ discard block |
||
273 | 273 | $session_img = api_get_session_image($row['session_id'], $_user['status']); |
274 | 274 | $updateValue = ''; |
275 | 275 | if ($row['update_date'] <> $row['creation_date']) { |
276 | - $updateValue = ', ' . get_lang('UpdateDate') . ': ' . Display::dateToStringAgoAndLongDate($row['update_date']); |
|
276 | + $updateValue = ', '.get_lang('UpdateDate').': '.Display::dateToStringAgoAndLongDate($row['update_date']); |
|
277 | 277 | } |
278 | 278 | |
279 | - $actions = '<a href="' . api_get_self() . '?action=editnote¬ebook_id=' . $row['notebook_id'] . '">' . |
|
280 | - Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . '</a>'; |
|
281 | - $actions .= '<a href="' . api_get_self() . '?action=deletenote¬ebook_id=' . $row['notebook_id'] . '" onclick="return confirmation(\'' . $row['title'] . '\');">' . |
|
282 | - Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . '</a>'; |
|
279 | + $actions = '<a href="'.api_get_self().'?action=editnote¬ebook_id='.$row['notebook_id'].'">'. |
|
280 | + Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'; |
|
281 | + $actions .= '<a href="'.api_get_self().'?action=deletenote¬ebook_id='.$row['notebook_id'].'" onclick="return confirmation(\''.$row['title'].'\');">'. |
|
282 | + Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>'; |
|
283 | 283 | |
284 | 284 | echo Display::panel( |
285 | 285 | $row['description'], |
286 | - $row['title'] . $session_img.' <div class="pull-right">'.$actions.'</div>', |
|
287 | - get_lang('CreationDate') . ': ' . Display::dateToStringAgoAndLongDate($row['creation_date']). $updateValue |
|
286 | + $row['title'].$session_img.' <div class="pull-right">'.$actions.'</div>', |
|
287 | + get_lang('CreationDate').': '.Display::dateToStringAgoAndLongDate($row['creation_date']).$updateValue |
|
288 | 288 | ); |
289 | 289 | } |
290 | 290 | } |
@@ -666,9 +666,10 @@ |
||
666 | 666 | $result = ''; |
667 | 667 | for ($i = $min; $i <= $max; $i ++) { |
668 | 668 | $result .= '<option value="'.$i.'"'; |
669 | - if (is_int($selected_num)) |
|
670 | - if ($selected_num == $i) { |
|
669 | + if (is_int($selected_num)) { |
|
670 | + if ($selected_num == $i) { |
|
671 | 671 | $result .= ' selected="selected"'; |
672 | + } |
|
672 | 673 | } |
673 | 674 | $result .= '>'.$i.'</option>'; |
674 | 675 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @param string Optional help file name |
57 | 57 | * @param string $page_header |
58 | 58 | */ |
59 | - public static function display_header($tool_name ='', $help = null, $page_header = null) |
|
59 | + public static function display_header($tool_name = '', $help = null, $page_header = null) |
|
60 | 60 | { |
61 | 61 | $origin = api_get_origin(); |
62 | 62 | $showHeader = true; |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | $grid_class = array(), |
355 | 355 | $elementCount = 0 |
356 | 356 | ) { |
357 | - $column = 0; |
|
357 | + $column = 0; |
|
358 | 358 | $default_items_per_page = isset($paging_options['per_page']) ? $paging_options['per_page'] : 20; |
359 | 359 | |
360 | 360 | $table = new SortableTableFromArray($content, $column, $default_items_per_page, $name); |
@@ -483,7 +483,7 @@ discard block |
||
483 | 483 | * @deprecated use Display::addFlash with Display::return_message |
484 | 484 | * @return void |
485 | 485 | */ |
486 | - public static function display_confirmation_message ($message, $filter = true, $returnValue = false) |
|
486 | + public static function display_confirmation_message($message, $filter = true, $returnValue = false) |
|
487 | 487 | { |
488 | 488 | $message = self::return_message($message, 'confirm', $filter); |
489 | 489 | if ($returnValue) { |
@@ -502,7 +502,7 @@ discard block |
||
502 | 502 | * |
503 | 503 | * @return void |
504 | 504 | */ |
505 | - public static function display_error_message ($message, $filter = true, $returnValue = false) |
|
505 | + public static function display_error_message($message, $filter = true, $returnValue = false) |
|
506 | 506 | { |
507 | 507 | $message = self::return_message($message, 'error', $filter); |
508 | 508 | if ($returnValue) { |
@@ -517,7 +517,7 @@ discard block |
||
517 | 517 | * @param string $type |
518 | 518 | * @param bool $filter |
519 | 519 | */ |
520 | - public static function return_message_and_translate($message, $type='normal', $filter = true) |
|
520 | + public static function return_message_and_translate($message, $type = 'normal', $filter = true) |
|
521 | 521 | { |
522 | 522 | $message = get_lang($message); |
523 | 523 | echo self::return_message($message, $type, $filter); |
@@ -584,14 +584,14 @@ discard block |
||
584 | 584 | } |
585 | 585 | // Encrypt email |
586 | 586 | $hmail = ''; |
587 | - for ($i = 0; $i < strlen($email); $i ++) { |
|
587 | + for ($i = 0; $i < strlen($email); $i++) { |
|
588 | 588 | $hmail .= '&#'.ord($email { |
589 | 589 | $i }).';'; |
590 | 590 | } |
591 | 591 | $hclickable_text = null; |
592 | 592 | // Encrypt clickable text if @ is present |
593 | 593 | if (strpos($clickable_text, '@')) { |
594 | - for ($i = 0; $i < strlen($clickable_text); $i ++) { |
|
594 | + for ($i = 0; $i < strlen($clickable_text); $i++) { |
|
595 | 595 | $hclickable_text .= '&#'.ord($clickable_text { |
596 | 596 | $i }).';'; |
597 | 597 | } |
@@ -623,7 +623,7 @@ discard block |
||
623 | 623 | } |
624 | 624 | // Encrypt email |
625 | 625 | $hmail = ''; |
626 | - for ($i = 0; $i < strlen($email); $i ++) { |
|
626 | + for ($i = 0; $i < strlen($email); $i++) { |
|
627 | 627 | $hmail .= '&#'.ord($email { |
628 | 628 | $i }).';'; |
629 | 629 | } |
@@ -643,7 +643,7 @@ discard block |
||
643 | 643 | public static function get_alphabet_options($selected_letter = '') |
644 | 644 | { |
645 | 645 | $result = ''; |
646 | - for ($i = 65; $i <= 90; $i ++) { |
|
646 | + for ($i = 65; $i <= 90; $i++) { |
|
647 | 647 | $letter = chr($i); |
648 | 648 | $result .= '<option value="'.$letter.'"'; |
649 | 649 | if ($selected_letter == $letter) { |
@@ -664,7 +664,7 @@ discard block |
||
664 | 664 | public static function get_numeric_options($min, $max, $selected_num = 0) |
665 | 665 | { |
666 | 666 | $result = ''; |
667 | - for ($i = $min; $i <= $max; $i ++) { |
|
667 | + for ($i = $min; $i <= $max; $i++) { |
|
668 | 668 | $result .= '<option value="'.$i.'"'; |
669 | 669 | if (is_int($selected_num)) |
670 | 670 | if ($selected_num == $i) { |
@@ -734,8 +734,8 @@ discard block |
||
734 | 734 | // important to use the public path (i.e. web/css/) rather than the |
735 | 735 | // internal path (/app/Resource/public/css/) because the path used |
736 | 736 | // in the end must be the public path |
737 | - $alternateCssPath = api_get_path(SYS_PUBLIC_PATH) . 'css/'; |
|
738 | - $alternateWebCssPath = api_get_path(WEB_PUBLIC_PATH) . 'css/'; |
|
737 | + $alternateCssPath = api_get_path(SYS_PUBLIC_PATH).'css/'; |
|
738 | + $alternateWebCssPath = api_get_path(WEB_PUBLIC_PATH).'css/'; |
|
739 | 739 | |
740 | 740 | $image = trim($image); |
741 | 741 | |
@@ -745,7 +745,7 @@ discard block |
||
745 | 745 | $size = ICON_SIZE_SMALL; |
746 | 746 | } |
747 | 747 | |
748 | - $size_extra = $size . '/'; |
|
748 | + $size_extra = $size.'/'; |
|
749 | 749 | |
750 | 750 | // Checking the img/ folder |
751 | 751 | $icon = $w_code_path.'img/'.$image; |
@@ -753,7 +753,7 @@ discard block |
||
753 | 753 | $theme = 'themes/chamilo/icons/'; |
754 | 754 | |
755 | 755 | if ($loadThemeIcon) { |
756 | - $theme = 'themes/' . api_get_visual_theme() . '/icons/'; |
|
756 | + $theme = 'themes/'.api_get_visual_theme().'/icons/'; |
|
757 | 757 | // Checking the theme icons folder example: app/Resources/public/css/themes/chamilo/icons/XXX |
758 | 758 | if (is_file($alternateCssPath.$theme.$size_extra.$image)) { |
759 | 759 | $icon = $alternateWebCssPath.$theme.$size_extra.$image; |
@@ -775,11 +775,11 @@ discard block |
||
775 | 775 | // ask for the SVG version directly |
776 | 776 | $svgIcons = api_get_setting('icons_mode_svg'); |
777 | 777 | if ($svgIcons == 'true' && $return_only_path == false) { |
778 | - $svgImage = substr($image, 0, -3) . 'svg'; |
|
779 | - if (is_file($code_path . $theme . 'svg/' . $svgImage)) { |
|
780 | - $icon = $w_code_path . $theme . 'svg/' . $svgImage; |
|
781 | - } elseif (is_file($code_path . 'img/icons/svg/' . $svgImage)) { |
|
782 | - $icon = $w_code_path . 'img/icons/svg/' . $svgImage; |
|
778 | + $svgImage = substr($image, 0, -3).'svg'; |
|
779 | + if (is_file($code_path.$theme.'svg/'.$svgImage)) { |
|
780 | + $icon = $w_code_path.$theme.'svg/'.$svgImage; |
|
781 | + } elseif (is_file($code_path.'img/icons/svg/'.$svgImage)) { |
|
782 | + $icon = $w_code_path.'img/icons/svg/'.$svgImage; |
|
783 | 783 | } |
784 | 784 | |
785 | 785 | if (empty($additional_attributes['height'])) { |
@@ -868,7 +868,7 @@ discard block |
||
868 | 868 | } |
869 | 869 | } |
870 | 870 | //some tags don't have this </XXX> |
871 | - if (in_array($tag, array('img','input','br'))) { |
|
871 | + if (in_array($tag, array('img', 'input', 'br'))) { |
|
872 | 872 | $return_value = '<'.$tag.' '.$attribute_list.' />'; |
873 | 873 | } else { |
874 | 874 | $return_value = '<'.$tag.' '.$attribute_list.' >'.$content.'</'.$tag.'>'; |
@@ -921,13 +921,13 @@ discard block |
||
921 | 921 | public static function input($type, $name, $value, $attributes = array()) |
922 | 922 | { |
923 | 923 | if (isset($type)) { |
924 | - $attributes['type']= $type; |
|
924 | + $attributes['type'] = $type; |
|
925 | 925 | } |
926 | 926 | if (isset($name)) { |
927 | - $attributes['name']= $name; |
|
927 | + $attributes['name'] = $name; |
|
928 | 928 | } |
929 | 929 | if (isset($value)) { |
930 | - $attributes['value']= $value; |
|
930 | + $attributes['value'] = $value; |
|
931 | 931 | } |
932 | 932 | return self::tag('input', '', $attributes); |
933 | 933 | } |
@@ -960,14 +960,14 @@ discard block |
||
960 | 960 | ) { |
961 | 961 | $html = ''; |
962 | 962 | $extra = ''; |
963 | - $default_id = 'id="' . $name . '" '; |
|
963 | + $default_id = 'id="'.$name.'" '; |
|
964 | 964 | foreach ($extra_attributes as $key => $parameter) { |
965 | 965 | if ($key == 'id') { |
966 | 966 | $default_id = ''; |
967 | 967 | } |
968 | - $extra .= $key . '="' . $parameter . '" '; |
|
968 | + $extra .= $key.'="'.$parameter.'" '; |
|
969 | 969 | } |
970 | - $html .= '<select name="' . $name . '" ' . $default_id . ' ' . $extra . '>'; |
|
970 | + $html .= '<select name="'.$name.'" '.$default_id.' '.$extra.'>'; |
|
971 | 971 | |
972 | 972 | if ($show_blank_item) { |
973 | 973 | if (empty($blank_item_text)) { |
@@ -975,14 +975,14 @@ discard block |
||
975 | 975 | } else { |
976 | 976 | $blank_item_text = Security::remove_XSS($blank_item_text); |
977 | 977 | } |
978 | - $html .= self::tag('option', '-- ' . $blank_item_text . ' --', array('value' => '-1')); |
|
978 | + $html .= self::tag('option', '-- '.$blank_item_text.' --', array('value' => '-1')); |
|
979 | 979 | } |
980 | 980 | if ($values) { |
981 | 981 | foreach ($values as $key => $value) { |
982 | 982 | if (is_array($value) && isset($value['name'])) { |
983 | 983 | $value = $value['name']; |
984 | 984 | } |
985 | - $html .= '<option value="' . $key . '"'; |
|
985 | + $html .= '<option value="'.$key.'"'; |
|
986 | 986 | |
987 | 987 | if (is_array($default)) { |
988 | 988 | foreach ($default as $item) { |
@@ -997,7 +997,7 @@ discard block |
||
997 | 997 | } |
998 | 998 | } |
999 | 999 | |
1000 | - $html .= '>' . $value . '</option>'; |
|
1000 | + $html .= '>'.$value.'</option>'; |
|
1001 | 1001 | } |
1002 | 1002 | } |
1003 | 1003 | $html .= '</select>'; |
@@ -1025,7 +1025,7 @@ discard block |
||
1025 | 1025 | */ |
1026 | 1026 | public static function tabs($headers, $items, $id = 'tabs', $attributes = array(), $ul_attributes = array()) |
1027 | 1027 | { |
1028 | - if (empty($headers) || count($headers) == 0 ) { |
|
1028 | + if (empty($headers) || count($headers) == 0) { |
|
1029 | 1029 | return ''; |
1030 | 1030 | } |
1031 | 1031 | |
@@ -1036,7 +1036,7 @@ discard block |
||
1036 | 1036 | if ($i == 1) { |
1037 | 1037 | $active = ' active'; |
1038 | 1038 | } |
1039 | - $item = self::tag('a', $item, array('href'=>'#'.$id.'-'.$i, 'role'=> 'tab', 'data-toggle' => 'tab', 'id' => $id . $i)); |
|
1039 | + $item = self::tag('a', $item, array('href'=>'#'.$id.'-'.$i, 'role'=> 'tab', 'data-toggle' => 'tab', 'id' => $id.$i)); |
|
1040 | 1040 | $ul_attributes['role'] = 'presentation'; |
1041 | 1041 | $ul_attributes['class'] = $active; |
1042 | 1042 | $lis .= self::tag('li', $item, $ul_attributes); |
@@ -1065,7 +1065,7 @@ discard block |
||
1065 | 1065 | |
1066 | 1066 | $main_div = self::tag('div', $ul.self::tag('div', $divs, ['class' => 'tab-content']), $attributes); |
1067 | 1067 | |
1068 | - return $main_div ; |
|
1068 | + return $main_div; |
|
1069 | 1069 | } |
1070 | 1070 | |
1071 | 1071 | /** |
@@ -1113,8 +1113,8 @@ discard block |
||
1113 | 1113 | */ |
1114 | 1114 | public static function grid_html($div_id) |
1115 | 1115 | { |
1116 | - $table = self::tag('table','', array('id' => $div_id)); |
|
1117 | - $table .= self::tag('div','', array('id' => $div_id.'_pager')); |
|
1116 | + $table = self::tag('table', '', array('id' => $div_id)); |
|
1117 | + $table .= self::tag('div', '', array('id' => $div_id.'_pager')); |
|
1118 | 1118 | return $table; |
1119 | 1119 | } |
1120 | 1120 | |
@@ -1175,7 +1175,7 @@ discard block |
||
1175 | 1175 | $obj->colNames = $column_names; |
1176 | 1176 | $obj->colModel = $column_model; |
1177 | 1177 | $obj->pager = '#'.$div_id.'_pager'; |
1178 | - $obj->datatype = 'json'; |
|
1178 | + $obj->datatype = 'json'; |
|
1179 | 1179 | $obj->viewrecords = 'true'; |
1180 | 1180 | |
1181 | 1181 | $all_value = 10000000; |
@@ -1236,10 +1236,10 @@ discard block |
||
1236 | 1236 | // Adding static data. |
1237 | 1237 | if (!empty($data)) { |
1238 | 1238 | $data_var = $div_id.'_data'; |
1239 | - $json.=' var '.$data_var.' = '.json_encode($data).';'; |
|
1239 | + $json .= ' var '.$data_var.' = '.json_encode($data).';'; |
|
1240 | 1240 | $obj->data = $data_var; |
1241 | 1241 | $obj->datatype = 'local'; |
1242 | - $json.="\n"; |
|
1242 | + $json .= "\n"; |
|
1243 | 1243 | } |
1244 | 1244 | |
1245 | 1245 | $obj->end = 'end'; |
@@ -1253,12 +1253,12 @@ discard block |
||
1253 | 1253 | } |
1254 | 1254 | |
1255 | 1255 | // Fixing true/false js values that doesn't need the "" |
1256 | - $json_encode = str_replace(':"true"',':true',$json_encode); |
|
1256 | + $json_encode = str_replace(':"true"', ':true', $json_encode); |
|
1257 | 1257 | // wrap_cell is not a valid jqgrid attributes is a hack to wrap a text |
1258 | 1258 | $json_encode = str_replace('"wrap_cell":true', 'cellattr : function(rowId, value, rowObject, colModel, arrData) { return \'class = "jqgrid_whitespace"\'; }', $json_encode); |
1259 | - $json_encode = str_replace(':"false"',':false',$json_encode); |
|
1259 | + $json_encode = str_replace(':"false"', ':false', $json_encode); |
|
1260 | 1260 | $json_encode = str_replace('"formatter":"action_formatter"', 'formatter:action_formatter', $json_encode); |
1261 | - $json_encode = str_replace(array('{"first":"first",','"end":"end"}'), '', $json_encode); |
|
1261 | + $json_encode = str_replace(array('{"first":"first",', '"end":"end"}'), '', $json_encode); |
|
1262 | 1262 | |
1263 | 1263 | // Creating the jqgrid element. |
1264 | 1264 | $json .= '$("#'.$div_id.'").jqGrid({'; |
@@ -1273,22 +1273,22 @@ discard block |
||
1273 | 1273 | $groups = ''; |
1274 | 1274 | foreach ($extra_params['groupHeaders'] as $group) { |
1275 | 1275 | //{ "startColumnName" : "courses", "numberOfColumns" : 1, "titleText" : "Order Info" }, |
1276 | - $groups .= '{ "startColumnName" : "' . $group['startColumnName'] . '", "numberOfColumns" : ' . $group['numberOfColumns'] . ', "titleText" : "' . $group['titleText'] . '" },'; |
|
1276 | + $groups .= '{ "startColumnName" : "'.$group['startColumnName'].'", "numberOfColumns" : '.$group['numberOfColumns'].', "titleText" : "'.$group['titleText'].'" },'; |
|
1277 | 1277 | |
1278 | 1278 | } |
1279 | 1279 | $json .= '$("#'.$div_id.'").jqGrid("setGroupHeaders", { |
1280 | 1280 | "useColSpanStyle" : false, |
1281 | 1281 | "groupHeaders" : [ |
1282 | - ' . $groups . ' |
|
1282 | + ' . $groups.' |
|
1283 | 1283 | ] |
1284 | 1284 | });'; |
1285 | 1285 | } |
1286 | 1286 | |
1287 | 1287 | $all_text = addslashes(get_lang('All')); |
1288 | 1288 | $json .= '$("'.$obj->pager.' option[value='.$all_value.']").text("'.$all_text.'");'; |
1289 | - $json.= "\n"; |
|
1289 | + $json .= "\n"; |
|
1290 | 1290 | // Adding edit/delete icons. |
1291 | - $json.= $formatter; |
|
1291 | + $json .= $formatter; |
|
1292 | 1292 | |
1293 | 1293 | return $json; |
1294 | 1294 | } |
@@ -1319,7 +1319,7 @@ discard block |
||
1319 | 1319 | } |
1320 | 1320 | |
1321 | 1321 | if (!empty($rows)) { |
1322 | - foreach($rows as $content) { |
|
1322 | + foreach ($rows as $content) { |
|
1323 | 1323 | $table->setCellContents($row, $column, $content); |
1324 | 1324 | $row++; |
1325 | 1325 | } |
@@ -1430,7 +1430,7 @@ discard block |
||
1430 | 1430 | lastedit_user_id != $user_id $sessionCondition AND |
1431 | 1431 | visibility != 2 AND |
1432 | 1432 | (to_user_id IN ('$user_id', '0') OR to_user_id IS NULL) AND |
1433 | - (to_group_id IN ('".implode("','",$group_ids)."') OR to_group_id IS NULL) |
|
1433 | + (to_group_id IN ('".implode("','", $group_ids)."') OR to_group_id IS NULL) |
|
1434 | 1434 | ORDER BY lastedit_date DESC |
1435 | 1435 | LIMIT 1"; |
1436 | 1436 | |
@@ -1449,9 +1449,8 @@ discard block |
||
1449 | 1449 | $return = ' '; |
1450 | 1450 | foreach ($notifications as $notification) { |
1451 | 1451 | $toolName = $notification['tool']; |
1452 | - if (! |
|
1453 | - ( |
|
1454 | - $notification['visibility'] == '1' || |
|
1452 | + if (!( |
|
1453 | + $notification['visibility'] == '1' || |
|
1455 | 1454 | ($status == '1' && $notification['visibility'] == '0') || |
1456 | 1455 | !isset($notification['visibility']) |
1457 | 1456 | ) |
@@ -1535,9 +1534,9 @@ discard block |
||
1535 | 1534 | $main_user_table = Database :: get_main_table(TABLE_MAIN_USER); |
1536 | 1535 | $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION); |
1537 | 1536 | // Request for the name of the general coach |
1538 | - $sql ='SELECT tu.lastname, tu.firstname, ts.* |
|
1537 | + $sql = 'SELECT tu.lastname, tu.firstname, ts.* |
|
1539 | 1538 | FROM '.$tbl_session.' ts |
1540 | - LEFT JOIN '.$main_user_table .' tu |
|
1539 | + LEFT JOIN '.$main_user_table.' tu |
|
1541 | 1540 | ON ts.id_coach = tu.user_id |
1542 | 1541 | WHERE ts.id = '.intval($session_id); |
1543 | 1542 | $rs = Database::query($sql); |
@@ -1549,7 +1548,7 @@ discard block |
||
1549 | 1548 | $session['title'] = $session_info['name']; |
1550 | 1549 | $session['id_coach'] = $session_info['id_coach']; |
1551 | 1550 | $session['coach'] = ''; |
1552 | - $session['dates'] = ''; |
|
1551 | + $session['dates'] = ''; |
|
1553 | 1552 | |
1554 | 1553 | if (($session_info['access_end_date'] == '0000-00-00 00:00:00' && $session_info['access_start_date'] == '0000-00-00 00:00:00') || |
1555 | 1554 | ($session_info['access_end_date'] == '0000-00-00 00:00:00' && $session_info['access_start_date'] == '0000-00-00 00:00:00') || |
@@ -1621,7 +1620,7 @@ discard block |
||
1621 | 1620 | $session['dates'] = $dates['access']; |
1622 | 1621 | |
1623 | 1622 | |
1624 | - if (api_get_setting('show_session_coach') === 'true' ) { |
|
1623 | + if (api_get_setting('show_session_coach') === 'true') { |
|
1625 | 1624 | $session['coach'] = api_get_person_name( |
1626 | 1625 | $session_info['firstname'], |
1627 | 1626 | $session_info['lastname'] |
@@ -1675,9 +1674,9 @@ discard block |
||
1675 | 1674 | $percentage = isset($point_info['point_average']) ? $point_info['point_average'] : 0; |
1676 | 1675 | |
1677 | 1676 | if (!empty($percentage)) { |
1678 | - $percentage = $percentage*125/100; |
|
1677 | + $percentage = $percentage * 125 / 100; |
|
1679 | 1678 | } |
1680 | - $accesses = isset($point_info['accesses']) ? $point_info['accesses'] : 0; |
|
1679 | + $accesses = isset($point_info['accesses']) ? $point_info['accesses'] : 0; |
|
1681 | 1680 | |
1682 | 1681 | $star_label = sprintf(get_lang('XStarsOutOf5'), $point_info['point_average_star']); |
1683 | 1682 | |
@@ -1692,19 +1691,19 @@ discard block |
||
1692 | 1691 | |
1693 | 1692 | $labels = array(); |
1694 | 1693 | |
1695 | - $labels[]= $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes'); |
|
1696 | - $labels[]= $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits'); |
|
1694 | + $labels[] = $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes'); |
|
1695 | + $labels[] = $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits'); |
|
1697 | 1696 | /* if (!empty($number_of_users_who_voted)) { |
1698 | 1697 | $labels[]= get_lang('Average').' '.$point_info['point_average_star'].'/5'; |
1699 | 1698 | } */ |
1700 | 1699 | |
1701 | - $labels[]= $point_info['user_vote'] ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote'). ' [?] '; |
|
1700 | + $labels[] = $point_info['user_vote'] ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote').' [?] '; |
|
1702 | 1701 | |
1703 | 1702 | if (!$add_div_wrapper && api_is_anonymous()) { |
1704 | - $labels[]= Display::tag('span', get_lang('LoginToVote'), array('class' => 'error')); |
|
1703 | + $labels[] = Display::tag('span', get_lang('LoginToVote'), array('class' => 'error')); |
|
1705 | 1704 | } |
1706 | 1705 | |
1707 | - $html .= Display::div(implode(' | ', $labels) , array('id' => 'vote_label_'.$id, 'class' => 'vote_label_info')); |
|
1706 | + $html .= Display::div(implode(' | ', $labels), array('id' => 'vote_label_'.$id, 'class' => 'vote_label_info')); |
|
1708 | 1707 | $html .= ' '.Display::span(' ', array('id' => 'vote_label2_'.$id)); |
1709 | 1708 | |
1710 | 1709 | if ($add_div_wrapper) { |
@@ -1777,8 +1776,8 @@ discard block |
||
1777 | 1776 | if (!empty($list)) { |
1778 | 1777 | $html = '<dl class="dl-horizontal">'; |
1779 | 1778 | foreach ($list as $item) { |
1780 | - $html .= '<dt>' . $item['title'] . '</dt>'; |
|
1781 | - $html .= '<dd>' . $item['content'] . '</dd>'; |
|
1779 | + $html .= '<dt>'.$item['title'].'</dt>'; |
|
1780 | + $html .= '<dd>'.$item['content'].'</dd>'; |
|
1782 | 1781 | } |
1783 | 1782 | $html .= '</dl>'; |
1784 | 1783 | } |
@@ -1820,7 +1819,7 @@ discard block |
||
1820 | 1819 | * @param string $type |
1821 | 1820 | * @return null|string |
1822 | 1821 | */ |
1823 | - public static function badge($count, $type ="warning") |
|
1822 | + public static function badge($count, $type = "warning") |
|
1824 | 1823 | { |
1825 | 1824 | $class = ''; |
1826 | 1825 | |
@@ -1896,7 +1895,7 @@ discard block |
||
1896 | 1895 | if (!empty($content)) { |
1897 | 1896 | $html = '<span class="label '.$class.'">'; |
1898 | 1897 | $html .= $content; |
1899 | - $html .='</span>'; |
|
1898 | + $html .= '</span>'; |
|
1900 | 1899 | } |
1901 | 1900 | |
1902 | 1901 | return $html; |
@@ -1917,7 +1916,7 @@ discard block |
||
1917 | 1916 | $class = 'class ="active"'; |
1918 | 1917 | } |
1919 | 1918 | |
1920 | - if (basename($_SERVER['REQUEST_URI']) == basename($value['url']) ) { |
|
1919 | + if (basename($_SERVER['REQUEST_URI']) == basename($value['url'])) { |
|
1921 | 1920 | $class = 'class ="active"'; |
1922 | 1921 | } |
1923 | 1922 | $html .= "<li $class >"; |
@@ -2171,7 +2170,7 @@ discard block |
||
2171 | 2170 | } |
2172 | 2171 | $label = $nextValue + $localCounter + 1; |
2173 | 2172 | if ($isMedia) { |
2174 | - $label = ($fixedValue + 1) .' '.chr(97 + $localCounter); |
|
2173 | + $label = ($fixedValue + 1).' '.chr(97 + $localCounter); |
|
2175 | 2174 | $link_to_show = $link.$fixedValue.'#questionanchor'.$itemId; |
2176 | 2175 | } |
2177 | 2176 | $link = Display::url($label.' ', $link_to_show, $linkAttributes); |
@@ -2352,7 +2351,7 @@ discard block |
||
2352 | 2351 | $attributes['title'] = isset($attributes['title']) ? $attributes['title'] : $text; |
2353 | 2352 | |
2354 | 2353 | if (!$includeText) { |
2355 | - $text = '<span class="sr-only">' . $text . '</span>'; |
|
2354 | + $text = '<span class="sr-only">'.$text.'</span>'; |
|
2356 | 2355 | } |
2357 | 2356 | |
2358 | 2357 | return self::url("$icon $text", $url, $attributes); |
@@ -2367,9 +2366,9 @@ discard block |
||
2367 | 2366 | */ |
2368 | 2367 | public static function toolbarAction($id, $content = array(), $col = 2, $right = true) |
2369 | 2368 | { |
2370 | - $columns = 12/$col; |
|
2369 | + $columns = 12 / $col; |
|
2371 | 2370 | $html = ''; |
2372 | - $html .= '<div id="' . $id . '" class="actions">'; |
|
2371 | + $html .= '<div id="'.$id.'" class="actions">'; |
|
2373 | 2372 | $html .= '<div class="row">'; |
2374 | 2373 | if ($col > 4) { |
2375 | 2374 | $html = '<div class="alert alert-warning" role="alert"> |
@@ -2377,7 +2376,7 @@ discard block |
||
2377 | 2376 | </div>'; |
2378 | 2377 | } else { |
2379 | 2378 | for ($i = 0; $i < $col; $i++) { |
2380 | - $html .= '<div class="col-md-' . $columns . '">'; |
|
2379 | + $html .= '<div class="col-md-'.$columns.'">'; |
|
2381 | 2380 | if ($col == 2 && $i == 1) { |
2382 | 2381 | if ($right === true) { |
2383 | 2382 | $html .= '<div class="pull-right">'; |
@@ -2493,9 +2492,9 @@ discard block |
||
2493 | 2492 | $params['class'] = 'panel panel-default'; |
2494 | 2493 | $html = null; |
2495 | 2494 | if (!empty($title)) { |
2496 | - $html .= '<div class="panel-heading">'.$title.'</div>' . PHP_EOL; |
|
2495 | + $html .= '<div class="panel-heading">'.$title.'</div>'.PHP_EOL; |
|
2497 | 2496 | } |
2498 | - $html.= '<div class="panel-body">'.$content.'</div>' . PHP_EOL; |
|
2497 | + $html .= '<div class="panel-body">'.$content.'</div>'.PHP_EOL; |
|
2499 | 2498 | $html = Display::div($html, $params); |
2500 | 2499 | } |
2501 | 2500 | return $html; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | /** |
36 | - * @return array |
|
36 | + * @return string[] |
|
37 | 37 | */ |
38 | 38 | public static function toolList() |
39 | 39 | { |
@@ -293,7 +293,6 @@ discard block |
||
293 | 293 | * 'page_nr' = The page to display |
294 | 294 | * 'hide_navigation' = true to hide the navigation |
295 | 295 | * @param array $query_vars Additional variables to add in the query-string |
296 | - * @param array $form actions Additional variables to add in the query-string |
|
297 | 296 | * @param mixed An array with bool values to know which columns show. |
298 | 297 | * i.e: $visibility_options= array(true, false) we will only show the first column |
299 | 298 | * Can be also only a bool value. TRUE: show all columns, FALSE: show nothing |
@@ -334,7 +333,6 @@ discard block |
||
334 | 333 | * 'page_nr' = The page to display |
335 | 334 | * 'hide_navigation' = true to hide the navigation |
336 | 335 | * @param array $query_vars Additional variables to add in the query-string |
337 | - * @param array $form actions Additional variables to add in the query-string |
|
338 | 336 | * @param mixed An array with bool values to know which columns show. i.e: |
339 | 337 | * $visibility_options= array(true, false) we will only show the first column |
340 | 338 | * Can be also only a bool value. TRUE: show all columns, FALSE: show nothing |
@@ -391,10 +389,11 @@ discard block |
||
391 | 389 | * 'per_page' = number of items to show per page |
392 | 390 | * 'page_nr' = The page to display |
393 | 391 | * @param array $query_vars Additional variables to add in the query-string |
394 | - * @param array $column_show Array of binaries 1= show columns 0. hide a column |
|
392 | + * @param integer[] $column_show Array of binaries 1= show columns 0. hide a column |
|
395 | 393 | * @param array $column_order An array of integers that let us decide how the columns are going to be sort. |
396 | 394 | * i.e: $column_order=array('1''4','3','4'); The 2nd column will be order like the 4th column |
397 | 395 | * @param array $form_actions Set optional forms actions |
396 | + * @param string $table_name |
|
398 | 397 | * |
399 | 398 | * @author Julio Montoya |
400 | 399 | */ |
@@ -449,7 +448,7 @@ discard block |
||
449 | 448 | * |
450 | 449 | * @deprecated use Display::addFlash with Display::return_message($message, 'normal'); |
451 | 450 | * |
452 | - * @return void |
|
451 | + * @return string|null |
|
453 | 452 | */ |
454 | 453 | public static function display_normal_message($message, $filter = true, $returnValue = false) |
455 | 454 | { |
@@ -481,7 +480,7 @@ discard block |
||
481 | 480 | * Displays an confirmation message. Use this if something has been done successfully |
482 | 481 | * @param bool Filter (true) or not (false) |
483 | 482 | * @deprecated use Display::addFlash with Display::return_message |
484 | - * @return void |
|
483 | + * @return string|null |
|
485 | 484 | */ |
486 | 485 | public static function display_confirmation_message ($message, $filter = true, $returnValue = false) |
487 | 486 | { |
@@ -500,7 +499,7 @@ discard block |
||
500 | 499 | * @param bool Filter (true) or not (false) |
501 | 500 | * @deprecated use Display::addFlash with Display::return_message |
502 | 501 | * |
503 | - * @return void |
|
502 | + * @return string|null |
|
504 | 503 | */ |
505 | 504 | public static function display_error_message ($message, $filter = true, $returnValue = false) |
506 | 505 | { |
@@ -681,6 +680,7 @@ discard block |
||
681 | 680 | * @param string The alt text (probably a language variable) |
682 | 681 | * @param array additional attributes (for instance height, width, onclick, ...) |
683 | 682 | * @param integer The wanted width of the icon (to be looked for in the corresponding img/icons/ folder) |
683 | + * @param string $image |
|
684 | 684 | * @return void |
685 | 685 | */ |
686 | 686 | public static function display_icon( |
@@ -917,6 +917,7 @@ discard block |
||
917 | 917 | /** |
918 | 918 | * Displays an HTML input tag |
919 | 919 | * |
920 | + * @param string $type |
|
920 | 921 | */ |
921 | 922 | public static function input($type, $name, $value, $attributes = array()) |
922 | 923 | { |
@@ -933,8 +934,8 @@ discard block |
||
933 | 934 | } |
934 | 935 | |
935 | 936 | /** |
936 | - * @param $name |
|
937 | - * @param $value |
|
937 | + * @param string $name |
|
938 | + * @param string $value |
|
938 | 939 | * @param array $attributes |
939 | 940 | * @return string |
940 | 941 | */ |
@@ -949,6 +950,7 @@ discard block |
||
949 | 950 | /** |
950 | 951 | * Displays an HTML select tag |
951 | 952 | * |
953 | + * @param string $blank_item_text |
|
952 | 954 | */ |
953 | 955 | public static function select( |
954 | 956 | $name, |
@@ -1015,8 +1017,8 @@ discard block |
||
1015 | 1017 | $( "#tabs" ).tabs(); |
1016 | 1018 | }); |
1017 | 1019 | </script> |
1018 | - * @param array $headers list of the tab titles |
|
1019 | - * @param array $items |
|
1020 | + * @param string[] $headers list of the tab titles |
|
1021 | + * @param string[] $items |
|
1020 | 1022 | * @param string $id id of the container of the tab in the example "tabs" |
1021 | 1023 | * @param array $attributes for the ul |
1022 | 1024 | * @param array $ul_attributes |
@@ -1070,7 +1072,7 @@ discard block |
||
1070 | 1072 | |
1071 | 1073 | /** |
1072 | 1074 | * @param $headers |
1073 | - * @param null $selected |
|
1075 | + * @param integer $selected |
|
1074 | 1076 | * |
1075 | 1077 | * @return string |
1076 | 1078 | */ |
@@ -1108,6 +1110,7 @@ discard block |
||
1108 | 1110 | * As you can see both function use the same "my_grid_name" this is very important otherwise nothing will work |
1109 | 1111 | * |
1110 | 1112 | * @param string the div id, this value must be the same with the first parameter of Display::grid_js() |
1113 | + * @param string $div_id |
|
1111 | 1114 | * @return string html |
1112 | 1115 | * |
1113 | 1116 | */ |
@@ -1668,6 +1671,8 @@ discard block |
||
1668 | 1671 | * @param string url that will be added (for jquery see hot_courses.tpl) |
1669 | 1672 | * @param string point info array see function CourseManager::get_course_ranking() |
1670 | 1673 | * @param bool add a div wrapper |
1674 | + * @param string $id |
|
1675 | + * @param string $url |
|
1671 | 1676 | * @todo use templates |
1672 | 1677 | **/ |
1673 | 1678 | public static function return_rating_system($id, $url, $point_info = array(), $add_div_wrapper = true) |
@@ -1758,6 +1763,9 @@ discard block |
||
1758 | 1763 | return '<'.$size.'>'.Security::remove_XSS($title).'</'.$size.'>'; |
1759 | 1764 | } |
1760 | 1765 | |
1766 | + /** |
|
1767 | + * @param string $title |
|
1768 | + */ |
|
1761 | 1769 | public static function page_subheader2($title, $second_title = null) |
1762 | 1770 | { |
1763 | 1771 | return self::page_header($title, $second_title, 'h4'); |
@@ -2005,6 +2013,7 @@ discard block |
||
2005 | 2013 | |
2006 | 2014 | /** |
2007 | 2015 | * @todo use twig |
2016 | + * @param string $title |
|
2008 | 2017 | */ |
2009 | 2018 | public static function groupButtonWithDropDown($title, $elements) |
2010 | 2019 | { |
@@ -2378,9 +2387,9 @@ discard block |
||
2378 | 2387 | |
2379 | 2388 | /** |
2380 | 2389 | * @param int $id |
2381 | - * @param array $content |
|
2390 | + * @param string[] $content |
|
2382 | 2391 | * @param int $col |
2383 | - * @param bool|true $right |
|
2392 | + * @param boolean $right |
|
2384 | 2393 | * @return string |
2385 | 2394 | */ |
2386 | 2395 | public static function toolbarAction($id, $content = array(), $col = 2, $right = true) |
@@ -2464,10 +2473,10 @@ discard block |
||
2464 | 2473 | /** |
2465 | 2474 | * @param string $title |
2466 | 2475 | * @param string $content |
2467 | - * @param null $id |
|
2476 | + * @param string $id |
|
2468 | 2477 | * @param array $params |
2469 | - * @param null $idAccordion |
|
2470 | - * @param null $idCollapse |
|
2478 | + * @param string $idAccordion |
|
2479 | + * @param string $idCollapse |
|
2471 | 2480 | * @param bool|true $open |
2472 | 2481 | * @param bool|false $fullClickable |
2473 | 2482 | * @return null|string |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | ); |
51 | 51 | } |
52 | 52 | |
53 | - /** |
|
54 | - * Displays the page header |
|
55 | - * @param string The name of the page (will be showed in the page title) |
|
56 | - * @param string Optional help file name |
|
57 | - * @param string $page_header |
|
58 | - */ |
|
53 | + /** |
|
54 | + * Displays the page header |
|
55 | + * @param string The name of the page (will be showed in the page title) |
|
56 | + * @param string Optional help file name |
|
57 | + * @param string $page_header |
|
58 | + */ |
|
59 | 59 | public static function display_header($tool_name ='', $help = null, $page_header = null) |
60 | 60 | { |
61 | 61 | $origin = api_get_origin(); |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | */ |
454 | 454 | public static function display_normal_message($message, $filter = true, $returnValue = false) |
455 | 455 | { |
456 | - $message = self::return_message($message, 'normal', $filter); |
|
456 | + $message = self::return_message($message, 'normal', $filter); |
|
457 | 457 | if ($returnValue) { |
458 | 458 | return $message; |
459 | 459 | } else { |
@@ -537,22 +537,22 @@ discard block |
||
537 | 537 | } |
538 | 538 | |
539 | 539 | if ($filter) { |
540 | - $message = api_htmlentities($message, ENT_QUOTES, api_is_xml_http_request() ? 'UTF-8' : api_get_system_encoding()); |
|
540 | + $message = api_htmlentities($message, ENT_QUOTES, api_is_xml_http_request() ? 'UTF-8' : api_get_system_encoding()); |
|
541 | 541 | } |
542 | 542 | |
543 | 543 | $class = ''; |
544 | 544 | switch ($type) { |
545 | 545 | case 'warning': |
546 | 546 | $class .= 'alert alert-warning'; |
547 | - break; |
|
547 | + break; |
|
548 | 548 | case 'error': |
549 | 549 | $class .= 'alert alert-danger'; |
550 | - break; |
|
550 | + break; |
|
551 | 551 | case 'confirmation': |
552 | 552 | case 'confirm': |
553 | 553 | case 'success': |
554 | 554 | $class .= 'alert alert-success'; |
555 | - break; |
|
555 | + break; |
|
556 | 556 | case 'normal': |
557 | 557 | default: |
558 | 558 | $class .= 'alert alert-info'; |
@@ -682,7 +682,7 @@ discard block |
||
682 | 682 | * @param array additional attributes (for instance height, width, onclick, ...) |
683 | 683 | * @param integer The wanted width of the icon (to be looked for in the corresponding img/icons/ folder) |
684 | 684 | * @return void |
685 | - */ |
|
685 | + */ |
|
686 | 686 | public static function display_icon( |
687 | 687 | $image, |
688 | 688 | $alt_text = '', |
@@ -718,7 +718,7 @@ discard block |
||
718 | 718 | * @author Julio Montoya 2010 Function improved, adding image constants |
719 | 719 | * @author Yannick Warnier 2011 Added size handler |
720 | 720 | * @version Feb 2011 |
721 | - */ |
|
721 | + */ |
|
722 | 722 | public static function return_icon( |
723 | 723 | $image, |
724 | 724 | $alt_text = '', |
@@ -920,14 +920,14 @@ discard block |
||
920 | 920 | */ |
921 | 921 | public static function input($type, $name, $value, $attributes = array()) |
922 | 922 | { |
923 | - if (isset($type)) { |
|
924 | - $attributes['type']= $type; |
|
925 | - } |
|
926 | - if (isset($name)) { |
|
927 | - $attributes['name']= $name; |
|
928 | - } |
|
929 | - if (isset($value)) { |
|
930 | - $attributes['value']= $value; |
|
923 | + if (isset($type)) { |
|
924 | + $attributes['type']= $type; |
|
925 | + } |
|
926 | + if (isset($name)) { |
|
927 | + $attributes['name']= $name; |
|
928 | + } |
|
929 | + if (isset($value)) { |
|
930 | + $attributes['value']= $value; |
|
931 | 931 | } |
932 | 932 | return self::tag('input', '', $attributes); |
933 | 933 | } |
@@ -940,10 +940,10 @@ discard block |
||
940 | 940 | */ |
941 | 941 | public static function button($name, $value, $attributes = array()) |
942 | 942 | { |
943 | - if (!empty($name)) { |
|
943 | + if (!empty($name)) { |
|
944 | 944 | $attributes['name'] = $name; |
945 | - } |
|
946 | - return self::tag('button', $value, $attributes); |
|
945 | + } |
|
946 | + return self::tag('button', $value, $attributes); |
|
947 | 947 | } |
948 | 948 | |
949 | 949 | /** |
@@ -1010,7 +1010,7 @@ discard block |
||
1010 | 1010 | * in the $htmlHeadXtra variable before the display_header |
1011 | 1011 | * Add this script |
1012 | 1012 | * @example |
1013 | - * <script> |
|
1013 | + * <script> |
|
1014 | 1014 | $(function() { |
1015 | 1015 | $( "#tabs" ).tabs(); |
1016 | 1016 | }); |
@@ -1076,20 +1076,20 @@ discard block |
||
1076 | 1076 | */ |
1077 | 1077 | public static function tabsOnlyLink($headers, $selected = null) |
1078 | 1078 | { |
1079 | - $id = uniqid(); |
|
1080 | - $i = 1; |
|
1081 | - $lis = null; |
|
1082 | - foreach ($headers as $item) { |
|
1079 | + $id = uniqid(); |
|
1080 | + $i = 1; |
|
1081 | + $lis = null; |
|
1082 | + foreach ($headers as $item) { |
|
1083 | 1083 | $class = null; |
1084 | 1084 | if ($i == $selected) { |
1085 | 1085 | $class = 'active'; |
1086 | 1086 | } |
1087 | - $item = self::tag( |
|
1088 | - 'a', |
|
1089 | - $item['content'], |
|
1090 | - array('id' => $id.'-'.$i, 'href' => $item['url']) |
|
1091 | - ); |
|
1092 | - $lis .= self::tag('li', $item, array('class' => $class)); |
|
1087 | + $item = self::tag( |
|
1088 | + 'a', |
|
1089 | + $item['content'], |
|
1090 | + array('id' => $id.'-'.$i, 'href' => $item['url']) |
|
1091 | + ); |
|
1092 | + $lis .= self::tag('li', $item, array('class' => $class)); |
|
1093 | 1093 | $i++; |
1094 | 1094 | } |
1095 | 1095 | return self::tag('ul', $lis, array('class' => 'nav nav-tabs tabs-margin')); |
@@ -1301,8 +1301,8 @@ discard block |
||
1301 | 1301 | */ |
1302 | 1302 | public static function table($headers, $rows, $attributes = array()) |
1303 | 1303 | { |
1304 | - if (empty($attributes)) { |
|
1305 | - $attributes['class'] = 'data_table'; |
|
1304 | + if (empty($attributes)) { |
|
1305 | + $attributes['class'] = 'data_table'; |
|
1306 | 1306 | } |
1307 | 1307 | $table = new HTML_Table($attributes); |
1308 | 1308 | $row = 0; |
@@ -1310,17 +1310,17 @@ discard block |
||
1310 | 1310 | |
1311 | 1311 | // Course headers |
1312 | 1312 | if (!empty($headers)) { |
1313 | - foreach ($headers as $item) { |
|
1314 | - $table->setHeaderContents($row, $column, $item); |
|
1315 | - $column++; |
|
1316 | - } |
|
1317 | - $row = 1; |
|
1318 | - $column = 0; |
|
1313 | + foreach ($headers as $item) { |
|
1314 | + $table->setHeaderContents($row, $column, $item); |
|
1315 | + $column++; |
|
1316 | + } |
|
1317 | + $row = 1; |
|
1318 | + $column = 0; |
|
1319 | 1319 | } |
1320 | 1320 | |
1321 | 1321 | if (!empty($rows)) { |
1322 | - foreach($rows as $content) { |
|
1323 | - $table->setCellContents($row, $column, $content); |
|
1322 | + foreach($rows as $content) { |
|
1323 | + $table->setCellContents($row, $column, $content); |
|
1324 | 1324 | $row++; |
1325 | 1325 | } |
1326 | 1326 | } |
@@ -1666,21 +1666,21 @@ discard block |
||
1666 | 1666 | * |
1667 | 1667 | * @param string id of the rating ul element |
1668 | 1668 | * @param string url that will be added (for jquery see hot_courses.tpl) |
1669 | - * @param string point info array see function CourseManager::get_course_ranking() |
|
1670 | - * @param bool add a div wrapper |
|
1671 | - * @todo use templates |
|
1669 | + * @param string point info array see function CourseManager::get_course_ranking() |
|
1670 | + * @param bool add a div wrapper |
|
1671 | + * @todo use templates |
|
1672 | 1672 | **/ |
1673 | 1673 | public static function return_rating_system($id, $url, $point_info = array(), $add_div_wrapper = true) |
1674 | 1674 | { |
1675 | - $number_of_users_who_voted = isset($point_info['users_who_voted']) ? $point_info['users_who_voted'] : null; |
|
1676 | - $percentage = isset($point_info['point_average']) ? $point_info['point_average'] : 0; |
|
1675 | + $number_of_users_who_voted = isset($point_info['users_who_voted']) ? $point_info['users_who_voted'] : null; |
|
1676 | + $percentage = isset($point_info['point_average']) ? $point_info['point_average'] : 0; |
|
1677 | 1677 | |
1678 | - if (!empty($percentage)) { |
|
1678 | + if (!empty($percentage)) { |
|
1679 | 1679 | $percentage = $percentage*125/100; |
1680 | 1680 | } |
1681 | - $accesses = isset($point_info['accesses']) ? $point_info['accesses'] : 0; |
|
1681 | + $accesses = isset($point_info['accesses']) ? $point_info['accesses'] : 0; |
|
1682 | 1682 | |
1683 | - $star_label = sprintf(get_lang('XStarsOutOf5'), $point_info['point_average_star']); |
|
1683 | + $star_label = sprintf(get_lang('XStarsOutOf5'), $point_info['point_average_star']); |
|
1684 | 1684 | |
1685 | 1685 | $html = '<ul id="'.$id.'" class="star-rating"> |
1686 | 1686 | <li class="current-rating" style="width:'.$percentage.'px;"></li> |
@@ -1691,26 +1691,26 @@ discard block |
||
1691 | 1691 | <li><a href="javascript:void(0);" data-link="'.$url.'&star=5" title="'.$star_label.'" class="five-stars">5</a></li> |
1692 | 1692 | </ul>'; |
1693 | 1693 | |
1694 | - $labels = array(); |
|
1694 | + $labels = array(); |
|
1695 | 1695 | |
1696 | - $labels[]= $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes'); |
|
1697 | - $labels[]= $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits'); |
|
1698 | - /* if (!empty($number_of_users_who_voted)) { |
|
1696 | + $labels[]= $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes'); |
|
1697 | + $labels[]= $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits'); |
|
1698 | + /* if (!empty($number_of_users_who_voted)) { |
|
1699 | 1699 | $labels[]= get_lang('Average').' '.$point_info['point_average_star'].'/5'; |
1700 | 1700 | } */ |
1701 | 1701 | |
1702 | - $labels[]= $point_info['user_vote'] ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote'). ' [?] '; |
|
1702 | + $labels[]= $point_info['user_vote'] ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote'). ' [?] '; |
|
1703 | 1703 | |
1704 | - if (!$add_div_wrapper && api_is_anonymous()) { |
|
1705 | - $labels[]= Display::tag('span', get_lang('LoginToVote'), array('class' => 'error')); |
|
1706 | - } |
|
1704 | + if (!$add_div_wrapper && api_is_anonymous()) { |
|
1705 | + $labels[]= Display::tag('span', get_lang('LoginToVote'), array('class' => 'error')); |
|
1706 | + } |
|
1707 | 1707 | |
1708 | 1708 | $html .= Display::div(implode(' | ', $labels) , array('id' => 'vote_label_'.$id, 'class' => 'vote_label_info')); |
1709 | 1709 | $html .= ' '.Display::span(' ', array('id' => 'vote_label2_'.$id)); |
1710 | 1710 | |
1711 | 1711 | if ($add_div_wrapper) { |
1712 | - $html = Display::div($html, array('id' => 'rating_wrapper_'.$id)); |
|
1713 | - } |
|
1712 | + $html = Display::div($html, array('id' => 'rating_wrapper_'.$id)); |
|
1713 | + } |
|
1714 | 1714 | |
1715 | 1715 | return $html; |
1716 | 1716 | } |
@@ -1743,8 +1743,8 @@ discard block |
||
1743 | 1743 | return self::page_header($title, $second_title); |
1744 | 1744 | } |
1745 | 1745 | |
1746 | - public static function page_subheader_and_translate($title, $second_title = null) |
|
1747 | - { |
|
1746 | + public static function page_subheader_and_translate($title, $second_title = null) |
|
1747 | + { |
|
1748 | 1748 | $title = get_lang($title); |
1749 | 1749 | return self::page_subheader($title, $second_title); |
1750 | 1750 | } |
@@ -2527,7 +2527,7 @@ discard block |
||
2527 | 2527 | */ |
2528 | 2528 | public static function dateToStringAgoAndLongDate($dateTime) |
2529 | 2529 | { |
2530 | - if (empty($dateTime) || $dateTime === '0000-00-00 00:00:00') { |
|
2530 | + if (empty($dateTime) || $dateTime === '0000-00-00 00:00:00') { |
|
2531 | 2531 | return ''; |
2532 | 2532 | } |
2533 | 2533 |
@@ -333,8 +333,12 @@ discard block |
||
333 | 333 | ) { |
334 | 334 | global $debug; |
335 | 335 | |
336 | - if ($debug) error_log('Called to update_event_exercice'); |
|
337 | - if ($debug) error_log('duration:' . $duration); |
|
336 | + if ($debug) { |
|
337 | + error_log('Called to update_event_exercice'); |
|
338 | + } |
|
339 | + if ($debug) { |
|
340 | + error_log('duration:' . $duration); |
|
341 | + } |
|
338 | 342 | |
339 | 343 | if ($exeid != '') { |
340 | 344 | /* |
@@ -386,8 +390,12 @@ discard block |
||
386 | 390 | WHERE exe_id = '".Database::escape_string($exeid)."'"; |
387 | 391 | $res = Database::query($sql); |
388 | 392 | |
389 | - if ($debug) error_log('update_event_exercice called'); |
|
390 | - if ($debug) error_log("$sql"); |
|
393 | + if ($debug) { |
|
394 | + error_log('update_event_exercice called'); |
|
395 | + } |
|
396 | + if ($debug) { |
|
397 | + error_log("$sql"); |
|
398 | + } |
|
391 | 399 | |
392 | 400 | //Deleting control time session track |
393 | 401 | //ExerciseLib::exercise_time_control_delete($exo_id); |
@@ -77,9 +77,7 @@ discard block |
||
77 | 77 | Database::query($sql); |
78 | 78 | |
79 | 79 | // Auto subscribe |
80 | - $user_status = $userInfo['status'] == SESSIONADMIN ? 'sessionadmin' : |
|
81 | - $userInfo['status'] == COURSEMANAGER ? 'teacher' : |
|
82 | - $userInfo['status'] == DRH ? 'DRH' : 'student'; |
|
80 | + $user_status = $userInfo['status'] == SESSIONADMIN ? 'sessionadmin' : $userInfo['status'] == COURSEMANAGER ? 'teacher' : $userInfo['status'] == DRH ? 'DRH' : 'student'; |
|
83 | 81 | $autoSubscribe = api_get_setting($user_status.'_autosubscribe'); |
84 | 82 | if ($autoSubscribe) { |
85 | 83 | $autoSubscribe = explode('|', $autoSubscribe); |
@@ -336,7 +334,7 @@ discard block |
||
336 | 334 | global $debug; |
337 | 335 | |
338 | 336 | if ($debug) error_log('Called to update_event_exercice'); |
339 | - if ($debug) error_log('duration:' . $duration); |
|
337 | + if ($debug) error_log('duration:'.$duration); |
|
340 | 338 | |
341 | 339 | if ($exeid != '') { |
342 | 340 | /* |
@@ -384,7 +382,7 @@ discard block |
||
384 | 382 | status = '".$status."', |
385 | 383 | questions_to_check = '".$remind_list."', |
386 | 384 | data_tracking = '".implode(',', $question_list)."', |
387 | - user_ip = '" . Database::escape_string(api_get_real_ip()) . "' |
|
385 | + user_ip = '" . Database::escape_string(api_get_real_ip())."' |
|
388 | 386 | WHERE exe_id = '".Database::escape_string($exeid)."'"; |
389 | 387 | $res = Database::query($sql); |
390 | 388 | |
@@ -1055,15 +1053,15 @@ discard block |
||
1055 | 1053 | |
1056 | 1054 | if (!empty($exe_list) && is_array($exe_list) && count($exe_list) > 0) { |
1057 | 1055 | $sql = "DELETE FROM $track_e_exercises |
1058 | - WHERE exe_id IN (" . implode(',', $exe_list) . ")"; |
|
1056 | + WHERE exe_id IN (".implode(',', $exe_list).")"; |
|
1059 | 1057 | Database::query($sql); |
1060 | 1058 | |
1061 | 1059 | $sql = "DELETE FROM $track_attempts |
1062 | - WHERE exe_id IN (" . implode(',', $exe_list) . ")"; |
|
1060 | + WHERE exe_id IN (".implode(',', $exe_list).")"; |
|
1063 | 1061 | Database::query($sql); |
1064 | 1062 | |
1065 | 1063 | $sql = "DELETE FROM $recording_table |
1066 | - WHERE exe_id IN (" . implode(',', $exe_list) . ")"; |
|
1064 | + WHERE exe_id IN (".implode(',', $exe_list).")"; |
|
1067 | 1065 | Database::query($sql); |
1068 | 1066 | } |
1069 | 1067 | |
@@ -1105,7 +1103,7 @@ discard block |
||
1105 | 1103 | Event::addEvent( |
1106 | 1104 | LOG_EXERCISE_RESULT_DELETE, |
1107 | 1105 | LOG_EXERCISE_AND_USER_ID, |
1108 | - $exercise_id . '-' . $user_id, |
|
1106 | + $exercise_id.'-'.$user_id, |
|
1109 | 1107 | null, |
1110 | 1108 | null, |
1111 | 1109 | $course_id, |
@@ -1705,7 +1703,7 @@ discard block |
||
1705 | 1703 | Event::addEvent( |
1706 | 1704 | LOG_QUESTION_RESULT_DELETE, |
1707 | 1705 | LOG_EXERCISE_ATTEMPT_QUESTION_ID, |
1708 | - $exe_id . '-' . $question_id, |
|
1706 | + $exe_id.'-'.$question_id, |
|
1709 | 1707 | null, |
1710 | 1708 | null, |
1711 | 1709 | $courseId, |
@@ -1741,7 +1739,7 @@ discard block |
||
1741 | 1739 | Event::addEvent( |
1742 | 1740 | LOG_QUESTION_RESULT_DELETE, |
1743 | 1741 | LOG_EXERCISE_ATTEMPT_QUESTION_ID, |
1744 | - $exe_id . '-' . $question_id, |
|
1742 | + $exe_id.'-'.$question_id, |
|
1745 | 1743 | null, |
1746 | 1744 | null, |
1747 | 1745 | $courseId, |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | } |
240 | 240 | |
241 | 241 | /** |
242 | - * @param doc_id id of document (id in mainDb.document table) |
|
242 | + * @param doc_id string of document (id in mainDb.document table) |
|
243 | 243 | * @author Sebastien Piraux <[email protected]> |
244 | 244 | * @desc Record information for upload event |
245 | 245 | * used in the works tool to record informations when |
@@ -313,6 +313,9 @@ discard block |
||
313 | 313 | * @param int session_id |
314 | 314 | * @param int learnpath_id (id of the learnpath) |
315 | 315 | * @param int learnpath_item_id (id of the learnpath_item) |
316 | + * @param integer $score |
|
317 | + * @param integer $weighting |
|
318 | + * @param integer $session_id |
|
316 | 319 | * |
317 | 320 | * @author Sebastien Piraux <[email protected]> |
318 | 321 | * @author Julio Montoya Armas <[email protected]> Reworked 2010 |
@@ -414,7 +417,9 @@ discard block |
||
414 | 417 | * @param integer Session ID (from the session table). Default value of null means "get from context". |
415 | 418 | * @param integer Learnpath ID (from c_lp table). Default value of null means "get from context". |
416 | 419 | * @param integer Learnpath item ID (from the c_lp_item table). Default value of null means "get from context". |
417 | - * @return boolean Result of the insert query |
|
420 | + * @param integer $exe_id |
|
421 | + * @param integer $position |
|
422 | + * @return false|string Result of the insert query |
|
418 | 423 | */ |
419 | 424 | public static function saveQuestionAttempt( |
420 | 425 | $score, |
@@ -588,6 +593,8 @@ discard block |
||
588 | 593 | * @param int Whether this answer is correct (1) or not (0) |
589 | 594 | * @param string Coordinates of this point (e.g. 123;324) |
590 | 595 | * @param bool update results? |
596 | + * @param integer $exe_id |
|
597 | + * @param integer $correct |
|
591 | 598 | * @return boolean Result of the insert query |
592 | 599 | * @uses Course code and user_id from global scope $_cid and $_user |
593 | 600 | */ |
@@ -800,11 +807,11 @@ discard block |
||
800 | 807 | /** |
801 | 808 | * Save the new message for one event and for one language |
802 | 809 | * |
803 | - * @param string $eventName |
|
810 | + * @param string $event_name |
|
804 | 811 | * @param array $users |
805 | 812 | * @param string $message |
806 | 813 | * @param string $subject |
807 | - * @param string $eventMessageLanguage |
|
814 | + * @param string $event_message_language |
|
808 | 815 | * @param int $activated |
809 | 816 | */ |
810 | 817 | public static function save_event_type_message($event_name, $users, $message, $subject, $event_message_language, $activated) |
@@ -938,10 +945,10 @@ discard block |
||
938 | 945 | } |
939 | 946 | |
940 | 947 | /** |
941 | - * @param $user_id |
|
948 | + * @param integer $user_id |
|
942 | 949 | * @param $exerciseId |
943 | - * @param $lp_id |
|
944 | - * @param $lp_item_id |
|
950 | + * @param integer $lp_id |
|
951 | + * @param integer $lp_item_id |
|
945 | 952 | * @return int |
946 | 953 | */ |
947 | 954 | public static function get_attempt_count_not_finished($user_id, $exerciseId, $lp_id, $lp_item_id) |
@@ -1118,6 +1125,7 @@ discard block |
||
1118 | 1125 | * @param int exercise id |
1119 | 1126 | * @param int $courseId |
1120 | 1127 | * @param int session id |
1128 | + * @param integer $user_id |
|
1121 | 1129 | * @return array with the results |
1122 | 1130 | * |
1123 | 1131 | */ |
@@ -1213,6 +1221,7 @@ discard block |
||
1213 | 1221 | * @param int exercise id |
1214 | 1222 | * @param int $courseId |
1215 | 1223 | * @param int session id |
1224 | + * @param integer $user_id |
|
1216 | 1225 | * @return array with the results |
1217 | 1226 | * |
1218 | 1227 | */ |
@@ -1301,6 +1310,8 @@ discard block |
||
1301 | 1310 | * @param int lp id |
1302 | 1311 | * @param int lp item id |
1303 | 1312 | * @param string order asc or desc |
1313 | + * @param integer $courseId |
|
1314 | + * @param string $order |
|
1304 | 1315 | * @return array with the results |
1305 | 1316 | * |
1306 | 1317 | */ |
@@ -1367,7 +1378,7 @@ discard block |
||
1367 | 1378 | * @param int exercise id |
1368 | 1379 | * @param int $courseId |
1369 | 1380 | * @param int session id |
1370 | - * @return array with the results |
|
1381 | + * @return string with the results |
|
1371 | 1382 | * |
1372 | 1383 | */ |
1373 | 1384 | public static function count_exercise_attempts_by_user($user_id, $exercise_id, $courseId, $session_id = 0) |
@@ -1538,7 +1549,7 @@ discard block |
||
1538 | 1549 | * @param int exercise id |
1539 | 1550 | * @param int course id |
1540 | 1551 | * @param int session id |
1541 | - * @return array with the results |
|
1552 | + * @return integer with the results |
|
1542 | 1553 | * |
1543 | 1554 | */ |
1544 | 1555 | public static function get_count_exercises_attempted_by_course($courseId, $session_id = 0) |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | |
177 | 177 | $sql = "SELECT MAX(description_type) as MAX |
178 | 178 | FROM $tbl_course_description |
179 | - WHERE c_id = $course_id AND session_id='" . $this->session_id . "'"; |
|
179 | + WHERE c_id = $course_id AND session_id='".$this->session_id."'"; |
|
180 | 180 | $rs = Database::query($sql); |
181 | 181 | $max = Database::fetch_array($rs); |
182 | 182 | $description_type = $max['MAX'] + 1; |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | 'session_id' => $this->session_id |
212 | 212 | ]; |
213 | 213 | |
214 | - $last_id = Database::insert($table, $params); |
|
214 | + $last_id = Database::insert($table, $params); |
|
215 | 215 | |
216 | 216 | if ($last_id > 0) { |
217 | 217 | $sql = "UPDATE $table SET id = iid WHERE iid = $last_id"; |
@@ -319,8 +319,8 @@ discard block |
||
319 | 319 | $sql = "DELETE FROM $tbl_course_description |
320 | 320 | WHERE |
321 | 321 | c_id = $course_id AND |
322 | - id = '" . intval($this->id) . "' AND |
|
323 | - session_id = '" . intval($this->session_id) . "'"; |
|
322 | + id = '".intval($this->id)."' AND |
|
323 | + session_id = '" . intval($this->session_id)."'"; |
|
324 | 324 | $result = Database::query($sql); |
325 | 325 | $affected_rows = Database::affected_rows($result); |
326 | 326 | if ($this->id > 0) { |
@@ -349,7 +349,7 @@ discard block |
||
349 | 349 | $course_id = api_get_course_int_id(); |
350 | 350 | |
351 | 351 | $sql = "SELECT id FROM $tbl_course_description |
352 | - WHERE c_id = $course_id AND description_type = '" . intval($description_type) . "'"; |
|
352 | + WHERE c_id = $course_id AND description_type = '".intval($description_type)."'"; |
|
353 | 353 | $rs = Database::query($sql); |
354 | 354 | $row = Database::fetch_array($rs); |
355 | 355 | $description_id = $row['id']; |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | |
360 | 360 | /** |
361 | 361 | * Get description titles by default |
362 | - * @return array |
|
362 | + * @return string[] |
|
363 | 363 | */ |
364 | 364 | public function get_default_description_title() |
365 | 365 | { |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | |
379 | 379 | /** |
380 | 380 | * Get description titles editable by default |
381 | - * @return array |
|
381 | + * @return boolean[] |
|
382 | 382 | */ |
383 | 383 | public function get_default_description_title_editable() |
384 | 384 | { |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | |
398 | 398 | /** |
399 | 399 | * Get description icons by default |
400 | - * @return array |
|
400 | + * @return string[] |
|
401 | 401 | */ |
402 | 402 | public function get_default_description_icon() |
403 | 403 | { |
@@ -417,7 +417,7 @@ discard block |
||
417 | 417 | |
418 | 418 | /** |
419 | 419 | * Get questions by default for help |
420 | - * @return array |
|
420 | + * @return string[] |
|
421 | 421 | */ |
422 | 422 | public function get_default_question() |
423 | 423 | { |
@@ -436,7 +436,7 @@ discard block |
||
436 | 436 | |
437 | 437 | /** |
438 | 438 | * Get informations by default for help |
439 | - * @return array |
|
439 | + * @return string[] |
|
440 | 440 | */ |
441 | 441 | public function get_default_information() |
442 | 442 | { |
@@ -574,7 +574,7 @@ discard block |
||
574 | 574 | /** |
575 | 575 | * get progress of a description |
576 | 576 | * |
577 | - * @return int |
|
577 | + * @return string |
|
578 | 578 | */ |
579 | 579 | public function get_progress() |
580 | 580 | { |
@@ -33,11 +33,11 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | /** |
36 | - * This function is for editing profile info from profile_id. |
|
37 | - * @param int $profileId |
|
38 | - * @param string $name |
|
39 | - * @param string $description |
|
40 | - */ |
|
36 | + * This function is for editing profile info from profile_id. |
|
37 | + * @param int $profileId |
|
38 | + * @param string $name |
|
39 | + * @param string $description |
|
40 | + */ |
|
41 | 41 | public function updateProfileInfo($profileId, $name, $description) |
42 | 42 | { |
43 | 43 | $profileId = intval($profileId); |
@@ -128,9 +128,9 @@ discard block |
||
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
131 | - * This function is for getting profile info from profile_id. |
|
132 | - * @param int $profileId |
|
133 | - */ |
|
131 | + * This function is for getting profile info from profile_id. |
|
132 | + * @param int $profileId |
|
133 | + */ |
|
134 | 134 | |
135 | 135 | public function getProfileInfo($profileId) |
136 | 136 | { |
@@ -803,7 +803,7 @@ discard block |
||
803 | 803 | $attributes = array( |
804 | 804 | 'skill_id' => $skill_id, |
805 | 805 | 'parent_id' => $parent_id, |
806 | - 'relation_type' => (isset($params['relation_type'])?$params['relation_type']:0), |
|
806 | + 'relation_type' => (isset($params['relation_type']) ? $params['relation_type'] : 0), |
|
807 | 807 | //'level' => $params['level'], |
808 | 808 | ); |
809 | 809 | $skill_rel_skill->save($attributes); |
@@ -1012,7 +1012,7 @@ discard block |
||
1012 | 1012 | $skills[$skill_id] = $skill_info; |
1013 | 1013 | // Uncomment code below to hide the searched skill |
1014 | 1014 | $skills[$skill_id]['data']['parent_id'] = $skill_info['extra']['parent_id']; |
1015 | - $skills[$skill_id]['parent_id'] = 1; |
|
1015 | + $skills[$skill_id]['parent_id'] = 1; |
|
1016 | 1016 | } |
1017 | 1017 | } |
1018 | 1018 | } |
@@ -1077,7 +1077,7 @@ discard block |
||
1077 | 1077 | $skill['data']['skill_has_gradebook'] = true; |
1078 | 1078 | } |
1079 | 1079 | $refs[$skill['id']] = &$skill; |
1080 | - $flat_array[$skill['id']] = &$skill; |
|
1080 | + $flat_array[$skill['id']] = &$skill; |
|
1081 | 1081 | } |
1082 | 1082 | |
1083 | 1083 | // Checking family value |
@@ -1098,7 +1098,7 @@ discard block |
||
1098 | 1098 | $refs['root']['children'][0] = $skills[1]; |
1099 | 1099 | $skills[$skill_id]['data']['family_id'] = 1; |
1100 | 1100 | $refs['root']['children'][0]['children'][0] = $skills[$skill_id]; |
1101 | - $flat_array[$skill_id] = $skills[$skill_id]; |
|
1101 | + $flat_array[$skill_id] = $skills[$skill_id]; |
|
1102 | 1102 | } else { |
1103 | 1103 | // Moving node to the children index of their parents |
1104 | 1104 | |
@@ -1107,7 +1107,7 @@ discard block |
||
1107 | 1107 | $skill['data']['family_id'] = $new_family_array[$skill['id']]; |
1108 | 1108 | } |
1109 | 1109 | $refs[$skill['parent_id']]['children'][] = &$skill; |
1110 | - $flat_array[$my_skill_id] = $skill; |
|
1110 | + $flat_array[$my_skill_id] = $skill; |
|
1111 | 1111 | } |
1112 | 1112 | } |
1113 | 1113 | |
@@ -1219,7 +1219,7 @@ discard block |
||
1219 | 1219 | INNER JOIN {$this->table_skill_rel_user} su |
1220 | 1220 | ON (s.id = su.skill_id) |
1221 | 1221 | WHERE user_id = $user_id"; |
1222 | - $result = Database::query($sql); |
|
1222 | + $result = Database::query($sql); |
|
1223 | 1223 | if (Database::num_rows($result)) { |
1224 | 1224 | $result = Database::fetch_row($result); |
1225 | 1225 | return $result[0]; |
@@ -1261,7 +1261,7 @@ discard block |
||
1261 | 1261 | */ |
1262 | 1262 | public function get_user_list_skill_ranking_count() |
1263 | 1263 | { |
1264 | - $sql = "SELECT count(*) FROM ( |
|
1264 | + $sql = "SELECT count(*) FROM ( |
|
1265 | 1265 | SELECT count(distinct 1) |
1266 | 1266 | FROM {$this->table} s |
1267 | 1267 | INNER JOIN {$this->table_skill_rel_user} su |
@@ -1316,7 +1316,7 @@ discard block |
||
1316 | 1316 | ON c.code = g.course_code |
1317 | 1317 | WHERE sg.skill_id = $skill_id |
1318 | 1318 | AND (g.session_id IS NULL OR g.session_id = 0)"; |
1319 | - $result = Database::query($sql); |
|
1319 | + $result = Database::query($sql); |
|
1320 | 1320 | |
1321 | 1321 | return Database::store_result($result, 'ASSOC'); |
1322 | 1322 | } |
@@ -1505,7 +1505,7 @@ discard block |
||
1505 | 1505 | WHERE sg.skill_id = $skillId |
1506 | 1506 | AND g.session_id > 0"; |
1507 | 1507 | |
1508 | - $result = Database::query($sql); |
|
1508 | + $result = Database::query($sql); |
|
1509 | 1509 | |
1510 | 1510 | return Database::store_result($result, 'ASSOC'); |
1511 | 1511 | } |
@@ -348,6 +348,7 @@ discard block |
||
348 | 348 | |
349 | 349 | /** |
350 | 350 | * Gets an element |
351 | + * @param integer $gradebook_id |
|
351 | 352 | */ |
352 | 353 | public function get_skill_info($skill_id, $gradebook_id) |
353 | 354 | { |
@@ -577,7 +578,7 @@ discard block |
||
577 | 578 | * Gets an element |
578 | 579 | * @param int $id |
579 | 580 | * |
580 | - * @return array|mixed |
|
581 | + * @return integer |
|
581 | 582 | */ |
582 | 583 | public function get($id) |
583 | 584 | { |
@@ -923,7 +924,7 @@ discard block |
||
923 | 924 | /** |
924 | 925 | * Get user's skills |
925 | 926 | * |
926 | - * @param int $userId User's id |
|
927 | + * @param integer $user_id User's id |
|
927 | 928 | * @param bool $get_skill_data |
928 | 929 | */ |
929 | 930 | public function get_user_skills($user_id, $get_skill_data = false) |
@@ -1133,7 +1134,7 @@ discard block |
||
1133 | 1134 | * @param int skill id |
1134 | 1135 | * @param bool return a flat array or not |
1135 | 1136 | * @param int depth of the skills |
1136 | - * @return json |
|
1137 | + * @return string |
|
1137 | 1138 | */ |
1138 | 1139 | public function get_skills_tree_json( |
1139 | 1140 | $user_id = null, |
@@ -8,11 +8,11 @@ discard block |
||
8 | 8 | * Code |
9 | 9 | */ |
10 | 10 | require_once 'xapian.php'; |
11 | -require_once dirname(__FILE__) . '/../IndexableChunk.class.php'; |
|
11 | +require_once dirname(__FILE__).'/../IndexableChunk.class.php'; |
|
12 | 12 | //TODO: think another way without including specific fields here |
13 | -require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php'; |
|
13 | +require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php'; |
|
14 | 14 | |
15 | -define('XAPIAN_DB', api_get_path(SYS_UPLOAD_PATH) . 'plugins/xapian/searchdb/'); |
|
15 | +define('XAPIAN_DB', api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/searchdb/'); |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * Queries the database. |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | |
96 | 96 | // process each specific field prefix |
97 | 97 | foreach ($specific_fields as $specific_field) { |
98 | - $results[$count]['sf-' . $specific_field['code']] = xapian_get_doc_terms($document, $specific_field['code']); |
|
98 | + $results[$count]['sf-'.$specific_field['code']] = xapian_get_doc_terms($document, $specific_field['code']); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | // rest of data |
@@ -261,6 +261,6 @@ discard block |
||
261 | 261 | } else { |
262 | 262 | $message_error = get_lang('SearchOtherXapianError'); |
263 | 263 | } |
264 | - $display_message = get_lang('Error') . ' : ' . $message_error; |
|
264 | + $display_message = get_lang('Error').' : '.$message_error; |
|
265 | 265 | Display::display_error_message($display_message); |
266 | 266 | } |
@@ -239,6 +239,7 @@ |
||
239 | 239 | /** |
240 | 240 | * @author Isaac flores paz <[email protected]> |
241 | 241 | * @param String The xapian error message |
242 | + * @param string $xapian_error_message |
|
242 | 243 | * @return String The chamilo error message |
243 | 244 | */ |
244 | 245 | function display_xapian_error($xapian_error_message) { |
@@ -150,7 +150,7 @@ |
||
150 | 150 | $data = substr($png,$ipos,$chunk['size']); |
151 | 151 | $sections = explode("\0", $data); |
152 | 152 | if ($sections[0] == $key) { |
153 | - return $sections; |
|
153 | + return $sections; |
|
154 | 154 | } |
155 | 155 | } |
156 | 156 | // Extract the data and the CRC |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | foreach (array_keys($this->_chunks[$type]) as $typekey) { |
52 | 52 | list($key, $data) = explode("\0", $this->_chunks[$type][$typekey]); |
53 | 53 | if (strcmp($key, $check) == 0) { |
54 | - echo 'Key "' . $check . '" already exists in "' . $type . '" chunk.'; |
|
54 | + echo 'Key "'.$check.'" already exists in "'.$type.'" chunk.'; |
|
55 | 55 | return false; |
56 | 56 | } |
57 | 57 | } |
@@ -70,11 +70,11 @@ discard block |
||
70 | 70 | */ |
71 | 71 | public function addChunk($chunkType, $key, $value) { |
72 | 72 | |
73 | - $chunkData = $key . "\0" . $value; |
|
74 | - $crc = pack("N", crc32($chunkType . $chunkData)); |
|
73 | + $chunkData = $key."\0".$value; |
|
74 | + $crc = pack("N", crc32($chunkType.$chunkData)); |
|
75 | 75 | $len = pack("N", strlen($chunkData)); |
76 | 76 | |
77 | - $newChunk = $len . $chunkType . $chunkData . $crc; |
|
77 | + $newChunk = $len.$chunkType.$chunkData.$crc; |
|
78 | 78 | $result = substr($this->_contents, 0, $this->_size - 12) |
79 | 79 | . $newChunk |
80 | 80 | . substr($this->_contents, $this->_size - 12, 12); |
@@ -92,30 +92,30 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function removeChunks($chunkType, $key, $png) { |
94 | 94 | // Read the magic bytes and verify |
95 | - $retval = substr($png,0,8); |
|
95 | + $retval = substr($png, 0, 8); |
|
96 | 96 | $ipos = 8; |
97 | 97 | if ($retval != "\x89PNG\x0d\x0a\x1a\x0a") |
98 | 98 | throw new Exception('Is not a valid PNG image'); |
99 | 99 | // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type |
100 | - $chunkHeader = substr($png,$ipos,8); |
|
100 | + $chunkHeader = substr($png, $ipos, 8); |
|
101 | 101 | $ipos = $ipos + 8; |
102 | 102 | while ($chunkHeader) { |
103 | 103 | // Extract length and type from binary data |
104 | 104 | $chunk = @unpack('Nsize/a4type', $chunkHeader); |
105 | 105 | $skip = false; |
106 | - if ( $chunk['type'] == $chunkType ) { |
|
107 | - $data = substr($png,$ipos,$chunk['size']); |
|
106 | + if ($chunk['type'] == $chunkType) { |
|
107 | + $data = substr($png, $ipos, $chunk['size']); |
|
108 | 108 | $sections = explode("\0", $data); |
109 | 109 | print_r($sections); |
110 | - if ( $sections[0] == $key ) $skip = true; |
|
110 | + if ($sections[0] == $key) $skip = true; |
|
111 | 111 | } |
112 | 112 | // Extract the data and the CRC |
113 | - $data = substr($png,$ipos,$chunk['size']+4); |
|
113 | + $data = substr($png, $ipos, $chunk['size'] + 4); |
|
114 | 114 | $ipos = $ipos + $chunk['size'] + 4; |
115 | 115 | // Add in the header, data, and CRC |
116 | - if ( ! $skip ) $retval = $retval . $chunkHeader . $data; |
|
116 | + if (!$skip) $retval = $retval.$chunkHeader.$data; |
|
117 | 117 | // Read next chunk header |
118 | - $chunkHeader = substr($png,$ipos,8); |
|
118 | + $chunkHeader = substr($png, $ipos, 8); |
|
119 | 119 | $ipos = $ipos + 8; |
120 | 120 | } |
121 | 121 | return $retval; |
@@ -131,34 +131,34 @@ discard block |
||
131 | 131 | * If there is PNG information that matches the key an array is returned |
132 | 132 | * |
133 | 133 | */ |
134 | - public function extractBadgeInfo($png, $key='openbadges') { |
|
134 | + public function extractBadgeInfo($png, $key = 'openbadges') { |
|
135 | 135 | // Read the magic bytes and verify |
136 | - $retval = substr($png,0,8); |
|
136 | + $retval = substr($png, 0, 8); |
|
137 | 137 | $ipos = 8; |
138 | 138 | if ($retval != "\x89PNG\x0d\x0a\x1a\x0a") { |
139 | 139 | return false; |
140 | 140 | } |
141 | 141 | |
142 | 142 | // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type |
143 | - $chunkHeader = substr($png,$ipos,8); |
|
143 | + $chunkHeader = substr($png, $ipos, 8); |
|
144 | 144 | $ipos = $ipos + 8; |
145 | 145 | while ($chunkHeader) { |
146 | 146 | // Extract length and type from binary data |
147 | 147 | $chunk = @unpack('Nsize/a4type', $chunkHeader); |
148 | 148 | $skip = false; |
149 | 149 | if ($chunk['type'] == 'tEXt') { |
150 | - $data = substr($png,$ipos,$chunk['size']); |
|
150 | + $data = substr($png, $ipos, $chunk['size']); |
|
151 | 151 | $sections = explode("\0", $data); |
152 | 152 | if ($sections[0] == $key) { |
153 | 153 | return $sections; |
154 | 154 | } |
155 | 155 | } |
156 | 156 | // Extract the data and the CRC |
157 | - $data = substr($png,$ipos,$chunk['size']+4); |
|
157 | + $data = substr($png, $ipos, $chunk['size'] + 4); |
|
158 | 158 | $ipos = $ipos + $chunk['size'] + 4; |
159 | 159 | |
160 | 160 | // Read next chunk header |
161 | - $chunkHeader = substr($png,$ipos,8); |
|
161 | + $chunkHeader = substr($png, $ipos, 8); |
|
162 | 162 | $ipos = $ipos + 8; |
163 | 163 | } |
164 | 164 | } |
@@ -94,8 +94,9 @@ discard block |
||
94 | 94 | // Read the magic bytes and verify |
95 | 95 | $retval = substr($png,0,8); |
96 | 96 | $ipos = 8; |
97 | - if ($retval != "\x89PNG\x0d\x0a\x1a\x0a") |
|
98 | - throw new Exception('Is not a valid PNG image'); |
|
97 | + if ($retval != "\x89PNG\x0d\x0a\x1a\x0a") { |
|
98 | + throw new Exception('Is not a valid PNG image'); |
|
99 | + } |
|
99 | 100 | // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type |
100 | 101 | $chunkHeader = substr($png,$ipos,8); |
101 | 102 | $ipos = $ipos + 8; |
@@ -107,13 +108,17 @@ discard block |
||
107 | 108 | $data = substr($png,$ipos,$chunk['size']); |
108 | 109 | $sections = explode("\0", $data); |
109 | 110 | print_r($sections); |
110 | - if ( $sections[0] == $key ) $skip = true; |
|
111 | + if ( $sections[0] == $key ) { |
|
112 | + $skip = true; |
|
113 | + } |
|
111 | 114 | } |
112 | 115 | // Extract the data and the CRC |
113 | 116 | $data = substr($png,$ipos,$chunk['size']+4); |
114 | 117 | $ipos = $ipos + $chunk['size'] + 4; |
115 | 118 | // Add in the header, data, and CRC |
116 | - if ( ! $skip ) $retval = $retval . $chunkHeader . $data; |
|
119 | + if ( ! $skip ) { |
|
120 | + $retval = $retval . $chunkHeader . $data; |
|
121 | + } |
|
117 | 122 | // Read next chunk header |
118 | 123 | $chunkHeader = substr($png,$ipos,8); |
119 | 124 | $ipos = $ipos + 8; |