Эх сурвалжийг харах

Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

Yannick Warnier 6 жил өмнө
parent
commit
c2ac1fa8cc

+ 4 - 4
main/auth/courses_controller.php

@@ -735,7 +735,7 @@ class CoursesController
     public function sessionListBySearch(array $limit)
     {
         $q = isset($_REQUEST['q']) ? Security::remove_XSS($_REQUEST['q']) : null;
-        $hiddenLinks = isset($_GET['hidden_links']) ? intval($_GET['hidden_links']) == 1 : false;
+        $hiddenLinks = isset($_GET['hidden_links']) ? (int) $_GET['hidden_links'] == 1 : false;
         $courseUrl = CourseCategory::getCourseCategoryUrl(
             1,
             $limit['length'],
@@ -751,7 +751,7 @@ class CoursesController
         $tpl = new Template();
         $tpl->assign('show_courses', CoursesAndSessionsCatalog::showCourses());
         $tpl->assign('show_sessions', CoursesAndSessionsCatalog::showSessions());
-        $tpl->assign('show_tutor', (api_get_setting('show_session_coach') === 'true' ? true : false));
+        $tpl->assign('show_tutor', api_get_setting('show_session_coach') === 'true' ? true : false);
         $tpl->assign('course_url', $courseUrl);
         $tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
         $tpl->assign('hidden_links', $hiddenLinks);
@@ -770,8 +770,8 @@ class CoursesController
      */
     public static function getLimitArray()
     {
-        $pageCurrent = isset($_REQUEST['pageCurrent']) ? intval($_GET['pageCurrent']) : 1;
-        $pageLength = isset($_REQUEST['pageLength']) ? intval($_GET['pageLength']) : CoursesAndSessionsCatalog::PAGE_LENGTH;
+        $pageCurrent = isset($_REQUEST['pageCurrent']) ? (int) $_GET['pageCurrent'] : 1;
+        $pageLength = isset($_REQUEST['pageLength']) ? (int) $_GET['pageLength'] : CoursesAndSessionsCatalog::PAGE_LENGTH;
 
         return [
             'start' => ($pageCurrent - 1) * $pageLength,

+ 1 - 1
src/Chamilo/CourseBundle/Component/CourseCopy/CourseBuilder.php

@@ -1462,7 +1462,7 @@ class CourseBuilder
                         WHERE c_id = '$courseId' AND lp_id = ".$obj->id;
                 $resultItem = Database::query($sql);
                 while ($obj_item = Database::fetch_object($resultItem)) {
-                    $item['id'] = $obj_item->id;
+                    $item['id'] = $obj_item->iid;
                     $item['item_type'] = $obj_item->item_type;
                     $item['ref'] = $obj_item->ref;
                     $item['title'] = $obj_item->title;

+ 5 - 1
src/Chamilo/CourseBundle/Component/CourseCopy/CourseRestorer.php

@@ -2890,6 +2890,7 @@ class CourseRestorer
                     }
 
                     foreach ($parent_item_ids as $new_item_id => $parent_item_old_id) {
+                        $new_item_id = (int) $new_item_id;
                         $parent_new_id = 0;
                         if ($parent_item_old_id != 0) {
                             $parent_new_id = isset($new_item_ids[$parent_item_old_id]) ? $new_item_ids[$parent_item_old_id] : 0;
@@ -2900,9 +2901,10 @@ class CourseRestorer
                     }
 
                     foreach ($previous_item_ids as $new_item_id => $previous_item_old_id) {
+                        $new_item_id = (int) $new_item_id;
                         $previous_new_id = 0;
                         if ($previous_item_old_id != 0) {
-                            $previous_new_id = isset($new_item_ids[$previous_item_old_id]) ? $new_item_ids[$previous_item_old_id] : '';
+                            $previous_new_id = isset($new_item_ids[$previous_item_old_id]) ? $new_item_ids[$previous_item_old_id] : 0;
                         }
                         $sql = "UPDATE $table_item SET previous_item_id = $previous_new_id
                                 WHERE c_id = ".$this->destination_course_id." AND id = '".$new_item_id."'";
@@ -2910,6 +2912,7 @@ class CourseRestorer
                     }
 
                     foreach ($next_item_ids as $new_item_id => $next_item_old_id) {
+                        $new_item_id = (int) $new_item_id;
                         $next_new_id = 0;
                         if ($next_item_old_id != 0) {
                             $next_new_id = isset($new_item_ids[$next_item_old_id]) ? $new_item_ids[$next_item_old_id] : 0;
@@ -2920,6 +2923,7 @@ class CourseRestorer
                     }
 
                     foreach ($prerequisite_ids as $new_item_id => $prerequisite_old_id) {
+                        $new_item_id = (int) $new_item_id;
                         $prerequisite_new_id = 0;
                         if ($prerequisite_old_id != 0) {
                             $prerequisite_new_id = $new_item_ids[$prerequisite_old_id];