diff --git a/main/admin/configure_plugin.php b/main/admin/configure_plugin.php
index 013ce31e45..c13a7f0343 100755
--- a/main/admin/configure_plugin.php
+++ b/main/admin/configure_plugin.php
@@ -43,12 +43,13 @@ if (isset($pluginInfo['settings_form'])) {
Display::return_message(get_lang('NoConfigurationSettingsForThisPlugin'), 'warning')
);
}
+
if (isset($form)) {
if ($form->validate()) {
$values = $form->getSubmitValues();
// Fix only for bbb
- if ($pluginName === 'bbb') {
+ if ($pluginName == 'bbb') {
if (!isset($values['global_conference_allow_roles'])) {
$values['global_conference_allow_roles'] = [];
}
diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php
index 122e7d664e..43a8a7ddc4 100755
--- a/main/admin/settings.lib.php
+++ b/main/admin/settings.lib.php
@@ -197,12 +197,12 @@ function handlePlugins()
$pluginRow .= Display::url(
'
'.get_lang('Configure'),
'configure_plugin.php?name='.$pluginName,
- ['class' => 'btn btn-secondary']
+ ['class' => 'btn btn-default']
);
$pluginRow .= Display::url(
'
'.get_lang('Regions'),
'settings.php?category=Regions&name='.$pluginName,
- ['class' => 'btn btn-secondary']
+ ['class' => 'btn btn-default']
);
}
@@ -211,7 +211,7 @@ function handlePlugins()
"
readme.txt",
api_get_path(WEB_PLUGIN_PATH).$pluginName."/readme.txt",
[
- 'class' => 'btn btn-secondary ajax',
+ 'class' => 'btn btn-default ajax',
'data-title' => $plugin_info['title'],
'data-size' => 'lg',
'_target' => '_blank',
@@ -225,7 +225,7 @@ function handlePlugins()
"
README.md",
api_get_path(WEB_AJAX_PATH).'plugin.ajax.php?a=md_to_html&plugin='.$pluginName,
[
- 'class' => 'btn btn-secondary ajax',
+ 'class' => 'btn btn-default ajax',
'data-title' => $plugin_info['title'],
'data-size' => 'lg',
'_target' => '_blank',
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index 7c2dc98eb3..2f9c1afeeb 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -245,7 +245,7 @@ $form->addElement(
);
//drh list (display only if student)
-$display = isset($_POST['status']) && $_POST['status'] == STUDENT || !isset($_POST['status']) ? 'block' : 'none';
+$display = (isset($_POST['status']) && $_POST['status'] == STUDENT) || !isset($_POST['status']) ? 'block' : 'none';
//@todo remove the drh list here. This code is unused
$form->addElement('html', '
');
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 4a193d654f..2a371da855 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -450,7 +450,7 @@ switch ($action) {
);
// when we want to remind the users who have never been active
// then we have a different subject and content for the announcement
- if ($_GET['since'] == 'never') {
+ if ($_GET['since'] === 'never') {
$title_to_modify = sprintf(
get_lang('RemindInactiveLearnersMailSubject'),
api_get_setting('siteName')
@@ -475,6 +475,7 @@ switch ($action) {
$announcementInfo = AnnouncementManager::get_by_id($courseId, $id);
if (isset($announcementInfo) && !empty($announcementInfo)) {
$to = AnnouncementManager::load_edit_users('announcement', $id);
+
$defaults = [
'title' => $announcementInfo['title'],
'content' => $announcementInfo['content'],
@@ -545,6 +546,8 @@ switch ($action) {
$form->addCheckBox('send_to_hrm_users', null, get_lang('SendAnnouncementCopyToDRH'));
}
+ $form->addCheckBox('send_me_a_copy_by_email', null, get_lang('SendAnnouncementCopyToMyself'));
+ $defaults['send_me_a_copy_by_email'] = true;
$form->addButtonSave(get_lang('ButtonPublishAnnouncement'));
$form->setDefaults($defaults);
@@ -552,6 +555,7 @@ switch ($action) {
$data = $form->getSubmitValues();
$data['users'] = isset($data['users']) ? $data['users'] : [];
$sendToUsersInSession = isset($data['send_to_users_in_session']) ? true : false;
+ $sendMeCopy = isset($data['send_me_a_copy_by_email']) ? true : false;
if (isset($id) && $id) {
// there is an Id => the announcement already exists => update mode
@@ -570,8 +574,9 @@ switch ($action) {
);
// Send mail
+ $messageSentTo = [];
if (isset($_POST['email_ann']) && empty($_POST['onlyThoseMails'])) {
- AnnouncementManager::sendEmail(
+ $messageSentTo = AnnouncementManager::sendEmail(
api_get_course_info(),
api_get_session_id(),
$id,
@@ -580,6 +585,11 @@ switch ($action) {
);
}
+ if ($sendMeCopy && !in_array(api_get_user_id(), $messageSentTo)) {
+ $email = new AnnouncementEmail(api_get_course_info(), api_get_session_id(), $id);
+ $email->sendAnnouncementEmailToMySelf();
+ }
+
Display::addFlash(
Display::return_message(
get_lang('AnnouncementModified'),
@@ -612,13 +622,14 @@ switch ($action) {
$insert_id = AnnouncementManager::add_group_announcement(
$data['title'],
$data['content'],
- ['GROUP:'.$group_id],
+ $group_id,
$data['users'],
$file,
$file_comment,
$sendToUsersInSession
);
}
+
if ($insert_id) {
Display::addFlash(
Display::return_message(
@@ -628,14 +639,21 @@ switch ($action) {
);
// Send mail
+ $messageSentTo = [];
if (isset($data['email_ann']) && $data['email_ann']) {
- AnnouncementManager::sendEmail(
+ $messageSentTo = AnnouncementManager::sendEmail(
api_get_course_info(),
api_get_session_id(),
$insert_id,
$sendToUsersInSession
);
}
+
+ if ($sendMeCopy && !in_array(api_get_user_id(), $messageSentTo)) {
+ $email = new AnnouncementEmail(api_get_course_info(), api_get_session_id(), $insert_id);
+ $email->sendAnnouncementEmailToMySelf();
+ }
+
Security::clear_token();
header('Location: '.$homeUrl);
exit;
diff --git a/main/course_info/about.php b/main/course_info/about.php
index e0f23720e1..f0b3775400 100644
--- a/main/course_info/about.php
+++ b/main/course_info/about.php
@@ -154,7 +154,7 @@ $courseItem = [
$metaInfo = '';
$metaInfo .= '';
$metaInfo .= '';
-$metaInfo .= '';
+$metaInfo .= '';
$metaInfo .= '';
$htmlHeadXtra[] = $metaInfo;
diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index 8ef13dc8bd..8ca905a81c 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -240,11 +240,11 @@ class ImportCsv
'teachers-static',
'courses-static',
'sessions-static',
- 'calendar-static',
'sessionsextid-static',
'unsubscribe-static',
'unsubsessionsextid-static',
'subsessionsextid-static',
+ 'calendar-static',
];
foreach ($sections as $section) {
@@ -667,6 +667,10 @@ class ImportCsv
false //$send_mail = false
);
+ $row['extra_mail_notify_invitation'] = 1;
+ $row['extra_mail_notify_message'] = 1;
+ $row['extra_mail_notify_group_message'] = 1;
+
if ($userId) {
foreach ($row as $key => $value) {
if (substr($key, 0, 6) == 'extra_') {
@@ -832,6 +836,10 @@ class ImportCsv
false //$send_mail = false
);
+ $row['extra_mail_notify_invitation'] = 1;
+ $row['extra_mail_notify_message'] = 1;
+ $row['extra_mail_notify_group_message'] = 1;
+
if ($result) {
foreach ($row as $key => $value) {
if (substr($key, 0, 6) === 'extra_') {
@@ -1026,6 +1034,11 @@ class ImportCsv
if (empty($courseInfo)) {
$this->logger->addInfo("Course '$courseCode' does not exists");
+ } else {
+ if ($courseInfo['visibility'] == COURSE_VISIBILITY_HIDDEN) {
+ $this->logger->addInfo("Course '".$courseInfo['code']."' has hidden visiblity. Skip");
+ $errorFound = true;
+ }
}
if (empty($sessionId)) {
@@ -1035,7 +1048,6 @@ class ImportCsv
$sessionInfo = [];
if (!empty($sessionId) && !empty($courseInfo)) {
$sessionInfo = api_get_session_info($sessionId);
-
$courseIncluded = SessionManager::relation_session_course_exist(
$sessionId,
$courseInfo['real_id']
diff --git a/main/document/show_content.php b/main/document/show_content.php
index c713f1cabe..e57db36c59 100755
--- a/main/document/show_content.php
+++ b/main/document/show_content.php
@@ -94,7 +94,7 @@ header('Last-Modified: Wed, 01 Jan 2100 00:00:00 GMT');
header('Cache-Control: no-cache, must-revalidate');
header('Pragma: no-cache');
$browser_display_title = 'Documents - '.Security::remove_XSS($_GET['cidReq']).' - '.$file;
-$file_url_web = api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$header_file.'?'.api_get_cidreq();
+$file_url_web = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/document'.$header_file.'?'.api_get_cidreq();
$pathinfo = pathinfo($header_file);
if ($pathinfo['extension'] == 'swf') {
diff --git a/main/exercise/exercise.class.php b/main/exercise/exercise.class.php
index 598f807504..a1ad081824 100755
--- a/main/exercise/exercise.class.php
+++ b/main/exercise/exercise.class.php
@@ -962,29 +962,38 @@ class Exercise
$result['question_list'] = isset($question_list) ? $question_list : [];
$result['category_with_questions_list'] = isset($questions_by_category) ? $questions_by_category : [];
+ $parentsLoaded = [];
// Adding category info in the category list with question list:
if (!empty($questions_by_category)) {
$newCategoryList = [];
$em = Database::getManager();
+
foreach ($questions_by_category as $categoryId => $questionList) {
$cat = new TestCategory();
$cat = $cat->getCategory($categoryId);
- $cat = (array) $cat;
- $cat['iid'] = $cat['id'];
+ if ($cat) {
+ $cat = (array) $cat;
+ $cat['iid'] = $cat['id'];
+ }
+
$categoryParentInfo = null;
// Parent is not set no loop here
- if (!empty($cat['parent_id'])) {
+ if (isset($cat['parent_id']) && !empty($cat['parent_id'])) {
+ /** @var \Chamilo\CourseBundle\Entity\CQuizCategory $categoryEntity */
if (!isset($parentsLoaded[$cat['parent_id']])) {
$categoryEntity = $em->find('ChamiloCoreBundle:CQuizCategory', $cat['parent_id']);
$parentsLoaded[$cat['parent_id']] = $categoryEntity;
} else {
$categoryEntity = $parentsLoaded[$cat['parent_id']];
}
+ $repo = $em->getRepository('ChamiloCoreBundle:CQuizCategory');
$path = $repo->getPath($categoryEntity);
+
$index = 0;
if ($this->categoryMinusOne) {
//$index = 1;
}
+
/** @var \Chamilo\CourseBundle\Entity\CQuizCategory $categoryParent */
foreach ($path as $categoryParent) {
$visibility = $categoryParent->getVisibility();
@@ -3229,7 +3238,11 @@ class Exercise
*/
public function showTimeControlJS($time_left)
{
- $time_left = intval($time_left);
+ $time_left = (int) $time_left;
+ $script = "redirectExerciseToResult();";
+ if ($this->type == ALL_ON_ONE_PAGE) {
+ $script = "save_now_all('validate');";
+ }
return "