forked from moodle/moodle
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'MDL-48933-master' of git://github.com/FMCorz/moodle
- Loading branch information
Showing
18 changed files
with
2,025 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| <?php | ||
| // This file is part of Moodle - http://moodle.org/ | ||
| // | ||
| // Moodle is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // Moodle is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| /** | ||
| * Message ajax. | ||
| * | ||
| * @package core_message | ||
| * @copyright 2015 Frédéric Massart - FMCorz.net | ||
| * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later | ||
| */ | ||
|
|
||
| define('AJAX_SCRIPT', true); | ||
|
|
||
| require('../config.php'); | ||
| require_once($CFG->libdir . '/filelib.php'); | ||
| require_once(__DIR__ . '/lib.php'); | ||
|
|
||
| // Only real logged in users. | ||
| require_login(null, false, null, true, true); | ||
| if (isguestuser()) { | ||
| throw new require_login_exception(); | ||
| } | ||
|
|
||
| // Messaging needs to be enabled. | ||
| if (empty($CFG->messaging)) { | ||
| throw new moodle_exception('disabled', 'core_message'); | ||
| } | ||
|
|
||
| require_sesskey(); | ||
| $action = optional_param('action', null, PARAM_ALPHA); | ||
| $response = null; | ||
|
|
||
| switch ($action) { | ||
|
|
||
| // Sending a message. | ||
| case 'sendmessage': | ||
|
|
||
| require_capability('moodle/site:sendmessage', context_system::instance()); | ||
|
|
||
| $userid = required_param('userid', PARAM_INT); | ||
| if (empty($userid) || isguestuser($userid) || $userid == $USER->id) { | ||
| // Cannot send messags to self, nobody or a guest. | ||
| throw new coding_exception('Invalid user to send the message to'); | ||
| } | ||
|
|
||
| $message = required_param('message', PARAM_RAW); | ||
| $user2 = core_user::get_user($userid); | ||
| $messageid = message_post_message($USER, $user2, $message, FORMAT_MOODLE); | ||
|
|
||
| if (!$messageid) { | ||
| throw new moodle_exception('errorwhilesendingmessage', 'core_message'); | ||
| } | ||
|
|
||
| $response = array(); | ||
| break; | ||
| } | ||
|
|
||
| if ($response !== null) { | ||
| echo json_encode($response); | ||
| exit(); | ||
| } | ||
|
|
||
| throw new coding_exception('Invalid request'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| @core @core_message | ||
| Feature: Users can send messages to each other | ||
| In order to communicate with another user | ||
| As a user | ||
| I can send private messages | ||
|
|
||
| Background: | ||
| Given the following "users" exist: | ||
| | username | firstname | lastname | email | | ||
| | user1 | User | One | one@asd.com | | ||
| | user2 | User | Two | two@asd.com | | ||
|
|
||
| @javascript | ||
| Scenario: Using the 'Send message' dialog on one's profile | ||
| Given I log in as "admin" | ||
| And I set the following administration settings values: | ||
| | forceloginforprofiles | 0 | | ||
| And I log out | ||
| And I log in as "user1" | ||
| And I navigate to "Messages" node in "My profile" | ||
| And I set the field "Search people and messages" to "User Two" | ||
| And I press "Search people and messages" | ||
| And I follow "Picture of User Two" | ||
| When I follow "Send a message" | ||
| And I set the field "Message to send" to "Lorem ipsum sa messagus textus" | ||
| And I press "Send message" | ||
| And I navigate to "Messages" node in "My profile" | ||
| And I set the field "Search people and messages" to "User Two" | ||
| And I press "Search people and messages" | ||
| And I follow "Send message to User Two" | ||
| Then I should see "Lorem ipsum sa messagus textus" | ||
|
|
||
| @javascript | ||
| Scenario: Using the 'Send message' dialog on one's course profile | ||
| Given the following "courses" exist: | ||
| | fullname | shortname | category | | ||
| | Course 1 | C1 | 0 | | ||
| And the following "course enrolments" exist: | ||
| | user | course | role | | ||
| | user1 | C1 | student | | ||
| | user2 | C1 | student | | ||
| And I log in as "user1" | ||
| And I follow "Course 1" | ||
| And I follow "Participants" | ||
| And I follow "User Two" | ||
| When I follow "Send a message" | ||
| And I set the field "Message to send" to "Lorem ipsum sa messagus textus" | ||
| And I press "Send message" | ||
| And I navigate to "Messages" node in "My profile" | ||
| And I set the field "Search people and messages" to "User Two" | ||
| And I press "Search people and messages" | ||
| And I follow "Send message to User Two" | ||
| Then I should see "Lorem ipsum sa messagus textus" |
Oops, something went wrong.