Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:fschuett
oss-moodle
oss-moodle-mod_chat.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File oss-moodle-mod_chat.patch of Package oss-moodle
diff -up ./moodle/mod/chat/chatd.php.orig ./moodle/mod/chat/chatd.php --- ./moodle/mod/chat/chatd.php.orig 2021-01-22 04:30:57.000000000 +0100 +++ ./moodle/mod/chat/chatd.php 2021-01-28 17:27:27.725947132 +0100 @@ -123,6 +123,9 @@ class ChatDaemon { } public function poll_idle_chats($now) { + global $DB; + $temp = $DB->get_record('user', ['id' => '1']); + $temp = ""; $this->trace('Polling chats to detect disconnected users'); if (!empty($this->chatrooms)) { foreach ($this->chatrooms as $chatid => $chatroom) { @@ -297,7 +300,7 @@ EOD; echo "<p><font size=\"1\">"; echo fullname($userinfo['user'])."<br />"; echo "<font color=\"#888888\">$str->idle: ".format_time($lastping, $str)."</font> "; - echo '<a target="empty" href="http://'.$CFG->chat_serverhost.':'.$CFG->chat_serverport. + echo '<a target="empty" href="https://'.$CFG->chat_serverhost.':'.$CFG->chat_serverport. '/?win=beep&beep='.$userinfo['user']->id. '&chat_sid='.$sessionid.'">'.$str->beep."</a>\n"; echo "</font></p>"; @@ -396,7 +399,7 @@ EOD; // This is because we are doing JS refreshes all the time. // However, if the JS doesn't work for some reason, we still want to refresh once in a while. $header .= "Refresh: ".(intval($CFG->chat_refresh_userlist) + 2). - "; url=http://$CFG->chat_serverhost:$CFG->chat_serverport/?win=users&". + "; url=https://$CFG->chat_serverhost:$CFG->chat_serverport/?win=users&". "chat_sid=".$sessionid."\n"; $header .= "\n"; @@ -817,7 +820,6 @@ EOD; $lasterr = socket_last_error(); $this->fatal('socket_create() failed: '. socket_strerror($lasterr).' ['.$lasterr.']'); } - if (!socket_bind($this->listen_socket, $CFG->chat_serverip, $CFG->chat_serverport)) { // Failed to bind socket. $lasterr = socket_last_error(); @@ -981,7 +981,7 @@ if (!function_exists('socket_set_option' $daemon->init_sockets(); -$daemon->trace('Started Moodle chatd on port '.$CFG->chat_serverport.', listening socket '.$daemon->listen_socket, E_USER_WARNING); +$daemon->trace('Started Moodle chatd on port '.$CFG->chat_serverport, E_USER_WARNING); // Clear the decks of old stuff. $DB->delete_records('chat_users', array('version' => 'sockets')); diff -up ./moodle/mod/chat/gui_sockets/chatinput.php.orig ./moodle/mod/chat/gui_sockets/chatinput.php --- ./moodle/mod/chat/gui_sockets/chatinput.php.orig 2021-01-22 04:30:57.000000000 +0100 +++ ./moodle/mod/chat/gui_sockets/chatinput.php 2021-01-28 17:27:55.101886376 +0100 @@ -48,7 +48,7 @@ echo $OUTPUT->header(); <input type="text" name="chat_message" id="chat_message" size="60" value="" /> </form> - <form action="<?php echo "http://$CFG->chat_serverhost:$CFG->chat_serverport/"; ?>" method="get" target="empty" id="sendform"> + <form action="<?php echo "https://$CFG->chat_serverhost:$CFG->chat_serverport/"; ?>" method="get" target="empty" id="sendform"> <input type="hidden" name="win" value="message" /> <input type="hidden" name="chat_message" value="" /> <input type="hidden" name="chat_msgidnr" value="0" /> diff -up ./moodle/mod/chat/gui_sockets/index.php.orig ./moodle/mod/chat/gui_sockets/index.php --- ./moodle/mod/chat/gui_sockets/index.php.orig 2021-01-22 04:30:57.000000000 +0100 +++ ./moodle/mod/chat/gui_sockets/index.php 2021-01-28 17:28:10.393852427 +0100 @@ -67,8 +67,8 @@ $params = "chat_sid=$chatsid"; $courseshortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id))); $chatname = format_string($chat->name, true, array('context' => $context)); -$winchaturl = "http://$CFG->chat_serverhost:$CFG->chat_serverport?win=chat&$params"; -$winusersurl = "http://$CFG->chat_serverhost:$CFG->chat_serverport?win=users&$params" +$winchaturl = "https://$CFG->chat_serverhost:$CFG->chat_serverport?win=chat&$params"; +$winusersurl = "https://$CFG->chat_serverhost:$CFG->chat_serverport?win=users&$params" ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"> <html>
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor