From 9262b38429743057848ff3b6978d30aff7d6549c Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 9 Apr 2019 14:07:34 +0200 Subject: [PATCH] Minor - flint fixes --- .../export/aiken/aiken_import.inc.php | 2 -- main/exercise/question.class.php | 2 +- main/inc/global.inc.php | 1 - main/inc/lib/exercise.lib.php | 5 +-- main/inc/lib/tracking.lib.php | 5 ++- main/session/session_category_list.php | 34 ++++++++----------- .../CoreBundle/Component/Utils/ChamiloApi.php | 2 +- 7 files changed, 22 insertions(+), 29 deletions(-) diff --git a/main/exercise/export/aiken/aiken_import.inc.php b/main/exercise/export/aiken/aiken_import.inc.php index 9defbfd552..db783ddf49 100755 --- a/main/exercise/export/aiken/aiken_import.inc.php +++ b/main/exercise/export/aiken/aiken_import.inc.php @@ -10,8 +10,6 @@ * @package chamilo.exercise */ -use Chamilo\CourseBundle\Entity\CQuizAnswer; - /** * This function displays the form for import of the zip file with qti2. * diff --git a/main/exercise/question.class.php b/main/exercise/question.class.php index e633ae7737..362d83791a 100755 --- a/main/exercise/question.class.php +++ b/main/exercise/question.class.php @@ -122,7 +122,7 @@ abstract class Question /** * Reads question information from the data base. * - * @param int $id - question ID + * @param int $id - question ID * @param array $course_info * @param bool $getExerciseList * diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php index 1f7d5203c3..353541ea5b 100755 --- a/main/inc/global.inc.php +++ b/main/inc/global.inc.php @@ -16,7 +16,6 @@ use Chamilo\CoreBundle\Component\Utils\ChamiloApi; * @todo remove the code that displays the button that links to the install page * but use a redirect immediately. By doing so the $alreadyInstalled variable can be removed. */ - define('SHOW_ERROR_CODES', false); // Include the libraries that are necessary everywhere diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php index ed9b26650d..64259f933a 100644 --- a/main/inc/lib/exercise.lib.php +++ b/main/inc/lib/exercise.lib.php @@ -5343,12 +5343,13 @@ EOT; /** * Check if an exercise complies with the requirements to be embedded in the mobile app or a video. By making sure - * it is set on one question per page and it only contains unique-answer or multiple-answer questions + * it is set on one question per page and it only contains unique-answer or multiple-answer questions. * * @param array $exercise Exercise info * - * @return bool * @throws \Doctrine\ORM\Query\QueryException + * + * @return bool */ public static function isQuizEmbeddable(array $exercise) { diff --git a/main/inc/lib/tracking.lib.php b/main/inc/lib/tracking.lib.php index 1b3282eca7..99d4800f65 100755 --- a/main/inc/lib/tracking.lib.php +++ b/main/inc/lib/tracking.lib.php @@ -3995,11 +3995,10 @@ class Tracking * * @param array|int $student_id * @param string $course_code - * @param int $session_id if param is null(default) return count of assignments including sessions, - * 0 = session is not filtered + * @param int $session_id if param is null(default) return count of assignments including sessions, + * 0 = session is not filtered * * @return int Count of assignments - * */ public static function count_student_assignments( $student_id, diff --git a/main/session/session_category_list.php b/main/session/session_category_list.php index a5674ec478..7f86976d7a 100644 --- a/main/session/session_category_list.php +++ b/main/session/session_category_list.php @@ -109,11 +109,10 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') { Display::return_icon('new_folder.png', get_lang('AddSessionCategory'), [], ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'session/session_category_add.php' ); - echo Display::url( + echo Display::url( Display::return_icon('session.png', get_lang('ListSession'), [], ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH).'session/session_list.php' - ); - ?> + ); ?>
@@ -166,13 +165,10 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') { + } ?>
+ } ?> @@ -190,12 +186,12 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') { $enreg) { - if ($key == $limit) { - break; - } - $sql = 'SELECT COUNT(session_category_id) + $x = 0; + foreach ($Sessions as $key => $enreg) { + if ($key == $limit) { + break; + } + $sql = 'SELECT COUNT(session_category_id) FROM '.$tbl_session.' s INNER JOIN '.$table_access_url_rel_session.' us ON (s.id = us.session_id) @@ -203,8 +199,8 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') { s.session_category_id = '.intval($enreg['id']).' AND us.access_url_id = '.api_get_current_access_url_id(); - $rs = Database::query($sql); - list($nb_courses) = Database::fetch_array($rs); ?> + $rs = Database::query($sql); + list($nb_courses) = Database::fetch_array($rs); ?> @@ -235,9 +231,9 @@ if (isset($_GET['search']) && $_GET['search'] === 'advanced') { + $x++; + } + unset($Sessions); ?>

diff --git a/src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php b/src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php index a81e75bde1..42d3f33b3f 100644 --- a/src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php +++ b/src/Chamilo/CoreBundle/Component/Utils/ChamiloApi.php @@ -357,7 +357,7 @@ class ChamiloApi } /** - * Get JavaScript code necessary to load quiz markers-rolls in medialement's Markers Rolls plugin + * Get JavaScript code necessary to load quiz markers-rolls in medialement's Markers Rolls plugin. * * @return string */