From bc85bd6ab60967ed42df5444c16088e18f951d67 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 22 May 2015 19:31:28 +0200 Subject: [PATCH] Minor format code. --- main/auth/courses.php | 26 +++++++++++++++---- main/auth/courses_controller.php | 5 ++-- .../template/default/auth/session_catalog.tpl | 7 ++--- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/main/auth/courses.php b/main/auth/courses.php index e977f679e5..2a865e5636 100755 --- a/main/auth/courses.php +++ b/main/auth/courses.php @@ -120,14 +120,23 @@ if (isset($_GET['move'])) { // We are moving the course of the user to a different user defined course category (=Sort My Courses). if (isset($_POST['submit_change_course_category'])) { if ($ctok == $_POST['sec_token']) { - $courses_controller->change_course_category($_POST['course_2_edit_category'], $_POST['course_categories']); + $courses_controller->change_course_category( + $_POST['course_2_edit_category'], + $_POST['course_categories'] + ); } } // We edit course category -if (isset($_POST['submit_edit_course_category']) && isset($_POST['title_course_category']) && strlen(trim($_POST['title_course_category'])) > 0) { +if (isset($_POST['submit_edit_course_category']) && + isset($_POST['title_course_category']) && + strlen(trim($_POST['title_course_category'])) > 0 +) { if ($ctok == $_POST['sec_token']) { - $courses_controller->edit_course_category($_POST['title_course_category'], $_POST['edit_course_category']); + $courses_controller->edit_course_category( + $_POST['title_course_category'], + $_POST['edit_course_category'] + ); } } @@ -140,7 +149,10 @@ if ($action == 'deletecoursecategory' && isset($_GET['id'])) { } // We are creating a new user defined course category (= Create Course Category). -if (isset($_POST['create_course_category']) && isset($_POST['title_course_category']) && strlen(trim($_POST['title_course_category'])) > 0) { +if (isset($_POST['create_course_category']) && + isset($_POST['title_course_category']) && + strlen(trim($_POST['title_course_category'])) > 0 +) { if ($ctok == $_POST['sec_token']) { $courses_controller->add_course_category($_POST['title_course_category']); } @@ -176,7 +188,11 @@ if (isset($_POST['unsubscribe'])) { switch ($action) { case 'subscribe_user_with_password': - $courses_controller->subscribe_user($_POST['subscribe_user_with_password'], $_POST['search_term'], $_POST['category_code']); + $courses_controller->subscribe_user( + $_POST['subscribe_user_with_password'], + $_POST['search_term'], + $_POST['category_code'] + ); exit; break; case 'createcoursecategory': diff --git a/main/auth/courses_controller.php b/main/auth/courses_controller.php index 06d84150da..e96ab954d4 100755 --- a/main/auth/courses_controller.php +++ b/main/auth/courses_controller.php @@ -564,7 +564,7 @@ class CoursesController $sessionsBlocks = array(); // Get session list catalogue URL - $sessionUrl = getCourseCategoryUrl(1, $limit['length'], null, 0, 'display_sessions'); + //$sessionUrl = getCourseCategoryUrl(1, $limit['length'], null, 0, 'display_sessions'); // Get session search catalogue URL $courseUrl = getCourseCategoryUrl(1, $limit['length'], null, 0, 'subscribe'); @@ -593,7 +593,7 @@ class CoursesController ); - /** @var SequenceRepository $repo */ + /** @var \Chamilo\CoreBundle\Entity\Repository\SequenceRepository $repo */ $repo = Database::getManager()->getRepository('ChamiloCoreBundle:SequenceResource'); $requirementAndDependencies = $repo->getRequirementAndDependencies( $session['id'], @@ -629,5 +629,4 @@ class CoursesController $tpl->display($contentTemplate); } - } diff --git a/main/template/default/auth/session_catalog.tpl b/main/template/default/auth/session_catalog.tpl index d491816e81..dbf519192c 100644 --- a/main/template/default/auth/session_catalog.tpl +++ b/main/template/default/auth/session_catalog.tpl @@ -125,25 +125,26 @@ {% if session.requirements %}

{{ 'Requirements' | get_lang }}

+

{% for requirement in session.requirements %} {{ requirement.name }} {% endfor %} +

{% endif %} {% if session.dependencies %}

{{ 'Dependencies' | get_lang }}

+

{% for dependency in session.dependencies %} {{ dependency.name }} {% endfor %} +

{% endif %} - {{ 'CourseList' | get_lang }} - -