From 5e3679d495dae735482b0c8f23075b22fd2dd0b4 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 17 Jan 2019 14:20:10 +0100 Subject: [PATCH] Minor - flint fixes --- main/admin/index.php | 2 +- main/admin/system_announcements.php | 4 - main/auth/courses.php | 4 +- main/auth/courses_categories.php | 226 +++++++------- main/auth/courses_list.php | 4 +- .../course_description_controller.php | 1 - main/course_info/about.php | 2 - main/document/document_slideshow.inc.php | 2 - main/dropbox/dropbox_functions.inc.php | 2 +- main/dropbox/index.php | 12 +- ...MultipleAnswerTrueFalseDegreeCertainty.php | 2 +- main/exercise/ReadingComprehension.php | 26 +- main/exercise/TestCategory.php | 2 +- main/exercise/question.class.php | 44 +-- main/gradebook/lib/be/category.class.php | 4 +- main/gradebook/lib/be/exerciselink.class.php | 2 +- .../gradebook/lib/fe/gradebooktable.class.php | 2 +- main/gradebook/lib/fe/linkform.class.php | 4 +- main/gradebook/lib/fe/resulttable.class.php | 2 +- .../lib/gradebook_data_generator.class.php | 2 +- .../lib/CoursesAndSessionsCatalog.class.php | 3 +- main/inc/lib/MoodleImport.php | 2 +- main/inc/lib/api.lib.php | 4 +- main/inc/lib/blog.lib.php | 6 +- main/inc/lib/course.lib.php | 19 +- main/inc/lib/course_category.lib.php | 2 +- main/inc/lib/display.lib.php | 47 ++- main/inc/lib/document.lib.php | 8 +- main/inc/lib/extra_field_option.lib.php | 2 +- main/inc/lib/link.lib.php | 29 +- main/inc/lib/plugin.lib.php | 2 +- main/inc/lib/social.lib.php | 6 +- main/inc/lib/system_announcements.lib.php | 14 +- main/inc/lib/usergroup.lib.php | 41 ++- main/inc/lib/userportal.lib.php | 287 +++++++++--------- main/lp/learnpath.class.php | 2 - main/lp/learnpathItem.class.php | 4 +- main/lp/lp_ajax_save_item.php | 2 +- main/mySpace/student.php | 2 +- main/mySpace/users.php | 2 +- main/social/group_view.php | 1 - main/social/groups.php | 4 +- main/social/home.php | 6 +- main/ticket/ticket_details.php | 1 - main/webservices/lp.php | 2 +- main/webservices/registration.soap.php | 18 +- main/work/work.lib.php | 2 +- .../src/HookAdvancedSubscription.php | 4 +- .../GraphQL/Resolver/CourseResolver.php | 2 +- .../Block/BreadcrumbBlockService.php | 5 +- .../Editor/CkEditor/Toolbar/TestMatching.php | 4 +- .../Controller/EditorController.php | 2 +- .../Controller/ResourceController.php | 2 +- .../EventListener/LoginSuccessHandler.php | 2 +- .../EventListener/LogoutSuccessHandler.php | 2 +- src/CoreBundle/Framework/PageController.php | 2 +- .../Settings/AbstractSettingsSchema.php | 6 +- .../Controller/Home/HomeController.php | 6 +- src/LtiBundle/Entity/ExternalTool.php | 14 +- src/UserBundle/Entity/User.php | 1 + src/UserBundle/Repository/UserRepository.php | 2 +- .../Security/LoginFormAuthenticator.php | 2 +- user_portal.php | 4 +- 63 files changed, 435 insertions(+), 492 deletions(-) diff --git a/main/admin/index.php b/main/admin/index.php index 70f43ef4f9..be5b3493b8 100644 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -689,7 +689,7 @@ if (api_is_platform_admin()) { // The template contains the call to the AJAX version checker $template = $tpl->get_template('admin/index.html.twig'); $content = $tpl->fetch($template); -$tpl->assign('content',$content); +$tpl->assign('content', $content); $tpl->display_one_col_template(); //$tpl->display($template); diff --git a/main/admin/system_announcements.php b/main/admin/system_announcements.php index d9da9481ac..b7f5fd393b 100755 --- a/main/admin/system_announcements.php +++ b/main/admin/system_announcements.php @@ -185,7 +185,6 @@ if ($action_todo) { $allowed_picture_types ); - $image = ''; // Display announcements picture $store_path = api_get_path(SYS_UPLOAD_PATH).'announcements'; // course path @@ -198,7 +197,6 @@ if ($action_todo) { $form->addHtml($image); $form->addElement('checkbox', 'delete_picture', null, get_lang('DeletePicture')); } - } catch (Exception $e) { } catch (HTML_QuickForm_Error $e) { error_log($e); @@ -285,7 +283,6 @@ if ($action_todo) { ); if ($announcement_id !== false) { - // ADD Picture $picture = $_FILES['picture']; if (!empty($picture['name'])) { @@ -325,7 +322,6 @@ if ($action_todo) { $sendMail, $sendMailTest )) { - $deletePicture = isset($values['delete_picture']) ? $values['delete_picture'] : ''; if ($deletePicture) { diff --git a/main/auth/courses.php b/main/auth/courses.php index d45a48dd50..5a773b2a1d 100755 --- a/main/auth/courses.php +++ b/main/auth/courses.php @@ -220,8 +220,8 @@ switch ($action) { if ($form->validate()) { if (sha1($_POST['course_registration_code']) === $courseInfo['registration_code']) { CourseManager::autoSubscribeToCourse($_POST['subscribe_user_with_password']); - header('Location: '.api_get_self()); - exit; + header('Location: '.api_get_self()); + exit; } else { Display::addFlash(Display::return_message(get_lang('CourseRegistrationCodeIncorrect')), 'warning'); header('Location: '.$action); diff --git a/main/auth/courses_categories.php b/main/auth/courses_categories.php index 541e1ebfba..d0355ce185 100755 --- a/main/auth/courses_categories.php +++ b/main/auth/courses_categories.php @@ -75,25 +75,23 @@ $message = null; addHidden('sec_token', $stok); $formSearch->addHidden('search_course', 1); - $formSearch->addText('search_term', get_lang('Search'), false,['value'=>$term, 'icon' => 'search'])->setButton(true); + $formSearch->addText('search_term', get_lang('Search'), false, ['value' => $term, 'icon' => 'search'])->setButton(true); //$formSearch->defaultRenderer()->setElementTemplate($formSearch->getDefaultElementTemplate(),'search_term'); $search = $formSearch->returnForm(); $webAction = api_get_path(WEB_CODE_PATH).'auth/courses.php'; - $formSelect = new FormValidator('select_category', 'get',$webAction,null,[]); - $formSelect->addHidden('action',$action); - $formSelect->addHidden('pageCurrent',$pageCurrent); + $formSelect = new FormValidator('select_category', 'get', $webAction, null, []); + $formSelect->addHidden('action', $action); + $formSelect->addHidden('pageCurrent', $pageCurrent); $formSelect->addHidden('pageLength', $pageLength); $options = []; - foreach ($browse_course_categories[0] as $category){ - + foreach ($browse_course_categories[0] as $category) { $categoryCode = $category['code']; $countCourse = $category['count_courses']; if (empty($countCourse)) { @@ -101,96 +99,91 @@ $message = null; } $options[$categoryCode] = $category['name'].' ('.$countCourse.')'; - } - if(empty($codeType)){ + if (empty($codeType)) { $codeType = 'ALL'; } - $formSelect->addSelect('category_code',get_lang('Categories'),$options,['onchange' =>'submit();'])->setSelected($codeType); + $formSelect->addSelect('category_code', get_lang('Categories'), $options, ['onchange' => 'submit();'])->setSelected($codeType); $select = $formSelect->returnForm(); } - - if ($showCourses && $action != 'display_sessions') { - if (!empty($message)) { - $message = Display::return_message($message, 'confirmation', false); - } - if (!empty($error)) { - $message = Display::return_message($error, 'error', false); - } + if (!empty($message)) { + $message = Display::return_message($message, 'confirmation', false); + } + if (!empty($error)) { + $message = Display::return_message($error, 'error', false); + } - if (!empty($content)) { - $message = $content; - } + if (!empty($content)) { + $message = $content; + } - if (!empty($searchTerm)) { - $message = "

".get_lang('SearchResultsFor')." ".$searchTerm."
"; - } + if (!empty($searchTerm)) { + $message = "

".get_lang('SearchResultsFor')." ".$searchTerm."
"; + } - $showTeacher = api_get_setting('display_teacher_in_courselist') === 'true'; - $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote'; - $user_id = api_get_user_id(); - $categoryListFromDatabase = CourseCategory::getCategories(); + $showTeacher = api_get_setting('display_teacher_in_courselist') === 'true'; + $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote'; + $user_id = api_get_user_id(); + $categoryListFromDatabase = CourseCategory::getCategories(); - $courseList = []; - $categoryList = []; - if (!empty($categoryListFromDatabase)) { - foreach ($categoryListFromDatabase as $categoryItem) { - $categoryList[$categoryItem['code']] = $categoryItem['name']; - } + $courseList = []; + $categoryList = []; + if (!empty($categoryListFromDatabase)) { + foreach ($categoryListFromDatabase as $categoryItem) { + $categoryList[$categoryItem['code']] = $categoryItem['name']; } + } - if (!empty($browse_courses_in_category)) { - - foreach ($browse_courses_in_category as $course) { - $course_hidden = $course['visibility'] == COURSE_VISIBILITY_HIDDEN; - - if ($course_hidden) { - continue; - } + if (!empty($browse_courses_in_category)) { + foreach ($browse_courses_in_category as $course) { + $course_hidden = $course['visibility'] == COURSE_VISIBILITY_HIDDEN; - $userRegisteredInCourse = CourseManager::is_user_subscribed_in_course($user_id, $course['code']); - $userRegisteredInCourseAsTeacher = CourseManager::is_course_teacher($user_id, $course['code']); - $userRegistered = $userRegisteredInCourse && $userRegisteredInCourseAsTeacher; + if ($course_hidden) { + continue; + } - $course_public = $course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD; - $course_open = $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM; - $course_private = $course['visibility'] == COURSE_VISIBILITY_REGISTERED; - $course_closed = $course['visibility'] == COURSE_VISIBILITY_CLOSED; + $userRegisteredInCourse = CourseManager::is_user_subscribed_in_course($user_id, $course['code']); + $userRegisteredInCourseAsTeacher = CourseManager::is_course_teacher($user_id, $course['code']); + $userRegistered = $userRegisteredInCourse && $userRegisteredInCourseAsTeacher; - $course_subscribe_allowed = $course['subscribe'] == 1; - $course_unsubscribe_allowed = $course['unsubscribe'] == 1; - $count_connections = $course['count_connections']; - $creation_date = substr($course['creation_date'], 0, 10); + $course_public = $course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD; + $course_open = $course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM; + $course_private = $course['visibility'] == COURSE_VISIBILITY_REGISTERED; + $course_closed = $course['visibility'] == COURSE_VISIBILITY_CLOSED; - // display the course bloc + $course_subscribe_allowed = $course['subscribe'] == 1; + $course_unsubscribe_allowed = $course['unsubscribe'] == 1; + $count_connections = $course['count_connections']; + $creation_date = substr($course['creation_date'], 0, 10); + // display the course bloc - $course['category_title'] = ''; - if (isset($course['category'])) { - $course['category_title'] = isset($categoryList[$course['category']]) ? $categoryList[$course['category']] : ''; - } + $course['category_title'] = ''; + if (isset($course['category'])) { + $course['category_title'] = isset($categoryList[$course['category']]) ? $categoryList[$course['category']] : ''; + } - if (api_get_configuration_value('hide_course_rating') === false) { - $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote'; - $rating = Display::return_rating_system( + if (api_get_configuration_value('hide_course_rating') === false) { + $ajax_url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=add_course_vote'; + $rating = Display::return_rating_system( 'star_'.$course['real_id'], $ajax_url.'&course_id='.$course['real_id'], $course['point_info'] ); - } + } - //course return image + //course return image - $course_path = api_get_path(SYS_COURSE_PATH).$course['directory']; + $course_path = api_get_path(SYS_COURSE_PATH).$course['directory']; - if (file_exists($course_path.'/course-pic.png')) { - $courseMediumImage = api_get_path(WEB_COURSE_PATH).$course['directory'].'/course-pic.png'; - } else { - // without picture - $courseMediumImage = Display::return_icon( + if (file_exists($course_path.'/course-pic.png')) { + $courseMediumImage = api_get_path(WEB_COURSE_PATH).$course['directory'].'/course-pic.png'; + } else { + // without picture + $courseMediumImage = Display::return_icon( 'session_default.png', null, null, @@ -198,61 +191,61 @@ if ($showCourses && $action != 'display_sessions') { null, true ); - } + } - if ($showTeacher) { - $teachers = CourseManager::getTeachersFromCourse($course['real_id']); - } + if ($showTeacher) { + $teachers = CourseManager::getTeachersFromCourse($course['real_id']); + } - $separator = null; - $subscribeBuy = return_register_button($course, $stok, $code, $searchTerm); - // Start buy course validation + $separator = null; + $subscribeBuy = return_register_button($course, $stok, $code, $searchTerm); + // Start buy course validation - // display the course price and buy button if the buycourses plugin is enabled and this course is configured - $plugin = BuyCoursesPlugin::create(); - $isThisCourseInSale = $plugin->buyCoursesForGridCatalogValidator( + // display the course price and buy button if the buycourses plugin is enabled and this course is configured + $plugin = BuyCoursesPlugin::create(); + $isThisCourseInSale = $plugin->buyCoursesForGridCatalogValidator( $course['real_id'], BuyCoursesPlugin::PRODUCT_TYPE_COURSE ); - if ($isThisCourseInSale) { - // set the Price label - $separator = $isThisCourseInSale['html']; - // set the Buy button instead register. - if ($isThisCourseInSale['verificator']) { - $subscribeBuy = $plugin->returnBuyCourseButton( + if ($isThisCourseInSale) { + // set the Price label + $separator = $isThisCourseInSale['html']; + // set the Buy button instead register. + if ($isThisCourseInSale['verificator']) { + $subscribeBuy = $plugin->returnBuyCourseButton( $course['real_id'], BuyCoursesPlugin::PRODUCT_TYPE_COURSE ); - } } - // end buy course validation - - // if user registered as student - if ($userRegisteredInCourse) { - $subscribeButton = return_already_registered_label('student'); - if (!$course_closed) { - if ($course_unsubscribe_allowed) { - $subscribeButton = return_unregister_button($course, $stok, $searchTerm, $code); - } - } - } elseif ($userRegisteredInCourseAsTeacher) { - // if user registered as teacher + } + // end buy course validation + + // if user registered as student + if ($userRegisteredInCourse) { + $subscribeButton = return_already_registered_label('student'); + if (!$course_closed) { if ($course_unsubscribe_allowed) { $subscribeButton = return_unregister_button($course, $stok, $searchTerm, $code); } - } else { - // if user not registered in the course - if (!$course_closed) { - if (!$course_private) { - if ($course_subscribe_allowed) { - $subscribeButton = $subscribeBuy; - } + } + } elseif ($userRegisteredInCourseAsTeacher) { + // if user registered as teacher + if ($course_unsubscribe_allowed) { + $subscribeButton = return_unregister_button($course, $stok, $searchTerm, $code); + } + } else { + // if user not registered in the course + if (!$course_closed) { + if (!$course_private) { + if ($course_subscribe_allowed) { + $subscribeButton = $subscribeBuy; } } } + } - $courseList[] = [ + $courseList[] = [ 'id' => $course['real_id'], 'title' => $course['title'], 'category' => $course['category_title'], @@ -261,23 +254,20 @@ if ($showCourses && $action != 'display_sessions') { 'teachers' => $teachers, 'ranking' => $rating, 'description_ajax' => CourseManager::returnDescriptionButton($course), - 'subscribe' => $subscribeButton + 'subscribe' => $subscribeButton, ]; - - } - - } else { - if (!isset($_REQUEST['subscribe_user_with_password']) && + } + } else { + if (!isset($_REQUEST['subscribe_user_with_password']) && !isset($_REQUEST['subscribe_course']) ) { - $message = Display::return_message( + $message = Display::return_message( get_lang('ThereAreNoCoursesInThisCategory'), 'warning' ); - } } } - +} $template = new Template(get_lang('Course Catalog')); $template->assign('search', $search); @@ -290,10 +280,6 @@ $content = $template->fetch($layout); echo $content; - - - - /** * Display the goto course button of a course in the course catalog. * diff --git a/main/auth/courses_list.php b/main/auth/courses_list.php index d760218971..09044789b3 100755 --- a/main/auth/courses_list.php +++ b/main/auth/courses_list.php @@ -24,8 +24,8 @@ if ($action != 'createcoursecategory') { echo ''; if (!empty($message)) { - echo Display::return_message($message, 'confirm', false); - } + echo Display::return_message($message, 'confirm', false); +} $allowCollapsable = api_get_configuration_value('allow_user_course_category_collapsable'); diff --git a/main/course_description/course_description_controller.php b/main/course_description/course_description_controller.php index fd5a33ce45..416293844d 100644 --- a/main/course_description/course_description_controller.php +++ b/main/course_description/course_description_controller.php @@ -124,7 +124,6 @@ class CourseDescriptionController $content = $tpl->fetch($templateName); - $tpl->assign('content', $content); $tpl->display_one_col_template(); } diff --git a/main/course_info/about.php b/main/course_info/about.php index 696718edbf..8841c1f608 100644 --- a/main/course_info/about.php +++ b/main/course_info/about.php @@ -139,8 +139,6 @@ if ($checker) { ); } - - $courseItem = [ 'code' => $course->getCode(), 'title' => $course->getTitle(), diff --git a/main/document/document_slideshow.inc.php b/main/document/document_slideshow.inc.php index 9d0b0016cc..93db937cd6 100755 --- a/main/document/document_slideshow.inc.php +++ b/main/document/document_slideshow.inc.php @@ -1,8 +1,6 @@ + $activeSend = 'active'; + } ?>

  • - +
    • + } ?>
  • - +
    • diff --git a/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php b/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php index b1583861b4..f40f217527 100644 --- a/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php +++ b/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php @@ -304,7 +304,7 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question * @param int $counter * @param float $score * - * @return null|string + * @return string|null */ public function return_header($exercise, $counter = null, $score = null) { diff --git a/main/exercise/ReadingComprehension.php b/main/exercise/ReadingComprehension.php index 6a5fc53466..b871aaf8db 100755 --- a/main/exercise/ReadingComprehension.php +++ b/main/exercise/ReadingComprehension.php @@ -53,7 +53,7 @@ class ReadingComprehension extends UniqueAnswer /** * Indicates how show the question list. - * 1 = all in one page; 2 = one per page (default) + * 1 = all in one page; 2 = one per page (default). * * @var int */ @@ -197,6 +197,18 @@ class ReadingComprehension extends UniqueAnswer return $select_level; } + /** + * @param int $type + * + * @return ReadingComprehension + */ + public function setExerciseType($type) + { + $this->exerciseType = (int) $type; + + return $this; + } + /** * @param $wordsCount * @param $turns @@ -216,16 +228,4 @@ class ReadingComprehension extends UniqueAnswer $view->assign('exercise_type', $this->exerciseType); $view->display($template); } - - /** - * @param int $type - * - * @return ReadingComprehension - */ - public function setExerciseType($type) - { - $this->exerciseType = (int) $type; - - return $this; - } } diff --git a/main/exercise/TestCategory.php b/main/exercise/TestCategory.php index b284808623..b34e1bdc4a 100644 --- a/main/exercise/TestCategory.php +++ b/main/exercise/TestCategory.php @@ -648,7 +648,7 @@ class TestCategory * @param int $questionId * @param int $in_display_category_name * - * @return null|string + * @return string|null */ public static function returnCategoryAndTitle($questionId, $in_display_category_name = 1) { diff --git a/main/exercise/question.class.php b/main/exercise/question.class.php index 42f0d570f2..73f87a955b 100755 --- a/main/exercise/question.class.php +++ b/main/exercise/question.class.php @@ -2309,6 +2309,28 @@ abstract class Question return '
    '.Display::return_message($this->feedback, 'normal', false); } + /** + * Check if this question exists in another exercise. + * + * @throws \Doctrine\ORM\Query\QueryException + * + * @return mixed + */ + public function existsInAnotherExercises() + { + $em = Database::getManager(); + + $count = $em + ->createQuery(' + SELECT COUNT(qq.iid) FROM ChamiloCourseBundle:CQuizRelQuestion qq + WHERE qq.questionId = :id + ') + ->setParameters(['id' => (int) $this->id]) + ->getSingleScalarResult(); + + return $count > 1; + } + /** * Resizes a picture || Warning!: can only be called after uploadPicture, * or if picture is already available in object. @@ -2373,26 +2395,4 @@ abstract class Question return false; } - - /** - * Check if this question exists in another exercise. - * - * @throws \Doctrine\ORM\Query\QueryException - * - * @return mixed - */ - public function existsInAnotherExercises() - { - $em = Database::getManager(); - - $count = $em - ->createQuery(' - SELECT COUNT(qq.iid) FROM ChamiloCourseBundle:CQuizRelQuestion qq - WHERE qq.questionId = :id - ') - ->setParameters(['id' => (int) $this->id]) - ->getSingleScalarResult(); - - return $count > 1; - } } diff --git a/main/gradebook/lib/be/category.class.php b/main/gradebook/lib/be/category.class.php index 598e83a3da..740bed0a90 100755 --- a/main/gradebook/lib/be/category.class.php +++ b/main/gradebook/lib/be/category.class.php @@ -298,7 +298,7 @@ class Category implements GradebookItem } /** - * @return null|int + * @return int|null */ public function get_grade_model_id() { @@ -2709,7 +2709,7 @@ class Category implements GradebookItem * Internal function used by get_tree(). * * @param int $level - * @param null|int $visible + * @param int|null $visible * * @return array */ diff --git a/main/gradebook/lib/be/exerciselink.class.php b/main/gradebook/lib/be/exerciselink.class.php index 8796d5591e..680a5a2b4e 100755 --- a/main/gradebook/lib/be/exerciselink.class.php +++ b/main/gradebook/lib/be/exerciselink.class.php @@ -334,7 +334,7 @@ class ExerciseLink extends AbstractLink $result = [0, $weight]; if ($cacheAvailable) { $cacheDriver->save($key, $result); - } + } return $result; } diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php index 34574feb7d..ada6db2c6f 100755 --- a/main/gradebook/lib/fe/gradebooktable.class.php +++ b/main/gradebook/lib/fe/gradebooktable.class.php @@ -1164,7 +1164,7 @@ class GradebookTable extends SortableTable /** * @param AbstractLink $item * - * @return null|string + * @return string|null */ private function build_edit_column($item) { diff --git a/main/gradebook/lib/fe/linkform.class.php b/main/gradebook/lib/fe/linkform.class.php index 33535f74a1..1f00d59b98 100755 --- a/main/gradebook/lib/fe/linkform.class.php +++ b/main/gradebook/lib/fe/linkform.class.php @@ -140,9 +140,9 @@ class LinkForm extends FormValidator /** * @param int $link - * @param null|string $courseCode + * @param string|null $courseCode * - * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|null|StudentPublicationLink|SurveyLink + * @return AttendanceLink|DropboxLink|ExerciseLink|ForumThreadLink|LearnpathLink|StudentPublicationLink|SurveyLink|null */ private function createLink($link, $courseCode) { diff --git a/main/gradebook/lib/fe/resulttable.class.php b/main/gradebook/lib/fe/resulttable.class.php index 7f8ef98f6c..41b304ffce 100755 --- a/main/gradebook/lib/fe/resulttable.class.php +++ b/main/gradebook/lib/fe/resulttable.class.php @@ -22,7 +22,7 @@ class ResultTable extends SortableTable * * @param string $evaluation * @param array $results - * @param null|string $iscourse + * @param string|null $iscourse * @param array $addparams * @param bool $forprint */ diff --git a/main/gradebook/lib/gradebook_data_generator.class.php b/main/gradebook/lib/gradebook_data_generator.class.php index 431192d33f..b88f2404f1 100755 --- a/main/gradebook/lib/gradebook_data_generator.class.php +++ b/main/gradebook/lib/gradebook_data_generator.class.php @@ -448,7 +448,7 @@ class GradebookDataGenerator * @param GradebookItem $item * @param bool $ignore_score_color * - * @return null|string + * @return string|null */ private function build_result_column( $userId, diff --git a/main/inc/lib/CoursesAndSessionsCatalog.class.php b/main/inc/lib/CoursesAndSessionsCatalog.class.php index 32b71da33e..c548a61757 100644 --- a/main/inc/lib/CoursesAndSessionsCatalog.class.php +++ b/main/inc/lib/CoursesAndSessionsCatalog.class.php @@ -469,8 +469,9 @@ class CoursesAndSessionsCatalog * @param string $date (optional) The date of sessions * @param array $limit * - * @return array The session list * @throws Exception + * + * @return array The session list */ public static function browseSessions($date = null, $limit = []) { diff --git a/main/inc/lib/MoodleImport.php b/main/inc/lib/MoodleImport.php index 914218c64f..82cb01b2ca 100644 --- a/main/inc/lib/MoodleImport.php +++ b/main/inc/lib/MoodleImport.php @@ -497,7 +497,7 @@ class MoodleImport /** * Search the current file resource in main Files XML. * - * @param resource $filesXml XML file + * @param resource $filesXml XML file * @param int $contextId * * @return mixed | array if is a valid xml file, false otherwise diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index 48aeb55bb4..18a7bd9e51 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -1738,7 +1738,7 @@ function api_get_user_entity($userId) } /** - * @return null|User + * @return User|null */ function api_get_current_user() { @@ -7997,7 +7997,7 @@ function api_get_user_info_from_official_code($officialCode) * @param string $usernameInputId * @param string $passwordInputId * - * @return null|string + * @return string|null */ function api_get_password_checker_js($usernameInputId, $passwordInputId) { diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php index 008198f347..891a866916 100755 --- a/main/inc/lib/blog.lib.php +++ b/main/inc/lib/blog.lib.php @@ -2879,7 +2879,7 @@ class Blog 'blog_admin.php?action=add' ); $form->addElement('header', get_lang('AddBlog')); - $form->addText('blog_name',get_lang('Title')); + $form->addText('blog_name', get_lang('Title')); $form->addHtmlEditor( 'blog_subtitle', get_lang('SubTitle'), @@ -2888,7 +2888,7 @@ class Blog [ 'ToolbarSet' => 'Profile', 'Width' => '100%', - 'Height' => '130' + 'Height' => '130', ] ); $form->addElement('hidden', 'new_blog_submit', 'true'); @@ -3222,7 +3222,7 @@ class Blog * @param string $fullText * @param int $length * - * @return null|string + * @return string|null */ private static function getPostExtract($fullText, $length = BLOG_MAX_PREVIEW_CHARS) { diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index 4fc58bab55..9f4b1aadb2 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -655,7 +655,7 @@ class CourseManager * * @param int $userId * @param string $courseCode - * @param int $status (STUDENT, COURSEMANAGER, COURSE_ADMIN, NORMAL_COURSE_MEMBER) + * @param int $status (STUDENT, COURSEMANAGER, COURSE_ADMIN, NORMAL_COURSE_MEMBER) * @param int $sessionId * @param int $userCourseCategoryId * @param bool $checkTeacherPermission @@ -702,7 +702,7 @@ class CourseManager $sessionId = empty($sessionId) ? api_get_session_id() : (int) $sessionId; $status = $status === STUDENT || $status === COURSEMANAGER ? $status : STUDENT; $courseUserTable = Database::get_main_table(TABLE_MAIN_COURSE_USER); - // The user has been already subscribed to the course. + // The user has been already subscribed to the course. if (!empty($sessionId)) { SessionManager::subscribe_users_to_session_course( [$userId], @@ -819,8 +819,8 @@ class CourseManager ); } - // Add event to the system log - Event::addEvent( + // Add event to the system log + Event::addEvent( LOG_SUBSCRIBE_USER_TO_COURSE, LOG_COURSE_CODE, $courseCode, @@ -829,7 +829,7 @@ class CourseManager $courseId ); - Event::addEvent( + Event::addEvent( LOG_SUBSCRIBE_USER_TO_COURSE, LOG_USER_OBJECT, $userInfo, @@ -838,7 +838,7 @@ class CourseManager $courseId ); - return true; + return true; } return false; @@ -3272,11 +3272,10 @@ class CourseManager $data['extrafield'] = $fieldValues; if (isset($descriptions) && count($descriptions) > 0) { foreach ($descriptions as $description) { - - if($description->description_type === '1'){ + if ($description->description_type === '1') { $data['description'] = [ 'title' => Security::remove_XSS($description->title), - 'content' => Security::remove_XSS($description->content) + 'content' => Security::remove_XSS($description->content), ]; } } @@ -6752,7 +6751,7 @@ class CourseManager * @param Course $course * @param bool $fullSize * - * @return null|string + * @return string|null */ public static function getPicturePath(Course $course, $fullSize = false) { diff --git a/main/inc/lib/course_category.lib.php b/main/inc/lib/course_category.lib.php index fe7a40ffee..75a106f5fe 100755 --- a/main/inc/lib/course_category.lib.php +++ b/main/inc/lib/course_category.lib.php @@ -409,7 +409,7 @@ class CourseCategory /** * @param string $categoryCode * - * @return null|string + * @return string|null */ public static function getParentsToString($categoryCode) { diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 173348a38f..7bcd4a91e9 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -1244,7 +1244,7 @@ class Display [ 'id' => $id.'-'.$i, 'href' => $item['url'], - 'class' => 'nav-link '.$class + 'class' => 'nav-link '.$class, ] ); $lis .= self::tag('li', $item, ['class' => 'nav-item']); @@ -1904,7 +1904,7 @@ class Display /** * @param array $list * - * @return null|string + * @return string|null */ public static function description($list) { @@ -1956,7 +1956,7 @@ class Display * @param string $count * @param string $type * - * @return null|string + * @return string|null */ public static function badge($count, $type = "warning") { @@ -2047,7 +2047,7 @@ class Display * @param array $items * @param string $class * - * @return null|string + * @return string|null */ public static function actions($items, $class = 'new_actions') { @@ -2141,7 +2141,7 @@ class Display * @param string $file * @param array $params * - * @return null|string + * @return string|null */ public static function getMediaPlayer($file, $params = []) { @@ -2453,7 +2453,7 @@ class Display } $cardBody = $title.' '.self::contentPanel($content).' '.$footer; - $panel = Display::tag('div',$cardBody,['id' => 'card-'.$id ,'class'=>'card-body']); + $panel = Display::tag('div', $cardBody, ['id' => 'card-'.$id, 'class' => 'card-body']); return '
    @@ -2497,7 +2497,7 @@ class Display $includeText = true ) { $buttonClass = "btn btn-outline-secondary"; - if(!empty($type)){ + if (!empty($type)) { $buttonClass = "btn btn-$type"; } $icon = self::tag('i', null, ['class' => "fa fa-$icon fa-fw", 'aria-hidden' => 'true']); @@ -2607,7 +2607,7 @@ class Display * @param bool|true $open * @param bool|false $fullClickable * - * @return null|string + * @return string|null * * @todo rework function to easy use */ @@ -2725,20 +2725,6 @@ HTML; return $html; } - /** - * Displays the reduced page header (without banner). - */ - private static function set_header() - { - global $show_learnpath, $tool_name; - self::$global_template = new Template( - $tool_name, - false, - false, - $show_learnpath - ); - } - public static function randomColor($id) { static $colors = []; @@ -2758,13 +2744,26 @@ HTML; } $result = [ - 'color' => '#' . $color, - 'luminosity' => $type + 'color' => '#'.$color, + 'luminosity' => $type, ]; $colors[$id] = $result; return $result; // example: #fc443a } + } + /** + * Displays the reduced page header (without banner). + */ + private static function set_header() + { + global $show_learnpath, $tool_name; + self::$global_template = new Template( + $tool_name, + false, + false, + $show_learnpath + ); } } diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php index e95ade6631..af4ae44365 100644 --- a/main/inc/lib/document.lib.php +++ b/main/inc/lib/document.lib.php @@ -427,7 +427,7 @@ class DocumentManager * @param string $path * @param int $sessionId * - * @return null|string + * @return string|null */ public static function getSessionFolderFilters($path, $sessionId) { @@ -6676,7 +6676,7 @@ class DocumentManager * @param string $target * @param string $overwrite_url * - * @return null|string + * @return string|null */ private static function parseFile( $userInfo, @@ -6777,7 +6777,7 @@ class DocumentManager * @param array $resource * @param int $lp_id * - * @return null|string + * @return string|null */ private static function parseFolder($folderId, $resource, $lp_id) { @@ -6980,7 +6980,7 @@ class DocumentManager * @param bool $isCertificateMode * @param int $parentId * - * @return null|string + * @return string|null */ private static function getButtonVisibility( $isReadOnly, diff --git a/main/inc/lib/extra_field_option.lib.php b/main/inc/lib/extra_field_option.lib.php index 185fee9096..24fa2badeb 100755 --- a/main/inc/lib/extra_field_option.lib.php +++ b/main/inc/lib/extra_field_option.lib.php @@ -721,7 +721,7 @@ class ExtraFieldOption extends Model /** * @param $priority * - * @return null|string + * @return string|null */ public function getPriorityMessageType($priority) { diff --git a/main/inc/lib/link.lib.php b/main/inc/lib/link.lib.php index 31c2652304..9631ac82c9 100755 --- a/main/inc/lib/link.lib.php +++ b/main/inc/lib/link.lib.php @@ -1187,7 +1187,7 @@ class Link extends Model 'pencil-alt', null, [ - 'title' => get_lang('Modify') + 'title' => get_lang('Modify'), ]); // DISPLAY MOVE UP COMMAND only if it is not the top link. @@ -1199,10 +1199,9 @@ class Link extends Model 'level-up-alt', 'outline-secondary', [ - 'title' => get_lang("Up") + 'title' => get_lang("Up"), ] ); - } else { $tools .= Display::toolbarButton( null, @@ -1211,7 +1210,7 @@ class Link extends Model 'outline-secondary', [ 'title' => get_lang("Up"), - 'class' => 'disabled' + 'class' => 'disabled', ] ); } @@ -1225,10 +1224,9 @@ class Link extends Model 'level-down-alt', 'outline-secondary', [ - 'title' => get_lang("Down") + 'title' => get_lang("Down"), ] ); - } else { $tools .= Display::toolbarButton( null, @@ -1237,7 +1235,7 @@ class Link extends Model 'outline-secondary', [ 'title' => get_lang("Down"), - 'class' => 'disabled' + 'class' => 'disabled', ] ); } @@ -1249,12 +1247,10 @@ class Link extends Model 'outline-secondary', [ 'title' => get_lang("Delete"), - 'onclick' => "javascript: if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;" + 'onclick' => "javascript: if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;", ] ); - - return $tools; } @@ -1690,7 +1686,6 @@ class Link extends Model echo '
    '; $linksPerCategory = self::showLinksPerCategory(0, $course_id, $session_id); - if (empty($countCategories)) { echo $linksPerCategory; } else { @@ -1701,7 +1696,7 @@ class Link extends Model $counter = 0; $category = []; - $list=[]; + $list = []; foreach ($categories as $myrow) { // Student don't see invisible categories. if (!api_is_allowed_to_edit(null, true)) { @@ -1719,16 +1714,14 @@ class Link extends Model $visibilityClass = null; if ($myrow['visibility'] == '1') { - $url = 'link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=invisible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY; $title = get_lang('Hide'); - $strVisibility = Display::toolbarButton(null,$url,'eye',null,['title'=>$title]); - + $strVisibility = Display::toolbarButton(null, $url, 'eye', null, ['title' => $title]); } elseif ($myrow['visibility'] == '0') { $visibilityClass = 'text-muted'; $url = 'link.php?'.api_get_cidreq().'&sec_token='.$token.'&action=visible&id='.$myrow['id'].'&scope='.TOOL_LINK_CATEGORY; $title = get_lang('Show'); - $strVisibility = Display::toolbarButton(null,$url,'eye-slash',null,['title'=>$title]); + $strVisibility = Display::toolbarButton(null, $url, 'eye-slash', null, ['title' => $title]); } $iconTree = ''; @@ -1766,7 +1759,6 @@ class Link extends Model } $category['children'] = $childrenContent; $list[] = $category; - } $tpl = new Template(null); $tpl->assign('data', $list); @@ -1774,7 +1766,6 @@ class Link extends Model $content = $tpl->fetch($courseInfoLayout); echo $content; - } /** @@ -1928,7 +1919,7 @@ class Link extends Model } $form->addHidden('id', $id); $form->addText('category_title', get_lang('CategoryName')); - $form->addHtmlEditor('description', get_lang('Description'),true,false, ['ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130']); + $form->addHtmlEditor('description', get_lang('Description'), true, false, ['ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130']); $form->addButtonSave($my_cat_title, 'submitCategory'); $form->setDefaults($defaults); diff --git a/main/inc/lib/plugin.lib.php b/main/inc/lib/plugin.lib.php index b174b6e61b..3a6691e35e 100755 --- a/main/inc/lib/plugin.lib.php +++ b/main/inc/lib/plugin.lib.php @@ -259,7 +259,7 @@ class AppPlugin * @param Twig_Environment $template * @param bool $forced * - * @return null|string + * @return string|null */ public function loadRegion($pluginName, $region, $template, $forced = false) { diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 405d645dbf..3a7885aec2 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -821,7 +821,7 @@ class SocialManager extends UserManager 'complete_name' => $userInfo['complete_name'], 'username' => $userInfo['username'], 'email' => $userInfo['email'], - 'status' => $userInfo['status'] + 'status' => $userInfo['status'], ]; $show_groups = [ @@ -856,13 +856,12 @@ class SocialManager extends UserManager $groupInfo['picture'], 128, GROUP_IMAGE_SIZE_MEDIUM - ) + ), ]; $template->assign('show_group', true); $template->assign('group', $groupInfo); $template->assign('avatar', $userGroupImage); - } else { $template->assign('show_group', false); $template->assign('show_user', true); @@ -1869,7 +1868,6 @@ class SocialManager extends UserManager $userInfo = api_get_user_info($userId, true, false, true, true); - $userGroup = new UserGroup(); $groupInfo = $userGroup->get($groupId); diff --git a/main/inc/lib/system_announcements.lib.php b/main/inc/lib/system_announcements.lib.php index af72dbe900..a49351eb2b 100755 --- a/main/inc/lib/system_announcements.lib.php +++ b/main/inc/lib/system_announcements.lib.php @@ -307,7 +307,6 @@ class SystemAnnouncementManager return $result ? $result : false; } - /** * @param int $start * @param string $user_id @@ -1026,17 +1025,20 @@ class SystemAnnouncementManager * get announcement picture. * * @param int $announcementId - * @return null|string + * + * @return string|null */ private static function getPictureAnnouncement($announcementId) { - $store_path = api_get_path(SYS_UPLOAD_PATH) . 'announcements'; - $announcementPicture = $store_path . '/announcement_' . $announcementId . '.png'; + $store_path = api_get_path(SYS_UPLOAD_PATH).'announcements'; + $announcementPicture = $store_path.'/announcement_'.$announcementId.'.png'; if (file_exists($announcementPicture)) { - $web_path = api_get_path(WEB_UPLOAD_PATH) . 'announcements'; - $urlPicture = $web_path . '/announcement_' . $announcementId . '.png'; + $web_path = api_get_path(WEB_UPLOAD_PATH).'announcements'; + $urlPicture = $web_path.'/announcement_'.$announcementId.'.png'; + return $urlPicture; } + return null; } } diff --git a/main/inc/lib/usergroup.lib.php b/main/inc/lib/usergroup.lib.php index bee192fe41..86d11d36e1 100755 --- a/main/inc/lib/usergroup.lib.php +++ b/main/inc/lib/usergroup.lib.php @@ -1322,10 +1322,10 @@ class UserGroup extends Model } /** - * @param int $groupId + * @param int $groupId * @param string $picture - * * @param string $cropParameters + * * @return bool|string */ public function manageFileUpload($groupId, $picture, $cropParameters) @@ -1357,18 +1357,17 @@ class UserGroup extends Model * Note: This method relies on configuration setting from main/inc/conf/profile.conf.php. * * @param $group_id - * @param string $file The common file name for the newly created photos. - * It will be checked and modified for compatibility with the file system. - * If full name is provided, path component is ignored. - * If an empty name is provided, then old user photos are deleted only, - * - * @param string $source_file the full system name of the image from which user photos will be created - * + * @param string $file The common file name for the newly created photos. + * It will be checked and modified for compatibility with the file system. + * If full name is provided, path component is ignored. + * If an empty name is provided, then old user photos are deleted only, + * @param string $source_file the full system name of the image from which user photos will be created * @param string $cropParameters + * * @return mixed Returns the resulting common file name of created images which usually should be stored in database. * When an image is removed the function returns an empty string. In case of internal error or negative validation it returns FALSE. - * @see UserManager::delete_user_picture() as the prefered way for deletion. * + * @see UserManager::delete_user_picture() as the prefered way for deletion. */ public function update_group_picture($group_id, $file = null, $source_file = null, $cropParameters = null) { @@ -1390,7 +1389,6 @@ class UserGroup extends Model @mkdir($path, api_get_permissions_for_new_directories(), true); } - // Exit if only deletion has been requested. Return an empty picture name. if ($delete) { return ''; @@ -1427,7 +1425,6 @@ class UserGroup extends Model $normal->resize(450); $normal->send_image($groupImageBig, -1, 'jpg'); - return $filename; } @@ -1611,7 +1608,6 @@ class UserGroup extends Model // Picture //$allowed_picture_types = $this->getAllowedPictureExtensions(); - // Picture $form->addFile( 'picture', @@ -2117,8 +2113,8 @@ class UserGroup extends Model $num = intval($num); } // only show admins and readers - $where_relation_condition = " WHERE g.group_type = " . self::SOCIAL_CLASS . " AND - gu.relation_type IN ('" . GROUP_USER_PERMISSION_ADMIN . "' , '" . GROUP_USER_PERMISSION_READER . "', '" . GROUP_USER_PERMISSION_HRM . "') "; + $where_relation_condition = " WHERE g.group_type = ".self::SOCIAL_CLASS." AND + gu.relation_type IN ('".GROUP_USER_PERMISSION_ADMIN."' , '".GROUP_USER_PERMISSION_READER."', '".GROUP_USER_PERMISSION_HRM."') "; $sql = "SELECT DISTINCT count(user_id) as count, g.picture, g.name, g.description, g.id FROM $tbl_group g INNER JOIN $table_group_rel_user gu @@ -2133,7 +2129,7 @@ class UserGroup extends Model $description = Security::remove_XSS($row['description'], STUDENT, true); $row['description'] = cut($description, 250, true); $row['name'] = Security::remove_XSS($row['name'], STUDENT, true); - $row['url'] = "group_view.php?id=" . $row['id']; + $row['url'] = "group_view.php?id=".$row['id']; if ($with_image) { $picture = self::get_picture_group( $row['id'], @@ -2172,12 +2168,12 @@ class UserGroup extends Model } $where = " WHERE - g.group_type = " . self::SOCIAL_CLASS . " AND + g.group_type = ".self::SOCIAL_CLASS." AND gu.relation_type IN - ('" . GROUP_USER_PERMISSION_ADMIN . "' , - '" . GROUP_USER_PERMISSION_READER . "', - '" . GROUP_USER_PERMISSION_MODERATOR . "', - '" . GROUP_USER_PERMISSION_HRM . "') + ('".GROUP_USER_PERMISSION_ADMIN."' , + '".GROUP_USER_PERMISSION_READER."', + '".GROUP_USER_PERMISSION_MODERATOR."', + '".GROUP_USER_PERMISSION_HRM."') "; $sql = "SELECT DISTINCT count(user_id) as count, @@ -2196,11 +2192,10 @@ class UserGroup extends Model $result = Database::query($sql); $array = []; while ($row = Database::fetch_array($result, 'ASSOC')) { - $description = Security::remove_XSS($row['description'], STUDENT, true); $row['description'] = cut($description, 250, true); $row['name'] = Security::remove_XSS($row['name'], STUDENT, true); - $row['url'] = "group_view.php?id=" . $row['id']; + $row['url'] = "group_view.php?id=".$row['id']; if ($with_image) { $picture = self::get_picture_group( $row['id'], diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index eba4f5f70b..d90ca7c716 100755 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -1095,7 +1095,6 @@ class IndexManager $useUserLanguageFilterIfAvailable ); - // Display courses. $courses = CourseManager::returnCourses( $user_id, @@ -1103,7 +1102,6 @@ class IndexManager $useUserLanguageFilterIfAvailable ); - // Course option (show student progress) // This code will add new variables (Progress, Score, Certificate) if ($studentInfoProgress || $studentInfoScore || $studentInfoCertificate) { @@ -1218,7 +1216,6 @@ class IndexManager $courseCount = count($courseCompleteList); } - $listSessions = null; /*$collapsable = api_get_configuration_value('allow_user_session_collapsable'); @@ -1244,117 +1241,117 @@ class IndexManager if (is_array($sessionCategories)) { foreach ($sessionCategories as $session_category) { - // Independent sessions - foreach ($session_category['sessions'] as $session) { - $session_id = $session['session_id']; - - // Don't show empty sessions. - if (count($session['courses']) < 1) { - continue; - } + // Independent sessions + foreach ($session_category['sessions'] as $session) { + $session_id = $session['session_id']; - // Courses inside the current session. - $date_session_start = $session['access_start_date']; - $date_session_end = $session['access_end_date']; - $coachAccessStartDate = $session['coach_access_start_date']; - $coachAccessEndDate = $session['coach_access_end_date']; - $count_courses_session = 0; - - // Loop course content - $list_courses_session = []; - $atLeastOneCourseIsVisible = false; - $markAsOld = false; - $markAsFuture = false; - - foreach ($session['courses'] as $course) { - $is_coach_course = api_is_coach($session_id, $course['real_id']); - $allowed_time = 0; - $allowedEndTime = true; + // Don't show empty sessions. + if (count($session['courses']) < 1) { + continue; + } - if (!empty($date_session_start)) { - if ($is_coach_course) { - $allowed_time = api_strtotime($coachAccessStartDate); - } else { - $allowed_time = api_strtotime($date_session_start); - } + // Courses inside the current session. + $date_session_start = $session['access_start_date']; + $date_session_end = $session['access_end_date']; + $coachAccessStartDate = $session['coach_access_start_date']; + $coachAccessEndDate = $session['coach_access_end_date']; + $count_courses_session = 0; + + // Loop course content + $list_courses_session = []; + $atLeastOneCourseIsVisible = false; + $markAsOld = false; + $markAsFuture = false; + + foreach ($session['courses'] as $course) { + $is_coach_course = api_is_coach($session_id, $course['real_id']); + $allowed_time = 0; + $allowedEndTime = true; + + if (!empty($date_session_start)) { + if ($is_coach_course) { + $allowed_time = api_strtotime($coachAccessStartDate); + } else { + $allowed_time = api_strtotime($date_session_start); + } - $endSessionToTms = null; - if (!isset($_GET['history'])) { - if (!empty($date_session_end)) { - if ($is_coach_course) { - // if coach end date is empty we use the default end date - if (empty($coachAccessEndDate)) { - $endSessionToTms = api_strtotime($date_session_end); - if ($session_now > $endSessionToTms) { - $allowedEndTime = false; - } - } else { - $endSessionToTms = api_strtotime($coachAccessEndDate); - if ($session_now > $endSessionToTms) { - $allowedEndTime = false; - } + $endSessionToTms = null; + if (!isset($_GET['history'])) { + if (!empty($date_session_end)) { + if ($is_coach_course) { + // if coach end date is empty we use the default end date + if (empty($coachAccessEndDate)) { + $endSessionToTms = api_strtotime($date_session_end); + if ($session_now > $endSessionToTms) { + $allowedEndTime = false; } } else { - $endSessionToTms = api_strtotime($date_session_end); + $endSessionToTms = api_strtotime($coachAccessEndDate); if ($session_now > $endSessionToTms) { $allowedEndTime = false; } } + } else { + $endSessionToTms = api_strtotime($date_session_end); + if ($session_now > $endSessionToTms) { + $allowedEndTime = false; + } } } } + } - if ($showAllSessions) { - if ($allowed_time < $session_now && $allowedEndTime === false) { - $markAsOld = true; - } - if ($allowed_time > $session_now && $endSessionToTms > $session_now) { - $markAsFuture = true; - } - $allowedEndTime = true; - $allowed_time = 0; + if ($showAllSessions) { + if ($allowed_time < $session_now && $allowedEndTime === false) { + $markAsOld = true; + } + if ($allowed_time > $session_now && $endSessionToTms > $session_now) { + $markAsFuture = true; } + $allowedEndTime = true; + $allowed_time = 0; + } - if ($session_now >= $allowed_time && $allowedEndTime) { - // Read only and accessible. - $atLeastOneCourseIsVisible = true; - if (api_get_setting('hide_courses_in_sessions') === 'false') { - $courseUserHtml = CourseManager::get_logged_user_course_html( + if ($session_now >= $allowed_time && $allowedEndTime) { + // Read only and accessible. + $atLeastOneCourseIsVisible = true; + if (api_get_setting('hide_courses_in_sessions') === 'false') { + $courseUserHtml = CourseManager::get_logged_user_course_html( $course, $session_id, 'session_course_item', true, $this->load_directories_preview ); - if (isset($courseUserHtml[1])) { - $course_session = $courseUserHtml[1]; - $course_session['skill'] = isset($courseUserHtml['skill']) ? $courseUserHtml['skill'] : ''; - - // Course option (show student progress) - // This code will add new variables (Progress, Score, Certificate) - if ($studentInfoProgress || $studentInfoScore || $studentInfoCertificate) { - if ($studentInfoProgress) { - $progress = Tracking::get_avg_student_progress( + if (isset($courseUserHtml[1])) { + $course_session = $courseUserHtml[1]; + $course_session['skill'] = isset($courseUserHtml['skill']) ? $courseUserHtml['skill'] : ''; + + // Course option (show student progress) + // This code will add new variables (Progress, Score, Certificate) + if ($studentInfoProgress || $studentInfoScore || $studentInfoCertificate) { + if ($studentInfoProgress) { + $progress = Tracking::get_avg_student_progress( $user_id, $course['course_code'], [], $session_id ); - $course_session['student_info']['progress'] = $progress === false ? null : $progress; - } + $course_session['student_info']['progress'] = $progress === false ? null : $progress; + } - if ($studentInfoScore) { - $percentage_score = Tracking::get_avg_student_score( + if ($studentInfoScore) { + $percentage_score = Tracking::get_avg_student_score( $user_id, $course['course_code'], [], $session_id ); - $course_session['student_info']['score'] = $percentage_score; - } + $course_session['student_info']['score'] = $percentage_score; + } - if ($studentInfoCertificate) { - $category = Category::load( + if ($studentInfoCertificate) { + $category = Category::load( null, null, $course['course_code'], @@ -1362,111 +1359,109 @@ class IndexManager null, $session_id ); - $course_session['student_info']['certificate'] = null; - if (isset($category[0])) { - if ($category[0]->is_certificate_available($user_id)) { - $course_session['student_info']['certificate'] = Display::label( + $course_session['student_info']['certificate'] = null; + if (isset($category[0])) { + if ($category[0]->is_certificate_available($user_id)) { + $course_session['student_info']['certificate'] = Display::label( get_lang('Yes'), 'success' ); - } else { - $course_session['student_info']['certificate'] = Display::label( + } else { + $course_session['student_info']['certificate'] = Display::label( get_lang('No') ); - } } } } - $list_courses_session[] = $course_session; } + $list_courses_session[] = $course_session; } - $count_courses_session++; } + $count_courses_session++; } + } - // No courses to show. - if ($atLeastOneCourseIsVisible === false) { - if (empty($list_courses_session)) { - continue; - } + // No courses to show. + if ($atLeastOneCourseIsVisible === false) { + if (empty($list_courses_session)) { + continue; } + } - if ($count_courses_session > 0) { - $params = [ + if ($count_courses_session > 0) { + $params = [ 'id' => $session_id, ]; - $session_box = Display::getSessionTitleBox($session_id); - $coachId = $session_box['coach_id']; + $session_box = Display::getSessionTitleBox($session_id); + $coachId = $session_box['coach_id']; - $params['title'] = $session_box['title']; - $params['id_coach'] = $coachId; - $params['coach_url'] = api_get_path(WEB_AJAX_PATH). + $params['title'] = $session_box['title']; + $params['id_coach'] = $coachId; + $params['coach_url'] = api_get_path(WEB_AJAX_PATH). 'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId; - $params['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null; - $params['coach_avatar'] = UserManager::getUserPicture( + $params['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null; + $params['coach_avatar'] = UserManager::getUserPicture( $coachId, USER_IMAGE_SIZE_SMALL ); - $params['date'] = $session_box['dates']; - $params['duration'] = isset($session_box['duration']) ? ' '.$session_box['duration'] : null; - $params['show_actions'] = SessionManager::cantEditSession($session_id); -/* - if ($collapsable) { - $collapsableData = Sessionmanager::getCollapsableData( - $user_id, - $session_id, - $extraFieldValue, - $collapsableLink - ); - $params['collapsed'] = $collapsableData['collapsed']; - $params['collapsable_link'] = $collapsableData['collapsable_link']; - }*/ - $params['image'] = $session_box['image']; - $params['url'] = $session_box['url']; - $params['show_description'] = $session_box['show_description'] == 1 && $portalShowDescription; - $params['description'] = $session_box['description']; - $params['visibility'] = $session_box['visibility']; - $params['show_simple_session_info'] = $showSimpleSessionInfo; - $params['course_list_session_style'] = $coursesListSessionStyle; - $params['num_users'] = $session_box['num_users']; - $params['num_courses'] = $session_box['num_courses']; - $params['course_categories'] = CourseManager::getCourseCategoriesFromCourseList( + $params['date'] = $session_box['dates']; + $params['duration'] = isset($session_box['duration']) ? ' '.$session_box['duration'] : null; + $params['show_actions'] = SessionManager::cantEditSession($session_id); + /* + if ($collapsable) { + $collapsableData = Sessionmanager::getCollapsableData( + $user_id, + $session_id, + $extraFieldValue, + $collapsableLink + ); + $params['collapsed'] = $collapsableData['collapsed']; + $params['collapsable_link'] = $collapsableData['collapsable_link']; + }*/ + $params['image'] = $session_box['image']; + $params['url'] = $session_box['url']; + $params['show_description'] = $session_box['show_description'] == 1 && $portalShowDescription; + $params['description'] = $session_box['description']; + $params['visibility'] = $session_box['visibility']; + $params['show_simple_session_info'] = $showSimpleSessionInfo; + $params['course_list_session_style'] = $coursesListSessionStyle; + $params['num_users'] = $session_box['num_users']; + $params['num_courses'] = $session_box['num_courses']; + $params['course_categories'] = CourseManager::getCourseCategoriesFromCourseList( $list_courses_session ); - $params['courses'] = $list_courses_session; - $params['is_old'] = $markAsOld; - $params['is_future'] = $markAsFuture; - $params['category'] = $session_box['category']; - $params['color'] = Display::randomColor($session_box['category']['id']); - - - if ($showSimpleSessionInfo) { - $params['subtitle'] = self::getSimpleSessionDetails( + $params['courses'] = $list_courses_session; + $params['is_old'] = $markAsOld; + $params['is_future'] = $markAsFuture; + $params['category'] = $session_box['category']; + $params['color'] = Display::randomColor($session_box['category']['id']); + + if ($showSimpleSessionInfo) { + $params['subtitle'] = self::getSimpleSessionDetails( $session_box['coach_name'], $session_box['dates'], isset($session_box['duration']) ? $session_box['duration'] : null ); - } + } - if ($gameModeIsActive) { - $params['stars'] = GamificationUtils::getSessionStars( + if ($gameModeIsActive) { + $params['stars'] = GamificationUtils::getSessionStars( $params['id'], $this->user_id ); - $params['progress'] = GamificationUtils::getSessionProgress( + $params['progress'] = GamificationUtils::getSessionProgress( $params['id'], $this->user_id ); - $params['points'] = GamificationUtils::getSessionPoints( + $params['points'] = GamificationUtils::getSessionPoints( $params['id'], $this->user_id ); - } - $listSession[] = $params; - $sessionCount++; } + $listSession[] = $params; + $sessionCount++; } - + } } $allCoursesInSessions = []; diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php index c902ec5519..fdc51b34ba 100755 --- a/main/lp/learnpath.class.php +++ b/main/lp/learnpath.class.php @@ -5,7 +5,6 @@ use Chamilo\CoreBundle\Repository\CourseRepository; use Chamilo\CourseBundle\Component\CourseCopy\CourseArchiver; use Chamilo\CourseBundle\Component\CourseCopy\CourseBuilder; use Chamilo\CourseBundle\Component\CourseCopy\CourseRestorer; -use Chamilo\CourseBundle\Entity\CDocument; use Chamilo\CourseBundle\Entity\CItemProperty; use Chamilo\CourseBundle\Entity\CLp; use Chamilo\CourseBundle\Entity\CLpCategory; @@ -10020,7 +10019,6 @@ class learnpath if (in_array($item_type, [TOOL_DOCUMENT, TOOL_LP_FINAL_ITEM, TOOL_HOTPOTATOES])) { $documentData = DocumentManager::get_document_data_by_id($row['path'], $course_code); if (empty($documentData)) { - $table = Database::get_course_table(TABLE_DOCUMENT); $sql = "SELECT path FROM $table WHERE diff --git a/main/lp/learnpathItem.class.php b/main/lp/learnpathItem.class.php index c274a1abf3..194240253c 100755 --- a/main/lp/learnpathItem.class.php +++ b/main/lp/learnpathItem.class.php @@ -89,7 +89,7 @@ class learnpathItem * @param int $id Learning path item ID * @param int $user_id User ID * @param int $course_id Course int id - * @param null|array $item_content An array with the contents of the item + * @param array|null $item_content An array with the contents of the item */ public function __construct( $id, @@ -4276,7 +4276,7 @@ class learnpathItem /** * Adds an audio file attached to the current item (store on disk and in db). * - * @return bool|null|string + * @return bool|string|null */ public function add_audio() { diff --git a/main/lp/lp_ajax_save_item.php b/main/lp/lp_ajax_save_item.php index 5b519479bc..18a5970caa 100755 --- a/main/lp/lp_ajax_save_item.php +++ b/main/lp/lp_ajax_save_item.php @@ -38,7 +38,7 @@ require_once __DIR__.'/../inc/global.inc.php'; * @param int $userNavigatesAway Whether the user is moving to another item * @param int $statusSignalReceived Whether the SCO called SetValue(lesson_status) * - * @return bool|null|string The resulting JS string + * @return bool|string|null The resulting JS string */ function save_item( $lp_id, diff --git a/main/mySpace/student.php b/main/mySpace/student.php index 5277d48e19..bffb33622b 100755 --- a/main/mySpace/student.php +++ b/main/mySpace/student.php @@ -268,7 +268,7 @@ if (api_is_drh()) { '#' ); $actions .= Display::url( - Display::return_icon('skills.png', get_lang('Skills'), array(), ICON_SIZE_MEDIUM), + Display::return_icon('skills.png', get_lang('Skills'), [], ICON_SIZE_MEDIUM), $webCodePath.'social/my_skills_report.php' ); $actionsLeft .= Display::url( diff --git a/main/mySpace/users.php b/main/mySpace/users.php index 3a897f8398..421cc3246c 100755 --- a/main/mySpace/users.php +++ b/main/mySpace/users.php @@ -242,7 +242,7 @@ if (api_is_drh()) { '#' ); $actions .= Display::url( - Display::return_icon('skills.png', get_lang('Skills'), array(), ICON_SIZE_MEDIUM), + Display::return_icon('skills.png', get_lang('Skills'), [], ICON_SIZE_MEDIUM), $webCodePath.'social/my_skills_report.php' ); $actionsLeft .= Display::url( diff --git a/main/social/group_view.php b/main/social/group_view.php index f58d58a1ee..ccdfebab97 100644 --- a/main/social/group_view.php +++ b/main/social/group_view.php @@ -298,7 +298,6 @@ if ($is_group_member || $groupInfo['visibility'] == GROUP_PERMISSION_OPEN) { $listTopic = $content; $listMembers = $member_content; - } else { // if I already sent an invitation message if (!in_array( diff --git a/main/social/groups.php b/main/social/groups.php index 79c9ad074c..87d2fa534a 100755 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -182,7 +182,7 @@ foreach ($results as $result) { $grid_item_2 = $html; $grid_newest_groups[] = [$grid_item_2]; } -$html.= ''; +$html .= ''; // Pop groups $results = $usergroup->get_groups_by_popularity(4, false); @@ -220,7 +220,6 @@ if (is_array($results) && count($results) > 0) { $picture = $usergroup->get_picture_group($result['id'], $result['picture'], 80); $result['picture'] = ''; - $html .= '
  • '; $html .= $result['picture']; $html .= '
    '; @@ -375,7 +374,6 @@ if (isset($_GET['view']) && $_GET['view'] == 'mygroups') { $show_menu = $_GET['view']; } - $tpl->setHelp('Groups'); $tpl->assign('social_right_content', $social_right_content); $social_layout = $tpl->get_template('social/groups.html.twig'); diff --git a/main/social/home.php b/main/social/home.php index a4fb04245b..6d9c2a4f06 100755 --- a/main/social/home.php +++ b/main/social/home.php @@ -67,8 +67,8 @@ $userGroup = new UserGroup(); )) { $table_user = Database::get_main_table(TABLE_MAIN_USER); $sql = "UPDATE $table_user - SET - picture_uri = '$new_picture' + SET + picture_uri = '$new_picture' WHERE user_id = ".api_get_user_id(); $result = Database::query($sql); @@ -77,7 +77,6 @@ $userGroup = new UserGroup(); } }*/ - $socialSearch = UserManager::getSearchForm(''); // Top Last @@ -104,7 +103,6 @@ $tpl = new Template(get_lang('SocialNetwork')); SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'home'); - $tpl->assign('social_friend_block', $friend_html); $tpl->assign('session_list', $social_session_block); $tpl->assign('social_search', $socialSearch); diff --git a/main/ticket/ticket_details.php b/main/ticket/ticket_details.php index 2ecb9cac0c..8a41054408 100644 --- a/main/ticket/ticket_details.php +++ b/main/ticket/ticket_details.php @@ -354,7 +354,6 @@ if ($ticket['ticket']['status_id'] == TicketManager::STATUS_CLOSE) { } $senderData = get_lang('AddedBy').' '.$ticket['usuario']['complete_name_with_message_link']; - echo '
    diff --git a/main/webservices/lp.php b/main/webservices/lp.php index 318a168701..71cf714ffe 100644 --- a/main/webservices/lp.php +++ b/main/webservices/lp.php @@ -592,7 +592,7 @@ $server->register( /** * @param array $params * - * @return null|soap_fault + * @return soap_fault|null */ function WSCreateLp($params) { diff --git a/main/webservices/registration.soap.php b/main/webservices/registration.soap.php index a1c8fc8f51..e8b9abfa32 100755 --- a/main/webservices/registration.soap.php +++ b/main/webservices/registration.soap.php @@ -19,7 +19,7 @@ define('DEFAULT_ADMIN_USER_ID', 1); /** * @param string $code * - * @return null|soap_fault + * @return soap_fault|null */ function returnError($code) { @@ -1119,7 +1119,7 @@ $server->register( * * @param array $params - WSFunction parameters (include VerifyKey) * - * @return bool|null|soap_fault A simple boolean (true if teacher successful subscribed, false otherwise) + * @return bool|soap_fault|null A simple boolean (true if teacher successful subscribed, false otherwise) */ function WSSubscribeTeacherToSessionCourse($params) { @@ -1178,7 +1178,7 @@ $server->register( * * @param array $params - WSFunction parameters (include VerifyKey) * - * @return bool|null|soap_fault A simple boolean (true if teacher successful unsubscribed, false otherwise) + * @return bool|soap_fault|null A simple boolean (true if teacher successful unsubscribed, false otherwise) */ function WSUnsubscribeTeacherFromSessionCourse($params) { @@ -1609,7 +1609,7 @@ $server->register( * * @throws \Doctrine\DBAL\DBALException * - * @return bool|int|null|soap_fault + * @return bool|int|soap_fault|null */ function WSEditUserCredentials($params) { @@ -4720,7 +4720,7 @@ $server->register( * * @param array $params * - * @return array|int|null|soap_fault|string + * @return array|int|soap_fault|string|null */ function WSSubscribeUserToCourseSimple($params) { @@ -5241,7 +5241,7 @@ $server->register( /** * @param array $params * - * @return array|null|soap_fault + * @return array|soap_fault|null */ function WSUnSubscribeUserFromCourseSimple($params) { @@ -5540,7 +5540,7 @@ $server->register( /** * @param array $params * - * @return int|null|soap_fault|string + * @return int|soap_fault|string|null */ function WSSubscribeUserToSessionSimple($params) { @@ -6298,7 +6298,7 @@ $server->register( /** * @param array $params * - * @return int|null|soap_fault + * @return int|soap_fault|null */ function WSUpdateUserApiKey($params) { @@ -6481,7 +6481,7 @@ $server->register( * * @param array $params Array of parameters (course and user_id) * - * @return bool|null|soap_fault A simple boolean (true if user is subscribed, false otherwise) + * @return bool|soap_fault|null A simple boolean (true if user is subscribed, false otherwise) */ function WSUserSubscribedInCourse($params) { diff --git a/main/work/work.lib.php b/main/work/work.lib.php index 27ae5afc81..77e5ca645d 100755 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -3819,7 +3819,7 @@ function checkExistingWorkFileName($filename, $workId) * @param bool $checkDuplicated * @param bool $showFlashMessage * - * @return null|string + * @return string|null */ function processWorkForm( $workInfo, diff --git a/plugin/advanced_subscription/src/HookAdvancedSubscription.php b/plugin/advanced_subscription/src/HookAdvancedSubscription.php index 9677883ebc..0cc7e5035b 100644 --- a/plugin/advanced_subscription/src/HookAdvancedSubscription.php +++ b/plugin/advanced_subscription/src/HookAdvancedSubscription.php @@ -405,7 +405,7 @@ class HookAdvancedSubscription extends HookObserver implements HookAdminBlockObs /** * @param $params * - * @return null|soap_fault + * @return soap_fault|null */ public static function WSSessionListInCategory($params) { @@ -456,7 +456,7 @@ class HookAdvancedSubscription extends HookObserver implements HookAdminBlockObs /** * @param $params * - * @return null|soap_fault + * @return soap_fault|null */ public static function WSSessionGetDetailsByUser($params) { diff --git a/src/ApiBundle/GraphQL/Resolver/CourseResolver.php b/src/ApiBundle/GraphQL/Resolver/CourseResolver.php index 0fc1373a81..da09594ef6 100644 --- a/src/ApiBundle/GraphQL/Resolver/CourseResolver.php +++ b/src/ApiBundle/GraphQL/Resolver/CourseResolver.php @@ -35,7 +35,7 @@ class CourseResolver implements ContainerAwareInterface * @param Course $course * @param Argument $args * - * @return null|string + * @return string|null */ public function getPicture(Course $course, Argument $args) { diff --git a/src/CoreBundle/Block/BreadcrumbBlockService.php b/src/CoreBundle/Block/BreadcrumbBlockService.php index 500cb28101..e05e86154a 100644 --- a/src/CoreBundle/Block/BreadcrumbBlockService.php +++ b/src/CoreBundle/Block/BreadcrumbBlockService.php @@ -61,10 +61,7 @@ class BreadcrumbBlockService extends BaseBreadcrumbMenuBlockService // Add course /** @var Course $course */ if ($course = $blockContext->getBlock()->getSetting('course')) { - - - - if(is_array($course)){ + if (is_array($course)) { $title = $course['title']; $code = $course['code']; } else { diff --git a/src/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php b/src/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php index 609bce511f..09d5a13d4e 100644 --- a/src/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php +++ b/src/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php @@ -87,8 +87,8 @@ class TestMatching extends Basic 'Subscript', 'Superscript', 'ShowBlocks', - ],['JustifyLeft', 'JustifyCenter', 'JustifyRight'], - ['Source'] + ], ['JustifyLeft', 'JustifyCenter', 'JustifyRight'], + ['Source'], ]; } diff --git a/src/CoreBundle/Controller/EditorController.php b/src/CoreBundle/Controller/EditorController.php index a45d0af6c7..eca70e5363 100644 --- a/src/CoreBundle/Controller/EditorController.php +++ b/src/CoreBundle/Controller/EditorController.php @@ -59,7 +59,7 @@ class EditorController extends BaseController { \Chat::setDisableChat(); $params = [ - 'course_condition' => '?'.$this->getCourseUrlQuery() + 'course_condition' => '?'.$this->getCourseUrlQuery(), ]; return $this->render('@ChamiloTheme/Editor/elfinder.html.twig', $params); diff --git a/src/CoreBundle/Controller/ResourceController.php b/src/CoreBundle/Controller/ResourceController.php index 0d9a47b866..2b22f67bec 100644 --- a/src/CoreBundle/Controller/ResourceController.php +++ b/src/CoreBundle/Controller/ResourceController.php @@ -153,7 +153,7 @@ class ResourceController extends BaseController implements CourseControllerInter * @param Request $request * @param string $fileType * - * @return null|\Symfony\Component\HttpFoundation\RedirectResponse|Response + * @return \Symfony\Component\HttpFoundation\RedirectResponse|Response|null */ public function createResource(Request $request, $fileType = 'file') { diff --git a/src/CoreBundle/EventListener/LoginSuccessHandler.php b/src/CoreBundle/EventListener/LoginSuccessHandler.php index b2cc395d3b..b47b46f089 100644 --- a/src/CoreBundle/EventListener/LoginSuccessHandler.php +++ b/src/CoreBundle/EventListener/LoginSuccessHandler.php @@ -45,7 +45,7 @@ class LoginSuccessHandler * @param Request $request * @param TokenInterface $token * - * @return null|RedirectResponse|Response + * @return RedirectResponse|Response|null */ public function onSecurityInteractiveLogin(InteractiveLoginEvent $event) { diff --git a/src/CoreBundle/EventListener/LogoutSuccessHandler.php b/src/CoreBundle/EventListener/LogoutSuccessHandler.php index e5af74db32..efc97f13e0 100644 --- a/src/CoreBundle/EventListener/LogoutSuccessHandler.php +++ b/src/CoreBundle/EventListener/LogoutSuccessHandler.php @@ -38,7 +38,7 @@ class LogoutSuccessHandler implements LogoutSuccessHandlerInterface /** * @param Request $request * - * @return null|RedirectResponse + * @return RedirectResponse|null */ public function onLogoutSuccess(Request $request) { diff --git a/src/CoreBundle/Framework/PageController.php b/src/CoreBundle/Framework/PageController.php index f905b65fab..c00f1cbc08 100644 --- a/src/CoreBundle/Framework/PageController.php +++ b/src/CoreBundle/Framework/PageController.php @@ -882,7 +882,7 @@ class PageController * @param string $filter current|history * @param int $page * - * @return bool|null|string + * @return bool|string|null */ public function returnSessions($user_id, $filter, $page) { diff --git a/src/CoreBundle/Settings/AbstractSettingsSchema.php b/src/CoreBundle/Settings/AbstractSettingsSchema.php index e2a680c54d..73102b4a1b 100644 --- a/src/CoreBundle/Settings/AbstractSettingsSchema.php +++ b/src/CoreBundle/Settings/AbstractSettingsSchema.php @@ -3,18 +3,18 @@ namespace Chamilo\CoreBundle\Settings; -use Sylius\Bundle\SettingsBundle\Schema\SchemaInterface; use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder; +use Sylius\Bundle\SettingsBundle\Schema\SchemaInterface; /** - * Class AbstractSettingsSchema + * Class AbstractSettingsSchema. * * @package Chamilo\CoreBundle\Settings */ abstract class AbstractSettingsSchema implements SchemaInterface { /** - * @param array $allowedTypes + * @param array $allowedTypes * @param AbstractSettingsBuilder $builder */ public function setMultipleAllowedTypes($allowedTypes, $builder) diff --git a/src/CourseBundle/Controller/Home/HomeController.php b/src/CourseBundle/Controller/Home/HomeController.php index d8d7deeaae..693bb0589b 100644 --- a/src/CourseBundle/Controller/Home/HomeController.php +++ b/src/CourseBundle/Controller/Home/HomeController.php @@ -155,7 +155,7 @@ class HomeController extends ToolBaseController * * @param $iconId * - * @return null|string + * @return string|null */ public function showIconAction($iconId) { @@ -177,7 +177,7 @@ class HomeController extends ToolBaseController * * @param $iconId * - * @return null|string + * @return string|null */ public function hideIconAction($iconId) { @@ -203,7 +203,7 @@ class HomeController extends ToolBaseController * * @param $iconId * - * @return null|string + * @return string|null */ public function deleteIcon($iconId) { diff --git a/src/LtiBundle/Entity/ExternalTool.php b/src/LtiBundle/Entity/ExternalTool.php index 239b7f84b8..d6fa5a4a5b 100644 --- a/src/LtiBundle/Entity/ExternalTool.php +++ b/src/LtiBundle/Entity/ExternalTool.php @@ -68,7 +68,7 @@ class ExternalTool */ private $activeDeepLinking = false; /** - * @var null|string + * @var string|null * * @ORM\Column(name="privacy", type="text", nullable=true, options={"default": null}) */ @@ -164,7 +164,7 @@ class ExternalTool } /** - * @return null|string + * @return string|null */ public function getDescription() { @@ -172,7 +172,7 @@ class ExternalTool } /** - * @param null|string $description + * @param string|null $description * * @return ExternalTool */ @@ -244,7 +244,7 @@ class ExternalTool } /** - * @return null|string + * @return string|null */ public function getCustomParams() { @@ -252,7 +252,7 @@ class ExternalTool } /** - * @param null|string $customParams + * @param string|null $customParams * * @return ExternalTool */ @@ -274,7 +274,7 @@ class ExternalTool /** * @param array $params * - * @return null|string + * @return string|null */ public function encodeCustomParams(array $params) { @@ -387,7 +387,7 @@ class ExternalTool /** * Get privacy. * - * @return null|string + * @return string|null */ public function getPrivacy() { diff --git a/src/UserBundle/Entity/User.php b/src/UserBundle/Entity/User.php index 9f1e2543d2..f36047df0d 100644 --- a/src/UserBundle/Entity/User.php +++ b/src/UserBundle/Entity/User.php @@ -1980,6 +1980,7 @@ class User extends BaseUser implements ThemeUser, EquatableInterface //implement if ($uri) { return 'users/'.substr((string) $id, 0, 1).'/'.$id.'/'.'small_'.$uri; } + return ''; } diff --git a/src/UserBundle/Repository/UserRepository.php b/src/UserBundle/Repository/UserRepository.php index 4ff00c2e11..3cd0704bdf 100644 --- a/src/UserBundle/Repository/UserRepository.php +++ b/src/UserBundle/Repository/UserRepository.php @@ -1349,7 +1349,7 @@ class UserRepository extends EntityRepository * * @throws \Exception * - * @return null|TrackELogin + * @return TrackELogin|null */ public function getLastLogin(User $user) { diff --git a/src/UserBundle/Security/LoginFormAuthenticator.php b/src/UserBundle/Security/LoginFormAuthenticator.php index d5e08a54b3..6fbda638bb 100644 --- a/src/UserBundle/Security/LoginFormAuthenticator.php +++ b/src/UserBundle/Security/LoginFormAuthenticator.php @@ -64,7 +64,7 @@ class LoginFormAuthenticator extends AbstractFormLoginAuthenticator * @param array $credentials * @param UserProviderInterface $userProvider * - * @return null|UserInterface + * @return UserInterface|null */ public function getUser($credentials, UserProviderInterface $userProvider) { diff --git a/user_portal.php b/user_portal.php index 52702f5132..244f2c2d85 100755 --- a/user_portal.php +++ b/user_portal.php @@ -131,7 +131,6 @@ $myCourseListAsCategory = api_get_configuration_value('my_courses_list_as_catego $controller = new IndexManager(get_lang('MyCourses')); if (!$myCourseListAsCategory) { - // Main courses and session list if (isset($_COOKIE['defaultMyCourseView'.$userId]) && $_COOKIE['defaultMyCourseView'.$userId] == IndexManager::VIEW_BY_SESSION && @@ -183,7 +182,7 @@ if (!$myCourseListAsCategory) { true, $loadHistory ); - + $getCategory = CourseCategory::getCategory($categoryCode); $controller->tpl->assign('category', $getCategory); } @@ -244,7 +243,6 @@ if (empty($courseAndSessions['html_courses']) && !isset($_GET['history'])) { $showWelcomeCourse = true; } - $controller->tpl->assign('show_welcome_course', $showWelcomeCourse); $controller->tpl->assign('html_sessions', $courseAndSessions['html_sessions']); $controller->tpl->assign('html_courses', $courseAndSessions['html_courses']);