diff --git a/admin/auth.php b/admin/auth.php index 0835af91be1..fa6d5c00667 100644 --- a/admin/auth.php +++ b/admin/auth.php @@ -123,8 +123,13 @@ admin_externalpage_print_header($adminroot); - - echo "
framename}\" name=\"authmenu\" method=\"post\" action=\"auth.php\">"; + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + echo ""; echo "sesskey."\" />"; echo "
"; print_string("chooseauthmethod","auth"); diff --git a/admin/dbperformance.php b/admin/dbperformance.php index e39c98febcd..5d6e62d5140 100644 --- a/admin/dbperformance.php +++ b/admin/dbperformance.php @@ -19,8 +19,14 @@ $site = get_site(); if (!empty($topframe)) { + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + print_header("$site->shortname: $strdatabaseperformance", "$site->fullname", - "framename\" href=\"index.php\">$stradministration -> Database performance"); + "$stradministration -> Database performance"); exit; } diff --git a/admin/enrol.php b/admin/enrol.php index 96bbc08154d..973b18440d3 100644 --- a/admin/enrol.php +++ b/admin/enrol.php @@ -52,7 +52,13 @@ print_simple_box(get_string('configenrolmentplugins', 'admin'), 'center', '700'); - echo "framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol.php\">"; + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + echo ""; echo "sesskey."\" />"; $table = new stdClass(); diff --git a/admin/enrol_config.php b/admin/enrol_config.php index 6d131527b56..0ae37e81ae7 100644 --- a/admin/enrol_config.php +++ b/admin/enrol_config.php @@ -44,7 +44,13 @@ admin_externalpage_print_header($adminroot); - echo "framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">"; + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + echo ""; echo "sesskey."\">"; echo "

"; diff --git a/admin/lang.php b/admin/lang.php index f813e523a16..ea3fafe5a40 100644 --- a/admin/lang.php +++ b/admin/lang.php @@ -88,21 +88,27 @@ $strfilecreated = 'New file created'; $currentlang = current_language(); - + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + switch ($mode) { case "missing": // Missing array keys are not bugs here but missing strings error_reporting(E_ALL ^ E_NOTICE); $navigation = "$strlanguage -> $strmissingstrings"; $title = $strmissingstrings; - $button = ''. + $button = ''. ''. ''; break; case "compare": $navigation = "$strlanguage -> $streditstrings"; $title = $streditstrings; - $button = '

'. + $button = ''. ''. ''; break; @@ -346,7 +352,7 @@ echo ' '; helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle'); - echo '
'. + echo ''. ''. ''. ''. diff --git a/admin/pagelib.php b/admin/pagelib.php index d5b2e831758..f8d3b8a4667 100644 --- a/admin/pagelib.php +++ b/admin/pagelib.php @@ -110,7 +110,13 @@ class page_admin extends page_base { // if not, print_header() has to be called with a $section parameter if ($this->user_allowed_editing()) { - $buttons = '
'. + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + $buttons = '' . diff --git a/blog/blogpage.php b/blog/blogpage.php index e2d652ca84f..4d560863799 100644 --- a/blog/blogpage.php +++ b/blog/blogpage.php @@ -185,7 +185,14 @@ class page_blog extends page_base { foreach ($params as $key=>$val) { $paramstring .= ''; } - $editformstring = '' + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + $editformstring = '' .$paramstring.''; } diff --git a/calendar/lib.php b/calendar/lib.php index 498b30cabdd..af7c97018e9 100644 --- a/calendar/lib.php +++ b/calendar/lib.php @@ -1255,7 +1255,13 @@ function calendar_preferences_button() { return ''; } - return "
framename\" method=\"get\" ". + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/calendar/preferences.php\">". ""; } diff --git a/filter/activitynames/filter.php b/filter/activitynames/filter.php index 1274a55f110..d421844c14b 100644 --- a/filter/activitynames/filter.php +++ b/filter/activitynames/filter.php @@ -29,6 +29,12 @@ //Sort modinfo by name length usort($modinfo,'comparemodulenamesbylength'); + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + foreach ($modinfo as $activity) { //Exclude labels and hidden items if ($activity->mod != "label" && $activity->visible) { @@ -36,7 +42,7 @@ /// Avoid empty or unlinkable activity names if (!empty($title)) { $title = str_replace('"', "'", $title); - $href_tag_begin = "wwwroot/mod/$activity->mod/view.php?id=$activity->cm\" target=\"$CFG->framename\">"; + $href_tag_begin = "wwwroot/mod/$activity->mod/view.php?id=$activity->cm\"$target>"; $currentname = urldecode($activity->name); if ($currentname = trim($currentname)) { $activitylist[] = new filterobject($currentname, $href_tag_begin, '', false, true); diff --git a/lib/weblib.php b/lib/weblib.php index 9f4184ea1e6..e5554f7b063 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -950,11 +950,17 @@ function popup_form($common, $options, $formid, $selected='', $nothing='choose', $nothing = $choose.'...'; } + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + // changed reference to document.getElementById('id_abc') instead of document.abc // MDL-7861 $startoutput = '
'; @@ -2322,6 +2328,12 @@ function print_header_simple($title='', $heading='', $navigation='', $focus='', function print_footer($course=NULL, $usercourse=NULL, $return=false) { global $USER, $CFG, $THEME; + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + /// Course links if ($course) { if (is_string($course) && $course == 'none') { // Don't print any links etc @@ -2335,13 +2347,13 @@ function print_footer($course=NULL, $usercourse=NULL, $return=false) { '
moodlelogo'; $home = true; } else { - $homelink = '
'.$course->shortname.'
'; $home = false; } } else { $course = get_site(); // Set course as site course by default - $homelink = '
'.get_string('home').'
'; + $homelink = '
'.get_string('home').'
'; $home = false; } @@ -2648,10 +2660,16 @@ function user_login_string($course=NULL, $user=NULL) { $course = $SITE; } + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + if (isset($user->realuser)) { if ($realuser = get_record('user', 'id', $user->realuser)) { $fullname = fullname($realuser, true); - $realuserinfo = " [framename}\" + $realuserinfo = " [wwwroot/course/loginas.php?id=$course->id&return=1\">$fullname] "; } } else { @@ -2671,25 +2689,25 @@ function user_login_string($course=NULL, $user=NULL) { $context = get_context_instance(CONTEXT_COURSE, $course->id); $fullname = fullname($user, true); - $username = "framename}\" href=\"$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id\">$fullname"; + $username = "wwwroot/user/view.php?id=$user->id&course=$course->id\">$fullname"; if (isset($user->username) && $user->username == 'guest') { $loggedinas = $realuserinfo.get_string('loggedinasguest'). - " (framename}\" href=\"$wwwroot/login/index.php\">".get_string('login').')'; + " (".get_string('login').')'; } else if (!empty($user->switchrole[$context->id])) { $rolename = ''; if ($role = get_record('role', 'id', $user->switchrole[$context->id])) { $rolename = ': '.format_string($role->name); } $loggedinas = get_string('loggedinas', 'moodle', $username).$rolename. - " (framename}\" + " (wwwroot/course/view.php?id=$course->id&switchrole=0&sesskey=".sesskey()."\">".get_string('switchrolereturn').')'; } else { $loggedinas = $realuserinfo.get_string('loggedinas', 'moodle', $username).' '. - " (framename}\" href=\"$CFG->wwwroot/login/logout.php\">".get_string('logout').')'; + " (wwwroot/login/logout.php\">".get_string('logout').')'; } } else { $loggedinas = get_string('loggedinnot', 'moodle'). - " (framename}\" href=\"$wwwroot/login/index.php\">".get_string('login').')'; + " (".get_string('login').')'; } return '
'.$loggedinas.'
'; } @@ -2754,6 +2772,12 @@ function print_navigation ($navigation, $separator=0, $return=false) { $separator = ''. $separator .''; } + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + if ($navigation) { //Accessibility: breadcrumb links now in a list, » replaced with a 'silent' character. $nav_text = get_string('youarehere','access'); @@ -2762,7 +2786,7 @@ function print_navigation ($navigation, $separator=0, $return=false) { $site->shortname = get_string('home'); } $navigation = "
  • $separator ". str_replace('->', "
    • \n
  • $separator", $navigation) ."
    • \n"; - $output .= '
  • '. $site->shortname ."
    • \n". $navigation; $output .= "\n"; } @@ -3812,7 +3836,14 @@ function update_course_icon($courseid) { $string = get_string('turneditingon'); $edit = '1'; } - return "framename\" method=\"get\" action=\"$CFG->wwwroot/course/view.php\">". + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/course/view.php\">". "". "". "". @@ -3879,7 +3910,14 @@ function update_mymoodle_icon() { $string = get_string('updatemymoodleon'); $edit = '1'; } - return "framename\" method=\"get\" action=\"$CFG->wwwroot/my/index.php\">". + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/my/index.php\">". "". ""; } @@ -3896,7 +3934,14 @@ function update_module_button($moduleid, $courseid, $string) { if (has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_MODULE, $moduleid))) { $string = get_string('updatethis', '', $string); - return "
    framename\" method=\"get\" action=\"$CFG->wwwroot/course/mod.php\">". + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/course/mod.php\">". "". "". "". @@ -3926,7 +3971,14 @@ function update_category_button($categoryid) { $string = get_string('turneditingon'); $edit = 'on'; } - return "framename\" method=\"get\" action=\"$CFG->wwwroot/course/category.php\">". + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/course/category.php\">". "". "". "sesskey\" />". @@ -3952,7 +4004,14 @@ function update_categories_button() { $string = get_string('turneditingon'); $categoryedit = 'on'; } - return "framename\" method=\"get\" action=\"$CFG->wwwroot/course/index.php\">". + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/course/index.php\">". ''. ''. ''; @@ -3977,7 +4036,14 @@ function update_categories_search_button($search,$page,$perpage) { $string = get_string("turneditingon"); $edit = "on"; } - return "
    framename\" method=\"get\" action=\"$CFG->wwwroot/course/search.php\">". + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/course/search.php\">". "". "sesskey\" />". "". @@ -4001,7 +4067,14 @@ function update_group_button($courseid, $groupid) { if (has_capability('moodle/course:managegroups', get_context_instance(CONTEXT_GROUP, $groupid))) { $string = get_string('editgroupprofile'); - return "framename\" method=\"get\" action=\"$CFG->wwwroot/course/group.php\">". + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/course/group.php\">". ''. ''. ''. @@ -4029,7 +4102,14 @@ function update_groups_button($courseid) { $string = get_string('turneditingon'); $edit = 'on'; } - return "framename\" method=\"get\" action=\"$CFG->wwwroot/course/groups.php\">". + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/course/groups.php\">". "". "". ""; @@ -4194,10 +4274,16 @@ function navmenu($course, $cm=NULL, $targetwindow='self') { } //Accessibility: added Alt text, replaced > < with 'silent' character and 'accesshide' text. check_theme_arrows(); - + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + if ($selectmod and has_capability('moodle/site:viewreports', $context)) { $logstext = get_string('alllogs'); - $logslink = ''. ''.$logstext.''; @@ -4205,14 +4291,14 @@ function navmenu($course, $cm=NULL, $targetwindow='self') { } if ($backmod) { $backtext= get_string('activityprev', 'access'); - $backmod = '
    '. + $backmod = ''. ''. ''; } if ($nextmod) { $nexttext= get_string('activitynext', 'access'); - $nextmod = '
    '. + $nextmod = ''. ''. ''; diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index c6366bc5119..7896641acf0 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -77,11 +77,17 @@ class assignment_base { $this->strsubmissions = get_string('submissions', 'assignment'); $this->strlastmodified = get_string('lastmodified'); - if ($this->course->id != SITEID) { - $this->navigation = "framename}\" href=\"$CFG->wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname} -> ". - "framename}\" href=\"index.php?id={$this->course->id}\">$this->strassignments ->"; + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; } else { - $this->navigation = "framename}\" href=\"index.php?id={$this->course->id}\">$this->strassignments ->"; + $target = ' target="'.$CFG->framename.'"'; + } + + if ($this->course->id != SITEID) { + $this->navigation = "wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname} -> ". + "course->id}\">$this->strassignments ->"; + } else { + $this->navigation = "course->id}\">$this->strassignments ->"; } $this->pagetitle = strip_tags($this->course->shortname.': '.$this->strassignment.': '.format_string($this->assignment->name,true)); @@ -144,7 +150,13 @@ class assignment_base { global $CFG; if ($subpage) { - $extranav = ''. + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + $extranav = ''. format_string($this->assignment->name,true).' -> '.$subpage; } else { $extranav = ' '.format_string($this->assignment->name,true); @@ -2189,11 +2201,10 @@ function assignment_count_real_submissions($assignment, $groupid=0) { if ($groupid) { /// How many in a particular group? return count_records_sql("SELECT COUNT(DISTINCT g.userid, g.groupid) FROM {$CFG->prefix}assignment_submissions a, - {$CFG->prefix}groups_members g + ".groups_members_from_sql()." WHERE a.assignment = $assignment->id AND a.timemodified > 0 - AND g.groupid = '$groupid' - AND a.userid = g.userid "); + AND ".groups_members_where_sql($groupid, 'a.userid')); } else { $cm = get_coursemodule_from_instance('assignment', $assignment->id); $context = get_context_instance(CONTEXT_MODULE, $cm->id); diff --git a/mod/chat/pagelib.php b/mod/chat/pagelib.php index 89bf62816f9..8014cf9b2cb 100644 --- a/mod/chat/pagelib.php +++ b/mod/chat/pagelib.php @@ -65,7 +65,12 @@ class page_chat extends page_generic_activity { if(empty($morebreadcrumbs) && $this->user_allowed_editing()) { $buttons = '
    '. ''. ''. '
    '; if(!empty($CFG->showblocksonmodpages)) { - $buttons .= ''; diff --git a/mod/data/filter.php b/mod/data/filter.php index 840a7002e95..924e06ff05c 100644 --- a/mod/data/filter.php +++ b/mod/data/filter.php @@ -47,6 +47,11 @@ $contentlist = array(); + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } foreach ($datacontents as $datacontent) { $currentcontent = trim($datacontent->content); $strippedcontent = strip_tags($currentcontent); @@ -57,8 +62,7 @@ '', + '&rid='. $datacontent->recordid .'"'.$target.'>', '', false, true); } } // End foreach diff --git a/mod/data/pagelib.php b/mod/data/pagelib.php index aee8b984a8c..059e17a9879 100755 --- a/mod/data/pagelib.php +++ b/mod/data/pagelib.php @@ -68,7 +68,13 @@ class page_data extends page_generic_activity { if(empty($morebreadcrumbs) && $this->user_allowed_editing()) { $buttons = '
    '.update_module_button($this->modulerecord->id, $this->courserecord->id, get_string('modulename', 'chat')).'
    '. + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + $buttons .= '
    		'. ''. ''. '
    '; if(!empty($CFG->showblocksonmodpages)) { - $buttons .= ''; diff --git a/mod/forum/lib.php b/mod/forum/lib.php index f8077dc589b..ac552140eae 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -324,7 +324,7 @@ function forum_cron() { $groupmode = false; if (!empty($cm->id)) { if ($groupmode = groupmode($course, $cm) and $discussion->groupid > 0) { // Groups are being used - if (!$group = get_record('groups', 'id', $discussion->groupid)) { // Can't find group + if (! groups_group_exists($discussion->groupid)) { // Can't find group //TODO: continue; // Be safe and don't send it to anyone } } @@ -1650,8 +1650,8 @@ function forum_subscribed_users($course, $forum, $groupid=0, $cache=false) { } if ($groupid) { - $grouptables = ", {$CFG->prefix}groups_members g"; - $groupselect = " AND g.groupid = '$groupid' AND u.id = g.userid"; + $grouptables = ', '. groups_members_from_sql(); + $groupselect = 'AND'.groups_members_where_sql($groupid, 'u.id'); } else { $grouptables = ''; $groupselect = ''; @@ -3290,7 +3290,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=5, $dis if (isset($groups[$discussion->groupid])) { $group = $groups[$discussion->groupid]; } else { - $group = $groups[$discussion->groupid] = get_record('groups', 'id', $discussion->groupid); + $group = $groups[$discussion->groupid] = groups_get_group($discussion->groupid); //TODO: } } else { $group = -1; @@ -3673,7 +3673,14 @@ function forum_update_subscriptions_button($courseid, $forumid) { $string = get_string('turneditingon'); $edit = "on"; } - return "framename\" method=\"get\" action=\"$CFG->wwwroot/mod/forum/subscribers.php\">". + + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + return "wwwroot/mod/forum/subscribers.php\">". "". "". ""; diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index 7c099c237df..d3feb8c19d7 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -242,9 +242,15 @@ function lesson_print_header($cm, $course, $lesson, $currenttab = '') { $pageid = get_field('lesson_pages', 'id', 'lessonid', $lesson->id, 'prevpageid', 0); } if (!empty($pageid) and $pageid != LESSON_EOL) { + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + $button = '
    '.update_module_button($this->modulerecord->id, $this->courserecord->id, get_string('modulename', 'data')).'
    '. + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + $buttons .= '
    		'. ''. ''. '
    '.$button. ''. - '
    '. + ''. ''. ''. ''. diff --git a/mod/quiz/pagelib.php b/mod/quiz/pagelib.php index 1a1175433ad..957cf4eb32f 100644 --- a/mod/quiz/pagelib.php +++ b/mod/quiz/pagelib.php @@ -67,7 +67,13 @@ class page_quiz extends page_generic_activity { $buttons = ''; if(!empty($CFG->showblocksonmodpages)) { - $buttons .= ''; diff --git a/mod/resource/filter.php b/mod/resource/filter.php index 33103379473..845d9189672 100644 --- a/mod/resource/filter.php +++ b/mod/resource/filter.php @@ -32,6 +32,12 @@ $resourcelist = array(); + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + foreach ($resources as $resource) { $currentname = trim($resource->name); $strippedname = strip_tags($currentname); @@ -39,7 +45,7 @@ if (!empty($strippedname)) { $resourcelist[] = new filterobject($currentname, '', + $CFG->wwwroot.'/mod/resource/view.php?r='.$resource->id.'"'.$target.'>', '', false, true); } } diff --git a/mod/resource/lib.php b/mod/resource/lib.php index 604c1abb348..1dc735e1bd2 100644 --- a/mod/resource/lib.php +++ b/mod/resource/lib.php @@ -113,11 +113,17 @@ function resource_base($cmid=0) { $this->strresource = get_string("modulename", "resource"); $this->strresources = get_string("modulenameplural", "resource"); - if ($this->course->id != SITEID) { - $this->navigation = "framename}\" href=\"$CFG->wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname} -> ". - "framename}\" href=\"index.php?id={$this->course->id}\">$this->strresources ->"; + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; } else { - $this->navigation = "framename}\" href=\"index.php?id={$this->course->id}\">$this->strresources ->"; + $target = ' target="'.$CFG->framename.'"'; + } + + if ($this->course->id != SITEID) { + $this->navigation = "wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname} -> ". + "course->id}\">$this->strresources ->"; + } else { + $this->navigation = "course->id}\">$this->strresources ->"; } if (!$this->cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $this->cm->id))) { diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php index 4ce58c82846..41803f1bbd6 100644 --- a/mod/resource/type/file/resource.class.php +++ b/mod/resource/type/file/resource.class.php @@ -399,7 +399,12 @@ function display() { if ($inpopup) { print_header($pagetitle); } else { - print_header($pagetitle, $course->fullname, "$this->navigation framename\" href=\"$fullurl\"> ".format_string($resource->name,true)."", "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "self")); + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + print_header($pagetitle, $course->fullname, "$this->navigation ".format_string($resource->name,true)."", "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "self")); } diff --git a/mod/resource/type/ims/deploy.php b/mod/resource/type/ims/deploy.php index 24c317a2c85..2be033ca8c6 100644 --- a/mod/resource/type/ims/deploy.php +++ b/mod/resource/type/ims/deploy.php @@ -54,11 +54,16 @@ /// Instantiate a resource_ims object and modify its navigation $resource_obj = new resource_ims ($cmid); - if ($resource_obj->course->id != SITEID) { - $resource_obj->navigation = "framename}\" href=\"$CFG->wwwroot/course/view.php?id={$course->id}\">{$course->shortname} -> ". - "framename}\" href=\"$CFG->wwwroot/mod/resource/index.php?id={$course->id}\">$resource_obj->strresources -> "; + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; } else { - $resource_obj->navigation = "framename}\" href=\"$CFG->wwwroot/mod/resource/index.php?id={$course->id}\">$resource_obj->strresources -> "; + $target = ' target="'.$CFG->framename.'"'; + } + if ($resource_obj->course->id != SITEID) { + $resource_obj->navigation = "wwwroot/course/view.php?id={$course->id}\">{$course->shortname} -> ". + "wwwroot/mod/resource/index.php?id={$course->id}\">$resource_obj->strresources -> "; + } else { + $resource_obj->navigation = "wwwroot/mod/resource/index.php?id={$course->id}\">$resource_obj->strresources -> "; } /// Print the header of the page diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php index f698fd5cf22..d8b10292493 100644 --- a/mod/resource/type/repository/resource.class.php +++ b/mod/resource/type/repository/resource.class.php @@ -382,7 +382,12 @@ function display() { if ($inpopup) { print_header($pagetitle); } else { - print_header($pagetitle, $course->fullname, "$this->navigation framename\" href=\"$fullurl\"> ".format_string($resource->name,true)."", "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "self")); + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + print_header($pagetitle, $course->fullname, "$this->navigation ".format_string($resource->name,true)."", "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "self")); } @@ -423,7 +428,7 @@ function display() { echo "

    "; echo ''; echo ""; echo ''; diff --git a/theme/chameleon/footer.html b/theme/chameleon/footer.html index a54e3d9567b..1e5a62a1e7f 100644 --- a/theme/chameleon/footer.html +++ b/theme/chameleon/footer.html @@ -11,8 +11,14 @@ } ?> - - +framename) or $CFG->framename=='_top') { + $target = ''; +} else { + $target = ' target="'.$CFG->framename.'"'; +} +?> +

    '. update_module_button($this->modulerecord->id, $this->courserecord->id, get_string('modulename', 'quiz')).''. + if (empty($CFG->framename) or $CFG->framename=='_top') { + $target = ''; + } else { + $target = ' target="'.$CFG->framename.'"'; + } + + $buttons .= ''. ''. ''. '