// 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');\"");
}
$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
$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 "<center><font size=-1>".text_to_html($resource->summary, true, false)."</font></center>";
+ } else {
+ redirect($fullurl);
+ break;
+ }
+
+ } else if ($frameset == "top" or $embedded) {
- if ($frameset == "top" or $embedded) {
if ($frameset == "top") {
$targetwindow = "parent";
} else {
echo "<center><img class=\"resourceimage\" src=\"$fullurl\"></center>";
echo "<br />";
}
- print_footer($course);
+ if (!$inpopup) {
+ print_footer($course);
+ }
} else { // Display resource in a frame of it's own.
echo "<head><title>$course->shortname: $resource->name</title></head>\n";
projects / moodle.git / commitdiff