Fix queries, php warnings

5 years ago · c6401d4ca0
parent 883f8170d1
commit c6401d4ca0
6 changed files with 13 additions and 29 deletions
--- a/ecs.php
+++ b/ecs.php
@ -7,8 +7,6 @@ declare(strict_types=1);
 use PHP_CodeSniffer\Standards\Generic\Sniffs\Arrays\DisallowLongArraySyntaxSniff;
 use PhpCsFixer\Fixer\ArrayNotation\TrailingCommaInMultilineArrayFixer;
 use PhpCsFixer\Fixer\Import\GlobalNamespaceImportFixer;
-
-//use SlevomatCodingStandard\Sniffs\Variables\UnusedVariableSniff;
 use PhpCsFixer\Fixer\Operator\IncrementStyleFixer;
 use SlevomatCodingStandard\Sniffs\TypeHints\PropertyTypeHintSniff;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
--- a/public/main/inc/lib/display.lib.php
+++ b/public/main/inc/lib/display.lib.php
@ -2651,7 +2651,6 @@ class Display
            $ariaExpanded = $open ? 'true' : 'false';

            $html = <<<HTML
-
                <div class="card" id="$id">
                    <div class="card-header">
                        $title
@ -2776,7 +2775,6 @@ HTML;
    public static function getFrameReadyBlock($frameName)
    {
        $webPublicPath = api_get_path(WEB_PUBLIC_PATH);
-
        $videoFeatures = [
            'playpause',
            'current',
--- a/public/main/inc/lib/events.lib.php
+++ b/public/main/inc/lib/events.lib.php
@ -1073,22 +1073,22 @@ class Event
        $track_e_exercises = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
        $track_attempts = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT);
        $recording_table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_ATTEMPT_RECORDING);
-
+        $sessionCondition = api_get_session_condition($session_id);
        // Make sure we have the exact lp_view_id
-        $sql = "SELECT id FROM $lp_view_table
+        $sql = "SELECT iid FROM $lp_view_table
                WHERE
                    c_id = $course_id AND
                    user_id = $user_id AND
-                    lp_id = $lp_id AND
-                    session_id = $session_id";
+                    lp_id = $lp_id
+                    $sessionCondition";
        $result = Database::query($sql);

        if (Database::num_rows($result)) {
            $view = Database::fetch_array($result, 'ASSOC');
-            $lp_view_id = $view['id'];
+            $lp_view_id = $view['iid'];

            $sql = "DELETE FROM $lp_item_view_table
-                    WHERE c_id = $course_id AND lp_view_id = $lp_view_id";
+                    WHERE lp_view_id = $lp_view_id";
            Database::query($sql);

            $sql = "DELETE FROM $lpInteraction
--- a/public/main/lp/lp_add_item.php
+++ b/public/main/lp/lp_add_item.php
@ -17,7 +17,7 @@ api_protect_course_script();

 $isStudentView = isset($_REQUEST['isStudentView']) ? $_REQUEST['isStudentView'] : null;
 $lpId = isset($_REQUEST['lp_id']) ? (int) $_REQUEST['lp_id'] : 0;
-$submit = isset($_POST['submit_button']) ? $_POST['submit_button'] : null;
+$submit = $_POST['submit_button'] ?? null;
 $type = isset($_GET['type']) ? $_GET['type'] : null;
 $action = isset($_GET['action']) ? $_GET['action'] : null;
 $is_allowed_to_edit = api_is_allowed_to_edit(null, false);
--- a/public/main/lp/lp_report.php
+++ b/public/main/lp/lp_report.php
@ -146,18 +146,6 @@ if ('1' === $lp->getSubscribeUsers()) {
    }
 }

-$lpInfo = Database::select(
-    '*',
-    $lpTable,
-    [
-        'where' => [
-            'c_id = ? AND ' => $courseId,
-            'iid = ?' => $lpId,
-        ],
-    ],
-    'first'
-);
-
 $groups = GroupManager::get_group_list(null, $course, null, $sessionId);
 $label = get_lang('Groups');
 $classes = [];
@ -301,14 +289,14 @@ if (!empty($users)) {
            $userId,
            $course,
            [$lpId],
-            $sessionId
+            $session
        );

        $lpProgress = Tracking::get_avg_student_progress(
            $userId,
-            $courseCode,
+            $course,
            [$lpId],
-            $sessionId
+            $session
        );

        $lpLastConnection = Tracking::get_last_connection_time_in_lp(
@ -461,7 +449,7 @@ $template->assign('export', (int) $export);
 $template->assign('group_form', $groupFilterForm);
 $template->assign('url', $url);
 $template->assign('url_base', $urlBase);
-$template->assign('header', $lpInfo['name']);
+$template->assign('header', $entity->getName());
 $template->assign('actions', Display::toolbarAction('lp_actions', [$actions]));
 $result = $template->fetch('@ChamiloCore/LearnPath/report.html.twig');
 $template->assign('content', $result);
--- a/public/main/mySpace/myStudents.php
+++ b/public/main/mySpace/myStudents.php
@ -1970,7 +1970,7 @@ if (empty($details)) {
                            $qualifyLink = '&action=qualify';
                        }
                        $attemptLink =
-                            '../exercise/exercise_show.php?id='.$id_last_attempt.'&cid='.$courseInfo['real_id']
+                            '../exercise/exercise_show.php?id='.$id_last_attempt.'&cid='.$courseId
                            .'&sid='.$sessionId.'&student='.$studentId.'&origin='
                            .(empty($origin) ? 'tracking' : $origin).$qualifyLink;
                        echo Display::url(
@ -1984,7 +1984,7 @@ if (empty($details)) {
                echo '<td>';
                if ($count_attempts > 0) {
                    $all_attempt_url = "../exercise/exercise_report.php?id=$exercise_id&"
-                        ."cid=".$courseInfo['real_id']."&filter_by_user=$studentId&sid=$sessionId";
+                        ."cid=".$courseId."&filter_by_user=$studentId&sid=$sessionId";
                    echo Display::url(
                        Display::return_icon(
                            'test_results.png',