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

message MDL-25267 made jabber processor detect if it hasnt been configured

Browse Source
This commit is contained in:
Andrew Davis
2010-11-18 02:59:23 +00:00
parent 0b4cede202
commit 861fa9120d
2 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/output/jabber/lang/en/message_jabber.php
+1
View File
@@ -25,3 +25,4 @@
$string['pluginname'] = 'Jabber message';
$string['jabberid'] = 'Jabber ID';
$string['notconfigured'] = 'The Jabber server hasn\'t been configured so Jabber messages cannot be sent';
message/output/jabber/message_output_jabber.php
+33 -23
View File
@@ -44,36 +44,40 @@ class message_output_jabber extends message_output {
function send_message($eventdata){
global $CFG;
//hold onto jabber id preference because /admin/cron.php sends a lot of messages at once
static $jabberaddresses = array();
//Is Jabber set up?
if (!empty($CFG->jabberhost) && !empty($CFG->jabberserver)) {
//hold onto jabber id preference because /admin/cron.php sends a lot of messages at once
static $jabberaddresses = array();
if (!array_key_exists($eventdata->userto->id, $jabberaddresses)) {
$jabberaddresses[$eventdata->userto->id] = get_user_preferences('message_processor_jabber_jabberid', $eventdata->userto->email, $eventdata->userto->id);
}
$jabberaddress = $jabberaddresses[$eventdata->userto->id];
if (!array_key_exists($eventdata->userto->id, $jabberaddresses)) {
$jabberaddresses[$eventdata->userto->id] = get_user_preferences('message_processor_jabber_jabberid', $eventdata->userto->email, $eventdata->userto->id);
}
$jabberaddress = $jabberaddresses[$eventdata->userto->id];
$jabbermessage = fullname($eventdata->userfrom).': '.$eventdata->smallmessage;
$jabbermessage = fullname($eventdata->userfrom).': '.$eventdata->smallmessage;
if (!empty($eventdata->contexturl)) {
$jabbermessage .= "\n".get_string('view').': '.$eventdata->contexturl;
}
if (!empty($eventdata->contexturl)) {
$jabbermessage .= "\n".get_string('view').': '.$eventdata->contexturl;
}
$jabbermessage .= "\n(".get_string('noreply','message').')';
$jabbermessage .= "\n(".get_string('noreply','message').')';
$conn = new XMPPHP_XMPP($CFG->jabberhost,$CFG->jabberport,$CFG->jabberusername,$CFG->jabberpassword,'moodle',$CFG->jabberserver);
$conn = new XMPPHP_XMPP($CFG->jabberhost,$CFG->jabberport,$CFG->jabberusername,$CFG->jabberpassword,'moodle',$CFG->jabberserver);
try {
//$conn->useEncryption(false);
$conn->connect();
$conn->processUntil('session_start');
$conn->presence();
$conn->message($jabberaddress, $jabbermessage);
$conn->disconnect();
} catch(XMPPHP_Exception $e) {
debugging($e->getMessage());
return false;
try {
//$conn->useEncryption(false);
$conn->connect();
$conn->processUntil('session_start');
$conn->presence();
$conn->message($jabberaddress, $jabbermessage);
$conn->disconnect();
} catch(XMPPHP_Exception $e) {
debugging($e->getMessage());
return false;
}
}
//note that we're reporting success if message was sent or if Jabber simply isnt configured
return true;
}
@@ -82,7 +86,13 @@ class message_output_jabber extends message_output {
* @param object $mform preferences form class
*/
function config_form($preferences){
return get_string('jabberid', 'message_jabber').': <input size="30" name="jabber_jabberid" value="'.$preferences->jabber_jabberid.'" />';
global $CFG;
if (empty($CFG->jabberhost) || empty($CFG->jabberserver)) {
return get_string('notconfigured','message_jabber');
} else {
return get_string('jabberid', 'message_jabber').': <input size="30" name="jabber_jabberid" value="'.$preferences->jabber_jabberid.'" />';
}
}
/**