From: moodler Date: Sun, 19 Oct 2003 14:21:54 +0000 (+0000) Subject: Allow uploaded files to be declared in popup windows too. X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0abc8154730c564d2eb2a2b855abc4f3c9ef7930;p=moodle.git Allow uploaded files to be declared in popup windows too. --- diff --git a/course/lib.php b/course/lib.php index b8ad44817b..6f9e311995 100644 --- a/course/lib.php +++ b/course/lib.php @@ -385,9 +385,9 @@ function get_array_of_activities($courseid) { // This part is an ugly hack that doesn't belong here// if ($mod[$seq]->mod == "resource") { if ($resource = get_record("resource", "id", $rawmods[$seq]->instance)) { - if ($resource->type == 5 and $resource->alltext) { + if (($resource->type == 3 or $resource->type == 5) and !empty($resource->alltext)) { $mod[$seq]->extra = urlencode("target=\"resource$resource->id\" onClick=\"return ". - "openpopup('/mod/resource/view.php?id=". + "openpopup('/mod/resource/view.php?inpopup=true&id=". $mod[$seq]->cm. "','resource$resource->id','$resource->alltext');\""); } diff --git a/mod/resource/view.php b/mod/resource/view.php index 757c3833a7..a858c82088 100644 --- a/mod/resource/view.php +++ b/mod/resource/view.php @@ -86,6 +86,8 @@ $fullurl = "$CFG->wwwroot/file.php?file=/$course->id/$resource->reference"; } + $inpopup = !empty($_GET["inpopup"]); + $embedded = false; if (mimeinfo("icon", $fullurl) == "image.gif") { // It's an image @@ -93,11 +95,20 @@ $resourceimage = true; } else { $resourceimage = false; - } + } // Later, look for more things to embed - // (could check for more embeddable media here...) + if ($inpopup) { + add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id"); + if ($embedded) { + print_header($pagetitle); + echo "
".text_to_html($resource->summary, true, false)."
"; + } else { + redirect($fullurl); + break; + } + + } else if ($frameset == "top" or $embedded) { - if ($frameset == "top" or $embedded) { if ($frameset == "top") { $targetwindow = "parent"; } else { @@ -118,7 +129,9 @@ echo "
"; echo "
"; } - print_footer($course); + if (!$inpopup) { + print_footer($course); + } } else { // Display resource in a frame of it's own. echo "$course->shortname: $resource->name\n";