LPs: Fix course home LP link visibility BT#17744

main/inc/lib/course_home.lib.php

@@ -530,7 +530,11 @@ class CourseHome
                             category = "authoring" OR
                             category = "interaction" OR
                             category = "plugin"
-                        ) OR (t.name = "'.TOOL_TRACKING.'")
+                        ) OR
+                        (t.name = "'.TOOL_TRACKING.'")
+                        OR (
+                            image = "scormbuilder.gif"
+                        )
                     )';
                 }
 
@@ -562,7 +566,6 @@ class CourseHome
                         ON (t.c_id = lc.c_id AND l.category_id = lc.iid)
                         $conditions AND
                         t.c_id = $course_id $condition_session
-
                         ORDER BY
                             CASE WHEN l.category_id IS NULL THEN 0 ELSE 1 END,
                             CASE WHEN l.display_order IS NULL THEN 0 ELSE 1 END,

main/lp/learnpath.class.php

@@ -4502,6 +4502,7 @@ class learnpath
 
             $result = Database::query($sql);
             $num = Database::num_rows($result);
+            $resultTool = Database::fetch_array($result, 'ASSOC');
 
             if ($set_visibility === 'i') {
                 if ($num > 0) {
@@ -4531,6 +4532,9 @@ class learnpath
                                 SET visibility = 0
                                 WHERE iid = $id ";
                         Database::query($sql);
+                        /*$sql = "DELETE FROM $tbl_tool
+                                WHERE iid = $id";
+                        Database::query($sql);*/
                     } else {
                         $params = [
                             'category' => 'authoring',
@@ -4565,6 +4569,7 @@ class learnpath
                     }
                 }
                 if ($num > 0) {
+                    $id = $resultTool['iid'];
                     $sql = "UPDATE $tbl_tool SET
                         c_id = $course_id,
                         name = '$name',
@@ -4577,9 +4582,7 @@ class learnpath
                         session_id = $session_id
                     WHERE
                         c_id = ".$course_id." AND
-                        (link = '$link' OR link = '$oldLink') AND
-                        image='scormbuilder.gif'
-                        $session_condition
+                        iid = $id
                     ";
                     Database::query($sql);
                 }

main/lp/learnpathList.class.php

@@ -112,14 +112,20 @@ class LearnpathList
             $link = 'lp/lp_controller.php?action=view&lp_id='.$row->getId().'&id_session='.$session_id;
             $oldLink = 'newscorm/lp_controller.php?action=view&lp_id='.$row->getId().'&id_session='.$session_id;
 
+            $extraCondition = '';
+            if (!empty($session_id)) {
+                $extraLink = 'lp/lp_controller.php?action=view&lp_id='.$row->getId().'&id_session=0';
+                $extraCondition = " OR link LIKE '$extraLink' ";
+            }
+
             $sql2 = "SELECT visibility FROM $tbl_tool
                      WHERE
                         c_id = $course_id AND
-                        name = '$name' AND
                         image = 'scormbuilder.gif' AND
                         (
                             link LIKE '$link%' OR
                             link LIKE '$oldLink%'
+                            $extraCondition
                         )
                         $toolSessionCondition
                       ";
@@ -127,7 +133,10 @@ class LearnpathList
             $pub = 'i';
             if (Database::num_rows($res2) > 0) {
                 $row2 = Database::fetch_array($res2);
-                $pub = $row2['visibility'];
+                $pub = (int) $row2['visibility'];
+                if (!empty($session_id) && 0 === $pub) {
+                    $pub = 'i';
+                }
             }
 
             // Check if visible.