L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-10107 - First check-in of Messaging 2.0 code from Luis Rodrigues, GSOC student.

Browse Source 
This new messaging system replaces all the various email_to_user() calls.
They are now replaced by events triggers, and the messages are then
processed centrally according to user preferences and sent to one or more
processors (email, popup, jabber etc...)

This code is not finished yet, a lot of work still has to be done on the
interface.  However, the basic structure is there and should be working.
Luis and I will be reviewing and polishing this heavily in the next few weeks.
This commit is contained in:
moodler
2008-07-24 08:38:03 +00:00
parent 09f295fde8
commit 3b120e464f
62 changed files with 5618 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/handlevirus.php
+43
View File
@@ -6,6 +6,8 @@
* php -d error_log=/path/to/log thisfile.php will override the default error log for php cli, which is stderr, so if you want this script to just print stuff out, use php thisfile.php instead.
*/
require_once($CFG->libdir.'/eventslib.php');
$fd = fopen('php://stdin','r');
if (!$fd) {
@@ -59,7 +61,22 @@ function notify_user($user,$subject,$a) {
return false;
}
$body = get_string('virusfoundlater','moodle',$a);
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = get_admin();
$eventdata->userto = $user;
$eventdata->subject = $subject;
$eventdata->fullmessage = $body;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($user,get_admin(),$subject,$body);
*/
}
@@ -69,7 +86,20 @@ function notify_admins($user,$subject,$a) {
$body = get_string('virusfoundlateradmin','moodle',$a);
foreach ($admins as $admin) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $admin;
$eventdata->userto = $admin;
$eventdata->subject = $subject;
$eventdata->fullmessage = $body;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($admin,$admin,$subject,$body);
*/
}
}
@@ -81,7 +111,20 @@ function notify_admins_unknown($file,$a) {
$subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
$body = get_string('virusfoundlateradminnolog','moodle',$a);
foreach ($admins as $admin) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $admin;
$eventdata->userto = $admin;
$eventdata->subject = $subject;
$eventdata->fullmessage = $body;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($admin,$admin,$subject,$body);
*/
}
}
backup/backup_scheduled.php
+15
View File
@@ -1,5 +1,7 @@
<?php //$Id$
//This file contains all the code needed to execute scheduled backups
require_once($CFG->libdir.'/eventslib.php');
//This function is executed via moodle cron
//It prepares all the info and execute backups as necessary
@@ -195,7 +197,20 @@ function schedule_backup_cron() {
$subject = $prefix.get_string("scheduledbackupstatus");
//Send the message
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $admin;
$eventdata->userto = $admin;
$eventdata->subject = $subject;
$eventdata->fullmessage = $message;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($admin,$admin,$subject,$message);
*/
}
course/pending.php
+28
View File
@@ -5,6 +5,7 @@
require_once($CFG->libdir.'/pagelib.php');
require_once($CFG->libdir.'/blocklib.php');
require_once('lib.php');
require_once($CFG->libdir.'/eventslib.php');
require_login();
@@ -52,7 +53,21 @@
$a->name = $course->fullname;
$a->url = $CFG->wwwroot.'/course/view.php?id='.$courseid;
$a->teacher = $course->teacher;
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $USER;
$eventdata->userto = $user;
$eventdata->subject = get_string('courseapprovedsubject');
$eventdata->fullmessage = get_string('courseapprovedemail','moodle',$a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($user,$USER,get_string('courseapprovedsubject'),get_string('courseapprovedemail','moodle',$a));
*/
redirect($CFG->wwwroot.'/course/edit.php?id='.$courseid);
exit;
}
@@ -79,7 +94,20 @@
}
else {
$user = $DB->get_record("user", array("id"=>$reject->requester));
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $USER;
$eventdata->userto = $user;
$eventdata->subject = get_string('courserejectsubject');
$eventdata->fullmessage = get_string('courserejectemail','moodle',$rejectnotice);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($user,$USER,get_string('courserejectsubject'),get_string('courserejectemail','moodle',$rejectnotice));
*/
$DB->delete_records("course_request", array("id"=>$reject->id));
notice(get_string('courserejected'),'pending.php');
}
enrol/authorize/enrol.php
+111 -5
View File
@@ -4,6 +4,7 @@ require_once($CFG->dirroot.'/enrol/enrol.class.php');
require_once($CFG->dirroot.'/enrol/authorize/const.php');
require_once($CFG->dirroot.'/enrol/authorize/localfuncs.php');
require_once($CFG->dirroot.'/enrol/authorize/authorizenet.class.php');
require_once($CFG->libdir.'/eventslib.php');
/**
* Authorize.net Payment Gateway plugin
@@ -171,7 +172,7 @@ class enrolment_plugin_authorize
$order->currency = $curcost['currency'];
$order->id = $DB->insert_record("enrol_authorize", $order);
if (!$order->id) {
email_to_admin("Error while trying to insert new data", $order);
message_to_admin("Error while trying to insert new data", $order);
return "Insert record error. Admin has been notified!";
}
@@ -242,7 +243,20 @@ class enrolment_plugin_authorize
$context = get_context_instance(CONTEXT_COURSE, $course->id);
if (($paymentmanagers = get_users_by_capability($context, 'enrol/authorize:managepayments'))) {
foreach ($paymentmanagers as $paymentmanager) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $USER;
$eventdata->userto = $paymentmanager;
$eventdata->subject = $emailsubject;
$eventdata->fullmessage = $emailmessage;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($paymentmanager, $USER, $emailsubject, $emailmessage);
*/
}
}
redirect($CFG->wwwroot, get_string("reviewnotify", "enrol_authorize"), '30');
@@ -265,12 +279,26 @@ class enrolment_plugin_authorize
$a = new stdClass;
$a->course = "$course->fullname";
$a->user = fullname($USER);
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $USER;
$eventdata->userto = $paymentmanager;
$eventdata->subject = get_string("enrolmentnew", '', format_string($course->shortname));
$eventdata->fullmessage = get_string('enrolmentnewuser', '', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user(
$paymentmanager,
$USER,
get_string("enrolmentnew", '', format_string($course->shortname)),
get_string('enrolmentnewuser', '', $a)
);
*/
}
if (!empty($CFG->enrol_mailadmins)) {
$a = new stdClass;
@@ -278,18 +306,31 @@ class enrolment_plugin_authorize
$a->user = fullname($USER);
$admins = get_admins();
foreach ($admins as $admin) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $USER;
$eventdata->userto = $paymentmanager;
$eventdata->subject = get_string("enrolmentnew", '', format_string($course->shortname));
$eventdata->fullmessage = get_string('enrolmentnewuser', '', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user(
$admin,
$USER,
get_string("enrolmentnew", '', format_string($course->shortname)),
get_string('enrolmentnewuser', '', $a)
);
*/
}
}
}
else
{
email_to_admin("Error while trying to enrol " . fullname($USER) . " in '$course->fullname'", $order);
message_to_admin("Error while trying to enrol " . fullname($USER) . " in '$course->fullname'", $order);
}
if ($SESSION->wantsurl) {
@@ -308,7 +349,7 @@ class enrolment_plugin_authorize
}
else
{
email_to_admin($message, $order);
message_to_admin($message, $order);
return $message;
}
}
@@ -348,7 +389,7 @@ class enrolment_plugin_authorize
$order->currency = $curcost['currency'];
$order->id = $DB->insert_record("enrol_authorize", $order);
if (!$order->id) {
email_to_admin("Error while trying to insert new data", $order);
message_to_admin("Error while trying to insert new data", $order);
return "Insert record error. Admin has been notified!";
}
@@ -385,7 +426,7 @@ class enrolment_plugin_authorize
return NULL;
}
else {
email_to_admin($message, $order);
message_to_admin($message, $order);
return $message;
}
}
@@ -695,10 +736,35 @@ class enrolment_plugin_authorize
$adminuser = get_admin();
if (!empty($faults)) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $adminuser;
$eventdata->userto = $adminuser;
$eventdata->subject = "AUTHORIZE.NET CRON FAULTS";
$eventdata->fullmessage = $faults;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($adminuser, $adminuser, "AUTHORIZE.NET CRON FAULTS", $faults);
*/
}
if (!empty($CFG->enrol_mailadmins)) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $adminuser;
$eventdata->userto = $adminuser;
$eventdata->subject = "AUTHORIZE.NET CRON LOG";
$eventdata->fullmessage = $this->log;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($adminuser, $adminuser, "AUTHORIZE.NET CRON LOG", $this->log);
*/
}
// Send emails to students about which courses have enrolled.
@@ -757,7 +823,20 @@ class enrolment_plugin_authorize
$a->url = $CFG->wwwroot.'/enrol/authorize/uploadcsv.php';
$message = get_string('pendingecheckemail', 'enrol_authorize', $a);
foreach($csvusers as $csvuser) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $adminuser;
$eventdata->userto = $csvuser;
$eventdata->subject = $subject;
$eventdata->fullmessage = $message;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
@email_to_user($csvuser, $adminuser, $subject, $message);
*/
}
mtrace(" users who have 'enrol/authorize:uploadcsv' were mailed");
}
@@ -791,7 +870,21 @@ class enrolment_plugin_authorize
$a->enrolurl = "$CFG->wwwroot/$CFG->admin/enrol_config.php?enrol=authorize";
$a->url = $CFG->wwwroot.'/enrol/authorize/index.php?status='.AN_STATUS_AUTH;
$message = get_string('pendingordersemail', 'enrol_authorize', $a);
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $adminuser;
$eventdata->userto = $adminuser;
$eventdata->subject = $subject;
$eventdata->fullmessage = $message;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($adminuser, $adminuser, $subject, $message);
*/
// Email to payment managers
if (empty($CFG->an_emailexpiredteacher)) {
@@ -830,7 +923,20 @@ class enrolment_plugin_authorize
$a->url = $CFG->wwwroot.'/enrol/authorize/index.php?course='.$lastcourse.'&amp;status='.AN_STATUS_AUTH;
$message = get_string('pendingordersemailteacher', 'enrol_authorize', $a);
foreach ($paymentmanagers as $paymentmanager) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $adminuser;
$eventdata->userto = $paymentmanager;
$eventdata->subject = $subject;
$eventdata->fullmessage = $message;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($paymentmanager, $adminuser, $subject, $message);
*/
}
}
}
enrol/authorize/localfuncs.php
+29 -1
View File
@@ -1,5 +1,7 @@
<?php // $Id$
require_once($CFG->libdir.'/eventslib.php');
function get_course_cost($course)
{
global $CFG;
@@ -111,7 +113,7 @@ function get_list_of_bank_account_types($getall = false)
}
}
function email_to_admin($subject, $data)
function message_to_admin($subject, $data)
{
global $SITE;
@@ -120,7 +122,19 @@ function email_to_admin($subject, $data)
$message = "$SITE->fullname: Transaction failed.\n\n$subject\n\n";
$message .= print_r($data, true);
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $admin;
$eventdata->userto = $admin;
$eventdata->subject = "$SITE->fullname: Authorize.net ERROR";
$eventdata->fullmessage = $emailmessage;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($admin, $admin, "$SITE->fullname: Authorize.net ERROR", $message);
*/
}
function send_welcome_messages($orderdata)
@@ -177,7 +191,21 @@ function send_welcome_messages($orderdata)
$a->profileurl = "$CFG->wwwroot/user/view.php?id=$lastuserid";
$a->paymenturl = "$CFG->wwwroot/enrol/authorize/index.php?user=$lastuserid";
$emailmessage = get_string('welcometocoursesemail', 'enrol_authorize', $a);
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $sender;
$eventdata->userto = $user;
$eventdata->subject = get_string("enrolmentnew", '', $SITE->shortname);
$eventdata->fullmessage = $emailmessage;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
@email_to_user($user, $sender, get_string("enrolmentnew", '', $SITE->shortname), $emailmessage);
*/
}
}
while ($ei);
enrol/authorize/uploadcsv.php
+15
View File
@@ -5,6 +5,7 @@
require_once($CFG->libdir.'/uploadlib.php');
require_once($CFG->dirroot.'/enrol/authorize/const.php');
require_once($CFG->dirroot.'/enrol/authorize/localfuncs.php');
require_once($CFG->libdir.'/eventslib.php');
/// Require capabilites
require_login();
@@ -224,7 +225,21 @@ function authorize_process_csv($filename)
/// Send email to admin
if (!empty($ignoredlines)) {
$admin = get_admin();
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $admin;
$eventdata->userto = $admin;
$eventdata->subject = "$SITE->fullname: Authorize.net CSV ERROR LOG";
$eventdata->fullmessage = $ignoredlines;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($admin, $admin, "$SITE->fullname: Authorize.net CSV ERROR LOG", $ignoredlines);
*/
}
/// Send welcome messages to users
enrol/flatfile/enrol.php
+55
View File
@@ -5,6 +5,7 @@
// $CFG->enrol_emailteachers: send email to teachers when they are enrolled in a course
// $CFG->enrol_emailadmins: email the log from the cron job to the admin
require_once($CFG->libdir.'/eventslib.php');
class enrolment_plugin_flatfile {
@@ -216,8 +217,22 @@ function get_access_icons($course) {
if (!empty($CFG->enrol_mailstudents)) {
$a->coursename = "$course->fullname";
$a->profileurl = "$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id";
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $teacher;
$eventdata->userto = $user;
$eventdata->subject = get_string("enrolmentnew", '', $course->shortname);
$eventdata->fullmessage = get_string('welcometocoursetext', '', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($user, $teacher, get_string("enrolmentnew", '', $course->shortname),
get_string('welcometocoursetext', '', $a));
*/
}
if (!empty($CFG->enrol_mailteachers) && $teachers) {
@@ -227,8 +242,22 @@ function get_access_icons($course) {
if (!$u->hidden || has_capability('moodle/role:viewhiddenassigns', $context)) {
$a->course = "$course->fullname";
$a->user = fullname($user);
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $user;
$eventdata->userto = $teacher;
$eventdata->subject = get_string("enrolmentnew", '', $course->shortname);
$eventdata->fullmessage = get_string('enrolmentnewuser', '', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($teacher, $user, get_string("enrolmentnew", '', $course->shortname),
get_string('enrolmentnewuser', '', $a));
*/
}
}
}
@@ -246,12 +275,38 @@ function get_access_icons($course) {
} // end of if(file_open)
if(! @unlink($filename)) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = get_admin();
$eventdata->userto = get_admin();
$eventdata->subject = get_string("filelockedmailsubject", "enrol_flatfile");
$eventdata->fullmessage = get_string("filelockedmail", "enrol_flatfile", $filename);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user(get_admin(), get_admin(), get_string("filelockedmailsubject", "enrol_flatfile"), get_string("filelockedmail", "enrol_flatfile", $filename));
*/
$this->log .= "Error unlinking file $filename\n";
}
if (!empty($CFG->enrol_mailadmins)) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = get_admin();
$eventdata->userto = get_admin();
$eventdata->subject = "Flatfile Enrolment Log";
$eventdata->fullmessage = $this->log;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user(get_admin(), get_admin(), "Flatfile Enrolment Log", $this->log);
*/
}
} // end of if(file_exists)
enrol/imsenterprise/enrol.php
+14
View File
@@ -6,6 +6,7 @@
*/
require_once("$CFG->libdir/blocklib.php");
require_once($CFG->dirroot.'/group/lib.php');
require_once($CFG->libdir.'/eventslib.php');
// The following flags are set in the configuration
// $CFG->enrol_imsfilelocation: where is the file we are looking for?
@@ -380,8 +381,21 @@ function cron() {
}else{
$msg .= "Logging is currently not active.";
}
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = get_admin();
$eventdata->userto = get_admin();
$eventdata->subject = "Moodle IMS Enterprise enrolment notification";
$eventdata->fullmessage = $msg;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user(get_admin(), get_admin(), "Moodle IMS Enterprise enrolment notification", $msg);
*/
$this->log_line('Notification email sent to administrator.');
}
enrol/manual/enrol.php
+26
View File
@@ -23,6 +23,7 @@
///////////////////////////////////////////////////////////////////////////
require_once($CFG->dirroot.'/group/lib.php');
require_once($CFG->libdir.'/eventslib.php');
/**
* enrolment_plugin_manual is the default enrolment plugin
@@ -313,8 +314,20 @@ function cron() {
$strexpirynotifystudentsemail = get_string('expirynotifystudentsemail', '', $a);
$strexpirynotify = get_string('expirynotify');
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $teacher;
$eventdata->userto = $user;
$eventdata->subject = format_string($SITE->fullname) .' '. $strexpirynotify;
$eventdata->fullmessage = $strexpirynotifystudentsemail;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($user, $teacher, format_string($SITE->fullname) .' '. $strexpirynotify,
$strexpirynotifystudentsemail);
*/
}
}
}
@@ -331,7 +344,20 @@ function cron() {
$strexpirynotifyemail = get_string('expirynotifyemail', '', $a);
$strexpirynotify = get_string('expirynotify');
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $admin;
$eventdata->userto = $teacher;
$eventdata->subject = $a->coursename .' '. $strexpirynotify;
$eventdata->fullmessage = $strexpirynotifyemail;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($teacher, $admin, $a->coursename .' '. $strexpirynotify, $strexpirynotifyemail);
*/
}
}
}
enrol/paypal/ipn.php
+84 -17
View File
@@ -15,6 +15,7 @@
require("../../config.php");
require("enrol.php");
require_once($CFG->libdir.'/eventslib.php');
/// Keep out casual intruders
if (empty($_POST) or !empty($_GET)) {
@@ -46,17 +47,17 @@
/// get the user and course records
if (! $user = $DB->get_record("user", array("id"=>$data->userid))) {
email_paypal_error_to_admin("Not a valid user id", $data);
message_paypal_error_to_admin("Not a valid user id", $data);
die;
}
if (! $course = $DB->get_record("course", array("id"=>$data->courseid))) {
email_paypal_error_to_admin("Not a valid course id", $data);
message_paypal_error_to_admin("Not a valid course id", $data);
die;
}
if (! $context = get_context_instance(CONTEXT_COURSE, $course->id)) {
email_paypal_error_to_admin("Not a valid context id", $data);
message_paypal_error_to_admin("Not a valid context id", $data);
die;
}
@@ -71,7 +72,7 @@
if (!$fp) { /// Could not open a socket to PayPal - FAIL
echo "<p>Error: could not access paypal.com</p>";
email_paypal_error_to_admin("Could not access paypal.com to verify payment", $data);
message_paypal_error_to_admin("Could not access paypal.com to verify payment", $data);
die;
}
@@ -93,7 +94,7 @@
if ($data->payment_status != "Completed" and $data->payment_status != "Pending") {
role_unassign(0, $data->userid, 0, $context->id);
email_paypal_error_to_admin("Status not completed or pending. User unenrolled from course", $data);
message_paypal_error_to_admin("Status not completed or pending. User unenrolled from course", $data);
die;
}
@@ -101,8 +102,21 @@
// Email user to let them know. Email admin.
if ($data->payment_status == "Pending" and $data->pending_reason != "echeck") {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = get_admin();
$eventdata->userto = $user;
$eventdata->subject = "Moodle: PayPal payment";
$eventdata->fullmessage = "Your PayPal payment is pending.";
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($user, get_admin(), "Moodle: PayPal payment", "Your PayPal payment is pending.");
email_paypal_error_to_admin("Payment pending", $data);
*/
message_paypal_error_to_admin("Payment pending", $data);
die;
}
@@ -119,24 +133,24 @@
if ($existing = $DB->get_record("enrol_paypal", array("txn_id"=>$data->txn_id))) { // Make sure this transaction doesn't exist already
email_paypal_error_to_admin("Transaction $data->txn_id is being repeated!", $data);
message_paypal_error_to_admin("Transaction $data->txn_id is being repeated!", $data);
die;
}
if ($data->business != $CFG->enrol_paypalbusiness) { // Check that the email is the one we want it to be
email_paypal_error_to_admin("Business email is $data->business (not $CFG->enrol_paypalbusiness)", $data);
message_paypal_error_to_admin("Business email is $data->business (not $CFG->enrol_paypalbusiness)", $data);
die;
}
if (!$user = $DB->get_record('user', array('id'=>$data->userid))) { // Check that user exists
email_paypal_error_to_admin("User $data->userid doesn't exist", $data);
message_paypal_error_to_admin("User $data->userid doesn't exist", $data);
die;
}
if (!$course = $DB->get_record('course', array('id'=>$data->courseid))) { // Check that course exists
email_paypal_error_to_admin("Course $data->courseid doesn't exist", $data);;
message_paypal_error_to_admin("Course $data->courseid doesn't exist", $data);;
die;
}
@@ -149,7 +163,7 @@
if ($data->payment_gross < $cost) {
$cost = format_float($cost, 2);
email_paypal_error_to_admin("Amount paid is not enough ($data->payment_gross < $cost))", $data);
message_paypal_error_to_admin("Amount paid is not enough ($data->payment_gross < $cost))", $data);
die;
}
@@ -157,11 +171,11 @@
// ALL CLEAR !
if (!$DB->insert_record("enrol_paypal", $data)) { // Insert a transaction record
email_paypal_error_to_admin("Error while trying to insert valid transaction", $data);
message_paypal_error_to_admin("Error while trying to insert valid transaction", $data);
}
if (!enrol_into_course($course, $user, 'paypal')) {
email_paypal_error_to_admin("Error while trying to enrol ".fullname($user)." in '$course->fullname'", $data);
message_paypal_error_to_admin("Error while trying to enrol ".fullname($user)." in '$course->fullname'", $data);
die;
} else {
$teacher = get_teacher($course->id);
@@ -169,24 +183,65 @@
if (!empty($CFG->enrol_mailstudents)) {
$a->coursename = $course->fullname;
$a->profileurl = "$CFG->wwwroot/user/view.php?id=$user->id";
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $teacher;
$eventdata->userto = $user;
$eventdata->subject = get_string("enrolmentnew", '', $course->shortname);
$eventdata->fullmessage = get_string('welcometocoursetext', '', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($user, $teacher, get_string("enrolmentnew", '', $course->shortname),
get_string('welcometocoursetext', '', $a));
*/
}
if (!empty($CFG->enrol_mailteachers)) {
$a->course = $course->fullname;
$a->user = fullname($user);
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $user;
$eventdata->userto = $teacher;
$eventdata->subject = get_string("enrolmentnew", '', $course->shortname);
$eventdata->fullmessage = get_string('enrolmentnewuser', '', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($teacher, $user, get_string("enrolmentnew", '', $course->shortname),
get_string('enrolmentnewuser', '', $a));
*/
}
if (!empty($CFG->enrol_mailadmins)) {
$a->course = $course->fullname;
$a->user = fullname($user);
$admins = get_admins();
foreach ($admins as $admin) {
foreach ($admins as $admin) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $user;
$eventdata->userto = $admin;
$eventdata->subject = get_string("enrolmentnew", '', $course->shortname);
$eventdata->fullmessage = get_string('enrolmentnewuser', '', $a);
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($admin, $user, get_string("enrolmentnew", '', $course->shortname),
get_string('enrolmentnewuser', '', $a));
*/
}
}
@@ -195,7 +250,7 @@
} else if (strcmp ($result, "INVALID") == 0) { // ERROR
$DB->insert_record("enrol_paypal", $data, false);
email_paypal_error_to_admin("Received an invalid payment notification!! (Fake payment?)", $data);
message_paypal_error_to_admin("Received an invalid payment notification!! (Fake payment?)", $data);
}
}
@@ -207,7 +262,7 @@
/// FUNCTIONS //////////////////////////////////////////////////////////////////
function email_paypal_error_to_admin($subject, $data) {
function message_paypal_error_to_admin($subject, $data) {
$admin = get_admin();
$site = get_site();
@@ -217,8 +272,20 @@ function email_paypal_error_to_admin($subject, $data) {
$message .= "$key => $value\n";
}
email_to_user($admin, $admin, "PAYPAL ERROR: ".$subject, $message);
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $admin;
$eventdata->userto = $admin;
$eventdata->subject = "PAYPAL ERROR: ".$subject;
$eventdata->fullmessage = $message;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($admin, $admin, "PAYPAL ERROR: ".$subject, $message);
*/
}
?>
error/index.php
+15 -1
View File
@@ -1,6 +1,7 @@
<?PHP // $Id$
require('../config.php');
require_once($CFG->libdir.'/eventslib.php');
if ($form = data_submitted()) { // form submitted, do not check referer (original page unknown)!
@@ -20,8 +21,21 @@
$supportuser->lastname = $CFG->supportname ? '' : $admin->lastname;
$supportuser->maildisplay = true;
/// Send the email and redirect
/// Send the message and redirect
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $USER;
$eventdata->userto = $supportuser;
$eventdata->subject = 'Error: '. $form->referer .' -> '. $form->requested;
$eventdata->fullmessage = $form->text;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($supportuser, $USER, 'Error: '. $form->referer .' -> '. $form->requested, $form->text);
*/
redirect($CFG->wwwroot .'/course/', 'Message sent, thanks', 3);
exit;
lang/en_utf8/message.php
+16 -4
View File
@@ -10,10 +10,8 @@ $string['allmine'] = 'All messages to me or from me';
$string['allstudents'] = 'All messages between students in course';
$string['allusers'] = 'All messages from all users';
$string['backupmessageshelp'] = 'If enabled, then instant messages will be included in SITE automated backups';
$string['beepnewmessage'] = 'Beep when a new message comes in (may require browser plugin that can play sounds, such as Quicktime)';
$string['blockcontact'] = 'Block contact';
$string['blockedmessages'] = '$a message(s) to/from blocked users';
$string['blocknoncontacts'] = 'Block all new messages from people who are not on my contact list';
$string['contactlistempty'] = 'Your contact list is currently empty';
$string['contacts'] = 'Contacts';
$string['context'] = 'context';
@@ -38,7 +36,6 @@ $string['messagingdisabled'] = 'Messaging is disabled on this site, emails will
$string['mycontacts'] = 'My Contacts';
$string['newsearch'] = 'New search';
$string['newonlymsg'] = 'Show only new';
$string['noframesjs'] = 'Version without frames and JavaScript';
$string['nomessages'] = 'No messages waiting';
$string['nomessagesfound'] = 'No messages were found';
$string['nosearchresults'] = 'There were no results from your search';
@@ -61,7 +58,6 @@ $string['sendmessageto'] = 'Send message to $a';
$string['sendmessagetopopup'] = "Send message to \$a - new window";
$string['settings'] = 'Settings';
$string['settingssaved'] = 'Your settings have been saved';
$string['showmessagewindow'] = 'Automatically show Message window when I get new messages (your browser needs to be set so that it doesn\'t block popups on this site)';
$string['strftimedaydatetime'] = '%%A, %%d %%B %%Y, %%I:%%M %%p';
$string['timenosee'] = 'Minutes since I was last seen online';
$string['timesent'] = 'Time Sent';
@@ -71,4 +67,20 @@ $string['userisblockingyou'] = 'This user has blocked you from sending messages
$string['userisblockingyounoncontact'] = 'This user is only accepting messages from people listed as contacts, and you are not currently on the list.';
$string['userssearchresults'] = 'Search results: $a users found';
//luis: used in the message system
$string['editmymessage'] = 'Messaging';
$string['guestnoeditmessage'] = 'Guest user can not edit messaging options';
$string['guestnoeditmessageother'] = 'Guest user can not edit other user messaging options';
$string['loggedin'] = 'Logged In: ';
$string['loggedoff'] = 'Logged Off: ';
$string['general_config'] = 'General Options';
$string['providers_config'] = 'Message Sources';
$string['processor_config'] = 'Destinations Configuration';
$string['showmessagewindow'] = 'Popup window on new message';
$string['blocknoncontacts'] = 'Block unknown users';
$string['beepnewmessage'] = 'Beep on new message';
$string['noframesjs'] = 'No frames and JavaScript';
$string['providerstag'] = 'Source: ';
$string['processortag'] = 'Destination: ';
?>
lang/en_utf8/role.php
+5
View File
@@ -189,4 +189,9 @@ $string['course:viewcoursegrades'] = 'View course grades';
$string['user:viewusergrades'] = 'View user grades';
$string['course:managegrades'] = 'Manage grades';
//LUIS: new message system
$string['user:editmessageprofile'] = 'Edit user messaging profile';
$string['user:editownmessageprofile'] = 'Edit own user messaging profile';
?>
lib/db/access.php
+23
View File
@@ -830,6 +830,29 @@ $moodle_capabilities = array(
'admin' => CAP_ALLOW
)
),
//capabilities designed for the new message system configuration
'moodle/user:editmessageprofile' => array(
'riskbitmask' => RISK_SPAM,
'captype' => 'write',
'contextlevel' => CONTEXT_USER,
'legacy' => array(
'admin' => CAP_ALLOW
)
),
'moodle/user:editownmessageprofile' => array(
'captype' => 'write',
'contextlevel' => CONTEXT_SYSTEM,
'legacy' => array(
'guest' => CAP_PROHIBIT,
'user' => CAP_ALLOW,
'admin' => CAP_ALLOW
)
),
'moodle/question:managecategory' => array(
lib/db/events.php
+48 -1
View File
@@ -29,7 +29,54 @@
/* List of handlers */
$handlers = array (); // no handlers for now in core
$handlers = array (
/*
* Messaging Events
*/
/*
* required parameters (object):
* modulename -
* modulefile -
*
*/
'message_provider_register' => array (
'handlerfile' => '/lib/messagelib.php',
'handlerfunction' => 'message_provider_register_handler',
'schedule' => 'instant'
),
/*
* required parameters (object):
* modulename -
*
*/
'message_provider_unregister' => array (
'handlerfile' => '/lib/messagelib.php',
'handlerfunction' => 'message_provider_unregister_handler',
'schedule' => 'instant'
),
/* required parameters (object):
* modulename -
* userfrom
* userto
* subject
* fullmessage - the full message in a given format
* fullmessageformat - the format if the full message (FORMAT_MOODLE, FORMAT_HTML, ..)
* fullmessagehtml - the full version (the message processor will choose with one to use)
* smallmessage - the small version of the message
*/
'message_send' => array (
'handlerfile' => '/lib/messagelib.php',
'handlerfunction' => 'message_send_handler',
'schedule' => 'instant'
)
);
lib/db/install.xml
+53 -16
View File
@@ -311,12 +311,14 @@
<TABLE NAME="message" COMMENT="Stores all unread messages" PREVIOUS="log_display" NEXT="message_read">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="useridfrom"/>
<FIELD NAME="useridfrom" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="useridto"/>
<FIELD NAME="useridto" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="useridfrom" NEXT="message"/>
<FIELD NAME="message" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="useridto" NEXT="format"/>
<FIELD NAME="format" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="message" NEXT="timecreated"/>
<FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="format" NEXT="messagetype"/>
<FIELD NAME="messagetype" TYPE="char" LENGTH="50" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="timecreated"/>
<FIELD NAME="useridfrom" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="useridto"/>
<FIELD NAME="useridto" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="useridfrom" NEXT="subject"/>
<FIELD NAME="subject" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="The message subject" PREVIOUS="useridto" NEXT="fullmessage"/>
<FIELD NAME="fullmessage" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false" ENUM="false" PREVIOUS="subject" NEXT="fullmessageformat"/>
<FIELD NAME="fullmessageformat" TYPE="int" LENGTH="4" NOTNULL="false" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" COMMENT="The format of the full message" PREVIOUS="fullmessage" NEXT="fullmessagehtml"/>
<FIELD NAME="fullmessagehtml" TYPE="text" LENGTH="medium" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="html format of message" PREVIOUS="fullmessageformat" NEXT="smallmessage"/>
<FIELD NAME="smallmessage" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="Smal version of message (eg sms)" PREVIOUS="fullmessagehtml" NEXT="timecreated"/>
<FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="smallmessage"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
@@ -329,14 +331,15 @@
<TABLE NAME="message_read" COMMENT="Stores all messages that have been read" PREVIOUS="message" NEXT="message_contacts">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="useridfrom"/>
<FIELD NAME="useridfrom" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="useridto"/>
<FIELD NAME="useridto" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="useridfrom" NEXT="message"/>
<FIELD NAME="message" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="useridto" NEXT="format"/>
<FIELD NAME="format" TYPE="int" LENGTH="4" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="message" NEXT="timecreated"/>
<FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="format" NEXT="timeread"/>
<FIELD NAME="timeread" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timecreated" NEXT="messagetype"/>
<FIELD NAME="messagetype" TYPE="char" LENGTH="50" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="timeread" NEXT="mailed"/>
<FIELD NAME="mailed" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="messagetype"/>
<FIELD NAME="useridfrom" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="useridto"/>
<FIELD NAME="useridto" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="useridfrom" NEXT="subject"/>
<FIELD NAME="subject" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="The message subject" PREVIOUS="useridto" NEXT="fullmessage"/>
<FIELD NAME="fullmessage" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false" ENUM="false" PREVIOUS="subject" NEXT="fullmessageformat"/>
<FIELD NAME="fullmessageformat" TYPE="int" LENGTH="4" NOTNULL="false" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" COMMENT="The format of the full message" PREVIOUS="fullmessage" NEXT="fullmessagehtml"/>
<FIELD NAME="fullmessagehtml" TYPE="text" LENGTH="medium" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="html format of message" PREVIOUS="fullmessageformat" NEXT="smallmessage"/>
<FIELD NAME="smallmessage" TYPE="text" LENGTH="small" NOTNULL="false" SEQUENCE="false" ENUM="false" COMMENT="Smal version of message (eg sms)" PREVIOUS="fullmessagehtml" NEXT="timecreated"/>
<FIELD NAME="timecreated" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="smallmessage" NEXT="timeread"/>
<FIELD NAME="timeread" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timecreated"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>
@@ -1708,7 +1711,7 @@
<INDEX NAME="name" UNIQUE="false" FIELDS="name" COMMENT="name index"/>
</INDEXES>
</TABLE>
<TABLE NAME="portfolio_instance_user" COMMENT="user data for portfolio instances." PREVIOUS="portfolio_instance_config">
<TABLE NAME="portfolio_instance_user" COMMENT="user data for portfolio instances." PREVIOUS="portfolio_instance_config" NEXT="message_providers">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="instance"/>
<FIELD NAME="instance" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="false" ENUM="false" COMMENT="fk to instance table" PREVIOUS="id" NEXT="userid"/>
@@ -1722,6 +1725,35 @@
<KEY NAME="userfk" TYPE="foreign" FIELDS="userid" REFTABLE="user" REFFIELDS="id" COMMENT="fk to user table" PREVIOUS="instancefk"/>
</KEYS>
</TABLE>
<TABLE NAME="message_providers" COMMENT="This table stores the message providers (modules and core systems)" PREVIOUS="portfolio_instance_user" NEXT="message_processors">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" SEQUENCE="true" ENUM="false" COMMENT="id of the table, please edit me" NEXT="modulename"/>
<FIELD NAME="modulename" TYPE="char" LENGTH="166" NOTNULL="true" SEQUENCE="false" ENUM="false" COMMENT="Module Name" PREVIOUS="id" NEXT="modulefile"/>
<FIELD NAME="modulefile" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" ENUM="false" COMMENT="The main module file" PREVIOUS="modulename"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="primary key of the table, please edit me"/>
</KEYS>
</TABLE>
<TABLE NAME="message_processors" COMMENT="List of message output plugins" PREVIOUS="message_providers" NEXT="message_working">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" SEQUENCE="true" ENUM="false" COMMENT="id of the table, please edit me" NEXT="name"/>
<FIELD NAME="name" TYPE="char" LENGTH="166" NOTNULL="true" SEQUENCE="false" ENUM="false" COMMENT="Default comment for the field, please edit me" PREVIOUS="id"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="primary key of the table, please edit me"/>
</KEYS>
</TABLE>
<TABLE NAME="message_working" COMMENT="Lists all the messages and processors that need to be processed" PREVIOUS="message_processors">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="false" SEQUENCE="true" ENUM="false" COMMENT="id of the table, please edit me" NEXT="unreadmessageid"/>
<FIELD NAME="unreadmessageid" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="false" ENUM="false" COMMENT="message that still needs some processing (on message table)" PREVIOUS="id" NEXT="processorid"/>
<FIELD NAME="processorid" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="false" ENUM="false" COMMENT="The processor with processes the message" PREVIOUS="unreadmessageid"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="primary key of the table, please edit me"/>
</KEYS>
</TABLE>
</TABLES>
<STATEMENTS>
<STATEMENT NAME="insert mnet_application" TYPE="insert" TABLE="mnet_application" COMMENT="Initial insert of records on table mnet_application" NEXT="insert log_display">
@@ -1730,7 +1762,7 @@
<SENTENCE TEXT="(name, display_name, xmlrpc_server_url, sso_land_url) VALUES ('mahara','Mahara','/api/xmlrpc/server.php', '/auth/xmlrpc/land.php')" />
</SENTENCES>
</STATEMENT>
<STATEMENT NAME="insert log_display" TYPE="insert" TABLE="log_display" COMMENT="Initial insert of records on table log_display" PREVIOUS="insert mnet_application">
<STATEMENT NAME="insert log_display" TYPE="insert" TABLE="log_display" COMMENT="Initial insert of records on table log_display" PREVIOUS="insert mnet_application" NEXT="insert message_providers">
<SENTENCES>
<SENTENCE TEXT="(module, action, mtable, field) VALUES ('user', 'view', 'user', 'CONCAT(firstname,&quot; &quot;,lastname)')" />
<SENTENCE TEXT="(module, action, mtable, field) VALUES ('course', 'user report', 'user', 'CONCAT(firstname,&quot; &quot;,lastname)')" />
@@ -1752,5 +1784,10 @@
<SENTENCE TEXT="(module, action, mtable, field) VALUES ('group', 'view', 'groups', 'name')" />
</SENTENCES>
</STATEMENT>
<STATEMENT NAME="insert message_providers" TYPE="insert" TABLE="message_providers" COMMENT="Initial insert of moodle record in message_providers" PREVIOUS="insert log_display">
<SENTENCES>
<SENTENCE TEXT="(modulename, modulefile) VALUES ('moodle', 'index.php')" />
</SENTENCES>
</STATEMENT>
</STATEMENTS>
</XMLDB>
lib/db/upgrade.php
+86 -1
View File
@@ -191,7 +191,7 @@ function xmldb_main_upgrade($oldversion=0) {
$result = $DB->delete_records_select('role_names', $DB->sql_isempty('role_names', 'name', false, false));
upgrade_main_savepoint($result, 2008070300);
}
if ($result && $oldversion < 2008070700) {
if (isset($CFG->defaultuserroleid) and isset($CFG->guestroleid) and $CFG->defaultuserroleid == $CFG->guestroleid) {
// guest can not be selected in defaultuserroleid!
@@ -262,6 +262,91 @@ function xmldb_main_upgrade($oldversion=0) {
/// Main savepoint reached
upgrade_main_savepoint($result, 2008070701);
}
if ($result && $oldversion < 2008072400) {
/// Create the database tables for message_processors and message_providers
$table = new XMLDBTable('message_providers');
$table->addFieldInfo('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
$table->addFieldInfo('modulename', XMLDB_TYPE_CHAR, '166', null, XMLDB_NOTNULL, null, null, null, null);
$table->addFieldInfo('modulefile', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, null, null);
$table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
$dbman->create_table($table);
$table = new XMLDBTable('message_processors');
$table->addFieldInfo('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
$table->addFieldInfo('name', XMLDB_TYPE_CHAR, '166', null, XMLDB_NOTNULL, null, null, null, null);
$table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
$dbman->create_table($table);
$provider = new object();
$provider->modulename = 'moodle';
$provider->modulefile = 'index.php';
$DB->insert_record('message_providers', $provider);
/// delete old and create new fields
$table = new XMLDBTable('message');
$field = new XMLDBField('messagetype');
$dbman->drop_field($table, $field);
/// fields to rename
$field = new XMLDBField('message');
$field->setAttributes(XMLDB_TYPE_TEXT, 'small', null, null, null, null, null, null, null);
$dbman->rename_field($table, $field, 'fullmessage');
$field = new XMLDBField('format');
$field->setAttributes(XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, null, null, null, null, '0', null);
$dbman->rename_field($table, $field, 'fullmessageformat');
/// new message fields
$field = new XMLDBField('subject');
$field->setAttributes(XMLDB_TYPE_TEXT, 'small', null, null, null, null, null, null, null);
$dbman->add_field($table, $field);
$field = new XMLDBField('fullmessagehtml');
$field->setAttributes(XMLDB_TYPE_TEXT, 'medium', null, null, null, null, null, null, null);
$dbman->add_field($table, $field);
$field = new XMLDBField('smallmessage');
$field->setAttributes(XMLDB_TYPE_TEXT, 'small', null, null, null, null, null, null, null);
$dbman->add_field($table, $field);
$table = new XMLDBTable('message_read');
$field = new XMLDBField('messagetype');
$dbman->drop_field($table, $field);
$field = new XMLDBField('mailed');
$dbman->drop_field($table, $field);
/// fields to rename
$field = new XMLDBField('message');
$field->setAttributes(XMLDB_TYPE_TEXT, 'small', null, null, null, null, null, null, null);
$dbman->rename_field($table, $field, 'fullmessage');
$field = new XMLDBField('format');
$field->setAttributes(XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, null, null, null, null, '0', null);
$dbman->rename_field($table, $field, 'fullmessageformat');
/// new message fields
$field = new XMLDBField('subject');
$field->setAttributes(XMLDB_TYPE_TEXT, 'small', null, null, null, null, null, null, null);
$dbman->add_field($table, $field);
$field = new XMLDBField('fullmessagehtml');
$field->setAttributes(XMLDB_TYPE_TEXT, 'medium', null, null, null, null, null, null, null);
$dbman->add_field($table, $field);
$field = new XMLDBField('smallmessage');
$field->setAttributes(XMLDB_TYPE_TEXT, 'small', null, null, null, null, null, null, null);
$dbman->add_field($table, $field);
/// new table
$table = new XMLDBTable('message_working');
$table->addFieldInfo('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
$table->addFieldInfo('unreadmessageid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, null);
$table->addFieldInfo('processorid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, null);
$table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
$dbman->create_table($table);
upgrade_main_savepoint($result, 2008072400);
}
/*
* TODO:
lib/messagelib.php
+153
View File
@@ -0,0 +1,153 @@
<?php // $Id$
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* messagelib.php - Contains the events handlers for the message system
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
define('TIMETOSHOWUSERS', 300);
/**
* Is trigged by an events_trigger in the MODULE_install function when
* a module wants to be a message provider provider.
* @param object $eventdata the information about the message provider (name and file)
* @return boolean success
*/
function message_provider_register_handler($eventdata) {
global $DB;
$return = true;
$provider = new object();
$provider->modulename = $eventdata->modulename;
$provider->modulefile = $eventdata->modulefile;
if (!$DB->insert_record('message_providers', $provider)) {
$return = false;
}
// everything ok :-)
return $return;
}
/**
* To be used to ungegister a message provider (curently not used)
* @param object $eventdata the information about the message provider (name and file)
* @return boolean success
*/
function message_provider_unregister_handler($eventdata) {
// everything ok :-)
return true;
}
/**
* Triggered when a message provider wants to send a message.
* This functions checks the user's processor configuration to send the given type of message,
* then tries to send it.
* @param object $eventdata information about he message (origin, destination, type, content)
* @return boolean success
*/
function message_send_handler($eventdata){
global $CFG, $DB;
if (isset($CFG->block_online_users_timetosee)) {
$timetoshowusers = $CFG->block_online_users_timetosee * 60;
} else {
$timetoshowusers = TIMETOSHOWUSERS;
}
/// Work out if the user is logged in or not
if ((time() - $eventdata->userto->lastaccess) > $timetoshowusers) {
$userstate = 'loggedoff';
} else {
$userstate = 'loggedin';
}
/// Create the message object
$savemessage = new object();
$savemessage->useridfrom = $eventdata->userfrom->id;
$savemessage->useridto = $eventdata->userto->id;
$savemessage->subject = $eventdata->subject;
$savemessage->fullmessage = $eventdata->fullmessage;
$savemessage->fullmessageformat = $eventdata->fullmessageformat;
$savemessage->fullmessagehtml = $eventdata->fullmessagehtml;
$savemessage->smallmessage = $eventdata->smallmessage;
$savemessage->timecreated = time();
/// Find out what processors are defined currently
// XXX TODO
// Note this currently defaults to email all the time. We need a better solution
// to be able to distinguish between a user who has no settings and one who doesn't want contact
// ... perhaps a "none" setting
$processor = get_user_preferences('message_provider_'.$eventdata->modulename.'_'.$userstate, 'email', $eventdata->userto->id);
/// Now process the message
if (empty($processor)) { // There is no processor so just mark it as read
$savemessage->timeread = time();
$messageid = $message->id;
unset($message->id);
$DB->insert_record('message_read', $savemessage);
} else { // Process the message
/// Store unread message just in case we can not send it
$savemessage->id = $DB->insert_record('message', $savemessage);
/// Try to deliver the message to each processor
$processorlist = explode(',', $processor);
foreach ($processorlist as $procname) {
$processorfile = $CFG->dirroot. '/message/output/'.$procname.'/message_output_'.$procname.'.php';
if (is_readable($processorfile)) {
include_once( $processorfile ); // defines $module with version etc
$processclass = 'message_output_' . $procname;
if (class_exists($processclass)) {
$pclass = new $processclass();
if (! $pclass->send_message($savemessage)) {
debugging('Error calling message processor '.$procname);
return false;
}
}
} else {
debugging('Error calling message processor '.$procname);
return false;
}
}
}
return true;
}
?>
lib/uploadlib.php
+19 -4
View File
@@ -9,6 +9,8 @@
* @package moodlecore
*/
require_once($CFG->libdir.'/eventslib.php');
//error_reporting(E_ALL ^ E_NOTICE);
/**
* This class handles all aspects of fileuploading
@@ -642,7 +644,7 @@ function clam_scan_moodle_file(&$file, $course) {
$notice .= "\n". clam_handle_infected_file($fullpath);
$newreturn = false;
}
clam_mail_admins($notice);
clam_message_admins($notice);
if ($appendlog) {
$file['uploadlog'] .= "\n". get_string('clambroken');
$file['clam'] = 1;
@@ -673,7 +675,7 @@ function clam_scan_moodle_file(&$file, $course) {
$notice = get_string('virusfound', 'moodle', $info);
$notice .= "\n\n". implode("\n", $output);
$notice .= "\n\n". clam_handle_infected_file($fullpath);
clam_mail_admins($notice);
clam_message_admins($notice);
if ($appendlog) {
$info->filename = $file['originalname'];
$file['uploadlog'] .= "\n". get_string('virusfounduser', 'moodle', $info);
@@ -689,7 +691,7 @@ function clam_scan_moodle_file(&$file, $course) {
$notice .= "\n". clam_handle_infected_file($fullpath);
$newreturn = false;
}
clam_mail_admins($notice);
clam_message_admins($notice);
if ($appendlog) {
$file['uploadlog'] .= "\n". get_string('clambroken');
$file['clam'] = 1;
@@ -703,14 +705,27 @@ function clam_scan_moodle_file(&$file, $course) {
*
* @param string $notice The body of the email to be sent.
*/
function clam_mail_admins($notice) {
function clam_message_admins($notice) {
$site = get_site();
$subject = get_string('clamemailsubject', 'moodle', format_string($site->fullname));
$admins = get_admins();
foreach ($admins as $admin) {
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = get_admin();
$eventdata->userto = $admin;
$eventdata->subject = $subject;
$eventdata->fullmessage = $notice;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/*
email_to_user($admin, get_admin(), $subject, $notice);
*/
}
}
message/edit.php
+222
View File
@@ -0,0 +1,222 @@
<?php // $Id$
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Edit user message preferences
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
require_once('../config.php');
require_once($CFG->dirroot.'/message/edit_form.php');
httpsrequired();
$userid = optional_param('id', $USER->id, PARAM_INT); // user id
$course = optional_param('course', SITEID, PARAM_INT); // course id (defaults to Site)
if (!$course = $DB->get_record('course', array('id' => $course))) {
error('Course ID was incorrect');
}
if ($course->id != SITEID) {
require_login($course);
} else {
if (!isloggedin()) {
if (empty($SESSION->wantsurl)) {
$SESSION->wantsurl = $CFG->httpswwwroot.'/message/edit.php';
}
redirect($CFG->httpswwwroot.'/login/index.php');
}
}
if (isguestuser()) {
print_error('guestnoeditmessage', 'message');
}
if (!$user = $DB->get_record('user', array('id' => $userid))) {
error('User ID was incorrect');
}
$systemcontext = get_context_instance(CONTEXT_SYSTEM);
$personalcontext = get_context_instance(CONTEXT_USER, $user->id);
// check access control
if ($user->id == $USER->id) {
//editing own message profile
require_capability('moodle/user:editownmessageprofile', $systemcontext);
} else {
// teachers, parents, etc.
require_capability('moodle/user:editmessageprofile', $personalcontext);
// no editing of guest user account
if (isguestuser($user->id)) {
print_error('guestnoeditmessageother', 'message');
}
// no editing of primary admin!
$mainadmin = get_admin();
if ($user->id == $mainadmin->id) {
print_error('adminprimarynoedit');
}
}
//retrieve preferences from db
$preferences = new object();
$preferences->id = $user->id;
//get the message general preferences
$preferences->showmessagewindow = get_user_preferences( 'message_showmessagewindow', '', $user->id);
$preferences->blocknoncontacts = get_user_preferences( 'message_blocknoncontacts', '', $user->id);
$preferences->beepnewmessage = get_user_preferences( 'message_beepnewmessage', '', $user->id);
$preferences->noframesjs = get_user_preferences( 'message_noframesjs', '', $user->id);
//for every message provider get preferences for the form
$providers = $DB->get_records('message_providers');
foreach ( $providers as $providerid => $provider){
foreach (array('loggedin', 'loggedoff') as $state){
$linepref = get_user_preferences('message_provider_'.$provider->modulename.'_'.$state, '', $user->id);
if ($linepref == ''){
continue;
}
$lineprefarray = explode(',', $linepref);
$preferences->{$provider->modulename.'_'.$state} = array();
foreach ($lineprefarray as $pref){
$preferences->{$provider->modulename.'_'.$state}[$provider->modulename.'_'.$state.'_'.$pref] = 1;
}
}
}
//for every processors put its options on the form (need to get funcion from processor's lib.php)
$processors = $DB->get_records('message_processors');
foreach ( $processors as $processorid => $processor){
$processorfile = $CFG->dirroot. '/message/output/'.$processor->name.'/message_output_'.$processor->name.'.php';
if ( is_readable($processorfile) ) {
include_once( $processorfile );
$processclass = 'message_output_' . $processor->name;
if ( class_exists($processclass) ){
$pclass = new $processclass();
$pclass->load_data($preferences, $user->id);
} else{
error('Error calling defined processor');
}
}
}
//create form
$userform = new user_edit_form();
$userform->set_data($preferences);
if ($messageconf = $userform->get_data()) {
add_to_log($course->id, 'message', 'update', "edit.php?id=$user->id&course=$course->id", '');
$preferences = array();
//get the list of normal preferences
$preferences['message_showmessagewindow'] = $messageconf->showmessagewindow?1:0;
$preferences['message_blocknoncontacts'] = $messageconf->blocknoncontacts?1:0;
$preferences['message_beepnewmessage'] = $messageconf->beepnewmessage?1:0;
$preferences['message_noframesjs'] = $messageconf->noframesjs?1:0;
//get a listing of all the message processors and process the form
$providers = $DB->get_records('message_providers');
foreach ( $providers as $providerid => $provider){
foreach (array('loggedin', 'loggedoff') as $state){
$linepref = '';
foreach ($messageconf->{$provider->modulename.'_'.$state} as $process=>$one){
$parray = explode( '_', $process);
if ($linepref == ''){
$linepref = $parray[2];
} else {
$linepref .= ','.$parray[2];
}
}
$preferences[ 'message_provider_'.$provider->modulename.'_'.$state ] = $linepref;
}
}
//list all the processors options (need to get funcion from processor's lib.php)
$processors = $DB->get_records('message_processors');
foreach ( $processors as $processorid => $processor){
$processorfile = $CFG->dirroot. '/message/output/'.$processor->name.'/lib.php';
if ( is_readable($processorfile) ) {
include_once( $processorfile );
$processclass = 'message_output_' . $processor->name;
if ( class_exists($processclass) ){
$pclass = new $processclass();
$pclass->process_form($messageconf, $preferences);
} else{
error('Error calling defined processor');
}
}
}
//set the user preferences
if (!set_user_preferences( $preferences, $user->id ) ){
error('Error updating user message preferences');
}
redirect("$CFG->wwwroot/message/edit.php?id=$user->id&course=$course->id");
}
/// Display page header
$streditmymessage = get_string('editmymessage', 'message');
$strparticipants = get_string('participants');
$userfullname = fullname($user, true);
if ($course->id != SITEID) {
print_header("$course->shortname: $streditmymessage", "$course->fullname: $streditmessage",
"<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a>
-> <a href=\"index.php?id=$course->id\">$strparticipants</a>
-> <a href=\"view.php?id=$user->id&amp;course=$course->id\">$userfullname</a>
-> $streditmymessage", "");
} else {
print_header("$course->shortname: $streditmymessage", $course->fullname,
"<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id\">$userfullname</a>
-> $streditmymessage", "");
}
/// Print tabs at the top
$showroles = 1;
$currenttab = 'editmessage';
require('../user/tabs.php');
notify('WARNING: This interface is still under construction!');
/// Finally display THE form
$userform->display();
/// and proper footer
print_footer($course);
?>
message/edit_form.php
+111
View File
@@ -0,0 +1,111 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Edit user message form
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
require_once($CFG->dirroot.'/lib/formslib.php');
class user_edit_form extends moodleform {
// Define the form
function definition () {
global $CFG, $COURSE, $DB;
$mform =& $this->_form;
$strrequired = get_string('required');
/// Add some extra hidden fields
$mform->addElement('hidden', 'id'); //the userid
$mform->addElement('hidden', 'course', $COURSE->id); //courseid
//get a listing of all the message processors
$processors = $DB->get_records('message_processors');
//create the general config section
$mform->addElement('header', 'general_config', get_string('general_config', 'message') );
$mform->addElement('checkbox', 'showmessagewindow', get_string('showmessagewindow', 'message') );
$mform->addElement('checkbox', 'blocknoncontacts', get_string('blocknoncontacts', 'message') );
$mform->addElement('checkbox', 'beepnewmessage', get_string('beepnewmessage', 'message') );
$mform->addElement('checkbox', 'noframesjs', get_string('noframesjs', 'message') );
//create the providers config section
$mform->addElement('header', 'providers_config', get_string('providers_config', 'message') );
$providers = $DB->get_records('message_providers');
foreach ( $providers as $providerid => $provider){
if ( $provider->modulename == 'moodle'){
$p = 'Moodle';
} else {
$p = get_string('modulename', $provider->modulename);
}
$mform->addElement('static', 'label'.$provider->modulename, get_string('providerstag', 'message').$p, '');
$test = array();
foreach ( $processors as $processorid => $processor){
$test[] = &$mform->createElement('checkbox', $provider->modulename.'_loggedin_'.$processor->name, $processor->name, $processor->name);
}
$mform->addGroup($test, $provider->modulename.'_loggedin', get_string('loggedin', 'message'));
$test = array();
foreach ( $processors as $processorid => $processor){
$test[] = &$mform->createElement('checkbox', $provider->modulename.'_loggedoff_'.$processor->name, $processor->name, $processor->name);
}
$mform->addGroup($test, $provider->modulename.'_loggedoff', get_string('loggedoff', 'message'));
}
//create the processors config section (need to get config items from processor's lib.php
$mform->addElement('header', 'processors_config', get_string('processor_config', 'message') );
foreach ( $processors as $processorid => $processor){
$processorfile = $CFG->dirroot. '/message/output/'.$processor->name.'/lib.php';
if ( is_readable($processorfile) ) {
include_once( $processorfile );
$processfunc = $processor->name .'_config_form';
if ( function_exists($processfunc) ){
$processfunc($mform);
}
}
}
$this->add_action_buttons(false, get_string('updatemyprofile'));
}
function definition_after_data() {
return true;
}
function validation ($messageconf) {
return true;
}
}
?>
message/lib.php
+17 -3
View File
@@ -1,6 +1,8 @@
<?php
/// library functions for messaging
require_once($CFG->libdir.'/eventslib.php');
define ('MESSAGE_SHORTLENGTH', 300);
define ('MESSAGE_WINDOW', true); // We are in a message window (so don't pop up a new one!)
@@ -951,6 +953,18 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
if (!empty($userto->lang)) {
$USER->lang = $userto->lang;
}
$eventdata = new object();
$eventdata->modulename = 'moodle';
$eventdata->userfrom = $userfrom;
$eventdata->userto = $userto;
$eventdata->subject = "MESSAGE";
$eventdata->fullmessage = $message;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
events_trigger('message_send', $eventdata);
/// Save the new message in the database
@@ -963,9 +977,9 @@ function message_post_message($userfrom, $userto, $message, $format, $messagetyp
$savemessage->messagetype = 'direct';
if ($CFG->messaging) {
if (!$savemessage->id = $DB->insert_record('message', $savemessage)) {
return false;
}
//if (!$savemessage->id = $DB->insert_record('message', $savemessage)) {
// return false;
//}
$emailforced = false;
} else { // $CFG->messaging is not on, we need to force sending of emails
$emailforced = true;
message/output/email/db/upgrade.php
+52
View File
@@ -0,0 +1,52 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Upgrade code for email message processor
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
function xmldb_message_email_upgrade($oldversion=0) {
global $CFG, $THEME, $DB;
$result = true;
if ($result && $oldversion < 2008072401) {
$processor = new object();
$processor->name = 'email';
if (! $DB->record_exists('message_processors', array('name' => $processor->name)) ){
$result = $result && $DB->insert_record('message_processors', $processor);
}
}
return $result;
}
?>
message/output/email/lib.php
+48
View File
@@ -0,0 +1,48 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Email message processor - lib file
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
/**
* Register the processor.
*/
function email_install(){
global $DB;
$result = true;
$provider = new object();
$provider->name = 'email';
if (!$DB->insert_record('message_processors', $provider)) {
$return = false;
}
return $result;
}
message/output/email/message_output_email.php
+109
View File
@@ -0,0 +1,109 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Email message processor - send a given message by email
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
require_once($CFG->dirroot.'/message/output/lib.php');
class message_output_email extends message_output {
/**
* Processes the message (sends by email).
* @param object $message the message to be sent
*/
function send_message($message) {
global $DB;
//send an email
//if fails saved as read message
//first try to get preference
$usertoemail = get_user_preferences( 'message_processor_email_email', '', $message->useridto);
//if fails use user profile default
if ( $usertoemail == NULL){
$userto = $DB->get_record('user', array('id' => $message->useridto));
$usertoemail = $userto->email;
}
$userfrom = $DB->get_record('user', array('id' => $message->useridfrom));
if ( email_to_user($usertoemail, $userfrom->email,
$message->subject, $message->fullmessage,
$message->fullmessagehtml)
){
/// Move the entry to the other table
$message->timeread = time();
$messageid = $message->id;
unset($message->id);
//if there is no more processor that want to process this can move message
if ( $DB->count_records('message_working', array('unreadmessageid' => $messageid)) == 0){
if ($DB->insert_record('message_read', $message)) {
$DB->delete_records('message', array('id' => $messageid));
}
}
}else{
//delete what we've processed and check if can move message
if ( $DB->count_records('message_working', array('unreadmessageid' => $messageid)) == 0){
if ($DB->insert_record('message_read', $message)) {
$DB->delete_records('message', array('id' => $messageid));
}
}
}
return true;
}
/**
* Creates necessary fields in the messaging config form.
* @param object $mform preferences form class
*/
function config_form(&$mform){
$mform->addElement('static', 'email_labelemail', get_string('processortag', 'message').'Email ', '');
$mform->addElement('text', 'email_email', get_string('email'));
$mform->setAdvanced('email_labelemail');
$mform->setAdvanced('email_email');
}
/**
* Parses the form submited data and saves it into preferences array.
* @param object $mform preferences form class
* @param array $preferences preferences array
*/
function process_form(&$form, &$preferences){
$preferences['message_processor_email_email'] = $form->email_email;
}
/**
* Loads the config data from database to put on the form (initial load)
* @param array $preferences preferences array
* @param int $userid the user id
*/
function load_data(&$preferences, $userid){
$preferences->email_email = get_user_preferences( 'message_processor_email_email', '', $userid);
}
}
message/output/email/version.php
Executable
+39
View File
@@ -0,0 +1,39 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Email processor version information
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
$plugin->version = 2008072401;
$plugin->requires = 2008072401;
?>
message/output/jabber/jabberclass/LICENSE
+504
View File
@@ -0,0 +1,504 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.
To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights. These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.
For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you. You must make sure that they, too, receive or can get the source
code. If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it. And you must show them these terms so they know their rights.
We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that
there is no warranty for the free library. Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder. Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.
Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License. This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License. We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.
When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library. The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom. The Lesser General
Public License permits more lax criteria for linking other code with
the library.
We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License. It also provides other free software developers Less
of an advantage over competing non-free programs. These disadvantages
are the reason we use the ordinary General Public License for many
libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard. To achieve this, non-free programs must be
allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software. For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.
Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".
A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.
The "Library", below, refers to any such software library or work
which has been distributed under these terms. A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language. (Hereinafter, translation is
included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) The modified work must itself be a software library.
b) You must cause the files modified to carry prominent notices
stating that you changed the files and the date of any change.
c) You must cause the whole of the work to be licensed at no
charge to all third parties under the terms of this License.
d) If a facility in the modified Library refers to a function or a
table of data to be supplied by an application program that uses
the facility, other than as an argument passed when the facility
is invoked, then you must make a good faith effort to ensure that,
in the event an application does not supply such function or
table, the facility still operates, and performs whatever part of
its purpose remains meaningful.
(For example, a function in a library to compute square roots has
a purpose that is entirely well-defined independent of the
application. Therefore, Subsection 2d requires that any
application-supplied function or table used by this function must
be optional: if the application does not supply it, the square
root function must still compute square roots.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.
In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.
4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.
If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library. The
threshold for this to be true is not precisely defined by law.
If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work. (Executables containing this object code plus portions of the
Library will still fall under Section 6.)
Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.
You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License. You must supply a copy of this License. If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one
of these things:
a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever
changes were used in the work (which must be distributed under
Sections 1 and 2 above); and, if the work is an executable linked
with the Library, with the complete machine-readable "work that
uses the Library", as object code and/or source code, so that the
user can modify the Library and then relink to produce a modified
executable containing the modified Library. (It is understood
that the user who changes the contents of definitions files in the
Library will not necessarily be able to recompile the application
to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (1) uses at run time a
copy of the library already present on the user's computer system,
rather than copying library functions into the executable, and (2)
will operate properly with a modified version of the library, if
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
c) Accompany the work with a written offer, valid for at
least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
specified materials from the same place.
e) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.
It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities. This must be distributed under the terms of the
Sections above.
b) Give prominent notice with the combined library of the fact
that part of it is a work based on the Library, and explaining
where to find the accompanying uncombined form of the same work.
8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License. Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License. However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.
9. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Library or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.
10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all. For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded. In such case, this License incorporates the limitation as if
written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this. Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).
To apply these terms, attach the following notices to the library. It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!
message/output/jabber/jabberclass/README
+59
View File
@@ -0,0 +1,59 @@
Jabber Client Library
Version 0.9rc1
Copyright 2002-2007, Centova Technologies Inc.
http://www.centova.com
Portions Copyright 2002, Carlo Zottmann
============================================================================
This file was contributed (in part or whole) by a third party, and is
released under the GNU LGPL. Please see the CREDITS and LICENSE sections
below for details.
****************************************************************************
DETAILS
This is an event-driven Jabber client class implementation. This library
allows PHP scripts to connect to and communicate with Jabber servers.
CREDITS & COPYRIGHTS
This class was originally based on Class.Jabber.PHP v0.4 (Copyright 2002,
Carlo "Gossip" Zottmann).
The code for this class has since been nearly completely rewritten by Steve
Blinch for Centova Technologies Inc. All such modified code is Copyright
2002-2007, Centova Technologies Inc.
The original Class.Jabber.PHP was released under the GNU General Public
License (GPL); however, we have received written permission from the
original author and copyright holder, Carlo Zottmann, to relicense our
version of this class and release it under the GNU Lesser General Public
License (LGPL).
LICENSE
class_Jabber.php - Jabber Client Library
Copyright (C) 2002-2007, Centova Technologies Inc.
Copyright (C) 2002, Carlo Zottmann
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2.1 of the License, or (at your
option) any later version.
This library 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 Lesser General Public License
for more details.
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
JABBER is a registered trademark of Jabber Inc.
message/output/jabber/jabberclass/class_ConnectionSocket.php
+86
View File
@@ -0,0 +1,86 @@
<?php
/*
* This file was contributed (in part or whole) by a third party, and is
* released under the GNU LGPL. Please see the CREDITS and LICENSE sections
* below for details.
*
*****************************************************************************
*
* DETAILS
*
* Connection handling class used by class_Jabber.php. Used as a generic
* socket interface to connect to Jabber servers.
*
*
* CREDITS & COPYRIGHTS
*
* This class was originally based on Class.Jabber.PHP v0.4 (Copyright 2002,
* Carlo "Gossip" Zottmann).
*
* The code for this class has since been nearly completely rewritten by Steve
* Blinch and Centova Technologies Inc. All such modified code is Copyright 2003-2006,
* Centova Technologies Inc.
*
* The original Class.Jabber.PHP was released under the GNU General Public
* License (GPL); however, we have received written permission from the
* original author and copyright holder, Carlo Zottmann, to relicense our
* version of this class and release it under the GNU Lesser General Public
* License (LGPL).
*
*
* LICENSE
*
* class_ConnectionSocket.php - Connection Socket Library
* Part of class_Jabber.php - Jabber Client Library
* Copyright (C) 2003-2007, Centova Technologies Inc.
* Copyright (C) 2002, Carlo Zottmann
*
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* This library 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 Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this library; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
class ConnectionSocket {
var $socket = null;
function socket_open($hostname,$port,$timeout) {
if ($this->socket = @fsockopen($hostname, $port, $errno, $errstr, $timeout)) {
socket_set_blocking($this->socket, 0);
socket_set_timeout($this->socket, 31536000);
return true;
} else {
$this->error = "{$errstr} (#{$errno})";
return false;
}
}
function socket_close() {
return fclose($this->socket);
}
function socket_write($data) {
return fwrite($this->socket, $data);
}
function socket_read($byte_count)
{
set_magic_quotes_runtime(0);
$buffer = fread($this->socket, $byte_count);
set_magic_quotes_runtime(get_magic_quotes_runtime());
return $buffer;
}
}
?>
message/output/jabber/jabberclass/class_Jabber.php
+2062
View File
File diff suppressed because it is too large Load Diff
message/output/jabber/jabberclass/class_SHA1Library.php
+264
View File
@@ -0,0 +1,264 @@
<?
/*
* This file was contributed (in part or whole) by a third party, and is
* released under a BSD-compatible free software license. Please see the
* CREDITS and LICENSE sections below for details.
*
*****************************************************************************
*
* DETAILS
*
* A PHP implementation of the Secure Hash Algorithm, SHA-1, as defined in
* FIPS PUB 180-1. This is used by Centova only when using PHP
* versions older than 4.3.0 (which did not support the sha1() function) and
* the server does not have the mhash extension installed.
*
*
* CREDITS/LICENSE
*
* Adjusted from the Javascript implementation by Joror ([email protected]).
*
* Javascript Version 2.1 Copyright Paul Johnston 2000 - 2002.
* Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
* Distributed under the BSD License
* See http://pajhome.org.uk/crypt/md5 for details.
*
*/
class SHA1Library
{
/*
* Configurable variables. You may need to tweak these to be compatible with
* the server-side, but the defaults work in most cases.
*/
var $hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */
var $b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */
var $chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */
/*
* These are the functions you'll usually want to call
* They take string arguments and return either hex or base-64 encoded strings
*/
function hex_sha1($s){return $this->binb2hex($this->core_sha1($this->str2binb($s),strlen($s) * $this->chrsz));}
function b64_sha1($s){return $this->binb2b64($this->core_sha1($this->str2binb($s),strlen($s) * $this->chrsz));}
function str_sha1($s){return $this->binb2str($this->core_sha1($this->str2binb($s),strlen($s) * $this->chrsz));}
function hex_hmac_sha1($key, $data){ return $this->binb2hex($this->core_hmac_sha1($key, $data));}
function b64_hmac_sha1($key, $data){ return $this->binb2b64($this->core_hmac_sha1($key, $data));}
function str_hmac_sha1($key, $data){ return $this->binb2str($this->core_hmac_sha1($key, $data));}
/*
* Perform a simple self-test to see if the VM is working
*/
function sha1_vm_test()
{
return $this->hex_sha1("abc") == "a9993e364706816aba3e25717850c26c9cd0d89d";
}
/*
* Calculate the SHA-1 of an array of big-endian words, and a bit $length
*/
function core_sha1($x, $len)
{
/* append padding */
$x[$len >> 5] |= 0x80 << (24 - $len % 32);
$x[(($len + 64 >> 9) << 4) + 15] = $len;
$w = Array();
$a = 1732584193;
$b = -271733879;
$c = -1732584194;
$d = 271733878;
$e = -1009589776;
for($i = 0; $i < sizeof($x); $i += 16)
{
$olda = $a;
$oldb = $b;
$oldc = $c;
$oldd = $d;
$olde = $e;
for($j = 0; $j < 80; $j++)
{
if ($j < 16)
$w[$j] = $x[$i + $j];
else
$w[$j] = $this->rol($w[$j-3] ^ $w[$j-8] ^ $w[$j-14] ^ $w[$j-16], 1);
$t = $this->safe_add( $this->safe_add($this->rol($a, 5), $this->sha1_ft($j, $b, $c, $d)),
$this->safe_add($this->safe_add($e, $w[$j]), $this->sha1_kt($j)));
$e = $d;
$d = $c;
$c = $this->rol($b, 30);
$b = $a;
$a = $t;
}
$a = $this->safe_add($a, $olda);
$b = $this->safe_add($b, $oldb);
$c = $this->safe_add($c, $oldc);
$d = $this->safe_add($d, $oldd);
$e = $this->safe_add($e, $olde);
}
return Array($a, $b, $c, $d, $e);
}
/*
* Joror: PHP does not have the java(script) >>> operator, so this is a
* replacement function. Credits to Terium.
*/
function zerofill_rightshift($a, $b)
{
$z = hexdec(80000000);
if ($z & $a)
{
$a >>= 1;
$a &= (~ $z);
$a |= 0x40000000;
$a >>= ($b-1);
}
else
{
$a >>= $b;
}
return $a;
}
/*
* Perform the appropriate triplet combination function for the current
* iteration
*/
function sha1_ft($t, $b, $c, $d)
{
if($t < 20) return ($b & $c) | ((~$b) & $d);
if($t < 40) return $b ^ $c ^ $d;
if($t < 60) return ($b & $c) | ($b & $d) | ($c & $d);
return $b ^ $c ^ $d;
}
/*
* Determine the appropriate additive constant for the current iteration
* Silly php does not understand the inline-if operator well when nested,
* so that's why it's ()ed now.
*/
function sha1_kt($t)
{
return ($t < 20) ? 1518500249 : (($t < 40) ? 1859775393 :
(($t < 60) ? -1894007588 : -899497514));
}
/*
* Calculate the HMAC-SHA1 of a key and some data
*/
function core_hmac_sha1($key, $data)
{
$bkey = $this->str2binb($key);
if(sizeof($bkey) > 16) $bkey = $this->core_sha1($bkey, sizeof($key) * $this->chrsz);
$ipad = Array();
$opad = Array();
for($i = 0; $i < 16; $i++)
{
$ipad[$i] = $bkey[$i] ^ 0x36363636;
$opad[$i] = $bkey[$i] ^ 0x5C5C5C5C;
}
$hash = $this->core_sha1(array_merge($ipad,$this->str2binb($data)), 512 + sizeof($data) * $this->chrsz);
return $this->core_sha1(array_merge($opad,$hash), 512 + 160);
}
/*
* Add integers, wrapping at 2^32. This uses 16-bit operations internally
* to work around bugs in some JS interpreters.
*/
function safe_add($x, $y)
{
$lsw = ($x & 0xFFFF) + ($y & 0xFFFF);
$msw = ($x >> 16) + ($y >> 16) + ($lsw >> 16);
return ($msw << 16) | ($lsw & 0xFFFF);
}
/*
* Bitwise rotate a 32-bit number to the left.
*/
function rol($num, $cnt)
{
return ($num << $cnt) | $this->zerofill_rightshift($num, (32 - $cnt));
}
/*
* Convert an 8-bit or 16-bit string to an array of big-endian words
* In 8-bit function, characters >255 have their hi-byte silently ignored.
*/
function str2binb($str)
{
$bin = Array();
$mask = (1 << $this->chrsz) - 1;
for($i = 0; $i < strlen($str) * $this->chrsz; $i += $this->chrsz)
$bin[$i >> 5] |= (ord($str{$i / $this->chrsz}) & $mask) << (24 - $i%32);
return $bin;
}
/*
* Convert an array of big-endian words to a string
*/
function binb2str($bin)
{
$str = "";
$mask = (1 << $this->chrsz) - 1;
for($i = 0; $i < sizeof($bin) * 32; $i += $this->chrsz)
$str .= chr($this->zerofill_rightshift($bin[$i>>5], 24 - $i%32) & $mask);
return $str;
}
/*
* Convert an array of big-endian words to a hex string.
*/
function binb2hex($binarray)
{
$hex_tab = $this->hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
$str = "";
for($i = 0; $i < sizeof($binarray) * 4; $i++)
{
$str .= $hex_tab{($binarray[$i>>2] >> ((3 - $i%4)*8+4)) & 0xF} .
$hex_tab{($binarray[$i>>2] >> ((3 - $i%4)*8 )) & 0xF};
}
return $str;
}
/*
* Convert an array of big-endian words to a base-64 string
*/
function binb2b64($binarray)
{
$tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
$str = "";
for($i = 0; i < sizeof($binarray) * 4; $i += 3)
{
$triplet = ((($binarray[$i >> 2] >> 8 * (3 - $i %4)) & 0xFF) << 16)
| ((($binarray[$i+1 >> 2] >> 8 * (3 - ($i+1)%4)) & 0xFF) << 8 )
| (($binarray[$i+2 >> 2] >> 8 * (3 - ($i+2)%4)) & 0xFF);
for($j = 0; $j < 4; $j++)
{
if($i * 8 + $j * 6 > sizeof($binarray) * 32) $str .= $this->b64pad;
else $str .= $tab{($triplet >> 6*(3-j)) & 0x3F};
}
}
return $str;
}
}
if ( !function_exists('sha1') )
{
function sha1( $string, $raw_output = false )
{
$library = &new SHA1Library();
return $raw_output ? $library->str_sha1($string) : $library->hex_sha1($string);
}
}
?>
message/output/jabber/jabberclass/class_XMLParser.php
+139
View File
@@ -0,0 +1,139 @@
<?php
/*
* This file was contributed (in part or whole) by a third party, and is
* released under a BSD-compatible free software license. Please see the
* CREDITS and LICENSE sections below for details.
*
*****************************************************************************
*
* DETAILS
*
* Provides the XML parser used by class_Jabber.php to parse Jabber XML data
* received from the Jabber server.
*
*
* CREDITS
*
* Originally by Hans Anderson (http://www.hansanderson.com/php/xml)
* Adapted for class.jabber.php by Carlo Zottman (http://phpjabber.g-blog.net)
* Adapted for class_Jabber.php by Steve Blinch (http://www.centova.com)
*
*
* LICENSE
*
* xmlize() is by Hans Anderson, www.hansanderson.com/contact/
*
* Ye Ole "Feel Free To Use it However" License [PHP, BSD, GPL].
* some code in xml_depth is based on code written by other PHPers
* as well as one Perl script. Poor programming practice and organization
* on my part is to blame for the credit these people aren't receiving.
* None of the code was copyrighted, though.
*
*
* REFERENCE
*
* @ = attributes
* # = nested tags
*
*/
class XMLParser {
function XMLParser() {
}
// xmlize()
// (c) Hans Anderson / http://www.hansanderson.com/php/xml/
function xmlize($data) {
$vals = $index = $array = array();
$parser = xml_parser_create();
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
// XML_OPTION_SKIP_WHITE is disabled as it clobbers valid
// newlines in instant messages
xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
xml_parse_into_struct($parser, $data, $vals, $index);
xml_parser_free($parser);
$i = 0;
$tagname = $vals[$i]['tag'];
$array[$tagname]['@'] = $vals[$i]['attributes'];
$array[$tagname]['#'] = $this->_xml_depth($vals, $i);
return $array;
}
// _xml_depth()
// (c) Hans Anderson / http://www.hansanderson.com/php/xml/
function _xml_depth($vals, &$i) {
$children = array();
if ($vals[$i]['value']) {
array_push($children, trim($vals[$i]['value']));
}
while (++$i < count($vals)) {
switch ($vals[$i]['type']) {
case 'cdata':
array_push($children, trim($vals[$i]['value']));
break;
case 'complete':
$tagname = $vals[$i]['tag'];
$size = sizeof($children[$tagname]);
$children[$tagname][$size]['#'] = trim($vals[$i]['value']);
if ($vals[$i]['attributes']) {
$children[$tagname][$size]['@'] = $vals[$i]['attributes'];
}
break;
case 'open':
$tagname = $vals[$i]['tag'];
$size = sizeof($children[$tagname]);
if ($vals[$i]['attributes']) {
$children[$tagname][$size]['@'] = $vals[$i]['attributes'];
$children[$tagname][$size]['#'] = $this->_xml_depth($vals, $i);
} else {
$children[$tagname][$size]['#'] = $this->_xml_depth($vals, $i);
}
break;
case 'close':
return $children;
break;
}
}
return $children;
}
// TraverseXMLize()
// (c) [email protected], a HUGE help!
function TraverseXMLize($array, $arrName = "array", $level = 0) {
if ($level == 0) {
echo "<pre>";
}
while (list($key, $val) = @each($array)) {
if (is_array($val)) {
$this->TraverseXMLize($val, $arrName . "[" . $key . "]", $level + 1);
} else {
echo '$' . $arrName . '[' . $key . '] = "' . $val . "\"\n";
}
}
if ($level == 0) {
echo "</pre>";
}
}
}
?>
message/output/jabber/jabberclass/jabber_example.php
+224
View File
@@ -0,0 +1,224 @@
#!/usr/local/bin/php -q
<?php
/* Jabber Class Example
* Copyright 2002-2007, Steve Blinch
* http://code.blitzaffe.com
* ============================================================================
*
* DETAILS
*
* Provides a very basic example of how to use class_Jabber.php.
*
* This example connects to a Jabber server, logs in, fetches (and displays)
* the roster, and then waits until a message is received from another contact.
*
* It then starts a countdown which, in sequence:
*
* 1) sends a "composing" event to the other contact (eg: "so-and-so is typing a message"),
* 2) sends a "composing stopped" event,
* 3) sends another "composing" event",
* 4) sends a message to the other contact,
* 5) logs out
*
*/
// set your Jabber server hostname, username, and password here
define("JABBER_SERVER","jabber.blitzaffe.com");
define("JABBER_USERNAME","helium");
define("JABBER_PASSWORD","zv4.5k1p8");
define("RUN_TIME",30); // set a maximum run time of 30 seconds
define("CBK_FREQ",1); // fire a callback event every second
// This class handles all events fired by the Jabber client class; you
// can optionally use individual functions instead of a class, but this
// method is a bit cleaner.
class TestMessenger {
function TestMessenger(&$jab) {
$this->jab = &$jab;
$this->first_roster_update = true;
echo "Created!\n";
$this->countdown = 0;
}
// called when a connection to the Jabber server is established
function handleConnected() {
echo "Connected!\n";
// now that we're connected, tell the Jabber class to login
echo "Authenticating ...\n";
$this->jab->login(JABBER_USERNAME,JABBER_PASSWORD);
}
// called after a login to indicate the the login was successful
function handleAuthenticated() {
echo "Authenticated!\n";
echo "Fetching service list and roster ...\n";
// browser for transport gateways
$this->jab->browse();
// retrieve this user's roster
$this->jab->get_roster();
// set this user's presence
$this->jab->set_presence("","Ya, I'm online... so what?");
}
// called after a login to indicate that the login was NOT successful
function handleAuthFailure($code,$error) {
echo "Authentication failure: $error ($code)\n";
// set terminated to TRUE in the Jabber class to tell it to exit
$this->jab->terminated = true;
}
// called periodically by the Jabber class to allow us to do our own
// processing
function handleHeartbeat() {
echo "Heartbeat - ";
// if the countdown is in progress, determine if we need to take any action
if ($this->countdown>0) {
$this->countdown--;
// display our countdown progress
echo "Countdown: {$this->countdown}\n";
// first, we want to fire our composing event
if ($this->countdown==7) {
echo "Composing start\n";
$this->jab->composing($this->last_msg_from,$this->last_msg_id);
}
// next, we want to indicate that we've stopped composing a message
if ($this->countdown==5) {
echo "Composing stop\n";
$this->jab->composing($this->last_msg_from,$this->last_msg_id,false);
}
// next, we indicate that we're composing again
if ($this->countdown==3) {
echo "Composing start\n";
$this->jab->composing($this->last_msg_from,$this->last_msg_id);
}
// and finally, we send a message to the remote user and tell the Jabber class
// to exit
if ($this->countdown==1) {
echo "Send message\n";
$this->jab->message($this->last_msg_from,"chat",NULL,"Hello! You said: ".$this->last_message);
$this->jab->terminated = true;
}
} else {
echo "Waiting for incoming message ...\n";
}
/*
reset($this->jab->roster);
foreach ($this->jab->roster as $jid=>$details) {
echo "$jid\t\t\t".$details["transport"]."\t".$details["show"]."\t".$details["status"]."\n";
}
*/
}
// called when an error is received from the Jabber server
function handleError($code,$error,$xmlns) {
echo "Error: $error ($code)".($xmlns?" in $xmlns":"")."\n";
}
// called when a message is received from a remote contact
function handleMessage($from,$to,$body,$subject,$thread,$id,$extended) {
echo "Incoming message!\n";
echo "From: $from\t\tTo: $to\n";
echo "Subject: $subject\tThread; $thread\n";
echo "Body: $body\n";
echo "ID: $id\n";
var_dump($extended);
echo "\n";
$this->last_message = $body;
$this->last_msg_id = $id;
$this->last_msg_from = $from;
// for the purposes of our example, we start a countdown here to do some
// random events, just for the sake of demonstration
echo "Starting countdown\n";
$this->countdown = 10;
}
function _contact_info($contact) {
return sprintf("Contact %s (JID %s) has status %s and message %s\n",$contact['name'],$contact['jid'],$contact['show'],$contact['status']);
}
function handleRosterUpdate($jid) {
if ($this->first_roster_update) {
// the first roster update indicates that the entire roster has been
// downloaded for the first time
echo "Roster downloaded:\n";
foreach ($this->jab->roster as $k=>$contact) {
echo $this->_contact_info($contact);
}
$this->first_roster_update = false;
} else {
// subsequent roster updates indicate changes for individual roster items
$contact = $this->jab->roster[$jid];
echo "Contact updated: " . $this->_contact_info($contact);
}
}
function handleDebug($msg,$level) {
echo "DBG: $msg\n";
}
}
// include the Jabber class
require_once("class_Jabber.php");
// create an instance of the Jabber class
$display_debug_info = false;
$jab = new Jabber($display_debug_info);
// create an instance of our event handler class
$test = new TestMessenger($jab);
// set handlers for the events we wish to be notified about
$jab->set_handler("connected",$test,"handleConnected");
$jab->set_handler("authenticated",$test,"handleAuthenticated");
$jab->set_handler("authfailure",$test,"handleAuthFailure");
$jab->set_handler("heartbeat",$test,"handleHeartbeat");
$jab->set_handler("error",$test,"handleError");
$jab->set_handler("message_normal",$test,"handleMessage");
$jab->set_handler("message_chat",$test,"handleMessage");
$jab->set_handler("debug_log",$test,"handleDebug");
$jab->set_handler("rosterupdate",$test,"handleRosterUpdate");
echo "Connecting ...\n";
// connect to the Jabber server
if (!$jab->connect(JABBER_SERVER)) {
die("Could not connect to the Jabber server!\n");
}
// now, tell the Jabber class to begin its execution loop
$jab->execute(CBK_FREQ,RUN_TIME);
// Note that we will not reach this point (and the execute() method will not
// return) until $jab->terminated is set to TRUE. The execute() method simply
// loops, processing data from (and to) the Jabber server, and firing events
// (which are handled by our TestMessenger class) until we tell it to terminate.
//
// This event-based model will be familiar to programmers who have worked on
// desktop applications, particularly in Win32 environments.
// disconnect from the Jabber server
$jab->disconnect();
?>
message/output/jabber/lib.php
+49
View File
@@ -0,0 +1,49 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Jabber message processor - lib file
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
/**
* Register the processor.
*/
function jabber_install(){
global $DB;
$result = true;
$provider = new object();
$provider->name = 'jabber';
if (!$DB->insert_record('message_processors', $provider)) {
$return = false;
}
return $result;
}
message/output/jabber/message_output_jabber.php
+139
View File
@@ -0,0 +1,139 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Jabber message processor - send a given message by jabber
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
define("JABBER_SERVER","jabber80.com");
define("JABBER_USERNAME","");
define("JABBER_PASSWORD","");
define("RUN_TIME",15); // set a maximum run time of 15 seconds
require_once('../config.php'); //included from messagelib (how to fix?)
require_once($CFG->dirroot.'/message/output/lib.php');
class JabberMessenger {
function JabberMessenger(&$jab, $message) {
$this->jab = &$jab;
$this->message = $message;
$this->first_roster_update = true;
$this->countdown = 0;
}
// called when a connection to the Jabber server is established
function handleConnected() {
$this->jab->login(JABBER_USERNAME,JABBER_PASSWORD);
}
// called after a login to indicate the the login was successful
function handleAuthenticated() {
$userfrom = $DB->get_record('user', array('id' => $this->message->useridfrom));
$this->jab->message("[email protected]","chat",NULL,fullname($userfrom)."(SITENAME) says: ".$this->message->fullmessage);
$this->jab->terminated = true;
}
// called after a login to indicate that the login was NOT successful
function handleAuthFailure($code,$error) {
// set terminated to TRUE in the Jabber class to tell it to exit
$this->jab->terminated = true;
}
}
class message_output_jabber extends message_output {
/**
* Processes the message (sends using jabber).
* @param object $message the message to be sent
* @return true if ok, false if error
*/
function send_message($message){
require_once("jabberclass/class_Jabber.php");
$jab = new Jabber( false );
// create an instance of our event handler class
$test = new JabberMessenger($jab, $message);
// set handlers for the events we wish to be notified about
$jab->set_handler("connected",$test,"handleConnected");
$jab->set_handler("authenticated",$test,"handleAuthenticated");
$jab->set_handler("authfailure",$test,"handleAuthFailure");
if (!$jab->connect(JABBER_SERVER)) {
return false;
}
// now, tell the Jabber class to begin its execution loop
// don't way for events
$jab->execute(-1,RUN_TIME);
$jab->disconnect();
$f = fopen('/tmp/event_jabber', 'a+');
fwrite($f, date('l dS \of F Y h:i:s A')."\n");
fwrite($f, "from: $message->userfromid\n");
fwrite($f, "userto: $message->usertoid\n");
fwrite($f, "subject: $message->subject\n");
fclose($f);
return true;
}
/**
* Creates necessary fields in the messaging config form.
* @param object $mform preferences form class
*/
function config_form(&$mform){
$mform->addElement('static', 'jabber_labeljabber', get_string('processortag', 'message').'Jabber ', '');
$mform->addElement('text', 'jabber_jabberid', 'jabber ID');
$mform->setAdvanced('jabber_labeljabber');
$mform->setAdvanced('jabber_jabberid');
}
/**
* Parses the form submited data and saves it into preferences array.
* @param object $mform preferences form class
* @param array $preferences preferences array
*/
function process_form(&$form, &$preferences){
$preferences['message_processor_jabber_jabberid'] = $form->jabber_jabberid;
}
/**
* Loads the config data from database to put on the form (initial load)
* @param array $preferences preferences array
* @param int $userid the user id
*/
function load_data(&$preferences, $userid){
$preferences->jabber_jabberid = get_user_preferences( 'message_processor_jabber_jabberid', '', $userid);
}
}
?>
message/output/jabber/version.php
Executable
+38
View File
@@ -0,0 +1,38 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Jabber processor version information
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
$plugin->version = 2008072401;
$plugin->requires = 2008072401;
?>
message/output/lib.php
+45
View File
@@ -0,0 +1,45 @@
<?php // $Id$
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Base message output class
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
/**
* Base message output class
*/
abstract class message_output {
public abstract function send_message($message);
public abstract function process_form(&$form, &$preferences);
public abstract function load_data(&$preferences, $userid);
}
?>
message/output/popup/db/upgrade.php
+52
View File
@@ -0,0 +1,52 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Upgrade code for popup message processor
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
function xmldb_message_popup_upgrade($oldversion=0) {
global $CFG, $THEME, $DB;
$result = true;
if ($result && $oldversion < 2008072401) {
$processor = new object();
$processor->name = 'popup';
if (! $DB->record_exists('message_processors', array('name' => $processor->name))){
$result = $result && $DB->insert_record('message_processors', $processor);
}
}
return $result;
}
?>
message/output/popup/lib.php
+50
View File
@@ -0,0 +1,50 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Popup message processor - lib file
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
/**
* Register the processor.
*/
function popup_install(){
global $DB;
$result = true;
$provider = new object();
$provider->name = 'popup';
if (!$DB->insert_record('message_processors', $provider)) {
$return = false;
}
return $result;
}
message/output/popup/message_output_popup.php
+72
View File
@@ -0,0 +1,72 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Popup message processor - stores the message to be shown using the message popup
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
require_once('../config.php'); //included from messagelib (how to fix?)
require_once($CFG->dirroot.'/message/output/lib.php');
class message_output_popup extends message_output{
/**
* Process the popup message.
* The popup doesn't send data only saves in the database for later use,
* the popup_interface.php takes the message from the message table into
* the message_read.
* @param object $message the message to be sent
* @return true if ok, false if error
*/
public function send_message($message){
global $DB;
//put the process record into db
$processor = $DB->get_record('message_processors', array('name'=>'popup'));
$procmessage = new object();
$procmessage->unreadmessageid = $message->id;
$procmessage->processorid = $processor->id;
if ( !$DB->insert_record('message_working', $procmessage) ) {
return false;
}
//should only save this message for later delivery
return true;
}
public function process_form(&$form, &$preferences){
return true;
}
public function load_data(&$preferences, $userid){
return true;
}
}
?>
message/output/popup/popup_interface.php
+70
View File
@@ -0,0 +1,70 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* This script returns the popup messages that need to be shown.
* FIXME: this is just a temp script to show how it could be done
* (this should be integrated with my new YUI interface)
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
require_once('../../../config.php');
require_once($CFG->dirroot.'/user/profile/lib.php');
$processor = $DB->get_record('message_processors', array('name' => 'popup'));
$messagesproc = $DB->get_records('message_working', array('processorid'=>$processor->id));
//for every message to process check if it's for current user and process
foreach ($messagesproc as $msgp){
$message = $DB->get_record('message', array('id'=>$msgp->unreadmessageid, 'useridto'=>$USER->id));
if (!$message){
continue;
}
//this is the show for now --> SHOULD BE SOMETHING ELSE...
echo "Usr from: ".$message->useridfrom." to: ".$message->useridto." subject:".$message->subject."<br>";
/// Move the entry to the other table
$message->timeread = time();
$messageid = $message->id;
unset($message->id);
//delete what we've processed and check if can move message
$DB->delete_records('message_working', array('id' => $msgp->id));
if ( $DB->count_records('message_working', array('unreadmessageid'=>$messageid)) == 0){
if ($DB->insert_record('message_read', $message)) {
$DB->delete_records('message', array('id' => $messageid));
}
}
}
?>
message/output/popup/version.php
Executable
+38
View File
@@ -0,0 +1,38 @@
<?php
///////////////////////////////////////////////////////////////////////////
// //
// NOTICE OF COPYRIGHT //
// //
// Moodle - Modular Object-Oriented Dynamic Learning Environment //
// http://moodle.com //
// //
// Copyright (C) 1999 onwards Martin Dougiamas http://moodle.com //
// //
// This program 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 2 of the License, or //
// (at your option) any later version. //
// //
// This program 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: //
// //
// http://www.gnu.org/copyleft/gpl.html //
// //
///////////////////////////////////////////////////////////////////////////
/**
* Popup processor version information
*
* @author Luis Rodrigues
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package
*/
$plugin->version = 2008072401;
$plugin->requires = 2008072401;
?>
mod/assignment/db/upgrade.php
+9
View File
@@ -35,6 +35,15 @@ function xmldb_assignment_upgrade($oldversion=0) {
$DB->set_debug(true);
upgrade_mod_savepoint($result, 2007101511, 'assignment');
}
if ($result && $oldversion < 2008072401) {
$eventdata = new object();
$eventdata->modulename = 'assignment';
$eventdata->modulefile = 'mod/assignment/index.php';
events_trigger('message_provider_register', $eventdata);
upgrade_mod_savepoint($result, 2008072401, 'assignment');
}
return $result;
}
mod/assignment/lib.php
+44
View File
@@ -5,6 +5,8 @@
* This class provides all the functionality for an assignment
*/
require_once($CFG->libdir.'/eventslib.php');
DEFINE ('ASSIGNMENT_COUNT_WORDS', 1);
DEFINE ('ASSIGNMENT_COUNT_LETTERS', 2);
@@ -1579,7 +1581,21 @@ class assignment_base {
$posttext = $this->email_teachers_text($info);
$posthtml = ($teacher->mailformat == 1) ? $this->email_teachers_html($info) : '';
$eventdata = new object();
$eventdata->modulename = 'assignment';
$eventdata->userfrom = $user;
$eventdata->userto = $teacher;
$eventdata->subject = $postsubject;
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
if ( events_trigger('message_send', $eventdata) > 0 ){
}
/*
@email_to_user($teacher, $user, $postsubject, $posttext, $posthtml); // If it fails, oh well, too bad.
*/
}
}
}
@@ -1932,6 +1948,19 @@ class assignment_base {
/// OTHER STANDARD FUNCTIONS ////////////////////////////////////////////////////////
/**
* Code to be executed when a module is installed
* now is just used to register the module as message provider
*/
function assignment_install() {
$eventdata = new object();
$eventdata->modulename = 'assignment';
$eventdata->modulefile = 'mod/assignment/index.php';
events_trigger('message_provider_register', $eventdata);
return true;
}
/**
* Deletes an assignment instance
*
@@ -2125,9 +2154,24 @@ function assignment_cron () {
$posthtml = "";
}
$eventdata = new object();
$eventdata->modulename = 'assignment';
$eventdata->userfrom = $teacher;
$eventdata->userto = $user;
$eventdata->subject = $postsubject;
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
if ( events_trigger('message_send', $eventdata) > 0 ){
echo "Error: assignment cron: Could not send out mail for id $submission->id to user $user->id ($user->email)\n";
}
/*
if (! email_to_user($user, $teacher, $postsubject, $posttext, $posthtml)) {
echo "Error: assignment cron: Could not send out mail for id $submission->id to user $user->id ($user->email)\n";
}
*/
}
$USER = $realuser;
mod/assignment/version.php
+2 -2
View File
@@ -5,8 +5,8 @@
// This fragment is called by /admin/index.php
////////////////////////////////////////////////////////////////////////////////
$module->version = 2007101511;
$module->requires = 2007101509; // Requires this Moodle version
$module->version = 2008072401;
$module->requires = 2008072401; // Requires this Moodle version
$module->cron = 60;
?>
mod/feedback/db/upgrade.php
+10
View File
@@ -232,6 +232,16 @@ function xmldb_feedback_upgrade($oldversion=0) {
upgrade_mod_savepoint($result, 2008050105, 'feedback');
}
if ($result and $oldversion < 2008072401) {
$eventdata = new object();
$eventdata->modulename = 'forum';
$eventdata->modulefile = 'mod/forum/index.php';
events_trigger('message_provider_register', $eventdata);
upgrade_mod_savepoint($result, 2008072401, 'feedback');
}
return $result;
}
mod/feedback/lib.php
+58
View File
@@ -8,6 +8,8 @@
* @package feedback
*/
require_once($CFG->libdir.'/eventslib.php');
/// Library of functions and constants for module feedback
define('FEEDBACK_INCLUDE_TEST', 1);
@@ -27,6 +29,20 @@ if(!isset($SESSION->feedback) OR !is_object($SESSION->feedback)) {
$SESSION->feedback = new object();
}
/**
* Code to be executed when a module is installed
* now is just used to register the module as message provider
*/
function feedback_install() {
$eventdata = new object();
$eventdata->modulename = 'feedback';
$eventdata->modulefile = 'mod/feedback/index.php';
events_trigger('message_provider_register', $eventdata);
return true;
}
/**
* this will create a new instance and return the id number
* of the new instance.
@@ -1808,9 +1824,37 @@ function feedback_send_email($cm, $feedback, $course, $userid) {
$posthtml = ($teacher->mailformat == 1) ? feedback_send_email_html($info, $course, $cm) : '';
if($feedback->anonymous == FEEDBACK_ANONYMOUS_NO) {
$eventdata = new object();
$eventdata->modulename = 'feedback';
$eventdata->userfrom = $user;
$eventdata->userto = $teacher;
$eventdata->subject = $postsubject;
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
if ( events_trigger('message_send', $eventdata) > 0 ){
}
/*
@email_to_user($teacher, $user, $postsubject, $posttext, $posthtml);
*/
}else {
$eventdata = new object();
$eventdata->modulename = 'feedback';
$eventdata->userfrom = $teacher;
$eventdata->userto = $teacher;
$eventdata->subject = $postsubject;
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
if ( events_trigger('message_send', $eventdata) > 0 ){
}
/*
@email_to_user($teacher, $teacher, $postsubject, $posttext, $posthtml);
*/
}
}
}
@@ -1849,7 +1893,21 @@ function feedback_send_email_anonym($cm, $feedback, $course) {
$posttext = feedback_send_email_text($info, $course);
$posthtml = ($teacher->mailformat == 1) ? feedback_send_email_html($info, $course, $cm) : '';
$eventdata = new object();
$eventdata->modulename = 'feedback';
$eventdata->userfrom = $teacher;
$eventdata->userto = $teacher;
$eventdata->subject = $postsubject;
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
if ( events_trigger('message_send', $eventdata) > 0 ){
}
/*
@email_to_user($teacher, $teacher, $postsubject, $posttext, $posthtml);
*/
}
}
}
mod/feedback/version.php
+2 -2
View File
@@ -10,8 +10,8 @@
*/
$module->version = 2008052209; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2007101503; // Requires this Moodle version
$module->version = 2008072401; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2008072401; // Requires this Moodle version
$feedback_version_intern = 1; //this version is used for restore older backups
$module->cron = 0; // Period for cron to check this module (secs)
mod/forum/db/upgrade.php
+10
View File
@@ -75,6 +75,16 @@ function xmldb_forum_upgrade($oldversion=0) {
upgrade_mod_savepoint($result, 2007101512, 'forum');
}
if ($result and $oldversion < 2008072401) {
$eventdata = new object();
$eventdata->modulename = 'forum';
$eventdata->modulefile = 'mod/forum/index.php';
events_trigger('message_provider_register', $eventdata);
upgrade_mod_savepoint($result, 2008072401, 'forum');
}
return $result;
mod/forum/lib.php
+40 -1
View File
@@ -1,6 +1,7 @@
<?php // $Id$
require_once($CFG->libdir.'/filelib.php');
require_once($CFG->libdir.'/eventslib.php');
/// CONSTANTS ///////////////////////////////////////////////////////////
@@ -28,6 +29,20 @@ define ('FORUM_AGGREGATE_SUM', 5);
/// STANDARD FUNCTIONS ///////////////////////////////////////////////////////////
/**
* Code to be executed when a module is installed
* now is just used to register the module as message provider
*/
function forum_install() {
$eventdata = new object();
$eventdata->modulename = 'forum';
$eventdata->modulefile = 'mod/forum/index.php';
events_trigger('message_provider_register', $eventdata);
return true;
}
/**
* Given an object containing all the necessary data,
* (defined by the form in mod_form.php) this function
@@ -446,9 +461,21 @@ function forum_cron() {
// Send the post now!
mtrace('Sending ', '');
/*
if (!$mailresult = email_to_user($userto, $userfrom, $postsubject, $posttext,
$posthtml, '', '', $CFG->forum_replytouser)) {
*/
$eventdata = new object();
$eventdata->modulename = 'forum';
$eventdata->userfrom = $userfrom;
$eventdata->userto = $userto;
$eventdata->subject = $postsubject;
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
if ( events_trigger('message_send', $eventdata) > 0){
mtrace("Error: mod/forum/cron.php: Could not send out mail for id $post->id to user $userto->id".
" ($userto->email) .. not trying again.");
add_to_log($course->id, 'forum', 'mail error', "discuss.php?d=$discussion->id#p$post->id",
@@ -734,8 +761,20 @@ function forum_cron() {
$posthtml = '';
}
/*
if (!$mailresult = email_to_user($userto, $site->shortname, $postsubject, $posttext, $posthtml,
'', '', $CFG->forum_replytouser)) {
*/
$eventdata = new object();
$eventdata->modulename = 'forum';
$eventdata->userfrom = $site->shortname;
$eventdata->userto = $userto;
$eventdata->subject = $postsubject;
$eventdata->fullmessage = $posttext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $posthtml;
$eventdata->smallmessage = '';
if ( events_trigger('message_send', $eventdata) > 0){
mtrace("ERROR!");
echo "Error: mod/forum/cron.php: Could not send out digest mail to user $userto->id ($userto->email)... not trying again.\n";
add_to_log($course->id, 'forum', 'mail digest error', '', '', $cm->id, $userto->id);
mod/forum/version.php
+2 -2
View File
@@ -5,8 +5,8 @@
// This fragment is called by /admin/index.php
////////////////////////////////////////////////////////////////////////////////
$module->version = 2007101512;
$module->requires = 2007101509; // Requires this Moodle version
$module->version = 2008072401;
$module->requires = 2008072401; // Requires this Moodle version
$module->cron = 60;
?>
mod/lesson/db/upgrade.php
+9
View File
@@ -43,6 +43,15 @@ function xmldb_lesson_upgrade($oldversion=0) {
upgrade_mod_savepoint($result, 2007072201, 'lesson');
}
if ($result and $oldversion < 2008072401) {
$eventdata = new object();
$eventdata->modulename = 'lesson';
$eventdata->modulefile = 'mod/lesson/index.php';
events_trigger('message_provider_register', $eventdata);
upgrade_mod_savepoint($result, 2008072401, 'lesson');
}
return $result;
}
mod/lesson/essay.php
+13
View File
@@ -10,6 +10,7 @@
require_once('../../config.php');
require_once('locallib.php');
require_once('lib.php');
require_once($CFG->libdir.'/eventslib.php');
$id = required_param('id', PARAM_INT); // Course Module ID
$mode = optional_param('mode', 'display', PARAM_ALPHA);
@@ -219,7 +220,19 @@
// Subject
$subject = get_string('essayemailsubject', 'lesson', format_string($pages[$attempt->pageid]->title,true));
/*
if(email_to_user($users[$attempt->userid], $USER, $subject, $plaintxt, $message)) {
*/
$eventdata = new object();
$eventdata->modulename = 'lesson';
$eventdata->userfrom = $USER;
$eventdata->userto = $users[$attempt->userid];
$eventdata->subject = $subject;
$eventdata->fullmessage = $plaintext;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = $message;
$eventdata->smallmessage = '';
if ( events_trigger('message_send', $eventdata) == 0){
$essayinfo->sent = 1;
$attempt->useranswer = serialize($essayinfo);
$DB->update_record('lesson_attempts', $attempt);
mod/lesson/lib.php
+16
View File
@@ -7,8 +7,24 @@
* @package lesson
**/
require_once($CFG->libdir.'/eventslib.php');
define("LESSON_MAX_EVENT_LENGTH", "432000"); // 5 days maximum
/**
* Code to be executed when a module is installed
* now is just used to register the module as message provider
*/
function lesson_install() {
$eventdata = new object();
$eventdata->modulename = 'lesson';
$eventdata->modulefile = 'mod/lesson/index.php';
events_trigger('message_provider_register', $eventdata);
return true;
}
/**
* Given an object containing all the necessary data,
* (defined by the form in mod_form.php) this function
mod/lesson/version.php
+2 -2
View File
@@ -8,8 +8,8 @@
* @package lesson
**/
$module->version = 2007101509; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2007101509; // Requires this Moodle version
$module->version = 2008072401; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2008072401; // Requires this Moodle version
$module->cron = 0; // Period for cron to check this module (secs)
?>
mod/quiz/db/upgrade.php
+10
View File
@@ -76,6 +76,16 @@ function xmldb_quiz_upgrade($oldversion=0) {
upgrade_mod_savepoint($result, 2008062001, 'quiz');
}
if ($result and $oldversion < 2008072401) {
$eventdata = new object();
$eventdata->modulename = 'quiz';
$eventdata->modulefile = 'mod/quiz/index.php';
events_trigger('message_provider_register', $eventdata);
upgrade_mod_savepoint($result, 2008072401, 'quiz');
}
return $result;
mod/quiz/lib.php
+14
View File
@@ -11,6 +11,7 @@
require_once($CFG->libdir.'/pagelib.php');
require_once($CFG->libdir.'/questionlib.php');
require_once($CFG->libdir.'/eventslib.php');
/// CONSTANTS ///////////////////////////////////////////////////////////////////
@@ -57,6 +58,19 @@ define("QUIZ_MAX_EVENT_LENGTH", 5*24*60*60); // 5 days maximum
/// FUNCTIONS ///////////////////////////////////////////////////////////////////
/**
* Code to be executed when a module is installed
* now is just used to register the module as message provider
*/
function quiz_install() {
$eventdata = new object();
$eventdata->modulename = 'quiz';
$eventdata->modulefile = 'mod/quiz/index.php';
events_trigger('message_provider_register', $eventdata);
return true;
}
/**
* Given an object containing all the necessary data,
* (defined by the form in mod_form.php) this function
mod/quiz/locallib.php
+27
View File
@@ -27,6 +27,7 @@ require_once($CFG->dirroot . '/mod/quiz/lib.php');
require_once($CFG->dirroot . '/mod/quiz/accessrules.php');
require_once($CFG->dirroot . '/question/editlib.php');
require_once($CFG->dirroot . '/mod/quiz/attemptlib.php');
require_once($CFG->libdir . '/eventslib.php');
/// Constants ///////////////////////////////////////////////////////////////////
@@ -927,7 +928,20 @@ function quiz_send_confirmation($a) {
$body = get_string('emailconfirmbody', 'quiz', $a);
// send email and analyse result
$eventdata = new object();
$eventdata->modulename = 'quiz';
$eventdata->userfrom = get_admin();
$eventdata->userto = $USER;
$eventdata->subject = $subject;
$eventdata->fullmessage = $body;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
return (events_trigger('message_send', $eventdata) == 0);
/*
return email_to_user($USER, get_admin(), $subject, $body);
*/
}
/**
@@ -952,7 +966,20 @@ function quiz_send_notification($recipient, $a) {
$body = get_string('emailnotifybody', 'quiz', $a);
// send email and analyse result
$eventdata = new object();
$eventdata->modulename = 'quiz';
$eventdata->userfrom = $USER;
$eventdata->userto = $recipient;
$eventdata->subject = $subject;
$eventdata->fullmessage = $body;
$eventdata->fullmessageformat = FORMAT_PLAIN;
$eventdata->fullmessagehtml = '';
$eventdata->smallmessage = '';
return (events_trigger('message_send', $eventdata) == 0);
/*
return email_to_user($recipient, $USER, $subject, $body);
*/
}
/**
mod/quiz/version.php
+2 -2
View File
@@ -5,8 +5,8 @@
// This fragment is called by moodle_needs_upgrading() and /admin/index.php
////////////////////////////////////////////////////////////////////////////////
$module->version = 2008062001; // The (date) version of this module
$module->requires = 2007101509; // Requires this Moodle version
$module->version = 2008072401; // The (date) version of this module
$module->requires = 2008072401; // Requires this Moodle version
$module->cron = 0; // How often should cron check this module (seconds)?
?>
user/editadvanced.php
+14 -2
View File
@@ -100,6 +100,7 @@
print_error('cannotcreateuser');
}
$usercreated = true;
} else {
if (!$DB->update_record('user', $usernew)) {
print_error('cannotupdateuser');
@@ -146,9 +147,20 @@
// reload from db
$usernew = $DB->get_record('user', array('id'=>$usernew->id));
// trigger events
if ($usercreated) {
//add default preferences for the messageprocessors (by default all users get email)
$providers = $DB->get_records('message_providers');
$preferences = array();
foreach ( $providers as $providerid => $provider){
$preferences[ 'message_provider_'.$provider->modulename.'_loggedin' ] = 'popup';
$preferences[ 'message_provider_'.$provider->modulename.'_loggedoff' ] = 'email';
}
if (!set_user_preferences( $preferences, $usernew->id ) ){
print_error('Error updating user message preferences');
}
events_trigger('user_created', $usernew);
} else {
events_trigger('user_updated', $usernew);
@@ -167,7 +179,7 @@
redirect("$CFG->wwwroot/$CFG->admin/");
} else {
redirect("$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id");
}
}
} else {
redirect("$CFG->wwwroot/$CFG->admin/user.php");
}
user/tabs.php
+6
View File
@@ -238,6 +238,12 @@
}
}
}
///added a new messaging tab
if (has_capability('moodle/user:editownmessageprofile', $systemcontext)) {
$toprow[] = new tabobject('editmessage', $wwwroot.'/message/edit.php?id='.$user->id.'&amp;course='.$course->id, get_string('editmymessage', 'message'));
}
/// Add second row to display if there is one
if (!empty($secondrow)) {
version.php
+1 -1
View File
@@ -6,7 +6,7 @@
// This is compared against the values stored in the database to determine
// whether upgrades should be performed (see lib/db/*.php)
$version = 2008072300; // YYYYMMDD = date of the last version bump
$version = 2008072401; // YYYYMMDD = date of the last version bump
// XX = daily increments
$release = '2.0 dev (Build: 20080724)'; // Human-friendly version name