chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - format code remove, unused code, int casting

Browse Source
pull/3023/head
Julio Montoya 6 years ago
parent 8fa575aea1
commit 7bbeb12879
3 changed files with 16 additions and 140 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 117
      main/auth/courses_controller.php
  2. 32
      main/inc/lib/course_category.lib.php
  3. 7
      main/inc/lib/sessionmanager.lib.php

117
main/auth/courses_controller.php
Unescape View File

@ -202,123 +202,6 @@ class CoursesController
}
}
/**
* Get the html block for courses categories.
*
* @param string $code Current category code
* @param bool $hiddenLinks Whether hidden links
* @param array $limit
*
* @return string The HTML block
*/
public function getCoursesCategoriesBlock(
$code = null,
$hiddenLinks = false,
$limit = null
) {
$categories = CoursesAndSessionsCatalog::getCourseCategories();
$html = '';
if (!empty($categories)) {
$action = 'display_courses';
foreach ($categories[0] as $category) {
$categoryName = $category['name'];
$categoryCode = $category['code'];
$categoryCourses = $category['count_courses'];
$html .= '<li>';
$categoryLink = CourseCategory::getCourseCategoryUrl(
1,
$limit['length'],
$categoryCode,
$hiddenLinks,
$action
);
if ($code == $categoryCode) {
$html .= '<strong>';
$html .= "$categoryName ($categoryCourses)";
$html .= '</strong>';
} else {
if (!empty($categoryCourses)) {
$html .= '<a href="'.$categoryLink.'">';
$html .= "$categoryName ($categoryCourses)";
$html .= '</a>';
} else {
$html .= "$categoryName ($categoryCourses)";
}
}
if (!empty($categories[$categoryCode])) {
$html .= '<ul class="nav nav-list">';
foreach ($categories[$categoryCode] as $subCategory1) {
$subCategory1Name = $subCategory1['name'];
$subCategory1Code = $subCategory1['code'];
$subCategory1Courses = $subCategory1['count_courses'];
$html .= '<li>';
if ($code == $subCategory1Code) {
$html .= "<strong>$subCategory1Name ($subCategory1Courses)</strong>";
} else {
$html .= '<a href="'.$categoryLink.'">';
$html .= "$subCategory1Name ($subCategory1Courses)";
$html .= '</a>';
}
if (!empty($categories[$subCategory1Code])) {
$html .= '<ul class="nav nav-list">';
foreach ($categories[$subCategory1Code] as $subCategory2) {
$subCategory2Name = $subCategory2['name'];
$subCategory2Code = $subCategory2['code'];
$subCategory2Courses = $subCategory2['count_courses'];
$html .= '<li>';
if ($code == $subCategory2Code) {
$html .= "<strong>$subCategory2Name ($subCategory2Courses)</strong>";
} else {
$html .= '<a href="'.$categoryLink.'">';
$html .= "$subCategory2Name ($subCategory2Courses)";
$html .= '</a>';
}
if (!empty($categories[$subCategory2Code])) {
$html .= '<ul class="nav nav-list">';
foreach ($categories[$subCategory2Code] as $subCategory3) {
$subCategory3Name = $subCategory3['name'];
$subCategory3Code = $subCategory3['code'];
$subCategory3Courses = $subCategory3['count_courses'];
$html .= '<li>';
if ($code == $subCategory3Code) {
$html .= "<strong>$subCategory3Name ($subCategory3Courses)</strong>";
} else {
$html .= '<a href="'.$categoryLink.'">';
$html .= "$subCategory3Name ($subCategory3Courses)";
$html .= '</a>';
}
$html .= '</li>';
}
$html .= '</ul>';
}
$html .= '</li>';
}
$html .= '</ul>';
}
$html .= '</li>';
}
$html .= '</ul>';
}
$html .= '</li>';
}
}
return $html;
}
/**
* Get a HTML button for subscribe to session.
*

32
main/inc/lib/course_category.lib.php
Unescape View File

@ -199,11 +199,17 @@ class CourseCategory
];
$categoryId = Database::insert($table, $params);
if ($categoryId) {
self::updateParentCategoryChildrenCount($parent_id, 1);
UrlManager::addCourseCategoryListToUrl(
[$categoryId],
[api_get_current_access_url_id()]
);
self::updateParentCategoryChildrenCount($parent_id, 1);
self::addToUrl($categoryId);
return $categoryId;
}
return $categoryId;
return false;
}
/**
@ -216,7 +222,7 @@ class CourseCategory
{
$table = Database::get_main_table(TABLE_MAIN_CATEGORY);
$categoryId = Database::escape_string($categoryId);
$delta = intval($delta);
$delta = (int) $delta;
// First get to the highest level possible in the tree
$result = Database::query("SELECT parent_id FROM $table WHERE code = '$categoryId'");
$row = Database::fetch_array($result);
@ -225,7 +231,6 @@ class CourseCategory
self::updateParentCategoryChildrenCount($row['parent_id'], $delta);
}
// Now we're at the top, get back down to update each child
//$children_count = courseCategoryChildrenCount($categoryId);
$sql = "UPDATE $table SET children_count = (children_count - ".abs($delta).") WHERE code = '$categoryId'";
if ($delta >= 0) {
$sql = "UPDATE $table SET children_count = (children_count + $delta) WHERE code = '$categoryId'";
@ -330,7 +335,7 @@ class CourseCategory
{
$table = Database::get_main_table(TABLE_MAIN_CATEGORY);
$code = Database::escape_string($code);
$tree_pos = intval($tree_pos);
$tree_pos = (int) $tree_pos;
$parent_id = Database::escape_string($parent_id);
$parentIdCondition = " AND (parent_id IS NULL OR parent_id = '' )";
@ -384,7 +389,7 @@ class CourseCategory
public static function courseCategoryChildrenCount($categoryId)
{
$table = Database::get_main_table(TABLE_MAIN_CATEGORY);
$categoryId = intval($categoryId);
$categoryId = (int) $categoryId;
$count = 0;
if (empty($categoryId)) {
return 0;
@ -580,19 +585,6 @@ class CourseCategory
return Database::store_result(Database::query($sql));
}
/**
* @param int $id
*
* @return bool
*/
public static function addToUrl($id)
{
UrlManager::addCourseCategoryListToUrl(
[$id],
[api_get_current_access_url_id()]
);
}
/**
* @param string $categoryCode
*

7
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -6855,9 +6855,9 @@ SQL;
*/
public static function editUserSessionDuration($duration, $userId, $sessionId)
{
$duration = intval($duration);
$userId = intval($userId);
$sessionId = intval($sessionId);
$duration = (int) $duration;
$userId = (int) $userId;
$sessionId = (int) $sessionId;
if (empty($userId) || empty($sessionId)) {
return false;
@ -9083,6 +9083,7 @@ SQL;
}
$userRelSession = self::getUserSession($userId, $sessionId);
if ($userRelSession) {
if (isset($userRelSession['collapsed']) && $userRelSession['collapsed'] != '') {
$collapsed = $userRelSession['collapsed'];

Write Preview
Loading…
Cancel
Save