From c85acc871f965042a3637ac22c1110eb354c6e5b Mon Sep 17 00:00:00 2001 From: tjhunt Date: Wed, 6 May 2009 09:25:54 +0000 Subject: [PATCH] pagelib: MDL-12212 eliminate chat_page --- lib/pagelib.php | 1 + mod/chat/lib.php | 8 -------- mod/chat/pagelib.php | 29 ----------------------------- mod/chat/view.php | 22 +++++++++++++++------- 4 files changed, 16 insertions(+), 44 deletions(-) delete mode 100644 mod/chat/pagelib.php diff --git a/lib/pagelib.php b/lib/pagelib.php index 878726fbe5..143e1a1353 100644 --- a/lib/pagelib.php +++ b/lib/pagelib.php @@ -902,6 +902,7 @@ function page_import_types($path) { * @return the global $PAGE object. */ function page_create_instance($instance) { + global $PAGE; return page_create_object($PAGE->pagetype, $instance); } diff --git a/mod/chat/lib.php b/mod/chat/lib.php index 40d88732fa..6871da87fb 100644 --- a/mod/chat/lib.php +++ b/mod/chat/lib.php @@ -1,7 +1,6 @@ libdir.'/pagelib.php'); require_once($CFG->libdir.'/portfoliolib.php'); $CFG->chat_ajax_debug = false; @@ -151,13 +150,6 @@ function chat_delete_instance($id) { $result = false; } - $pagetypes = page_import_types('mod/chat/'); - foreach($pagetypes as $pagetype) { - if(!blocks_delete_all_on_page($pagetype, $chat->id)) { - $result = false; - } - } - if (! $DB->delete_records('event', array('modulename'=>'chat', 'instance'=>$chat->id))) { $result = false; } diff --git a/mod/chat/pagelib.php b/mod/chat/pagelib.php deleted file mode 100644 index 23b438a590..0000000000 --- a/mod/chat/pagelib.php +++ /dev/null @@ -1,29 +0,0 @@ -libdir.'/pagelib.php'); - -define('PAGE_CHAT_VIEW', 'mod-chat-view'); - -page_map_class(PAGE_CHAT_VIEW, 'page_chat'); - -$DEFINEDPAGES = array(PAGE_CHAT_VIEW); - -/** - * Class that models the behavior of a chat - * - * @author Jon Papaioannou - * @package pages - */ - -class page_chat extends page_generic_activity { - - function init_quick($data) { - if(empty($data->pageid)) { - print_error('invalidcourseid'); - } - $this->activityname = 'chat'; - parent::init_quick($data); - } -} - -?> diff --git a/mod/chat/view.php b/mod/chat/view.php index 48337573ee..df0f4f96c0 100644 --- a/mod/chat/view.php +++ b/mod/chat/view.php @@ -2,9 +2,8 @@ /// This page prints a particular instance of chat - require_once('../../config.php'); - require_once('lib.php'); - require_once('pagelib.php'); + require_once(dirname(__FILE__) . '/../../config.php'); + require_once($CFG->dirroot . '/mod/chat/lib.php'); $id = optional_param('id', 0, PARAM_INT); $c = optional_param('c', 0, PARAM_INT); @@ -61,14 +60,11 @@ add_to_log($course->id, 'chat', 'view', "view.php?id=$cm->id", $chat->id, $cm->id); // Initialize $PAGE, compute blocks - - $PAGE = page_create_instance($chat->id); $PAGE->set_url('mod/chat/view.php', array('id' => $cm->id)); $pageblocks = blocks_setup($PAGE); $blocks_preferred_width = bounded_number(180, blocks_preferred_width($pageblocks[BLOCK_POS_LEFT]), 210); /// Print the page header - $strenterchat = get_string('enterchat', 'chat'); $stridle = get_string('idle', 'chat'); $strcurrentusers = get_string('currentusers', 'chat'); @@ -78,7 +74,19 @@ $USER->editing = $edit; } - $PAGE->print_header($course->shortname.': %fullname%'); + $title = $course->shortname . ': ' . format_string($chat->name); + + $buttons = ''; + if ($PAGE->user_allowed_editing() && !empty($CFG->showblocksonmodpages)) { + $buttons .= ''; + } + $buttons .= '
'.update_module_button($cm->id, $course->id, get_string('modulename', 'chat')).'
frametarget.' method="get" action="view.php">
'. + ''. + ''. + '
'; + + $navigation = build_navigation(array(), $cm); + print_header($title, $course->fullname, $navigation, '', '', true, $buttons, navmenu($course, $cm)); echo ''; -- 2.39.5