Internal - Format code, fix breadcrumb, fix variables.

public/main/admin/index.php

@@ -70,9 +70,9 @@ if (api_is_platform_admin()) {
     $items = [
         ['url' => 'user_list.php', 'label' => get_lang('User list')],
         ['url' => 'user_add.php', 'label' => get_lang('Add a user')],
-        ['url' => 'user_export.php', 'label' => get_lang('ExportUser listXMLCSV')],
+        ['url' => 'user_export.php', 'label' => get_lang('Export users list')],
-        ['url' => 'user_import.php', 'label' => get_lang('ImportUser listXMLCSV')],
+        ['url' => 'user_import.php', 'label' => get_lang('Import users list')],
-        ['url' => 'user_update_import.php', 'label' => get_lang('EditUser listCSV')],
+        ['url' => 'user_update_import.php', 'label' => get_lang('Edit users list')],
     ];
 
     if (isset($extAuthSource) && isset($extAuthSource['extldap']) && count($extAuthSource['extldap']) > 0) {
@@ -90,7 +90,7 @@ if (api_is_platform_admin()) {
     $items = [
         ['url' => 'user_list.php', 'label' => get_lang('User list')],
         ['url' => 'user_add.php', 'label' => get_lang('Add a user')],
-        ['url' => 'user_import.php', 'label' => get_lang('ImportUser listXMLCSV')],
+        ['url' => 'user_import.php', 'label' => get_lang('Import users list')],
         ['url' => 'usergroups.php', 'label' => get_lang('Classes')],
     ];
 

public/main/forum/forumfunction.inc.php

@@ -3230,6 +3230,7 @@ function saveThreadScore(
                 $sql = "INSERT INTO $table_threads_qualify (c_id, user_id, thread_id,qualify,qualify_user_id,qualify_time,session_id)
                         VALUES (".$course_id.", '".$user_id."','".$thread_id."',".(float) $thread_qualify.", '".$currentUserId."','".$qualify_time."','".$session_id."')";
                 Database::query($sql);
+
                 return 'insert';
             } else {
                 saveThreadScoreHistory(
@@ -6388,8 +6389,6 @@ function postIsEditableByStudent($forum, $post)
 }
 
 /**
- * @param CForumPost $post
- *
  * @return bool
  */
 function savePostRevision(CForumPost $post)
@@ -6454,7 +6453,6 @@ function postNeedsRevision(CForumPost $post): bool
 }
 
 /**
- * @param CForumPost   $post
  * @param array $threadInfo
  *
  * @return string
@@ -6590,9 +6588,8 @@ function getReportRecipients()
 }
 
 /**
- * @param CForumPost $post
+ * @param array $forumInfo
- * @param array      $forumInfo
+ * @param array $threadInfo
- * @param array      $threadInfo
  *
  * @return bool
  */
@@ -6628,5 +6625,4 @@ function reportPost(CForumPost $post, $forumInfo, $threadInfo)
             MessageManager::send_message_simple($userId, $subject, $content);
         }
     }
-
 }

public/main/forum/forumqualify.php

@@ -9,7 +9,6 @@ use Chamilo\CourseBundle\Entity\CForumThread;
 /**
  * @todo fix all this qualify files avoid including files, use classes POO jmontoya
  */
-
 require_once __DIR__.'/../inc/global.inc.php';
 require_once 'forumfunction.inc.php';
 

public/main/inc/lib/agenda.lib.php

@@ -2940,7 +2940,7 @@ class Agenda
     /**
      * This function delete a attachment file by id.
      *
-     * @param int   $attachmentId
+     * @param int $attachmentId
      *
      * @return string
      */

public/main/inc/lib/display.lib.php

@@ -125,9 +125,15 @@ class Display
 
         $courseInfo = api_get_course_info();
         if (!empty($courseInfo)) {
+            $url = $courseInfo['course_public_url'];
+            $sessionId = api_get_session_id();
+            if (!empty($sessionId)) {
+                $url.= '&sid='.$sessionId;
+            }
+
             array_unshift(
                 $interbreadcrumb,
-                ['name' => $courseInfo['title'], 'url' => $courseInfo['course_public_url']]
+                ['name' => $courseInfo['title'], 'url' => $url]
             );
         }
 

public/main/inc/lib/template.lib.php

@@ -1104,6 +1104,20 @@ class Template
     {
         // Set legacy breadcrumb
         global $interbreadcrumb;
+
+        $courseInfo = api_get_course_info();
+        if (!empty($courseInfo)) {
+            $url = $courseInfo['course_public_url'];
+            $sessionId = api_get_session_id();
+            if (!empty($sessionId)) {
+                $url.= '&sid='.$sessionId;
+            }
+            array_unshift(
+                $interbreadcrumb,
+                ['name' => $courseInfo['title'], 'url' => $url]
+            );
+        }
+
         $this->params['legacy_breadcrumb'] = $interbreadcrumb;
 
         global $htmlHeadXtra;

src/CoreBundle/Controller/CourseHomeController.php

@@ -114,10 +114,7 @@ class CourseHomeController extends ToolBaseController
 
         $qb = $toolRepository->getResourcesByCourse($course, $this->getSession());
         $qb->addSelect('tool');
-        $qb->innerJoin(
+        $qb->innerJoin('resource.tool', 'tool');
-            'resource.tool',
-            'tool'
-        );
         $result = $qb->getQuery()->getResult();
         $tools = [];
         /** @var CTool $item */

src/CoreBundle/Entity/Session.php

@@ -60,14 +60,13 @@ class Session
     protected $id;
 
     /**
-     * @ORM\OneToMany(
+     * @var ArrayCollection|SkillRelCourse[]
-     *     targetEntity="SkillRelCourse", mappedBy="session", cascade={"persist", "remove"}
+     * @ORM\OneToMany(targetEntity="SkillRelCourse", mappedBy="session", cascade={"persist", "remove"})
-     * )
      */
     protected $skills;
 
     /**
-     * @var ArrayCollection
+     * @var ArrayCollection|SessionRelCourse[]
      *
      * @ORM\OrderBy({"position" = "ASC"})
      * @ORM\OneToMany(targetEntity="SessionRelCourse", mappedBy="session", cascade={"persist"}, orphanRemoval=true)
@@ -75,7 +74,7 @@ class Session
     protected $courses;
 
     /**
-     * @var ArrayCollection
+     * @var ArrayCollection|SessionRelUser[]
      *
      * @ORM\OneToMany(targetEntity="SessionRelUser", mappedBy="session", cascade={"persist"}, orphanRemoval=true)
      */
@@ -99,11 +98,15 @@ class Session
     protected $currentCourse;
 
     /**
+     * @var ArrayCollection|SkillRelUser[]
+     *
      * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SkillRelUser", mappedBy="session", cascade={"persist"})
      */
     protected $issuedSkills;
 
     /**
+     * @var ArrayCollection|AccessUrlRelSession[]
+     *
      * @ORM\OneToMany(
      *     targetEntity="Chamilo\CoreBundle\Entity\AccessUrlRelSession",
      *     mappedBy="session",
@@ -113,6 +116,8 @@ class Session
     protected $urls;
 
     /**
+     * @var ArrayCollection|ResourceLink[]
+     *
      * @ORM\OneToMany(targetEntity="ResourceLink", mappedBy="session", cascade={"remove"}, orphanRemoval=true)
      */
     protected $resourceLinks;