diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php index 6daa391339..d8ce83fc9a 100755 --- a/main/course_info/infocours.php +++ b/main/course_info/infocours.php @@ -51,30 +51,32 @@ $form = new FormValidator( api_get_self().'?'.api_get_cidreq() ); - // COURSE SETTINGS -function card_settings_open($id, $title, $open = false, $icon, $parent){ +function card_settings_open($id, $title, $open = false, $icon, $parent) +{ $html = '
'; $html .= '
'; $html .= '
'; - $html .= ''; - if($icon){ - $html .= Display::return_icon($icon,null,null,ICON_SIZE_SMALL); + $html .= ''; + if ($icon) { + $html .= Display::return_icon($icon, null, null, ICON_SIZE_SMALL); } $html .= $title; $html .= '
'; $html .= '
'; $html .= '
'; + return $html; } -function card_settings_close(){ +function card_settings_close() +{ $html = '
'; + return $html; } - $form->addHtml(card_settings_open('course_settings', get_lang('CourseSettings'), true, 'settings.png', 'accordionSettings')); $image = ''; @@ -638,8 +640,7 @@ if (api_get_setting('allow_course_theme') == 'true') { 0 ); - $globalGroup[get_lang("AllowLearningPathTheme")]= $group; - + $globalGroup[get_lang("AllowLearningPathTheme")] = $group; } $allowLPReturnLink = api_get_setting('allow_lp_return_link'); @@ -707,7 +708,6 @@ if ($isEditable) { $form->freeze(); } - $form->addPanelOption( 'config_lp', get_lang('ConfigLearnpath'), @@ -1052,13 +1052,10 @@ if ($show_delete_watermark_text_message) { //Template Course Info $tpl = new Template($nameTools); - Display::display_header($nameTools, 'Settings'); - //$form->display(); - $tpl->assign('course_settings', $form->returnForm()); $courseInfoLayout = $tpl->get_template("course_info/index.html.twig"); $content = $tpl->fetch($courseInfoLayout); diff --git a/main/inc/lib/course_category.lib.php b/main/inc/lib/course_category.lib.php index d813d2d31a..dae542678f 100755 --- a/main/inc/lib/course_category.lib.php +++ b/main/inc/lib/course_category.lib.php @@ -50,8 +50,10 @@ class CourseCategory $category['access_url_id'] = $result['access_url_id']; } $category['course_count'] = self::countCoursesInCategory($categoryCode); + return $category; } + return []; } diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php index a2910aa1eb..9d1619a36a 100755 --- a/main/inc/lib/formvalidator/FormValidator.class.php +++ b/main/inc/lib/formvalidator/FormValidator.class.php @@ -947,17 +947,16 @@ EOT; */ public function addPanelOption($name, $title, $groupList, $icon, $open = false, $parent) { - $html = '
'; $html .= '
'; $html .= '
'; - $html .= ''; - if($icon){ - $html .= Display::return_icon($icon,null,null,ICON_SIZE_SMALL); + $html .= ''; + if ($icon) { + $html .= Display::return_icon($icon, null, null, ICON_SIZE_SMALL); } $html .= $title; $html .= '
'; - $html .= '
'; + $html .= '
'; $html .= '
'; $this->addHtml($html); diff --git a/main/install/install.lib.php b/main/install/install.lib.php index 03c5d0e69c..be28991cef 100755 --- a/main/install/install.lib.php +++ b/main/install/install.lib.php @@ -856,7 +856,6 @@ function display_requirements( '; echo '
'; - // RECOMMENDED SETTINGS // Note: these are the settings for Joomla, does this also apply for Chamilo? // Note: also add upload_max_filesize here so that large uploads are possible diff --git a/user_portal.php b/user_portal.php index 9b6bccfd87..da95c2ddbe 100755 --- a/user_portal.php +++ b/user_portal.php @@ -235,7 +235,7 @@ if (api_get_setting('go_to_course_after_login') === 'true') { } } -$showWelcomeCourse = false; +$showWelcomeCourse = false; // Show the chamilo mascot if (empty($courseAndSessions['html']) && !isset($_GET['history'])) { $controller->setWelComeCourse();