$course->shortname: $resource->name

From 82ca81cf696dc8c66aac29162163156014e17464 Mon Sep 17 00:00:00 2001 From: moodler Date: Tue, 30 Dec 2003 06:53:53 +0000 Subject: [PATCH] Big cleanup for logic in handling uploaded files, now shorter and clearer --- mod/resource/view.php | 139 +++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 75 deletions(-) diff --git a/mod/resource/view.php b/mod/resource/view.php index e9762273de..9297c34cbd 100644 --- a/mod/resource/view.php +++ b/mod/resource/view.php @@ -88,112 +88,101 @@ break; case UPLOADEDFILE: + /// Possible display modes are: + /// File displayed in a frame in a normal window + /// File displayed embedded in a normal page + /// File displayed in a popup window + /// File displayed emebedded in a popup window + + + /// First, find out what sort of file we are dealing with. require_once("../../files/mimetypes.php"); - $inpopup = !empty($_GET["inpopup"]); - if ($CFG->resource_filterexternalpages) { - if ($inpopup) { - $fetchingprefix = "$CFG->wwwroot/mod/resouce/fetch.php?id=$cm->id&url="; - } else { - $fetchingprefix = "fetch.php?id=$cm->id&url="; - } - // until we found a way to show uploaded files properly throught the - // fetch_remote_file function - $fetchingprefix = ""; - } else { - $fetchingprefix = ""; + $resourcetype = ""; + $embedded = false; + + $imagetypes = array('image/gif','image/jpg','image/png'); + if (in_array(mimeinfo("type", $fullurl), $imagetypes)) { // It's an image + $embedded = true; + $resourcetype = "image"; + + } else if (mimeinfo("icon", $fullurl) == "html.gif") { // It's a web page + $resourcetype = "html"; } + + + /// Set up some variables + + $inpopup = !empty($_GET["inpopup"]); + if ($CFG->slasharguments) { $fullurl = "$CFG->wwwroot/file.php/$course->id/$resource->reference"; } else { $fullurl = "$CFG->wwwroot/file.php?file=/$course->id/$resource->reference"; } - $embedded = false; + if ($CFG->resource_filterexternalpages and $resourcetype == "html") { + $fullurl = "$CFG->wwwroot/mod/resource/fetch.php?id=$cm->id&url=$fullurl"; + } - $inlinetypes = array('image/gif','image/jpg','image/png'); - if (in_array(mimeinfo("type", $fullurl), $inlinetypes)) { // It's an image - $embedded = true; - $resourceimage = true; - } else { - $resourceimage = false; - } // Later, look for more things to embed + /// Now check whether we need to display a frameset - if (mimeinfo("icon", $fullurl) == "html.gif" or - mimeinfo("icon", $fullurl) == "html.gif") { // It's a web page - $resourcehtml = true; - } else { - $resourcehtml = false; - } + if (empty($frameset) and !$embedded and !$inpopup) { + echo "$course->shortname: $resource->name\n"; + echo "resource_framesize,*\" border=\"2\">"; + echo "id&frameset=top\">"; + echo ""; + echo ""; + exit; + } - 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 { - if ( $resourcehtml ) { - redirect("$fetchingprefix$fullurl"); - } else { - redirect($fullurl); - } - break; - } - } else if ($frameset == "top" or $embedded) { + /// We can only get here once per resource, so add an entry to the log - if ($frameset == "top") { - $targetwindow = "parent"; - } else { - $targetwindow = "self"; - } + add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id"); + + /// If we are in a frameset, just print the top of it + + if ($frameset == "top") { print_header($pagetitle, "$course->fullname", - "$navigation framename\" HREF=\"$fullurl\">$resource->name", + "$navigation framename\" href=\"$fullurl\">$resource->name", "", "", true, update_module_button($cm->id, $course->id, $strresource), - navmenu($course, $cm, $targetwindow)); + navmenu($course, $cm, "parent")); echo "".text_to_html($resource->summary, true, false).""; - add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id"); + echo ""; + exit; } - + + + /// Display the actual resource + if ($embedded) { // Display resource embedded in page - if ($resourceimage) { + if ($inpopup) { + print_header($pagetitle); + echo "".text_to_html($resource->summary, true, false).""; + } else { + print_header($pagetitle, "$course->fullname", + "$navigation framename\" HREF=\"$fullurl\">$resource->name", + "", "", true, update_module_button($cm->id, $course->id, $strresource), + navmenu($course, $cm, "self")); + echo "".text_to_html($resource->summary, true, false).""; + } + if ($resourcetype == "image") { echo "
"; echo "

"; - echo "
"; - } else if ($resourcehtml and $fetchingprefix) { - echo "
"; - - $content = resource_fetch_remote_file("$fetchingprefix$fullurl"); - echo $content->results; - echo "
"; } if (!$inpopup) { print_footer($course); } - - } else { // Display resource in a frame of it's own. - echo "$course->shortname: $resource->name\n"; - echo "resource_framesize,*\" border=\"2\">"; - echo "id&frameset=top\">"; - - if ($CFG->slasharguments) { - $fullurl = "$CFG->wwwroot/file.php/$course->id/$resource->reference"; - } else { - $fullurl = "$CFG->wwwroot/file.php?file=/$course->id/$resource->reference"; - } - - if ( $resourcehtml and $fetchingprefix ) { - echo "id&url=$fetchingprefix$fullurl\">"; - } else { - echo ""; - } - echo ""; + } else { // Display the resource on it's own + redirect($fullurl); } break; + case PLAINTEXT: add_to_log($course->id, "resource", "view", "view.php?id=$cm->id", "$resource->id"); print_header($pagetitle, "$course->fullname", "$navigation $resource->name", -- 2.39.5