moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

"MDL-14129, fix print_error"

Browse source
This commit is contained in:
dongsheng 2008-06-15 12:24:36 +00:00
parent 9d068cd64a
commit 5c2f6a7fb1
7 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lang/en_utf8/chat.php
View file

@ -47,6 +47,7 @@ $string['modulename'] = 'Chat';
$string['modulenameplural'] = 'Chats'; $string['modulenameplural'] = 'Chats';
$string['neverdeletemessages'] = 'Never delete messages'; $string['neverdeletemessages'] = 'Never delete messages';
$string['nextsession'] = 'Next scheduled session'; $string['nextsession'] = 'Next scheduled session';
$string['nochat'] = 'No chat found';
$string['noguests'] = 'The chat is not open to guests'; $string['noguests'] = 'The chat is not open to guests';
$string['nomessages'] = 'No messages yet'; $string['nomessages'] = 'No messages yet';
$string['normalkeepalive'] = 'KeepAlive'; $string['normalkeepalive'] = 'KeepAlive';

2
mod/chat/gui_header_js/chatinput.php
View file

@ -8,7 +8,7 @@
$chat_sid = required_param('chat_sid', PARAM_ALPHANUM); $chat_sid = required_param('chat_sid', PARAM_ALPHANUM);
if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) { if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) {
print_error('Not logged in!'); print_error('notlogged', 'chat');
} }
//Get the user theme //Get the user theme

4
mod/chat/gui_header_js/index.php
View file

@ -33,7 +33,7 @@
if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used
if ($groupid = groups_get_activity_group($cm)) { if ($groupid = groups_get_activity_group($cm)) {
if (!$group = groups_get_group($groupid, false)) { if (!$group = groups_get_group($groupid, false)) {
print_error("That group (id $groupid) doesn't exist!"); print_error('invalidgroupid');
} }
$groupname = ': '.$group->name; $groupname = ': '.$group->name;
} else { } else {
@ -47,7 +47,7 @@
$strchat = get_string('modulename', 'chat'); // must be before current_language() in chat_login_user() to force course language!!! $strchat = get_string('modulename', 'chat'); // must be before current_language() in chat_login_user() to force course language!!!
if (!$chat_sid = chat_login_user($chat->id, 'header_js', $groupid, $course)) { if (!$chat_sid = chat_login_user($chat->id, 'header_js', $groupid, $course)) {
print_error('Could not log in to chat room!!'); print_error('cantlogin', 'chat');
} }
$params = "chat_sid=$chat_sid"; $params = "chat_sid=$chat_sid";

12
mod/chat/gui_header_js/insert.php
View file

@ -7,25 +7,25 @@
$chat_message = required_param('chat_message', PARAM_RAW); $chat_message = required_param('chat_message', PARAM_RAW);
if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) { if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) {
print_error('Not logged in!'); print_error('notlogged', 'chat');
} }
if (!$chat = $DB->get_record('chat', array('id'=>$chatuser->chatid))) { if (!$chat = $DB->get_record('chat', array('id'=>$chatuser->chatid))) {
print_error('No chat found'); print_error('nochat', 'chat');
} }
if (!$course = $DB->get_record('course', array('id'=>$chat->course))) { if (!$course = $DB->get_record('course', array('id'=>$chat->course))) {
print_error('Could not find the course this belongs to!'); print_error('invalidcourseid');
} }
if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) { if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) {
print_error('Course Module ID was incorrect'); print_error('invalidcoursemodule');
} }
require_login($course->id, false, $cm); require_login($course->id, false, $cm);
if (isguest()) { if (isguest()) {
print_error('Guest does not have access to chat rooms'); print_error('noguests');
} }
session_write_close(); session_write_close();
@ -50,7 +50,7 @@
$message->timestamp = time(); $message->timestamp = time();
if (!$DB->insert_record('chat_messages', $message)) { if (!$DB->insert_record('chat_messages', $message)) {
print_error('Could not insert a chat message!'); print_error('cantinsert', 'chat');
} }
$chatuser->lastmessageping = time() - 2; $chatuser->lastmessageping = time() - 2;

2
mod/chat/gui_sockets/chatinput.php
View file

@ -8,7 +8,7 @@
$chat_sid = required_param('chat_sid', PARAM_ALPHANUM); $chat_sid = required_param('chat_sid', PARAM_ALPHANUM);
if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) { if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) {
print_error('Not logged in!'); print_error('notlogged', 'chat');
} }
//Get the user theme //Get the user theme

12
mod/chat/gui_sockets/index.php
View file

@ -7,21 +7,21 @@
$groupid = optional_param('groupid', 0, PARAM_INT); //only for teachers $groupid = optional_param('groupid', 0, PARAM_INT); //only for teachers
if (!$chat = $DB->get_record('chat', array('id'=>$id))) { if (!$chat = $DB->get_record('chat', array('id'=>$id))) {
print_error('Could not find that chat room!'); print_error('invalidid', 'chat');
} }
if (!$course = $DB->get_record('course', array('id'=>$chat->course))) { if (!$course = $DB->get_record('course', array('id'=>$chat->course))) {
print_error('Could not find the course this belongs to!'); print_error('invalidcourseid');
} }
if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) { if (!$cm = get_coursemodule_from_instance('chat', $chat->id, $course->id)) {
print_error('Course Module ID was incorrect'); print_error('invalidcoursemodule');
} }
require_login($course->id, false, $cm); require_login($course->id, false, $cm);
if (isguest()) { if (isguest()) {
print_error('Guest does not have access to chat rooms'); print_error('noguests', 'chat');
} }
if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $cm->id))) { if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $cm->id))) {
@ -33,7 +33,7 @@
if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used
if ($groupid = groups_get_activity_group($cm)) { if ($groupid = groups_get_activity_group($cm)) {
if (!$group = groups_get_group($groupid, false)) { if (!$group = groups_get_group($groupid, false)) {
print_error("That group (id $groupid) doesn't exist!"); print_error('invalidgroupid');
} }
$groupname = ': '.$group->name; $groupname = ': '.$group->name;
} else { } else {
@ -47,7 +47,7 @@
$strchat = get_string('modulename', 'chat'); // must be before current_language() in chat_login_user() to force course language!!! $strchat = get_string('modulename', 'chat'); // must be before current_language() in chat_login_user() to force course language!!!
if (!$chat_sid = chat_login_user($chat->id, 'sockets', $groupid, $course)) { if (!$chat_sid = chat_login_user($chat->id, 'sockets', $groupid, $course)) {
print_error('Could not log in to chat room!!'); print_error('cantlogin');
} }
$params = "chat_sid=$chat_sid"; $params = "chat_sid=$chat_sid";

10
mod/chat/lib.php
View file

@ -20,7 +20,15 @@ $CHAT_HTMLHEAD_MSGINPUT = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transiti
$CHAT_HTMLHEAD_MSGINPUT_JS = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\"><html><head><title>Message Input</title>\n<script type=\"text/javascript\">\n//<![CDATA[\nscroll_active = true;\nfunction empty_field_and_submit()\n{\ndocument.fdummy.arsc_message.value=document.f.arsc_message.value;\ndocument.fdummy.submit();\ndocument.f.arsc_message.focus();\ndocument.f.arsc_message.select();\nreturn false;\n}\n//]]>\n</script>\n</head><body bgcolor=\"#FFFFFF\" OnLoad=\"document.f.arsc_message.focus();document.f.arsc_message.select();\">"; $CHAT_HTMLHEAD_MSGINPUT_JS = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\"><html><head><title>Message Input</title>\n<script type=\"text/javascript\">\n//<![CDATA[\nscroll_active = true;\nfunction empty_field_and_submit()\n{\ndocument.fdummy.arsc_message.value=document.f.arsc_message.value;\ndocument.fdummy.submit();\ndocument.f.arsc_message.focus();\ndocument.f.arsc_message.select();\nreturn false;\n}\n//]]>\n</script>\n</head><body bgcolor=\"#FFFFFF\" OnLoad=\"document.f.arsc_message.focus();document.f.arsc_message.select();\">";
// Dummy data that gets output to the browser as needed, in order to make it show output // Dummy data that gets output to the browser as needed, in order to make it show output
$CHAT_DUMMY_DATA = "<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n<!-- nix -->\n"; $CHAT_DUMMY_DATA = produce_data(200);
function produce_data($n){
$str = '';
for($i; $i<$n; $i++){
$str.='<!-- nix -->\n';
}
return $str;
}
function chat_add_instance($chat) { function chat_add_instance($chat) {
global $DB; global $DB;