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

Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Browse Source
pull/2585/head
Yannick Warnier 7 years ago
parent f85988579e bb0de8b703
commit c2d76309de
5 changed files with 42 additions and 30 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. 8
      index.php
  2. 41
      main/inc/lib/sessionmanager.lib.php
  3. 6
      main/inc/lib/userportal.lib.php
  4. 8
      main/survey/survey.lib.php
  5. 9
      main/template/default/user_portal/grid_session.tpl

8
index.php
Unescape View File

@ -14,17 +14,15 @@ define('CHAMILO_LOAD_WYSIWYG', false);
$cidReset = true;
require_once 'main/inc/global.inc.php';
$allow = api_get_configuration_value('plugin_redirection_enabled');
if ($allow) {
RedirectionPlugin::redirectUser(api_get_user_id());
}
// The section (for the tabs).
$this_section = SECTION_CAMPUS; //rewritten below if including HTML file
$includeFile = !empty($_GET['include']);
if ($includeFile) {
$this_section = SECTION_INCLUDE;
} elseif (api_get_configuration_value('plugin_redirection_enabled')) {
RedirectionPlugin::redirectUser(api_get_user_id());
}
$header_title = null;
if (!api_is_anonymous()) {
$header_title = ' ';

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

@ -4593,6 +4593,33 @@ SQL;
return $count;
}
/**
* @param int $id
* @param bool $checkSession
*
* @return bool
*/
public static function cantEditSession($id, $checkSession = true)
{
if (!self::allowToManageSessions()) {
return false;
}
if (api_is_platform_admin() && self::allowed($id)) {
return true;
}
if ($checkSession) {
if (self::allowed($id)) {
return true;
}
return false;
}
return true;
}
/**
* Protect a session to be edited.
*
@ -4603,19 +4630,7 @@ SQL;
*/
public static function protectSession($id, $checkSession = true)
{
if (self::allowToManageSessions()) {
if (api_is_platform_admin() && self::allowed($id)) {
return true;
}
if ($checkSession) {
if (self::allowed($id)) {
return true;
} else {
api_not_allowed(true);
}
}
} else {
if (!self::cantEditSession($id, $checkSession)) {
api_not_allowed(true);
}
}

6
main/inc/lib/userportal.lib.php
Unescape View File

@ -1529,8 +1529,6 @@ class IndexManager
'id' => $session_id,
];
$session_box = Display::getSessionTitleBox($session_id);
$actions = api_get_path(WEB_CODE_PATH).
'session/resume_session.php?id_session='.$session_id;
$coachId = $session_box['id_coach'];
$extraFieldValue = new ExtraFieldValue('session');
$imageField = $extraFieldValue->get_values_by_handler_and_field_variable(
@ -1552,7 +1550,7 @@ class IndexManager
$params['date'] = $session_box['dates'];
$params['image'] = isset($imageField['value']) ? $imageField['value'] : null;
$params['duration'] = isset($session_box['duration']) ? ' '.$session_box['duration'] : null;
$params['edit_actions'] = $actions;
$params['show_actions'] = SessionManager::cantEditSession($session_id);
$params['show_description'] = $session_box['show_description'] == 1 && $portalShowDescription;
$params['description'] = $session_box['description'];
$params['visibility'] = $session_box['visibility'];
@ -1687,7 +1685,7 @@ class IndexManager
$sessionParams[0]['course_list_session_style'] = $coursesListSessionStyle;
$sessionParams[0]['title'] = $session_box['title'];
$sessionParams[0]['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'].' | ' : '').$session_box['dates'];
$sessionParams[0]['show_actions'] = api_is_platform_admin();
$sessionParams[0]['show_actions'] = SessionManager::cantEditSession($session_id);
$sessionParams[0]['courses'] = $html_courses_session;
$sessionParams[0]['show_simple_session_info'] = $showSimpleSessionInfo;
$sessionParams[0]['coach_name'] = !empty($session_box['coach']) ? $session_box['coach'] : null;

8
main/survey/survey.lib.php
Unescape View File

@ -340,10 +340,10 @@ class SurveyManager
'author' => $_user['user_id'],
'lang' => $values['survey_language'],
'avail_from' => $allowSurveyAvailabilityDatetime
? api_get_utc_datetime($values['start_date'])
? api_get_utc_datetime($values['start_date'].':00')
: $values['start_date'],
'avail_till' => $allowSurveyAvailabilityDatetime
? api_get_utc_datetime($values['end_date'])
? api_get_utc_datetime($values['end_date'].':59')
: $values['end_date'],
'is_shared' => $shared_survey_id,
'template' => 'template',
@ -450,10 +450,10 @@ class SurveyManager
'author' => $_user['user_id'],
'lang' => $values['survey_language'],
'avail_from' => $allowSurveyAvailabilityDatetime
? api_get_utc_datetime($values['start_date'])
? api_get_utc_datetime($values['start_date'].':00')
: $values['start_date'],
'avail_till' => $allowSurveyAvailabilityDatetime
? api_get_utc_datetime($values['end_date'])
? api_get_utc_datetime($values['end_date'].':59')
: $values['end_date'],
'is_shared' => $shared_survey_id,
'template' => 'template',

9
main/template/default/user_portal/grid_session.tpl
Unescape View File

@ -9,7 +9,7 @@
<span class="category">{{ course.category }}</span>
<div class="cribbon"></div>
{% endif %}
{% if course.edit_actions != '' %}
{% if course.edit_actions %}
<div class="admin-actions">
{% if course.document == '' %}
<a class="btn btn-default btn-sm" href="{{ course.edit_actions }}">
@ -145,10 +145,11 @@
</a>
{% set collapsable = 'collapse' %}
{% endif %}
{% if row.edit_actions != '' %}
{% if row.show_actions %}
<div class="pull-right">
<a class="btn btn-default btn-sm" href="{{ row.edit_actions }}">
<i class="fa fa-pencil" aria-hidden="true"></i>
<a href="{{ _p.web_main ~ "session/resume_session.php?id_session=" ~ row.id }}">
<img src="{{ "edit.png"|icon(22) }}" width="22" height="22" alt="{{ "Edit"|get_lang }}"
title="{{ "Edit"|get_lang }}">
</a>
</div>
{% endif %}

Write Preview
Loading…
Cancel
Save