@@ -173,7 +173,7 @@ |
||
| 173 | 173 | |
| 174 | 174 | /** |
| 175 | 175 | * @param array $file |
| 176 | - * @return bool|string |
|
| 176 | + * @return string|false |
|
| 177 | 177 | */ |
| 178 | 178 | public static function import_uploaded_file($file) |
| 179 | 179 | { |
@@ -280,6 +280,7 @@ |
||
| 280 | 280 | } |
| 281 | 281 | /** |
| 282 | 282 | * Get dummy titles, descriptions and texts |
| 283 | + * @param string $type |
|
| 283 | 284 | */ |
| 284 | 285 | function get_dummy_content($type) |
| 285 | 286 | { |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | * @param null $feedback_type |
| 59 | 59 | * @param null $counter |
| 60 | 60 | * @param null $score |
| 61 | - * @return null|string |
|
| 61 | + * @return string |
|
| 62 | 62 | */ |
| 63 | 63 | function return_header($feedback_type = null, $counter = null, $score = null) |
| 64 | 64 | { |
@@ -95,7 +95,7 @@ |
||
| 95 | 95 | |
| 96 | 96 | /** |
| 97 | 97 | * Get the progress of this learnpath. Only the last attempt are taken into account. |
| 98 | - * @param $stud_id student id (default: all students who have results - then the average is returned) |
|
| 98 | + * @param integer $stud_id student id (default: all students who have results - then the average is returned) |
|
| 99 | 99 | * @return array (score, max) if student is given |
| 100 | 100 | * array (sum of scores, number of scores) otherwise |
| 101 | 101 | * or null if no scores available |
@@ -29,8 +29,9 @@ discard block |
||
| 29 | 29 | public function get_not_created_links() |
| 30 | 30 | { |
| 31 | 31 | return false; |
| 32 | - if (empty($this->course_code)) |
|
| 33 | - die('Error in get_not_created_links() : course code not set'); |
|
| 32 | + if (empty($this->course_code)) { |
|
| 33 | + die('Error in get_not_created_links() : course code not set'); |
|
| 34 | + } |
|
| 34 | 35 | |
| 35 | 36 | $tbl_grade_links = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); |
| 36 | 37 | |
@@ -57,8 +58,9 @@ discard block |
||
| 57 | 58 | */ |
| 58 | 59 | public function get_all_links() |
| 59 | 60 | { |
| 60 | - if (empty($this->course_code)) |
|
| 61 | - die('Error in get_not_created_links() : course code not set'); |
|
| 61 | + if (empty($this->course_code)) { |
|
| 62 | + die('Error in get_not_created_links() : course code not set'); |
|
| 63 | + } |
|
| 62 | 64 | |
| 63 | 65 | $session_id = api_get_session_id(); |
| 64 | 66 | if (empty($session_id)) { |
@@ -111,8 +113,9 @@ discard block |
||
| 111 | 113 | lp_id = ".$this->get_ref_id()." AND |
| 112 | 114 | session_id = $session_id "; |
| 113 | 115 | |
| 114 | - if (isset($stud_id)) |
|
| 115 | - $sql .= ' AND user_id = '.intval($stud_id); |
|
| 116 | + if (isset($stud_id)) { |
|
| 117 | + $sql .= ' AND user_id = '.intval($stud_id); |
|
| 118 | + } |
|
| 116 | 119 | |
| 117 | 120 | // order by id, that way the student's first attempt is accessed first |
| 118 | 121 | $sql .= ' ORDER BY view_count DESC'; |
@@ -122,8 +125,9 @@ discard block |
||
| 122 | 125 | if (isset($stud_id)) { |
| 123 | 126 | if ($data = Database::fetch_array($scores)) { |
| 124 | 127 | return array ($data['progress'], 100); |
| 125 | - } else |
|
| 126 | - return null; |
|
| 128 | + } else { |
|
| 129 | + return null; |
|
| 130 | + } |
|
| 127 | 131 | } else { |
| 128 | 132 | // all students -> get average |
| 129 | 133 | $students = array(); // user list, needed to make sure we only |
@@ -32,6 +32,8 @@ discard block |
||
| 32 | 32 | * @param array $evals |
| 33 | 33 | * @param array $links |
| 34 | 34 | * @param null $addparams |
| 35 | + * @param boolean $showTeacherView |
|
| 36 | + * @param integer $userId |
|
| 35 | 37 | */ |
| 36 | 38 | public function __construct( |
| 37 | 39 | $currentcat, |
@@ -895,7 +897,7 @@ discard block |
||
| 895 | 897 | |
| 896 | 898 | /** |
| 897 | 899 | * @param $item |
| 898 | - * @return mixed |
|
| 900 | + * @return string|null |
|
| 899 | 901 | */ |
| 900 | 902 | private function build_course_code($item) |
| 901 | 903 | { |
@@ -256,10 +256,11 @@ |
||
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | // Categories. |
| 259 | - if (!empty($data_array)) |
|
| 260 | - foreach ($data_array as $data) { |
|
| 259 | + if (!empty($data_array)) { |
|
| 260 | + foreach ($data_array as $data) { |
|
| 261 | 261 | // list of items inside the gradebook (exercises, lps, forums, etc) |
| 262 | 262 | $row = array(); |
| 263 | + } |
|
| 263 | 264 | /** @var AbstractLink $item */ |
| 264 | 265 | $item = $mainCategory = $data[0]; |
| 265 | 266 | |
@@ -72,6 +72,7 @@ discard block |
||
| 72 | 72 | |
| 73 | 73 | /** |
| 74 | 74 | * Get actual array data |
| 75 | + * @param integer $count |
|
| 75 | 76 | * @return array 2-dimensional array - each array contains the elements: |
| 76 | 77 | * 0: eval/link object |
| 77 | 78 | * 1: item name |
@@ -285,7 +286,7 @@ discard block |
||
| 285 | 286 | |
| 286 | 287 | /** |
| 287 | 288 | * @param $item |
| 288 | - * @param $ignore_score_color |
|
| 289 | + * @param boolean $ignore_score_color |
|
| 289 | 290 | * @return string |
| 290 | 291 | */ |
| 291 | 292 | private function build_average_column($item, $ignore_score_color) |
@@ -306,7 +307,7 @@ discard block |
||
| 306 | 307 | |
| 307 | 308 | /** |
| 308 | 309 | * @param $item |
| 309 | - * @param $ignore_score_color |
|
| 310 | + * @param boolean $ignore_score_color |
|
| 310 | 311 | * @return string |
| 311 | 312 | */ |
| 312 | 313 | private function build_result_column($item, $ignore_score_color) |
@@ -323,7 +324,7 @@ discard block |
||
| 323 | 324 | |
| 324 | 325 | /** |
| 325 | 326 | * @param $item |
| 326 | - * @param $ignore_score_color |
|
| 327 | + * @param boolean $ignore_score_color |
|
| 327 | 328 | * @return string |
| 328 | 329 | */ |
| 329 | 330 | private function build_mask_column($item, $ignore_score_color) |
@@ -339,7 +340,7 @@ discard block |
||
| 339 | 340 | |
| 340 | 341 | /** |
| 341 | 342 | * @param $coursecode |
| 342 | - * @return mixed |
|
| 343 | + * @return string |
|
| 343 | 344 | */ |
| 344 | 345 | private function get_course_name_from_code_cached($coursecode) |
| 345 | 346 | { |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | // sort users array |
| 96 | 96 | if ($sorting & self :: UDG_SORT_TYPE) { |
| 97 | 97 | usort($allitems, array('UserDataGenerator', 'sort_by_type')); |
| 98 | - }elseif ($sorting & self :: UDG_SORT_NAME) { |
|
| 98 | + } elseif ($sorting & self :: UDG_SORT_NAME) { |
|
| 99 | 99 | usort($allitems, array('UserDataGenerator', 'sort_by_name')); |
| 100 | 100 | } elseif ($sorting & self :: UDG_SORT_COURSE) { |
| 101 | 101 | usort($allitems, array('UserDataGenerator', 'sort_by_course')); |
@@ -148,8 +148,9 @@ discard block |
||
| 148 | 148 | $row[] = $this->build_category_name($item); |
| 149 | 149 | $row[] = $this->build_average_column($item, $ignore_score_color); |
| 150 | 150 | $row[] = $this->build_result_column($item, $ignore_score_color); |
| 151 | - if ($scoredisplay->is_custom()) |
|
| 152 | - $row[] = $this->build_mask_column($item, $ignore_score_color); |
|
| 151 | + if ($scoredisplay->is_custom()) { |
|
| 152 | + $row[] = $this->build_mask_column($item, $ignore_score_color); |
|
| 153 | + } |
|
| 153 | 154 | $data[] = $row; |
| 154 | 155 | } |
| 155 | 156 | return $data; |
@@ -362,13 +363,14 @@ discard block |
||
| 362 | 363 | if (isset ($this->categorycache) |
| 363 | 364 | && isset ($this->categorycache[$category_id])) { |
| 364 | 365 | return $this->categorycache[$category_id]; |
| 365 | - }else { |
|
| 366 | + } else { |
|
| 366 | 367 | $cat = Category::load($category_id); |
| 367 | 368 | if (isset($cat)){ |
| 368 | 369 | $this->categorycache[$category_id] = $cat[0]; |
| 369 | 370 | return $cat[0]; |
| 370 | - }else |
|
| 371 | - return null; |
|
| 371 | + } else { |
|
| 372 | + return null; |
|
| 373 | + } |
|
| 372 | 374 | } |
| 373 | 375 | } |
| 374 | 376 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * @return array |
|
| 21 | + * @return string[] |
|
| 22 | 22 | */ |
| 23 | 23 | public static function get_tags() |
| 24 | 24 | { |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @param string $course_code |
| 41 | 41 | * @param int $session_id |
| 42 | 42 | * |
| 43 | - * @return mixed |
|
| 43 | + * @return string |
|
| 44 | 44 | */ |
| 45 | 45 | public static function parse_content($userId, $content, $course_code, $session_id = 0) |
| 46 | 46 | { |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | * @param array uploaded file $_FILES |
| 350 | 350 | * @param string Comment describing the attachment |
| 351 | 351 | * @param bool $sendToUsersInSession |
| 352 | - * @return int false on failure, ID of the announcement on success |
|
| 352 | + * @return false|string false on failure, ID of the announcement on success |
|
| 353 | 353 | */ |
| 354 | 354 | public static function add_announcement( |
| 355 | 355 | $emailTitle, |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | * @param $to_users |
| 461 | 461 | * @param array $file |
| 462 | 462 | * @param string $file_comment |
| 463 | - * @return bool|int |
|
| 463 | + * @return false|string |
|
| 464 | 464 | */ |
| 465 | 465 | public static function add_group_announcement( |
| 466 | 466 | $emailTitle, |
@@ -699,7 +699,7 @@ discard block |
||
| 699 | 699 | |
| 700 | 700 | /** |
| 701 | 701 | * @param int $insert_id |
| 702 | - * @return bool |
|
| 702 | + * @return false|null |
|
| 703 | 703 | */ |
| 704 | 704 | public static function update_mail_sent($insert_id) |
| 705 | 705 | { |
@@ -719,6 +719,7 @@ discard block |
||
| 719 | 719 | * Gets all announcements from a user by course |
| 720 | 720 | * @param string course db |
| 721 | 721 | * @param int user id |
| 722 | + * @param integer $user_id |
|
| 722 | 723 | * @return array html with the content and count of announcements or false otherwise |
| 723 | 724 | */ |
| 724 | 725 | public static function get_all_annoucement_by_user_course($course_code, $user_id) |
@@ -1184,6 +1185,7 @@ discard block |
||
| 1184 | 1185 | * has been sent to |
| 1185 | 1186 | * @param string The tool (announcement, agenda, ...) |
| 1186 | 1187 | * @param int ID of the element of the corresponding type |
| 1188 | + * @param string $tool |
|
| 1187 | 1189 | * @return array Array of users and groups to whom the element has been sent |
| 1188 | 1190 | */ |
| 1189 | 1191 | public static function sent_to($tool, $id) |
@@ -1308,6 +1310,8 @@ discard block |
||
| 1308 | 1310 | * @param int attach id |
| 1309 | 1311 | * @param array uploaded file $_FILES |
| 1310 | 1312 | * @param string file comment |
| 1313 | + * @param integer $id_attach |
|
| 1314 | + * @param string $file_comment |
|
| 1311 | 1315 | * @return int |
| 1312 | 1316 | */ |
| 1313 | 1317 | public static function edit_announcement_attachment_file($id_attach, $file, $file_comment) |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | /** |
| 214 | 214 | * Displays the tools of a certain category. |
| 215 | 215 | * |
| 216 | - * @return void |
|
| 216 | + * @return string |
|
| 217 | 217 | * @param string $course_tool_category contains the category of tools to display: |
| 218 | 218 | * "Public", "PublicButHide", "courseAdmin", "claroAdmin" |
| 219 | 219 | */ |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | * @param array $all_tools_list List of tools as returned by get_tools_category() |
| 651 | 651 | * @param bool $rows |
| 652 | 652 | * |
| 653 | - * @return void |
|
| 653 | + * @return string |
|
| 654 | 654 | */ |
| 655 | 655 | public static function show_tools_category($all_tools_list, $rows = false) |
| 656 | 656 | { |
@@ -1194,6 +1194,7 @@ discard block |
||
| 1194 | 1194 | |
| 1195 | 1195 | /** |
| 1196 | 1196 | * Show a toolbar with shortcuts to the course tool |
| 1197 | + * @param integer $orientation |
|
| 1197 | 1198 | */ |
| 1198 | 1199 | public static function show_navigation_tool_shortcuts($orientation = SHORTCUTS_HORIZONTAL) |
| 1199 | 1200 | { |
@@ -1200,9 +1200,9 @@ |
||
| 1200 | 1200 | $navigation_items = self::get_navigation_items(false); |
| 1201 | 1201 | $html = ''; |
| 1202 | 1202 | if (!empty($navigation_items)) { |
| 1203 | - if ($orientation == SHORTCUTS_HORIZONTAL) |
|
| 1204 | - $style_id = "toolshortcuts_horizontal"; |
|
| 1205 | - else { |
|
| 1203 | + if ($orientation == SHORTCUTS_HORIZONTAL) { |
|
| 1204 | + $style_id = "toolshortcuts_horizontal"; |
|
| 1205 | + } else { |
|
| 1206 | 1206 | $style_id = "toolshortcuts_vertical"; |
| 1207 | 1207 | } |
| 1208 | 1208 | $html .= '<div id="'.$style_id.'">'; |
@@ -351,6 +351,12 @@ |
||
| 351 | 351 | |
| 352 | 352 | /** |
| 353 | 353 | * Additional functions needed for fast integration |
| 354 | + * @param integer $status |
|
| 355 | + * @param string $section |
|
| 356 | + * @param string $title |
|
| 357 | + * @param string $url |
|
| 358 | + * @param string|null $formatter |
|
| 359 | + * @param string $comment |
|
| 354 | 360 | */ |
| 355 | 361 | public function build_setting($status, $section, $title, $url, $current_value, $expected_value, $formatter, $comment, $img_path = null) { |
| 356 | 362 | switch ($status) { |
@@ -158,8 +158,9 @@ discard block |
||
| 158 | 158 | $array[] = $this->build_setting($status, '[INI]', 'display_errors', 'http://www.php.net/manual/en/ini.core.php#ini.display_errors', $setting, $req_setting, 'on_off', get_lang('DisplayErrorsInfo')); |
| 159 | 159 | |
| 160 | 160 | $setting = ini_get('default_charset'); |
| 161 | - if ($setting == '') |
|
| 162 | - $setting = null; |
|
| 161 | + if ($setting == '') { |
|
| 162 | + $setting = null; |
|
| 163 | + } |
|
| 163 | 164 | $req_setting = null; |
| 164 | 165 | $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_ERROR; |
| 165 | 166 | $array[] = $this->build_setting($status, '[INI]', 'default_charset', 'http://www.php.net/manual/en/ini.core.php#ini.default-charset', $setting, $req_setting, null, get_lang('DefaultCharsetInfo')); |
@@ -177,22 +178,25 @@ discard block |
||
| 177 | 178 | $setting = ini_get('memory_limit'); |
| 178 | 179 | $req_setting = '>= '.REQUIRED_MIN_MEMORY_LIMIT.'M'; |
| 179 | 180 | $status = self :: STATUS_ERROR; |
| 180 | - if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT) |
|
| 181 | - $status = self :: STATUS_OK; |
|
| 181 | + if ((float)$setting >= REQUIRED_MIN_MEMORY_LIMIT) { |
|
| 182 | + $status = self :: STATUS_OK; |
|
| 183 | + } |
|
| 182 | 184 | $array[] = $this->build_setting($status, '[INI]', 'memory_limit', 'http://www.php.net/manual/en/ini.core.php#ini.memory-limit', $setting, $req_setting, null, get_lang('MemoryLimitInfo')); |
| 183 | 185 | |
| 184 | 186 | $setting = ini_get('post_max_size'); |
| 185 | 187 | $req_setting = '>= '.REQUIRED_MIN_POST_MAX_SIZE.'M'; |
| 186 | 188 | $status = self :: STATUS_ERROR; |
| 187 | - if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE) |
|
| 188 | - $status = self :: STATUS_OK; |
|
| 189 | + if ((float)$setting >= REQUIRED_MIN_POST_MAX_SIZE) { |
|
| 190 | + $status = self :: STATUS_OK; |
|
| 191 | + } |
|
| 189 | 192 | $array[] = $this->build_setting($status, '[INI]', 'post_max_size', 'http://www.php.net/manual/en/ini.core.php#ini.post-max-size', $setting, $req_setting, null, get_lang('PostMaxSizeInfo')); |
| 190 | 193 | |
| 191 | 194 | $setting = ini_get('upload_max_filesize'); |
| 192 | 195 | $req_setting = '>= '.REQUIRED_MIN_UPLOAD_MAX_FILESIZE.'M'; |
| 193 | 196 | $status = self :: STATUS_ERROR; |
| 194 | - if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE) |
|
| 195 | - $status = self :: STATUS_OK; |
|
| 197 | + if ((float)$setting >= REQUIRED_MIN_UPLOAD_MAX_FILESIZE) { |
|
| 198 | + $status = self :: STATUS_OK; |
|
| 199 | + } |
|
| 196 | 200 | $array[] = $this->build_setting($status, '[INI]', 'upload_max_filesize', 'http://www.php.net/manual/en/ini.core.php#ini.upload_max_filesize', $setting, $req_setting, null, get_lang('UploadMaxFilesizeInfo')); |
| 197 | 201 | |
| 198 | 202 | $setting = ini_get('variables_order'); |
@@ -205,7 +209,7 @@ discard block |
||
| 205 | 209 | $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING; |
| 206 | 210 | $array[] = $this->build_setting($status, '[SESSION]', 'session.gc_maxlifetime', 'http://www.php.net/manual/en/ini.core.php#session.gc-maxlifetime', $setting, $req_setting, null, get_lang('SessionGCMaxLifetimeInfo')); |
| 207 | 211 | |
| 208 | - if (api_check_browscap()){$setting = true;}else{$setting=false;} |
|
| 212 | + if (api_check_browscap()){$setting = true;} else{$setting=false;} |
|
| 209 | 213 | $req_setting = true; |
| 210 | 214 | $status = $setting == $req_setting ? self :: STATUS_OK : self :: STATUS_WARNING; |
| 211 | 215 | $array[] = $this->build_setting($status, '[INI]', 'browscap', 'http://www.php.net/manual/en/misc.configuration.php#ini.browscap', $setting, $req_setting, 'on_off', get_lang('BrowscapInfo')); |