From: moodler Date: Wed, 10 Oct 2007 14:57:39 +0000 (+0000) Subject: Merged Urs fixes from 1.8 stable and reformatted a bit X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ba4418ad4e3e2133123b0769e16e8c8c631f5840;p=moodle.git Merged Urs fixes from 1.8 stable and reformatted a bit --- diff --git a/mod/chat/view.php b/mod/chat/view.php index 8ad9e46a3e..ea2e9faaeb 100644 --- a/mod/chat/view.php +++ b/mod/chat/view.php @@ -72,123 +72,137 @@ echo ''; - if(!empty($CFG->showblocksonmodpages) && (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) { - echo ''; - } - - echo ''; + } + break; + + case 'middle': + + echo ''; + + break; } - - notice_yesno(get_string('noguests', 'chat').'

'.get_string('liketologin'), - $wwwroot, $CFG->wwwroot.'/course/view.php?id='.$course->id); - - print_footer($course); - exit; - - } else { - // show some error message - require_capability('mod/chat:chat', $context); - } - - - if ($chat->chattime and $chat->schedule) { // A chat is scheduled - echo "

$strnextsession: ".userdate($chat->chattime).' ('.usertimezone($USER->timezone).')

'; - } else { - echo '
'; } - - if ($chat->intro) { - print_box(format_text($chat->intro), 'generalbox', 'intro'); - } - - chat_delete_old_users(); - - if ($chatusers = chat_get_users($chat->id, $currentgroup, $cm->groupingid)) { - $timenow = time(); - print_simple_box_start('center'); - print_heading($strcurrentusers); - echo '
'; - if (!empty($THEME->customcorners)) print_custom_corners_start(); - blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); - if (!empty($THEME->customcorners)) print_custom_corners_end(); - echo ''; - if (!empty($THEME->customcorners)) print_custom_corners_start(); - -/// Check to see if groups are being used here - $groupmode = groups_get_activity_groupmode($cm); - $currentgroup = groups_get_activity_group($cm, true); - groups_print_activity_menu($cm, "view.php?id=$cm->id"); - - if ($currentgroup) { - $groupselect = " AND groupid = '$currentgroup'"; - $groupparam = "&groupid=$currentgroup"; - } else { - $groupselect = ""; - $groupparam = ""; - } - - if ($chat->studentlogs or has_capability('mod/chat:readlog',$context)) { - echo '
'; - echo "id\">". - get_string('viewreport', 'chat').''; - echo '
'; - } - - - print_heading(format_string($chat->name)); - -/// Print the main part of the page - - if (has_capability('mod/chat:chat',$context)) { - print_box_start('generalbox', 'enterlink'); - // users with screenreader set, will only see 1 link, to the manual refresh page - // for better accessibility - if (!empty($USER->screenreader)) { - $chattarget = "/mod/chat/gui_basic/index.php?id=$chat->id$groupparam"; - } else { - $chattarget = "/mod/chat/gui_$CFG->chat_method/index.php?id=$chat->id$groupparam"; - } - - echo '

'; - link_to_popup_window ($chattarget, - "chat$course->id$chat->id$groupparam", "$strenterchat", 500, 700, get_string('modulename', 'chat')); - echo '

'; - - // if user is using screen reader, then there is no need to display this link again - if ($CFG->chat_method == 'header_js' && empty($USER->screenreader)) { - // show frame/js-less alternative - echo '

('; - link_to_popup_window ("/mod/chat/gui_basic/index.php?id=$chat->id$groupparam", - "chat$course->id$chat->id$groupparam", get_string('noframesjs', 'message'), 500, 700, get_string('modulename', 'chat')); - echo ')

'; - } - - print_box_end(); - - } else if (isguestuser()) { - $wwwroot = $CFG->wwwroot.'/login/index.php'; - if (!empty($CFG->loginhttps)) { - $wwwroot = str_replace('http:','https:', $wwwroot); + $lt = (empty($THEME->layouttable)) ? array('left', 'middle', 'right') : $THEME->layouttable; + foreach ($lt as $column) { + switch ($column) { + case 'left': + + if(!empty($CFG->showblocksonmodpages) && (blocks_have_content($pageblocks, BLOCK_POS_LEFT) || $PAGE->user_is_editing())) { + echo '		'; + if (!empty($THEME->customcorners)) print_custom_corners_start(); + blocks_print_group($PAGE, $pageblocks, BLOCK_POS_LEFT); + if (!empty($THEME->customcorners)) print_custom_corners_end(); + echo ''; + if (!empty($THEME->customcorners)) print_custom_corners_start(); + + /// Check to see if groups are being used here + $groupmode = groups_get_activity_groupmode($cm); + $currentgroup = groups_get_activity_group($cm, true); + groups_print_activity_menu($cm, "view.php?id=$cm->id"); + + if ($currentgroup) { + $groupselect = " AND groupid = '$currentgroup'"; + $groupparam = "&groupid=$currentgroup"; + } else { + $groupselect = ""; + $groupparam = ""; + } + + if ($chat->studentlogs or has_capability('mod/chat:readlog',$context)) { + echo '
'; + echo "id\">". + get_string('viewreport', 'chat').''; + echo '
'; + } + + + print_heading(format_string($chat->name)); + + /// Print the main part of the page + + if (has_capability('mod/chat:chat',$context)) { + print_box_start('generalbox', 'enterlink'); + // users with screenreader set, will only see 1 link, to the manual refresh page + // for better accessibility + if (!empty($USER->screenreader)) { + $chattarget = "/mod/chat/gui_basic/index.php?id=$chat->id$groupparam"; + } else { + $chattarget = "/mod/chat/gui_$CFG->chat_method/index.php?id=$chat->id$groupparam"; + } + + echo '

'; + link_to_popup_window ($chattarget, + "chat$course->id$chat->id$groupparam", "$strenterchat", 500, 700, get_string('modulename', 'chat')); + echo '

'; + + // if user is using screen reader, then there is no need to display this link again + if ($CFG->chat_method == 'header_js' && empty($USER->screenreader)) { + // show frame/js-less alternative + echo '

('; + link_to_popup_window ("/mod/chat/gui_basic/index.php?id=$chat->id$groupparam", + "chat$course->id$chat->id$groupparam", get_string('noframesjs', 'message'), 500, 700, get_string('modulename', 'chat')); + echo ')

'; + } + + print_box_end(); + + } else if (isguestuser()) { + $wwwroot = $CFG->wwwroot.'/login/index.php'; + if (!empty($CFG->loginhttps)) { + $wwwroot = str_replace('http:','https:', $wwwroot); + } + + notice_yesno(get_string('noguests', 'chat').'

'.get_string('liketologin'), + $wwwroot, $CFG->wwwroot.'/course/view.php?id='.$course->id); + + print_footer($course); + exit; + + } else { + // show some error message + require_capability('mod/chat:chat', $context); + } + + + if ($chat->chattime and $chat->schedule) { // A chat is scheduled + echo "

$strnextsession: ".userdate($chat->chattime).' ('.usertimezone($USER->timezone).')

'; + } else { + echo '
'; + } + + if ($chat->intro) { + print_box(format_text($chat->intro), 'generalbox', 'intro'); + } + + chat_delete_old_users(); + + if ($chatusers = chat_get_users($chat->id, $currentgroup, $cm->groupingid)) { + $timenow = time(); + print_simple_box_start('center'); + print_heading($strcurrentusers); + echo ''; + foreach ($chatusers as $chatuser) { + $lastping = $timenow - $chatuser->lastmessageping; + echo ''; + } + echo '
'; + echo "wwwroot/user/view.php?id=$chatuser->id&course=$chat->course\">"; + print_user_picture($chatuser->id, 0, $chatuser->picture, false, false, false); + echo ''; + echo '

'; + echo fullname($chatuser).'
'; + echo "$stridle: ".format_time($lastping).""; + echo '

'; + echo '
'; + print_simple_box_end(); + } + + if (!empty($THEME->customcorners)) { + print_custom_corners_end(); + } + echo '
'; - foreach ($chatusers as $chatuser) { - $lastping = $timenow - $chatuser->lastmessageping; - echo ''; - } - echo '
'; - echo "wwwroot/user/view.php?id=$chatuser->id&course=$chat->course\">"; - print_user_picture($chatuser->id, 0, $chatuser->picture, false, false, false); - echo ''; - echo '

'; - echo fullname($chatuser).'
'; - echo "$stridle: ".format_time($lastping).""; - echo '

'; - echo '
'; - print_simple_box_end(); - } - - -/// Finish the page - if (!empty($THEME->customcorners)) print_custom_corners_end(); - echo ''; + + echo ''; print_footer($course);