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 remote-tracking branch 'origin/1.10.x' into 1.11.x

Browse Source
ofaj
Julio 9 years ago
parent 5bfa5a1a49 d25e306f9e
commit 7f111fdb80
13 changed files with 228 additions and 135 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. 72
      app/Migrations/Schema/V110/Version20151101082300.php
  2. 2
      app/Resources/public/css/base.css
  3. 23
      documentation/changelog.html
  4. 5
      main/admin/settings.lib.php
  5. 2
      main/announcements/announcements.php
  6. 9
      main/exercice/hotpotatoes.php
  7. 36
      main/group/group_creation.php
  8. 92
      main/inc/lib/message.lib.php
  9. 25
      main/messages/inbox.php
  10. 30
      main/messages/outbox.php
  11. 27
      main/session/session_edit.php
  12. 14
      main/session/session_user_edit.php
  13. 26
      src/Chamilo/CoreBundle/Entity/SessionRelUser.php

72
app/Migrations/Schema/V110/Version20151101082300.php
Unescape View File

@ -46,11 +46,8 @@ class Version20151101082300 extends AbstractMigrationChamilo
$courseType->getColumn('id')->setUnsigned(false);
$schema->getTable('c_announcement')->addIndex(['c_id']);
$schema->getTable('c_announcement_attachment')->addIndex(['c_id']);
$schema->getTable('c_attendance')->addIndex(['c_id']);
$schema->getTable('c_attendance_calendar')->addIndex(['c_id']);
$cAttendanceCalendarRelGroup = $schema->getTable('c_attendance_calendar_rel_group');
@ -64,15 +61,10 @@ class Version20151101082300 extends AbstractMigrationChamilo
$cAttendanceSheet->addIndex(['user_id']);
$schema->getTable('c_attendance_sheet_log')->addIndex(['c_id']);
$schema->getTable('c_blog')->addIndex(['c_id']);
$schema->getTable('c_blog_attachment')->addIndex(['c_id']);
$schema->getTable('c_blog_comment')->addIndex(['c_id']);
$schema->getTable('c_blog_post')->addIndex(['c_id']);
$schema->getTable('c_blog_rating')->addIndex(['c_id']);
$cBlogRelUser = $schema->getTable('c_blog_rel_user');
@ -94,9 +86,7 @@ class Version20151101082300 extends AbstractMigrationChamilo
$cCalendarEvent->addIndex(['c_id']);
$schema->getTable('c_calendar_event_attachment')->addIndex(['c_id']);
$schema->getTable('c_calendar_event_repeat')->addIndex(['c_id']);
$schema->getTable('c_calendar_event_repeat_not')->addIndex(['c_id']);
$cChatConnected = $schema->getTable('c_chat_connected');
@ -104,13 +94,9 @@ class Version20151101082300 extends AbstractMigrationChamilo
$cChatConnected->addIndex(['user_id']);
$schema->getTable('c_course_setting')->addIndex(['c_id']);
$schema->getTable('c_document')->addIndex(['c_id']);
$schema->getTable('c_dropbox_category')->addIndex(['c_id']);
$schema->getTable('c_dropbox_feedback')->addIndex(['c_id']);
$schema->getTable('c_dropbox_file')->addIndex(['c_id']);
$cDropboxPerson = $schema->getTable('c_dropbox_person');
@ -122,9 +108,7 @@ class Version20151101082300 extends AbstractMigrationChamilo
$cDropboxPost->addIndex(['dest_user_id']);
$schema->getTable('c_forum_attachment')->addIndex(['c_id']);
$schema->getTable('c_forum_category')->addIndex(['c_id']);
$schema->getTable('c_forum_forum')->addIndex(['c_id']);
$cForumMailcue = $schema->getTable('c_forum_mailcue');
@ -139,63 +123,35 @@ class Version20151101082300 extends AbstractMigrationChamilo
$cForumNotification->addIndex(['post_id']);
$schema->getTable('c_forum_post')->addIndex(['c_id']);
$schema->getTable('c_forum_thread')->addIndex(['c_id']);
$schema->getTable('c_forum_thread_qualify')->addIndex(['c_id']);
$schema->getTable('c_forum_thread_qualify_log')->addIndex(['c_id']);
$schema->getTable('c_glossary')->addIndex(['c_id']);
$schema->getTable('c_group_category')->addIndex(['c_id']);
$schema->getTable('c_group_info')->addIndex(['c_id']);
$schema->getTable('c_group_rel_tutor')->addIndex(['c_id']);
$schema->getTable('c_group_rel_user')->addIndex(['c_id']);
$schema->getTable('c_link')->addIndex(['c_id']);
$schema->getTable('c_link_category')->addIndex(['c_id']);
$schema->getTable('c_lp')->addIndex(['c_id']);
$schema->getTable('c_lp_category')->addIndex(['c_id']);
$schema->getTable('c_lp_item')->addIndex(['c_id']);
$schema->getTable('c_lp_item_view')->addIndex(['c_id']);
$schema->getTable('c_lp_iv_interaction')->addIndex(['c_id']);
$schema->getTable('c_lp_iv_objective')->addIndex(['c_id']);
$schema->getTable('c_lp_view')->addIndex(['c_id']);
$schema->getTable('c_notebook')->addIndex(['c_id']);
$schema->getTable('c_online_connected')->addIndex(['c_id']);
$schema->getTable('c_online_link')->addIndex(['c_id']);
$schema->getTable('c_permission_group')->addIndex(['c_id']);
$schema->getTable('c_permission_task')->addIndex(['c_id']);
$schema->getTable('c_permission_user')->addIndex(['c_id']);
$schema->getTable('c_quiz')->addIndex(['c_id']);
$schema->getTable('c_quiz_answer')->addIndex(['c_id']);
$schema->getTable('c_quiz_question')->addIndex(['c_id']);
$schema->getTable('c_quiz_question_category')->addIndex(['c_id']);
$schema->getTable('c_quiz_question_option')->addIndex(['c_id']);
$schema->getTable('c_quiz_question_rel_category')->addIndex(['c_id']);
$cQuizRelQuestion = $schema->getTable('c_quiz_rel_question');
@ -220,7 +176,6 @@ class Version20151101082300 extends AbstractMigrationChamilo
$cRoleUser->addIndex(['user_id']);
$schema->getTable('c_student_publication')->addIndex(['c_id']);
$schema->getTable('c_student_publication_assignment')->addIndex(['c_id']);
$cStudentPublicationComment = $schema->getTable('c_student_publication_comment');
@ -239,35 +194,20 @@ class Version20151101082300 extends AbstractMigrationChamilo
$cStudentPublicationComment->addIndex(['user_id']);
$schema->getTable('c_survey')->addIndex(['c_id']);
$schema->getTable('c_survey_answer')->addIndex(['c_id']);
$schema->getTable('c_survey_group')->addIndex(['c_id']);
$schema->getTable('c_survey_invitation')->addIndex(['c_id']);
$schema->getTable('c_survey_question')->addIndex(['c_id']);
$schema->getTable('c_survey_question_option')->addIndex(['c_id']);
$schema->getTable('c_thematic')->addIndex(['c_id']);
$schema->getTable('c_thematic_advance')->addIndex(['c_id']);
$schema->getTable('c_thematic_plan')->addIndex(['c_id']);
$schema->getTable('c_tool')->addIndex(['c_id']);
$schema->getTable('c_tool_intro')->addIndex(['c_id']);
$schema->getTable('c_userinfo_content')->addIndex(['c_id']);
$schema->getTable('c_userinfo_def')->addIndex(['c_id']);
$schema->getTable('c_wiki')->addIndex(['c_id']);
$schema->getTable('c_wiki_conf')->addIndex(['c_id']);
$schema->getTable('c_wiki_discuss')->addIndex(['c_id']);
$cWikiMailcue = $schema->getTable('c_wiki_mailcue');
@ -312,7 +252,8 @@ class Version20151101082300 extends AbstractMigrationChamilo
$sessionRelUser->addColumn('moved_to', Type::INTEGER)->setNotnull(false);
$sessionRelUser->addColumn('moved_status', Type::INTEGER)->setNotnull(false);
$sessionRelUser->addColumn('moved_at', Type::DATETIME)->setNotnull(false);
$sessionRelUser->dropColumn('duration');
$sessionRelUser->addColumn('duration', Type::INTEGER)->setNotnull(false);
$sessionRelUser->addIndex(['session_id']);
$sessionRelUser->addIndex(['user_id']);
$sessionRelUser->addIndex(['user_id', 'moved_to']);
@ -327,9 +268,7 @@ class Version20151101082300 extends AbstractMigrationChamilo
$settingsCurrent->addUniqueIndex(['variable', 'value']);
$schema->getTable('track_e_access')->addIndex(['c_id']);
$schema->getTable('track_e_attempt')->addIndex(['c_id']);
$schema->getTable('track_e_course_access')->addIndex(['c_id']);
$trackEDefault = $schema->getTable('track_e_default');
@ -337,19 +276,12 @@ class Version20151101082300 extends AbstractMigrationChamilo
$trackEDefault->addIndex(['session_id']);
$schema->getTable('track_e_downloads')->addIndex(['c_id']);
$schema->getTable('track_e_exercises')->addIndex(['c_id']);
$schema->getTable('track_e_hotpotatoes')->addIndex(['c_id']);
$schema->getTable('track_e_lastaccess')->addIndex(['c_id']);
$schema->getTable('track_e_links')->addIndex(['c_id']);
$schema->getTable('track_e_online')->addIndex(['c_id']);
$schema->getTable('track_e_uploads')->addIndex(['c_id']);
$schema->getTable('user')->addUniqueIndex(['username_canonical']);
$usergroupRelUSer = $schema->getTable('usergroup_rel_user');

2
app/Resources/public/css/base.css
Unescape View File

@ -1480,7 +1480,7 @@ div.admin_section h4 {
.toolbar-groups{
margin-bottom: 30px;
}
.form-group label span{
#group_edit .form-group label span{
display: block;
font-size: 12px;
}

23
documentation/changelog.html
Unescape View File

@ -65,6 +65,11 @@
<h3>Notable new Features</h3>
<h4>For end-users, teachers and Chamilo admins</h4>
<ul>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/cf7627c04079d38a23530965ebe1d12fc11913b1">cf7627c0</a> - <a href="https://support.chamilo.org/issues/8118">#8118</a>) Add feature to customize the logo of a stylesheet</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/1c366ce8e0ab7a19b060af31996e47aae15d2f01">1c366ce8</a> - <a href="https://task.beeznest.com/issues/10960">BT#10960</a>) Take into account all lp ids not only lp with result</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/23173d5ea6e81c998a2012f66b96e3827adfe34f">23173d5e</a> - <a href="https://task.beeznest.com/issues/10951">BT#10951</a>) Add filters in announcements</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/a0d9ceb45cd2c5ecc030c2246eff6d339018a1d4">a0d9ceb4</a> - <a href="https://task.beeznest.com/issues/10950">BT#10950</a>) Add announcement option when editing an event</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/c1f149e92753a8524cd56ea81d131744d59c7465">c1f149e9</a> - <a href="https://task.beeznest.com/issues/10949">BT#10949</a>) Add pagination in course announcement + add multiple delete</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/f08406490c3152c4299fa1916e944bdfc72bf37d">f0840649</a> - <a href="https://support.chamilo.org/issues/8037">#8037</a>) Show user classes on learner details page</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/08b7cd5708f7ae783703b70bee29d3bb14ddf72e">08b7cd57</a> - <a href="https://support.chamilo.org/issues/8085">#8085</a>) Add announcements tags list again</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/da8bce63019338ab1261a6b1be75adbf2f99d340">da8bce63</a> - <a href="https://support.chamilo.org/issues/8086">#8086</a>) Add modulo operation for calculated answers</li>
@ -91,6 +96,24 @@
<h3>Improvements (minor features) and debug</h3>
<ul>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/3d39554195b3ce0443b9cbb57c7bb306a6d067a0">3d395541</a>) Fix icon paths (needed for v2.0)</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/9237518495ad917f69d4f83a7fa24526e07968b6">92375184</a>) use WEB_CODE_PATH</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/0c4a683e80d84277f48026b483fd24f711177f08">0c4a683e</a>) Use <br /></li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/b39cecc9b6c6b1d50ae26dbd54f47f1a755f1e3d">b39cecc9</a> - <a href="https://task.beeznest.com/issues/10970">BT#10970</a>) Students cannot see other student announcements</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/4b860e709ed710639d148be9906a9d7dcdefe13e">4b860e70</a> - <a href="https://support.chamilo.org/issues/8138">#8138</a>) update viewBox icons inkscape responsive IE9, IE10 and IE11 CT#8138</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/9111c61ce69443e19d141eda00b0e7224903f1c2">9111c61c</a>) Fix group by .</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/fa26547d468c49411454046f69172b1e845b99a5">fa26547d</a>) Fix icons of file list from Lp</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/a21c08b6ee2d80fea5a8ae9a1e7d14d8e44636fc">a21c08b6</a>) Fix slideshow in documents tool</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/849f971c0c6c4ebaef591e033faa1b291b26208e">849f971c</a> - <a href="https://task.beeznest.com/issues/10959">BT#10959</a>) Fix LP when checking prerequisites</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/f7511895b35a41d41cca5b8da038b55242a9266f">f7511895</a>) Fix paths + add fixes from 1.9.x</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/b65d66ae2e0e50021531520a7e01df63edc45919">b65d66ae</a>) Fix icons</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/70be1b2d192269b92f5f52299e14d403fb2a9170">70be1b2d</a>) Add api_get_cidreq() + format code</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/d74cea42deeee82ecb9af92af627764a907e79d2">d74cea42</a>) Fix icons.</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/c762b426dac2f8a5b5e8c266f72eb8c752d910b7">c762b426</a>) Add Display::returnIconPath function instead of using custom /img/ path construction</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ed12ba150066f60b29976debcb3e3b95343c24d2">ed12ba15</a>) Fix image path</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/93cae24e1d23530c38fb26a836004f7753328eb7">93cae24e</a>) Format code, use Session class, use Display::addFlash function.</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/681f64061ec79a0787f66ef9774abb7531b0b9f4">681f6406</a> - <a href="https://support.chamilo.org/issues/8076">#8076</a>) Remove allow_post_notification field when editing forum thread/post</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/5e25f1d7991efd3dabe61dc6e936582a406792c7">5e25f1d7</a> - <a href="https://support.chamilo.org/issues/8124">#8124</a>) Remove E_NOTICE when resolving the hotspot delineation question</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/ff07ecb82ed5ac564a469815177a6ead8a1ee087">ff07ecb8</a>) Add from to in list course (web service)</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/30b29f4dfcf3241c0e259da73bcac751543f1de2">30b29f4d</a>) Remove E_NOTICE when adding a course</li>
<li>(<a href="https://github.com/chamilo/chamilo-lms/commit/2758b3c47f34056efd172c8c323e7b35ae3beee1">2758b3c4</a>) Add api_get_cidReq, replace remove_XSS function with intval</li>

5
main/admin/settings.lib.php
Unescape View File

@ -513,7 +513,10 @@ function upload_stylesheet($values, $picture)
'ico',
'psd',
'woff',
'woff2'
'woff2',
'xcf',
'svg',
'webp'
);
for ($i = 0; $i < $num_files; $i++) {

2
main/announcements/announcements.php
Unescape View File

@ -164,7 +164,7 @@ switch ($action) {
$userIdToSearch = $filterData['user_id'];
}
$searchFormToString = $searchForm->returnForm();
//$searchFormToString = $searchForm->returnForm();
// jqgrid will use this URL to do the selects
$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_course_announcements&'.api_get_cidreq().'&title_to_search='.$keyword.'&user_id_to_search='.$userIdToSearch;

9
main/exercice/hotpotatoes.php
Unescape View File

@ -1,5 +1,6 @@
<?php
/* For licensing terms, see /license.txt */
/**
* Code for HotPotatoes integration.
* @package chamilo.exercise
@ -11,6 +12,7 @@ require_once 'hotpotatoes.lib.php';
// Section (for the tabs).
$this_section = SECTION_COURSES;
$_course = api_get_course_info();
// Access restriction: only teachers are allowed here.
if (!api_is_allowed_to_edit(null, true)) {
@ -28,12 +30,15 @@ if (!empty($gradebook) && $gradebook == 'view') {
);
}
// The breadcrumbs.
$interbreadcrumb[] = array('url' => './exercise.php', 'name' => get_lang('Exercises'));
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH) . '.exercice/exercise.php?' . api_get_cidreq(),
'name' => get_lang('Exercises')
);
$is_allowedToEdit = api_is_allowed_to_edit(null, true);
// Database table definitions.
$dbTable = Database::get_course_table(TABLE_DOCUMENT);
$dbTable = Database::get_course_table(TABLE_DOCUMENT);
$course_id = api_get_course_int_id();
// Setting some variables.

36
main/group/group_creation.php
Unescape View File

@ -6,10 +6,15 @@
*/
require_once '../inc/global.inc.php';
$this_section = SECTION_COURSES;
$current_course_tool = TOOL_GROUP;
$current_course_tool = TOOL_GROUP;
// Notice for unauthorized people.
api_protect_course_script(true);
if (!api_is_allowed_to_edit(false, true)) {
api_not_allowed(true);
}
$currentUrl = api_get_path(WEB_CODE_PATH).'group/group.php?'.api_get_cidreq();
/* Create the groups */
@ -70,13 +75,12 @@ if (isset($_POST['action'])) {
}
$nameTools = get_lang('GroupCreation');
$interbreadcrumb[] = array ('url' => 'group.php', 'name' => get_lang('Groups'));
$interbreadcrumb[] = array(
'url' => api_get_path(WEB_CODE_PATH).'group/group.php?'.api_get_cidreq(),
'name' => get_lang('Groups'),
);
Display :: display_header($nameTools, 'Group');
if (!api_is_allowed_to_edit(false, true)) {
api_not_allowed();
}
if (isset($_POST['number_of_groups'])) {
if (!is_numeric($_POST['number_of_groups']) || intval($_POST['number_of_groups']) < 1) {
Display :: display_error_message(
@ -176,9 +180,20 @@ EOT;
$group_el = array();
$group_el[] = $form->createElement('text', 'group_'.$group_number.'_name');
if (api_get_setting('allow_group_categories') == 'true') {
$group_el[] = $form->createElement('select', 'group_'.$group_number.'_category', null, $cat_options, array('id' => 'category_'.$group_number));
$group_el[] = $form->createElement(
'select',
'group_'.$group_number.'_category',
null,
$cat_options,
array('id' => 'category_'.$group_number)
);
}
$group_el[] = $form->createElement('text', 'group_'.$group_number.'_places', null, array('class' => 'span1', 'id' => 'places_'.$group_number));
$group_el[] = $form->createElement(
'text',
'group_'.$group_number.'_places',
null,
array('class' => 'span1', 'id' => 'places_'.$group_number)
);
if ($_POST['number_of_groups'] < 10000) {
if ($group_id < 10) {
@ -208,11 +223,6 @@ EOT;
$create_groups_form = new FormValidator('create_groups', 'post', api_get_self().'?'.api_get_cidreq());
$create_groups_form->addElement('header', $nameTools);
/* $group_el = array ();
$group_el[] = $create_groups_form->createElement('text', 'number_of_groups', array(get_lang('Create'), '1'));
$group_el[] = $create_groups_form->addButtonCreate(get_lang('ProceedToCreateGroup'), 'submit', true);
$create_groups_form->addGroup($group_el, 'create_groups', get_lang('NumberOfGroupsToCreate'), ' ', false);
*/
$create_groups_form->addText('number_of_groups',get_lang('NumberOfGroupsToCreate'),null,array('value'=>'1'));
$create_groups_form->addButton('submit', get_lang('ProceedToCreateGroup'),'plus','primary');
$defaults = array();

92
main/inc/lib/message.lib.php
Unescape View File

@ -1,6 +1,8 @@
<?php
/* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/**
* Class MessageManager
*
@ -105,11 +107,21 @@ class MessageManager
$condition_msg_status = ' msg_status IN('.MESSAGE_STATUS_NEW.','.MESSAGE_STATUS_UNREAD.') ';
}
$keyword = Session::read('message_search_keyword');
$keywordCondition = '';
if (!empty($keyword)) {
$keyword = Database::escape_string($keyword);
$keywordCondition = " AND (title like '%$keyword%' OR content LIKE '%$keyword%') ";
}
$sql = "SELECT COUNT(*) as number_messages
FROM $table_message
WHERE $condition_msg_status AND user_receiver_id=".api_get_user_id();
$sql_result = Database::query($sql);
$result = Database::fetch_array($sql_result);
WHERE $condition_msg_status AND
user_receiver_id=".api_get_user_id()."
$keywordCondition
";
$result = Database::query($sql);
$result = Database::fetch_array($result);
return $result['number_messages'];
}
@ -134,13 +146,24 @@ class MessageManager
if (!in_array($direction, array('ASC', 'DESC')))
$direction = 'ASC';
}
$keyword = Session::read('message_search_keyword');
$keywordCondition = '';
if (!empty($keyword)) {
$keyword = Database::escape_string($keyword);
$keywordCondition = " AND (title like '%$keyword%' OR content LIKE '%$keyword%') ";
}
$table_message = Database::get_main_table(TABLE_MESSAGE);
$sql = "SELECT id as col0, user_sender_id as col1, title as col2, send_date as col3, msg_status as col4
FROM $table_message
WHERE user_receiver_id=".api_get_user_id()." AND msg_status IN (0,1)
WHERE
user_receiver_id=".api_get_user_id()." AND
msg_status IN (0,1)
$keywordCondition
ORDER BY col$column $direction
LIMIT $from,$number_of_items";
LIMIT $from, $number_of_items";
$sql_result = Database::query($sql);
$i = 0;
@ -865,12 +888,21 @@ class MessageManager
}
$table_message = Database::get_main_table(TABLE_MESSAGE);
$request = api_is_xml_http_request();
$keyword = Session::read('message_sent_search_keyword');
$keywordCondition = '';
if (!empty($keyword)) {
$keyword = Database::escape_string($keyword);
$keywordCondition = " AND (title like '%$keyword%' OR content LIKE '%$keyword%') ";
}
$sql = "SELECT
id as col0, user_sender_id as col1, title as col2, send_date as col3, user_receiver_id as col4, msg_status as col5
FROM $table_message
WHERE
user_sender_id=".api_get_user_id()." AND
msg_status=".MESSAGE_STATUS_OUTBOX."
$keywordCondition
ORDER BY col$column $direction
LIMIT $from, $number_of_items";
$sql_result = Database::query($sql);
@ -921,10 +953,22 @@ class MessageManager
public static function get_number_of_messages_sent()
{
$table_message = Database::get_main_table(TABLE_MESSAGE);
$keyword = Session::read('message_sent_search_keyword');
$keywordCondition = '';
if (!empty($keyword)) {
$keyword = Database::escape_string($keyword);
$keywordCondition = " AND (title like '%$keyword%' OR content LIKE '%$keyword%') ";
}
$sql = "SELECT COUNT(*) as number_messages FROM $table_message
WHERE msg_status=".MESSAGE_STATUS_OUTBOX." AND user_sender_id=".api_get_user_id();
$sql_result = Database::query($sql);
$result = Database::fetch_array($sql_result);
WHERE
msg_status=".MESSAGE_STATUS_OUTBOX." AND
user_sender_id=".api_get_user_id()."
$keywordCondition
";
$result = Database::query($sql);
$result = Database::fetch_array($result);
return $result['number_messages'];
}
@ -1523,13 +1567,15 @@ class MessageManager
//@todo this functions should be in the message class
public static function inbox_display()
public static function inbox_display($keyword = '')
{
$success = get_lang('SelectedMessagesDeleted');
$success_read = get_lang('SelectedMessagesRead');
$success_unread = get_lang('SelectedMessagesUnRead');
$html = '';
Session::write('message_search_keyword', $keyword);
if (isset($_REQUEST['action'])) {
switch ($_REQUEST['action']) {
case 'mark_as_unread' :
@ -1590,18 +1636,25 @@ class MessageManager
)
);
$html .= $table->return_table();
Session::erase('message_search_keyword');
return $html;
}
/**
* @return string
* @param string $keyword
* @return null|string
*/
static function outbox_display()
public static function outbox_display($keyword = '')
{
$social_link = false;
if (isset($_REQUEST['f']) && $_REQUEST['f'] == 'social') {
$social_link = 'f=social';
}
Session::write('message_sent_search_keyword', $keyword);
$success = get_lang('SelectedMessagesDeleted').'&nbsp</b><br /><a href="outbox.php?'.$social_link.'">'.get_lang('BackToOutbox').'</a>';
$html = null;
@ -1645,6 +1698,8 @@ class MessageManager
$table->set_form_actions(array('delete' => get_lang('DeleteSelectedMessages')));
$html .= $table->return_table();
Session::erase('message_sent_search_keyword');
return $html;
}
@ -1756,4 +1811,19 @@ class MessageManager
return false;
}
/**
* @param string $url
*
* @return FormValidator
*/
public static function getSearchForm($url)
{
$form = new FormValidator('search', 'post', $url, null, [], FormValidator::LAYOUT_INLINE);
$form->addElement('text', 'keyword');
$form->addButtonSearch(get_lang('Search'));
return $form;
}
}

25
main/messages/inbox.php
Unescape View File

@ -139,22 +139,25 @@ if (api_get_setting('allow_social_tool') == 'true') {
//Right content
$social_right_content = null;
$keyword = '';
if (api_get_setting('allow_social_tool') == 'true') {
$social_right_content .= '<div class="col-md-12">';
$social_right_content .= '<div class="actions">';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.
$actionsLeft = '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.
Display::return_icon('new-message.png', get_lang('ComposeMessage'), array(), 32).'</a>';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.
$actionsLeft .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.
Display::return_icon('outbox.png', get_lang('Outbox'), array(), 32).'</a>';
$social_right_content .= '</div>';
$social_right_content .= '</div>';
$social_right_content .= '<div class="col-md-12">';
$form = MessageManager::getSearchForm(api_get_path(WEB_PATH).'main/messages/inbox.php');
if ($form->validate()) {
$values = $form->getSubmitValues();
$keyword = $values['keyword'];
}
$actionsRight = $form->returnForm();
$social_right_content .= Display::toolbarAction('toolbar', [$actionsLeft, $actionsRight]);
}
//MAIN CONTENT
if (!isset($_GET['del_msg'])) {
$social_right_content .= MessageManager::inbox_display();
$social_right_content .= MessageManager::inbox_display($keyword);
} else {
$num_msg = intval($_POST['total']);
for ($i = 0; $i < $num_msg; $i++) {
@ -166,10 +169,6 @@ if (!isset($_GET['del_msg'])) {
$social_right_content .= MessageManager::inbox_display();
}
if (api_get_setting('allow_social_tool') == 'true') {
$social_right_content .= '</div>';
}
$tpl = new Template(null);
// Block Social Avatar
SocialManager::setSocialUserBlock($tpl, $user_id, 'messages');

30
main/messages/outbox.php
Unescape View File

@ -99,15 +99,21 @@ if (isset($_REQUEST['action'])) {
$action = $_REQUEST['action'];
}
$keyword = '';
$social_right_content = '';
if (api_get_setting('allow_social_tool') == 'true') {
//Block Social Menu
$social_menu_block = SocialManager::show_social_menu('messages');
$social_right_content .= '<div class="actions">';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.
$actionsLeft = '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.
Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
$social_right_content .= '</div>';
$form = MessageManager::getSearchForm(api_get_path(WEB_PATH).'main/messages/outbox.php');
if ($form->validate()) {
$values = $form->getSubmitValues();
$keyword = $values['keyword'];
}
$actionsRight = $form->returnForm();
$social_right_content .= Display::toolbarAction('toolbar', [$actionsLeft, $actionsRight]);
}
//MAIN CONTENT
if ($action == 'delete') {
@ -118,20 +124,19 @@ if ($action == 'delete') {
if (isset($_POST['id'])) {
$delete_list_id=$_POST['id'];
}
for ($i=0;$i<count($delete_list_id);$i++) {
for ($i = 0; $i < count($delete_list_id); $i++) {
MessageManager::delete_message_by_user_sender(api_get_user_id(), $delete_list_id[$i]);
}
$delete_list_id=array();
$social_right_content .= MessageManager::outbox_display();
} elseif($action =='deleteone') {
$delete_list_id=array();
$social_right_content .= MessageManager::outbox_display($keyword);
} elseif ($action == 'deleteone') {
$delete_list_id = array();
$id = Security::remove_XSS($_GET['id']);
MessageManager::delete_message_by_user_sender(api_get_user_id(),$id);
MessageManager::delete_message_by_user_sender(api_get_user_id(), $id);
$delete_list_id=array();
$social_right_content .= MessageManager::outbox_display();
$social_right_content .= MessageManager::outbox_display($keyword);
} else {
$social_right_content .= MessageManager::outbox_display();
$social_right_content .= MessageManager::outbox_display($keyword);
}
$tpl = new Template(get_lang('ComposeMessage'));
@ -146,7 +151,6 @@ if (api_get_setting('allow_social_tool') == 'true') {
} else {
$content = $social_right_content;
$tpl->assign('actions', $actions);
//$tpl->assign('message', $show_message);
$tpl->assign('content', $content);
$tpl->display_one_col_template();
}

27
main/session/session_edit.php
Unescape View File

@ -25,13 +25,28 @@ SessionManager::protectSession($id);
$sessionInfo = SessionManager::fetch($id);
// Sets to local time to show it correctly when you edit a session
if (!empty($sessionInfo['display_start_date'])) {
$sessionInfo['display_start_date'] = api_get_local_time($sessionInfo['display_start_date']);
}
if (!empty($sessionInfo['display_end_date'])) {
$sessionInfo['display_end_date'] = api_get_local_time($sessionInfo['display_end_date']);
}
$sessionInfo['display_start_date'] = api_get_local_time($sessionInfo['display_start_date']);
$sessionInfo['display_end_date'] = api_get_local_time($sessionInfo['display_end_date']);
$sessionInfo['access_start_date'] = api_get_local_time($sessionInfo['access_start_date']);
$sessionInfo['access_end_date'] = api_get_local_time($sessionInfo['access_end_date']);
$sessionInfo['coach_access_start_date'] = api_get_local_time($sessionInfo['coach_access_start_date']);
$sessionInfo['coach_access_end_date'] = api_get_local_time($sessionInfo['coach_access_end_date']);
if (!empty($sessionInfo['access_start_date'])) {
$sessionInfo['access_start_date'] = api_get_local_time($sessionInfo['access_start_date']);
}
if (!empty($sessionInfo['access_end_date'])) {
$sessionInfo['access_end_date'] = api_get_local_time($sessionInfo['access_end_date']);
}
if (!empty($sessionInfo['coach_access_start_date'])) {
$sessionInfo['coach_access_start_date'] = api_get_local_time($sessionInfo['coach_access_start_date']);
}
if (!empty($sessionInfo['coach_access_end_date'])) {
$sessionInfo['coach_access_end_date'] = api_get_local_time($sessionInfo['coach_access_end_date']);
}
$id_coach = $sessionInfo['id_coach'];
$tool_name = get_lang('EditSession');

14
main/session/session_user_edit.php
Unescape View File

@ -12,12 +12,14 @@ $userId = isset($_GET['user_id']) ? $_GET['user_id'] : null;
SessionManager::protectSession($sessionId);
$sessionInfo = api_get_session_info($sessionId);
if (empty($sessionInfo)) {
api_not_allowed(true);
}
if (!isset($sessionInfo['duration']) ||
isset($sessionInfo['duration']) && empty($sessionInfo['duration'])) {
(isset($sessionInfo['duration']) && empty($sessionInfo['duration']))
) {
api_not_allowed(true);
}
@ -25,9 +27,12 @@ if (empty($sessionId) || empty($userId)) {
api_not_allowed(true);
}
//$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
$interbreadcrumb[] = array('url' => 'session_list.php','name' => get_lang('SessionList'));
$interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$sessionId, "name" => get_lang('SessionOverview'));
$interbreadcrumb[] = array(
'url' => "resume_session.php?id_session=".$sessionId,
"name" => get_lang('SessionOverview')
);
$form = new FormValidator('edit', 'post', api_get_self().'?session_id='.$sessionId.'&user_id='.$userId);
$form->addHeader(get_lang('EditUserSessionDuration'));
@ -39,6 +44,7 @@ $userAccess = CourseManager::getFirstCourseAccessPerSessionAndUser(
$sessionId,
$userId
);
if (count($userAccess) == 0) {
// User never accessed the session. End date is still open
$msg = sprintf(get_lang('UserNeverAccessedSessionDefaultDurationIsX'), $sessionInfo['duration']);
@ -54,7 +60,7 @@ if (count($userAccess) == 0) {
if ($days > 0) {
$msg = sprintf(get_lang('FirstAccessWasXSessionDurationYEndDateInZDays'), $firstAccessString, $duration, $days);
} else {
$endDateInSeconds = $firstAccess + $duration*24*60*60;
$endDateInSeconds = $firstAccess + $duration * 24*60*60;
$last = api_convert_and_format_date($endDateInSeconds, DATE_FORMAT_SHORT);
$msg = sprintf(get_lang('FirstAccessWasXSessionDurationYEndDateWasZ'), $firstAccessString, $duration, $last);
}

26
src/Chamilo/CoreBundle/Entity/SessionRelUser.php
Unescape View File

@ -47,6 +47,13 @@ class SessionRelUser
*/
private $relationType;
/**
* @var integer
*
* @ORM\Column(name="duration", type="integer", nullable=true)
*/
private $duration;
/**
* @var integer
*
@ -267,4 +274,23 @@ class SessionRelUser
return $this->registeredAt;
}
/**
* @return int
*/
public function getDuration()
{
return $this->duration;
}
/**
* @param int $duration
* @return SessionRelUser
*/
public function setDuration($duration)
{
$this->duration = $duration;
return $this;
}
}

Write Preview
Loading…
Cancel
Save