Minor - flint fixes

pull/3006/head
Julio Montoya 6 years ago
parent 68af9cd421
commit 0adf57ed50
  1. 2
      main/cron/import_csv.php
  2. 1
      main/document/document_quota.php
  3. 1
      main/document/upload.php
  4. 2
      main/exercise/exercise.class.php
  5. 10
      main/inc/lib/AnnouncementManager.php
  6. 1
      main/inc/lib/CoursesAndSessionsCatalog.class.php
  7. 1
      main/inc/lib/document.lib.php
  8. 2
      main/inc/lib/sessionmanager.lib.php
  9. 6
      main/inc/lib/sortable_table.class.php
  10. 2
      main/inc/lib/usergroup.lib.php
  11. 252
      main/inc/lib/userportal.lib.php
  12. 2
      main/lp/lp_add.php
  13. 12
      plugin/buycourses/src/buy_course_plugin.class.php
  14. 1
      src/CoreBundle/Block/BreadcrumbBlockService.php
  15. 1
      src/CoreBundle/EventListener/LocaleListener.php
  16. 3
      src/CourseBundle/EventListener/CourseListener.php

@ -1459,7 +1459,7 @@ class ImportCsv
);
$career = $career->find($careerValue['item_id']);
$careerName .= $career['name'].', ';
}
}
// Remove trailing comma
$careerName = substr($careerName, 0, -2);

@ -6,7 +6,6 @@
*
* @package chamilo.document
*/
use Chamilo\CoreBundle\Framework\Container;
require_once __DIR__.'/../inc/global.inc.php';

@ -4,7 +4,6 @@
/**
* @package chamilo.document
*/
use Chamilo\CoreBundle\Framework\Container;
require_once __DIR__.'/../inc/global.inc.php';

@ -8655,7 +8655,7 @@ class Exercise
// in the base course, it is included in a LP
// *and* the setting to show it is *not*
// specifically set to true, then hide it.
if ($visibility == 0) {
if ($visibility == 0) {
if (!$visibilitySetting) {
if ($exercise->exercise_was_added_in_lp == true) {
continue;

@ -1031,7 +1031,7 @@ class AnnouncementManager
$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
$sql = "SELECT DISTINCT
$sql = "SELECT DISTINCT
announcement.c_id,
count(announcement.id) count
FROM $tbl_announcement announcement
@ -1046,10 +1046,10 @@ class AnnouncementManager
AND ip.visibility='1'
AND announcement.session_id = 0
GROUP BY announcement.c_id";
$rs = Database::query($sql);
$num_rows = Database::num_rows($rs);
$result = [];
if ($num_rows > 0) {
$rs = Database::query($sql);
$num_rows = Database::num_rows($rs);
$result = [];
if ($num_rows > 0) {
while ($row = Database::fetch_array($rs, 'ASSOC')) {
if (empty($row['c_id'])) {
continue;

@ -580,7 +580,6 @@ class CoursesAndSessionsCatalog
s.nbrCourses > 0
";
if (!is_null($date)) {
$date = Database::escape_string($date);
$dql .= "

@ -3081,7 +3081,6 @@ class DocumentManager
* @param int $max_dir_space maximum size
*
* @return bool true if there is enough space, false otherwise
*
*/
public static function enough_space($file_size, $max_dir_space)
{

@ -4599,7 +4599,7 @@ class SessionManager
$userData['relation_type'] = (int) $userData['relation_type'];
$userListByStatus[$userData['relation_type']][] = $userData;
}
//Subscribing in read only mode
//Subscribing in read only mode
foreach ($userListByStatus as $status => $userList) {
$userList = array_column($userList, 'user_id');
switch ($status) {

@ -1076,11 +1076,11 @@ class SortableTable extends HTML_Table
return $data;
}
/**
/**
* @param array $data
*/
*/
public function setTableData($data)
{
{
$this->table_data = $data;
}
}

@ -231,7 +231,7 @@ class UserGroup extends Model
}
}
return 0;
return 0;
}
/**

@ -1278,7 +1278,7 @@ class IndexManager
}
$this->tpl->assign('courses', $specialCourses);
$specialCourseList = $this->tpl->fetch($this->tpl->get_template($coursesWithoutCategoryTemplate));
$courseCompleteList = array_merge($courseCompleteList, $specialCourses);
$courseCompleteList = array_merge($courseCompleteList, $specialCourses);
}
if ($courses['in_category'] || $courses['not_category']) {
@ -1290,7 +1290,7 @@ class IndexManager
}
$coursesNotInCategoryCount += count($courses['not_category']);
$courseCompleteList = array_merge($courseCompleteList, $courses['not_category']);
$courseCompleteList = array_merge($courseCompleteList, $courses['not_category']);
if ($categoryCodeFilter) {
$courses['in_category'] = self::filterByCategory(
@ -1301,7 +1301,7 @@ class IndexManager
$courses['not_category'],
$categoryCodeFilter
);
}
}
$this->tpl->assign('courses', $courses['not_category']);
$this->tpl->assign('categories', $courses['in_category']);
@ -1342,117 +1342,117 @@ class IndexManager
if (empty($session_category_id) &&
isset($session_category['sessions'])
) {
// Independent sessions
foreach ($session_category['sessions'] as $session) {
$session_id = $session['session_id'];
// Independent sessions
foreach ($session_category['sessions'] as $session) {
$session_id = $session['session_id'];
// Don't show empty sessions.
if (count($session['courses']) < 1) {
continue;
}
// Don't show empty sessions.
if (count($session['courses']) < 1) {
continue;
}
// Courses inside the current session.
$date_session_start = $session['access_start_date'];
$date_session_end = $session['access_end_date'];
$coachAccessStartDate = $session['coach_access_start_date'];
$coachAccessEndDate = $session['coach_access_end_date'];
$count_courses_session = 0;
// Courses inside the current session.
$date_session_start = $session['access_start_date'];
$date_session_end = $session['access_end_date'];
$coachAccessStartDate = $session['coach_access_start_date'];
$coachAccessEndDate = $session['coach_access_end_date'];
$count_courses_session = 0;
// Loop course content
// Loop course content
$html_courses_session = [];
$atLeastOneCourseIsVisible = false;
$markAsOld = false;
$markAsFuture = false;
foreach ($session['courses'] as $course) {
$is_coach_course = api_is_coach($session_id, $course['real_id']);
$allowed_time = 0;
$allowedEndTime = true;
if (!empty($date_session_start)) {
if ($is_coach_course) {
$allowed_time = api_strtotime($coachAccessStartDate);
} else {
$allowed_time = api_strtotime($date_session_start);
}
$atLeastOneCourseIsVisible = false;
$markAsOld = false;
$markAsFuture = false;
$endSessionToTms = null;
if (!isset($_GET['history'])) {
if (!empty($date_session_end)) {
if ($is_coach_course) {
// if coach end date is empty we use the default end date
if (empty($coachAccessEndDate)) {
$endSessionToTms = api_strtotime($date_session_end);
if ($session_now > $endSessionToTms) {
$allowedEndTime = false;
foreach ($session['courses'] as $course) {
$is_coach_course = api_is_coach($session_id, $course['real_id']);
$allowed_time = 0;
$allowedEndTime = true;
if (!empty($date_session_start)) {
if ($is_coach_course) {
$allowed_time = api_strtotime($coachAccessStartDate);
} else {
$allowed_time = api_strtotime($date_session_start);
}
$endSessionToTms = null;
if (!isset($_GET['history'])) {
if (!empty($date_session_end)) {
if ($is_coach_course) {
// if coach end date is empty we use the default end date
if (empty($coachAccessEndDate)) {
$endSessionToTms = api_strtotime($date_session_end);
if ($session_now > $endSessionToTms) {
$allowedEndTime = false;
}
} else {
$endSessionToTms = api_strtotime($coachAccessEndDate);
if ($session_now > $endSessionToTms) {
$allowedEndTime = false;
}
}
} else {
$endSessionToTms = api_strtotime($coachAccessEndDate);
$endSessionToTms = api_strtotime($date_session_end);
if ($session_now > $endSessionToTms) {
$allowedEndTime = false;
}
}
} else {
$endSessionToTms = api_strtotime($date_session_end);
if ($session_now > $endSessionToTms) {
$allowedEndTime = false;
}
}
}
}
}
if ($showAllSessions) {
if ($allowed_time < $session_now && $allowedEndTime === false) {
$markAsOld = true;
}
if ($allowed_time > $session_now && $endSessionToTms > $session_now) {
$markAsFuture = true;
if ($showAllSessions) {
if ($allowed_time < $session_now && $allowedEndTime === false) {
$markAsOld = true;
}
if ($allowed_time > $session_now && $endSessionToTms > $session_now) {
$markAsFuture = true;
}
$allowedEndTime = true;
$allowed_time = 0;
}
$allowedEndTime = true;
$allowed_time = 0;
}
if ($session_now >= $allowed_time && $allowedEndTime) {
// Read only and accessible.
$atLeastOneCourseIsVisible = true;
if (api_get_setting('hide_courses_in_sessions') === 'false') {
$courseUserHtml = CourseManager::get_logged_user_course_html(
if ($session_now >= $allowed_time && $allowedEndTime) {
// Read only and accessible.
$atLeastOneCourseIsVisible = true;
if (api_get_setting('hide_courses_in_sessions') === 'false') {
$courseUserHtml = CourseManager::get_logged_user_course_html(
$course,
$session_id,
'session_course_item',
true,
$this->load_directories_preview
);
if (isset($courseUserHtml[1])) {
$course_session = $courseUserHtml[1];
$course_session['skill'] = isset($courseUserHtml['skill']) ? $courseUserHtml['skill'] : '';
// Course option (show student progress)
// This code will add new variables (Progress, Score, Certificate)
if ($studentInfoProgress || $studentInfoScore || $studentInfoCertificate) {
if ($studentInfoProgress) {
$progress = Tracking::get_avg_student_progress(
if (isset($courseUserHtml[1])) {
$course_session = $courseUserHtml[1];
$course_session['skill'] = isset($courseUserHtml['skill']) ? $courseUserHtml['skill'] : '';
// Course option (show student progress)
// This code will add new variables (Progress, Score, Certificate)
if ($studentInfoProgress || $studentInfoScore || $studentInfoCertificate) {
if ($studentInfoProgress) {
$progress = Tracking::get_avg_student_progress(
$user_id,
$course['course_code'],
[],
$session_id
);
$course_session['student_info']['progress'] = $progress === false ? null : $progress;
}
$course_session['student_info']['progress'] = $progress === false ? null : $progress;
}
if ($studentInfoScore) {
$percentage_score = Tracking::get_avg_student_score(
if ($studentInfoScore) {
$percentage_score = Tracking::get_avg_student_score(
$user_id,
$course['course_code'],
[],
$session_id
);
$course_session['student_info']['score'] = $percentage_score;
}
$course_session['student_info']['score'] = $percentage_score;
}
if ($studentInfoCertificate) {
$category = Category::load(
if ($studentInfoCertificate) {
$category = Category::load(
null,
null,
$course['course_code'],
@ -1460,40 +1460,40 @@ class IndexManager
null,
$session_id
);
$course_session['student_info']['certificate'] = null;
if (isset($category[0])) {
if ($category[0]->is_certificate_available($user_id)) {
$course_session['student_info']['certificate'] = Display::label(
$course_session['student_info']['certificate'] = null;
if (isset($category[0])) {
if ($category[0]->is_certificate_available($user_id)) {
$course_session['student_info']['certificate'] = Display::label(
get_lang('Yes'),
'success'
);
} else {
$course_session['student_info']['certificate'] = Display::label(
} else {
$course_session['student_info']['certificate'] = Display::label(
get_lang('No')
);
}
}
}
}
}
$html_courses_session[] = $course_session;
}
}
$count_courses_session++;
}
$count_courses_session++;
}
}
// No courses to show.
if ($atLeastOneCourseIsVisible === false) {
// No courses to show.
if ($atLeastOneCourseIsVisible === false) {
if (empty($html_courses_session)) {
continue;
continue;
}
}
}
if ($count_courses_session > 0) {
$params = [
if ($count_courses_session > 0) {
$params = [
'id' => $session_id,
];
$session_box = Display::getSessionTitleBox($session_id);
$session_box = Display::getSessionTitleBox($session_id);
$coachId = $session_box['id_coach'];
$imageField = $extraFieldValue->get_values_by_handler_and_field_variable(
$session_id,
@ -1501,69 +1501,69 @@ class IndexManager
);
$params['category_id'] = $session_box['category_id'];
$params['title'] = $session_box['title'];
$params['id_coach'] = $coachId;
$params['coach_url'] = api_get_path(WEB_AJAX_PATH).
$params['title'] = $session_box['title'];
$params['id_coach'] = $coachId;
$params['coach_url'] = api_get_path(WEB_AJAX_PATH).
'user_manager.ajax.php?a=get_user_popup&user_id='.$coachId;
$params['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null;
$params['coach_avatar'] = UserManager::getUserPicture(
$params['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null;
$params['coach_avatar'] = UserManager::getUserPicture(
$coachId,
USER_IMAGE_SIZE_SMALL
);
$params['date'] = $session_box['dates'];
$params['date'] = $session_box['dates'];
$params['image'] = isset($imageField['value']) ? $imageField['value'] : null;
$params['duration'] = isset($session_box['duration']) ? ' '.$session_box['duration'] : null;
$params['show_actions'] = SessionManager::cantEditSession($session_id);
$params['duration'] = isset($session_box['duration']) ? ' '.$session_box['duration'] : null;
$params['show_actions'] = SessionManager::cantEditSession($session_id);
if ($collapsable) {
if ($collapsable) {
$collapsableData = SessionManager::getCollapsableData(
$user_id,
$session_id,
$extraFieldValue,
$collapsableLink
);
$params['collapsed'] = $collapsableData['collapsed'];
$params['collapsable_link'] = $collapsableData['collapsable_link'];
$params['collapsed'] = $collapsableData['collapsed'];
$params['collapsable_link'] = $collapsableData['collapsable_link'];
}
$params['show_description'] = $session_box['show_description'] == 1 && $portalShowDescription;
$params['description'] = $session_box['description'];
$params['visibility'] = $session_box['visibility'];
$params['show_simple_session_info'] = $showSimpleSessionInfo;
$params['course_list_session_style'] = $coursesListSessionStyle;
$params['num_users'] = $session_box['num_users'];
$params['num_courses'] = $session_box['num_courses'];
$params['course_categories'] = CourseManager::getCourseCategoriesFromCourseList(
$params['show_description'] = $session_box['show_description'] == 1 && $portalShowDescription;
$params['description'] = $session_box['description'];
$params['visibility'] = $session_box['visibility'];
$params['show_simple_session_info'] = $showSimpleSessionInfo;
$params['course_list_session_style'] = $coursesListSessionStyle;
$params['num_users'] = $session_box['num_users'];
$params['num_courses'] = $session_box['num_courses'];
$params['course_categories'] = CourseManager::getCourseCategoriesFromCourseList(
$html_courses_session
);
$params['courses'] = $html_courses_session;
$params['is_old'] = $markAsOld;
$params['is_future'] = $markAsFuture;
$params['is_old'] = $markAsOld;
$params['is_future'] = $markAsFuture;
if ($showSimpleSessionInfo) {
$params['subtitle'] = self::getSimpleSessionDetails(
if ($showSimpleSessionInfo) {
$params['subtitle'] = self::getSimpleSessionDetails(
$session_box['coach'],
$session_box['dates'],
isset($session_box['duration']) ? $session_box['duration'] : null
);
}
}
if ($gameModeIsActive) {
$params['stars'] = GamificationUtils::getSessionStars(
if ($gameModeIsActive) {
$params['stars'] = GamificationUtils::getSessionStars(
$params['id'],
$this->user_id
);
$params['progress'] = GamificationUtils::getSessionProgress(
$params['progress'] = GamificationUtils::getSessionProgress(
$params['id'],
$this->user_id
);
$params['points'] = GamificationUtils::getSessionPoints(
$params['points'] = GamificationUtils::getSessionPoints(
$params['id'],
$this->user_id
);
}
$listSession[] = $params;
$sessionCount++;
}
$listSession[] = $params;
$sessionCount++;
}
}
} else {

@ -100,7 +100,7 @@ if (api_get_configuration_value('save_titles_as_html')) {
['ToolbarSet' => 'TitleAsHtml']
);
} else {
$form->addElement(
$form->addElement(
'text',
'lp_name',
api_ucfirst(get_lang('LPName')),

@ -573,9 +573,9 @@ class BuyCoursesPlugin extends Plugin
*
* @param int $start
* @param int $end
* @param string $name Optional. The name filter
* @param int $min Optional. The minimum price filter
* @param int $max Optional. The maximum price filter
* @param string $name Optional. The name filter
* @param int $min Optional. The minimum price filter
* @param int $max Optional. The maximum price filter
*
* @return array
*/
@ -2837,9 +2837,9 @@ class BuyCoursesPlugin extends Plugin
*
* @param int $start
* @param int $end
* @param string $name Optional. The name filter
* @param int $min Optional. The minimun price filter
* @param int $max Optional. The maximum price filter
* @param string $name Optional. The name filter
* @param int $min Optional. The minimun price filter
* @param int $max Optional. The maximum price filter
*
* @return array
*/

@ -10,7 +10,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Class BreadcrumbBlockService.
*
*/
class BreadcrumbBlockService extends BaseBreadcrumbMenuBlockService
{

@ -15,7 +15,6 @@ use Symfony\Component\HttpKernel\KernelEvents;
* Class LocaleListener
* Checks the portal listener depending of different settings:
* platform, user, course.
*
*/
class LocaleListener implements EventSubscriberInterface
{

@ -15,9 +15,6 @@ use Symfony\Component\DependencyInjection\ContainerAwareTrait;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\ControllerEvent;
use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\Event\ResponseEvent;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

Loading…
Cancel
Save