Minor - flint fixes

pull/2827/head
Julio Montoya 7 years ago
parent 002ccd2853
commit a949d98e7c
  1. 2
      main/admin/questions.php
  2. 6
      main/auth/courses_categories.php
  3. 21
      main/inc/lib/CoursesAndSessionsCatalog.class.php
  4. 2
      main/inc/lib/course_category.lib.php

@ -36,7 +36,7 @@ if ($formSent) {
$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : ''; $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';
$description = isset($_REQUEST['description']) ? Security::remove_XSS($_REQUEST['description']) : ''; $description = isset($_REQUEST['description']) ? Security::remove_XSS($_REQUEST['description']) : '';
$title = isset($_REQUEST['title']) ? Security::remove_XSS($_REQUEST['title']) : ''; $title = isset($_REQUEST['title']) ? Security::remove_XSS($_REQUEST['title']) : '';
$page = isset($_GET['page']) && !empty($_GET['page']) ? (int) $_GET['page'] : 1; $page = isset($_GET['page']) && !empty($_GET['page']) ? (int) $_GET['page'] : 1;
$em = Database::getManager(); $em = Database::getManager();
$repo = $em->getRepository('ChamiloCourseBundle:CQuizQuestion'); $repo = $em->getRepository('ChamiloCourseBundle:CQuizQuestion');

@ -294,11 +294,11 @@ function getOptionSelect($categories, $codeType)
} else { } else {
$separate = ''; $separate = '';
} }
$html .= '<option ' . ($categoryCode == $codeType ? 'selected="selected" ' : '') $html .= '<option '.($categoryCode == $codeType ? 'selected="selected" ' : '')
. ' value="' . $category['code'] . '">' . $separate . ' ' . $category['name'] . ' (' . $countCourse . ') </option>'; .' value="'.$category['code'].'">'.$separate.' '.$category['name'].' ('.$countCourse.') </option>';
} }
$html .= '</select>'; $html .= '</select>';
return $html; return $html;
} }
/** /**

@ -156,7 +156,8 @@ class CoursesAndSessionsCatalog
return $row[0]; return $row[0];
} }
public static function getCourseCategoriesTree(){ public static function getCourseCategoriesTree()
{
$urlId = 1; $urlId = 1;
if (api_is_multiple_url_enabled()) { if (api_is_multiple_url_enabled()) {
$urlId = api_get_current_access_url_id(); $urlId = api_get_current_access_url_id();
@ -173,7 +174,7 @@ class CoursesAndSessionsCatalog
'parent_id' => null, 'parent_id' => null,
'tree_pos' => 0, 'tree_pos' => 0,
'number_courses' => $countCourses, 'number_courses' => $countCourses,
'level' => 0 'level' => 0,
]; ];
$allCategories = CourseCategory::getAllCategories(); $allCategories = CourseCategory::getAllCategories();
@ -185,7 +186,7 @@ class CoursesAndSessionsCatalog
$list[$category['code']]['level'] = 0; $list[$category['code']]['level'] = 0;
list($subList, $childrenCount) = self::buildCourseCategoryTree($allCategories, $category['code'], 0); list($subList, $childrenCount) = self::buildCourseCategoryTree($allCategories, $category['code'], 0);
//$list = array($list, $subList); //$list = array($list, $subList);
foreach($subList as $item) { foreach ($subList as $item) {
$list[$item['code']] = $item; $list[$item['code']] = $item;
} }
$list[$category['code']]['number_courses'] = $childrenCount + $category['number_courses']; $list[$category['code']]['number_courses'] = $childrenCount + $category['number_courses'];
@ -204,15 +205,14 @@ class CoursesAndSessionsCatalog
'auth_course_child' => true, 'auth_course_child' => true,
'auth_cat_child' => true, 'auth_cat_child' => true,
'number_courses' => $count_courses, 'number_courses' => $count_courses,
'level' => 0 'level' => 0,
]; ];
$result = array_merge($list,$categories); $result = array_merge($list, $categories);
return $result; return $result;
} }
/** /**
* @return array * @return array
*/ */
@ -679,12 +679,14 @@ class CoursesAndSessionsCatalog
} }
/** /**
* Build a recursive tree of course categories * Build a recursive tree of course categories.
*
* @param $categories * @param $categories
* @param $parentId * @param $parentId
*
* @return array * @return array
*/ */
public static function buildCourseCategoryTree($categories, $parentId = 0, $level=0) public static function buildCourseCategoryTree($categories, $parentId = 0, $level = 0)
{ {
$list = []; $list = [];
$count = 0; $count = 0;
@ -705,7 +707,7 @@ class CoursesAndSessionsCatalog
$level $level
); );
$list[$category['code']]['number_courses'] += $childrenCount; $list[$category['code']]['number_courses'] += $childrenCount;
foreach($subList as $item) { foreach ($subList as $item) {
$list[$item['code']] = $item; $list[$item['code']] = $item;
} }
$count += $childrenCount; $count += $childrenCount;
@ -714,5 +716,4 @@ class CoursesAndSessionsCatalog
return [$list, $count]; return [$list, $count];
} }
} }

@ -154,10 +154,10 @@ class CourseCategory
$result = Database::query($sql); $result = Database::query($sql);
$categories = Database::store_result($result, 'ASSOC'); $categories = Database::store_result($result, 'ASSOC');
return $categories; return $categories;
} }
/** /**
* @param string $code * @param string $code
* @param string $name * @param string $name

Loading…
Cancel
Save