MDL-8050 1.2 Remove all target="_top"

diff --git a/admin/auth.php b/admin/auth.php
index 0835af91be1762fc36619b4774b1b7b73ecaf320..fa6d5c006670cbe5b068cc9d661e67817cced6f6 100644 (file)
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -123,8 +123,13 @@
 
     admin_externalpage_print_header($adminroot);
 
-    
-    echo "<form target=\"{$CFG->framename}\" name=\"authmenu\" method=\"post\" action=\"auth.php\">";
+    if (empty($CFG->framename) or $CFG->framename=='_top') { 
+        $target = '';
+    } else {
+        $target = ' target="'.$CFG->framename.'"';
+    }
+
+    echo "<form$target name=\"authmenu\" method=\"post\" action=\"auth.php\">";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
     echo "<center><b>";
     print_string("chooseauthmethod","auth");

diff --git a/admin/dbperformance.php b/admin/dbperformance.php
index e39c98febcdec9645ac5dac725d0538fa234845f..5d6e62d51407acdddf8dccccf66b2678a654c4a3 100644 (file)
--- 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", 
-                     "<a target=\"$CFG->framename\" href=\"index.php\">$stradministration</a> -> Database performance");
+                     "<a$target href=\"index.php\">$stradministration</a> -> Database performance");
         exit;
     }
 

diff --git a/admin/enrol.php b/admin/enrol.php
index 96bbc08154db750a25b8751822ad9b08bd69617a..973b18440d3d3968dd6d74079f961f69a4d6ac7d 100644 (file)
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -52,7 +52,13 @@
 
     print_simple_box(get_string('configenrolmentplugins', 'admin'), 'center', '700');
 
-    echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
+    if (empty($CFG->framename) or $CFG->framename=='_top') { 
+        $target = '';
+    } else {
+        $target = ' target="'.$CFG->framename.'"';
+    }
+
+    echo "<form$target name=\"enrolmenu\" method=\"post\" action=\"enrol.php\">";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\" />";
 
     $table = new stdClass();

diff --git a/admin/enrol_config.php b/admin/enrol_config.php
index 6d131527b5618ca36844109b3235bb5ee52a0127..0ae37e81ae768f00ca15999008a4ef494c3c9664 100644 (file)
--- a/admin/enrol_config.php
+++ b/admin/enrol_config.php
@@ -44,7 +44,13 @@
 
     admin_externalpage_print_header($adminroot);
 
-    echo "<form target=\"{$CFG->framename}\" name=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
+    if (empty($CFG->framename) or $CFG->framename=='_top') { 
+        $target = '';
+    } else {
+        $target = ' target="'.$CFG->framename.'"';
+    }
+
+    echo "<form$target name=\"enrolmenu\" method=\"post\" action=\"enrol_config.php\">";
     echo "<input type=\"hidden\" name=\"sesskey\" value=\"".$USER->sesskey."\">";
     echo "<div align=\"center\"><p><b>";
 

diff --git a/admin/lang.php b/admin/lang.php
index f813e523a1622ca9be5b9f776ee76e99d8b97118..ea3fafe5a409f5eacba5846a86194b766d581936 100644 (file)
--- 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 = "<a href=\"lang.php\">$strlanguage</a> -> $strmissingstrings";
             $title = $strmissingstrings;
-            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+            $button = '<form'.$target.' method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
                       '<input type="hidden" name="mode" value="compare" />'.
                       '<input type="submit" value="'.$streditstrings.'" /></form>';
             break;
         case "compare":
             $navigation = "<a href=\"lang.php\">$strlanguage</a> -> $streditstrings";
             $title = $streditstrings;
-            $button = '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+            $button = '<form '.$target.' method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
                       '<input type="hidden" name="mode" value="missing" />'.
                       '<input type="submit" value="'.$strmissingstrings.'" /></form>';
             break;
@@ -346,7 +352,7 @@
         echo '</strong> ';
         helpbutton('langswitchstorage', $strfilestoredinhelp, 'moodle');
         
-        echo '<form target="'.$CFG->framename.'" method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
+        echo '<form'.$target.' method="get" action="'.$CFG->wwwroot.'/'.$CFG->admin.'/lang.php">'.
              '<input type="hidden" name="mode" value="compare" />'.
              '<input type="hidden" name="currentfile" value="'.$currentfile.'" />'.
              '<input type="hidden" name="uselocal" value="'.(1 - $uselocal % 2).'" />'.

diff --git a/admin/pagelib.php b/admin/pagelib.php
index d5b2e8317587df8a58bcf5b8d693aa8ce12f645c..f8d3b8a466751f298043bac07b8c6ab9cd0cdf7f 100644 (file)
--- 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 = '<table><tr><td><form target="' . $CFG->framename . '" method="get" action="' . $this->url_get_path() . '">'.
+            if (empty($CFG->framename) or $CFG->framename=='_top') { 
+                $target = '';
+            } else {
+                $target = ' target="'.$CFG->framename.'"';
+            }
+
+            $buttons = '<table><tr><td><form'.$target.' method="get" action="' . $this->url_get_path() . '">'.
                        '<input type="hidden" name="adminedit" value="'.($this->user_is_editing()?'off':'on').'" />'.
                        '<input type="hidden" name="section" value="'.$this->section.'" />'.
                        '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></form></td>' . 

diff --git a/blog/blogpage.php b/blog/blogpage.php
index e2d652ca84fdba12af039f45e9c2104895147021..4d560863799dd758fee2b22b10a159a395e63f77 100644 (file)
--- a/blog/blogpage.php
+++ b/blog/blogpage.php
@@ -185,7 +185,14 @@ class page_blog extends page_base {
             foreach ($params as $key=>$val) {
                 $paramstring .= '<input type="hidden" name="'.$key.'" value="'.s($val).'" />';
             }
-            $editformstring = '<form target="'.$CFG->framename.'" method="get" action="'.$this->url_get_path().'">'
+
+            if (empty($CFG->framename) or $CFG->framename=='_top') { 
+                $target = '';
+            } else {
+                $target = ' target="'.$CFG->framename.'"';
+            }
+
+            $editformstring = '<form'.$target.' method="get" action="'.$this->url_get_path().'">'
                              .$paramstring.'<input type="submit" value="'.$editingString.'" /></form>';
         }
 

diff --git a/calendar/lib.php b/calendar/lib.php
index 498b30cabdd72e11ae9c4996621d852655fc0dc6..af7c97018e9ab2489b63e53f8bfb7ae2142aa38e 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1255,7 +1255,13 @@ function calendar_preferences_button() {
         return '';
     }
 
-    return "<form target=\"$CFG->framename\" method=\"get\" ".
+    if (empty($CFG->framename) or $CFG->framename=='_top') { 
+        $target = '';
+    } else {
+        $target = ' target="'.$CFG->framename.'"';
+    }
+
+    return "<form$target method=\"get\" ".
            " action=\"$CFG->wwwroot/calendar/preferences.php\">".
            "<input type=\"submit\" value=\"".get_string("preferences", "calendar")." ...\" /></form>";
 }

diff --git a/filter/activitynames/filter.php b/filter/activitynames/filter.php
index 1274a55f110048368e4c5b75d289fe47ad470709..d421844c14b63a546182a7f97e9e68e4a65fbfd1 100644 (file)
--- 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 = "<a class=\"autolink\" title=\"$title\" href=\"$CFG->wwwroot/mod/$activity->mod/view.php?id=$activity->cm\" target=\"$CFG->framename\">";
+                            $href_tag_begin = "<a class=\"autolink\" title=\"$title\" href=\"$CFG->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, '</a>', false, true);

diff --git a/lib/weblib.php b/lib/weblib.php
index 9f4184ea1e612223a4f0500ea4f3224a2d22fae3..e5554f7b0636583d5e48a0c4f15929fcff7cfa4e 100644 (file)
--- 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 = '<form action="'.$CFG->wwwroot.'/course/jumpto.php"'.
                         ' method="get"'.
-                        ' target="'.$CFG->framename.'"'.
+                        $target.
                         ' id="'.$formid.'"'.
                         ' class="popupform">';
 
@@ -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) {
                '<br /><img width="100" height="30" src="pix/moodlelogo.gif" border="0" alt="moodlelogo" /></a></div>';
             $home  = true;
         } else {
-            $homelink = '<div class="homelink"><a target="'.$CFG->framename.'" href="'.$CFG->wwwroot.
+            $homelink = '<div class="homelink"><a'.$target.' href="'.$CFG->wwwroot.
                         '/course/view.php?id='.$course->id.'">'.$course->shortname.'</a></div>';
             $home  = false;
         }
     } else {
         $course = get_site();  // Set course as site course by default
-        $homelink = '<div class="homelink"><a target="'.$CFG->framename.'" href="'.$CFG->wwwroot.'/">'.get_string('home').'</a></div>';
+        $homelink = '<div class="homelink"><a'.$target.'" href="'.$CFG->wwwroot.'/">'.get_string('home').'</a></div>';
         $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 = " [<a target=\"{$CFG->framename}\"
+            $realuserinfo = " [<a$target
             href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&amp;return=1\">$fullname</a>] ";
         }
     } 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 = "<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id\">$fullname</a>";
+        $username = "<a$target href=\"$CFG->wwwroot/user/view.php?id=$user->id&amp;course=$course->id\">$fullname</a>";
         if (isset($user->username) && $user->username == 'guest') {
             $loggedinas = $realuserinfo.get_string('loggedinasguest').
-                      " (<a target=\"{$CFG->framename}\" href=\"$wwwroot/login/index.php\">".get_string('login').'</a>)';
+                      " (<a$target href=\"$wwwroot/login/index.php\">".get_string('login').'</a>)';
         } 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.
-                      " (<a target=\"{$CFG->framename}\"
+                      " (<a$target
                       href=\"$CFG->wwwroot/course/view.php?id=$course->id&amp;switchrole=0&amp;sesskey=".sesskey()."\">".get_string('switchrolereturn').'</a>)';
         } else {
             $loggedinas = $realuserinfo.get_string('loggedinas', 'moodle', $username).' '.
-                      " (<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/login/logout.php\">".get_string('logout').'</a>)';
+                      " (<a$target href=\"$CFG->wwwroot/login/logout.php\">".get_string('logout').'</a>)';
         }
     } else {
         $loggedinas = get_string('loggedinnot', 'moodle').
-                      " (<a target=\"{$CFG->framename}\" href=\"$wwwroot/login/index.php\">".get_string('login').'</a>)';
+                      " (<a$target href=\"$wwwroot/login/index.php\">".get_string('login').'</a>)';
     }
     return '<div class="logininfo">'.$loggedinas.'</div>';
 }
@@ -2754,6 +2772,12 @@ function print_navigation ($navigation, $separator=0, $return=false) {
         $separator = '<span class="sep">'. $separator .'</span>';
     }
 
+    if (empty($CFG->framename) or $CFG->framename=='_top') { 
+        $target = '';
+    } else {
+        $target = ' target="'.$CFG->framename.'"';
+    }
+
     if ($navigation) {
         //Accessibility: breadcrumb links now in a list, &raquo; 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 = "<li>$separator ". str_replace('->', "</li>\n<li>$separator", $navigation) ."</li>\n";
-        $output .= '<li class="first"><a target="'. $CFG->framename .'" href="'. $CFG->wwwroot.((!has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID)) && !empty($USER->id) && !empty($CFG->mymoodleredirect) && !isguest())
+        $output .= '<li class="first"><a'. $target .' href="'. $CFG->wwwroot.((!has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID)) && !empty($USER->id) && !empty($CFG->mymoodleredirect) && !isguest())
                                                                        ? '/my' : '') .'/">'. $site->shortname ."</a></li>\n". $navigation;
         $output .= "</ul>\n";  
     }
@@ -3812,7 +3836,14 @@ function update_course_icon($courseid) {
             $string = get_string('turneditingon');
             $edit = '1';
         }
-        return "<form target=\"$CFG->framename\" method=\"get\" action=\"$CFG->wwwroot/course/view.php\">".
+
+        if (empty($CFG->framename) or $CFG->framename=='_top') { 
+            $target = '';
+        } else {
+            $target = ' target="'.$CFG->framename.'"';
+        }
+
+        return "<form$target method=\"get\" action=\"$CFG->wwwroot/course/view.php\">".
             "<input type=\"hidden\" name=\"id\" value=\"$courseid\" />".
             "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
             "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />".
@@ -3879,7 +3910,14 @@ function update_mymoodle_icon() {
         $string = get_string('updatemymoodleon');
         $edit = '1';
     }
-    return "<form target=\"$CFG->framename\" method=\"get\" action=\"$CFG->wwwroot/my/index.php\">".
+
+    if (empty($CFG->framename) or $CFG->framename=='_top') { 
+        $target = '';
+    } else {
+        $target = ' target="'.$CFG->framename.'"';
+    }
+
+    return "<form$target method=\"get\" action=\"$CFG->wwwroot/my/index.php\">".
         "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
         "<input type=\"submit\" value=\"$string\" /></form>";
 }
@@ -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 "<form target=\"$CFG->framename\" method=\"get\" action=\"$CFG->wwwroot/course/mod.php\">".
+
+        if (empty($CFG->framename) or $CFG->framename=='_top') { 
+            $target = '';
+        } else {
+            $target = ' target="'.$CFG->framename.'"';
+        }
+
+        return "<form$target method=\"get\" action=\"$CFG->wwwroot/course/mod.php\">".
                "<input type=\"hidden\" name=\"update\" value=\"$moduleid\" />".
                "<input type=\"hidden\" name=\"return\" value=\"true\" />".
                "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />".
@@ -3926,7 +3971,14 @@ function update_category_button($categoryid) {
             $string = get_string('turneditingon');
             $edit = 'on';
         }
-        return "<form target=\"$CFG->framename\" method=\"get\" action=\"$CFG->wwwroot/course/category.php\">".
+
+        if (empty($CFG->framename) or $CFG->framename=='_top') { 
+            $target = '';
+        } else {
+            $target = ' target="'.$CFG->framename.'"';
+        }
+
+        return "<form$target method=\"get\" action=\"$CFG->wwwroot/course/category.php\">".
                "<input type=\"hidden\" name=\"id\" value=\"$categoryid\" />".
                "<input type=\"hidden\" name=\"categoryedit\" value=\"$edit\" />".
                "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />".
@@ -3952,7 +4004,14 @@ function update_categories_button() {
             $string = get_string('turneditingon');
             $categoryedit = 'on';
         }
-        return "<form target=\"$CFG->framename\" method=\"get\" action=\"$CFG->wwwroot/course/index.php\">".
+
+        if (empty($CFG->framename) or $CFG->framename=='_top') { 
+            $target = '';
+        } else {
+            $target = ' target="'.$CFG->framename.'"';
+        }
+
+        return "<form$target method=\"get\" action=\"$CFG->wwwroot/course/index.php\">".
                '<input type="hidden" name="categoryedit" value="'. $categoryedit .'" />'.
                '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />'.
                '<input type="submit" value="'. $string .'" /></form>';
@@ -3977,7 +4036,14 @@ function update_categories_search_button($search,$page,$perpage) {
             $string = get_string("turneditingon");
             $edit = "on";
         }
-        return "<form target=\"$CFG->framename\" method=\"get\" action=\"$CFG->wwwroot/course/search.php\">".
+
+        if (empty($CFG->framename) or $CFG->framename=='_top') { 
+            $target = '';
+        } else {
+            $target = ' target="'.$CFG->framename.'"';
+        }
+
+        return "<form$target method=\"get\" action=\"$CFG->wwwroot/course/search.php\">".
                "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
                "<input type=\"hidden\" name=\"sesskey\" value=\"$USER->sesskey\" />".
                "<input type=\"hidden\" name=\"search\" value=\"".s($search, true)."\" />".
@@ -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 "<form target=\"$CFG->framename\" method=\"get\" action=\"$CFG->wwwroot/course/group.php\">".
+
+        if (empty($CFG->framename) or $CFG->framename=='_top') { 
+            $target = '';
+        } else {
+            $target = ' target="'.$CFG->framename.'"';
+        }
+
+        return "<form$target method=\"get\" action=\"$CFG->wwwroot/course/group.php\">".
                '<input type="hidden" name="id" value="'. $courseid .'" />'.
                '<input type="hidden" name="group" value="'. $groupid .'" />'.
                '<input type="hidden" name="edit" value="on" />'.
@@ -4029,7 +4102,14 @@ function update_groups_button($courseid) {
             $string = get_string('turneditingon');
             $edit = 'on';
         }
-        return "<form target=\"$CFG->framename\" method=\"get\" action=\"$CFG->wwwroot/course/groups.php\">".
+
+        if (empty($CFG->framename) or $CFG->framename=='_top') { 
+            $target = '';
+        } else {
+            $target = ' target="'.$CFG->framename.'"';
+        }
+
+        return "<form$target method=\"get\" action=\"$CFG->wwwroot/course/groups.php\">".
                "<input type=\"hidden\" name=\"id\" value=\"$courseid\" />".
                "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
                "<input type=\"submit\" value=\"$string\" /></form>";
@@ -4194,10 +4274,16 @@ function navmenu($course, $cm=NULL, $targetwindow='self') {
     }
     //Accessibility: added Alt text, replaced &gt; &lt; 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 = '<a title="'.$logstext.'" target="'.$CFG->framename.'" href="'.
+        $logslink = '<a title="'.$logstext.'"'.$target.' href="'.
                     $CFG->wwwroot.'/course/report/log/index.php?chooselog=1&amp;user=0&amp;date=0&amp;id='.
                        $course->id.'&amp;modid='.$selectmod->cm.'">'.
                     '<img class="icon log" src="'.$CFG->pixpath.'/i/log.gif" alt="'.$logstext.'" /></a>';
@@ -4205,14 +4291,14 @@ function navmenu($course, $cm=NULL, $targetwindow='self') {
     }
     if ($backmod) {     
         $backtext= get_string('activityprev', 'access');
-        $backmod = '<form action="'.$CFG->wwwroot.'/mod/'.$backmod->mod.'/view.php" target="'.$CFG->framename.'">'.
+        $backmod = '<form action="'.$CFG->wwwroot.'/mod/'.$backmod->mod.'/view.php"'.$target.'>'.
                    '<input type="hidden" name="id" value="'.$backmod->cm.'" />'.
                    '<button type="submit" title="'.$backtext.'">'.$THEME->larrow.
                    '<span class="accesshide">'.$backtext.'</span></button></form>';
     }
     if ($nextmod) {    
         $nexttext= get_string('activitynext', 'access');
-        $nextmod = '<form action="'.$CFG->wwwroot.'/mod/'.$nextmod->mod.'/view.php" target="'.$CFG->framename.'">'.
+        $nextmod = '<form action="'.$CFG->wwwroot.'/mod/'.$nextmod->mod.'/view.php" '.$target.'>'.
                    '<input type="hidden" name="id" value="'.$nextmod->cm.'" />'.
                    '<button type="submit" title="'.$nexttext.'">'.$THEME->rarrow.
                    '<span class="accesshide">'.$nexttext.'</span></button></form>';

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index c6366bc511973228d192652c46c78a90dc02e3f1..7896641acf06e81d88d1bd9db4f96a9bbe8087db 100644 (file)
--- 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 (empty($CFG->framename) or $CFG->framename=='_top') { 
+                $target = '';
+            } else {
+                $target = ' target="'.$CFG->framename.'"';
+            }
+
             if ($this->course->id != SITEID) {
-                $this->navigation = "<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname}</a> -> ".
-                                    "<a target=\"{$CFG->framename}\" href=\"index.php?id={$this->course->id}\">$this->strassignments</a> ->";
+                $this->navigation = "<a$target href=\"$CFG->wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname}</a> -> ".
+                                    "<a$target href=\"index.php?id={$this->course->id}\">$this->strassignments</a> ->";
             } else {
-                $this->navigation = "<a target=\"{$CFG->framename}\" href=\"index.php?id={$this->course->id}\">$this->strassignments</a> ->";
+                $this->navigation = "<a$target href=\"index.php?id={$this->course->id}\">$this->strassignments</a> ->";
             }
 
             $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 = '<a target="'.$CFG->framename.'" href="view.php?id='.$this->cm->id.'">'.
+            if (empty($CFG->framename) or $CFG->framename=='_top') { 
+                $target = '';
+            } else {
+                $target = ' target="'.$CFG->framename.'"';
+            }
+
+            $extranav = '<a'.$target.' href="view.php?id='.$this->cm->id.'">'.
                           format_string($this->assignment->name,true).'</a> -> '.$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 89bf62816f9acc832ba9fe0912d3e1b1fc124541..8014cf9b2cb92f74f01c6f4c4dac0f1ab7bafb47 100644 (file)
--- 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 = '<table><tr><td>'.update_module_button($this->modulerecord->id, $this->courserecord->id, get_string('modulename', 'chat')).'</td>';
             if(!empty($CFG->showblocksonmodpages)) {
-               $buttons .= '<td><form target="'.$CFG->framename.'" method="get" action="view.php">'.
+            if (empty($CFG->framename) or $CFG->framename=='_top') { 
+                $target = '';
+            } else {
+                $target = ' target="'.$CFG->framename.'"';
+            }
+               $buttons .= '<td><form'.$target.' method="get" action="view.php">'.
                     '<input type="hidden" name="id" value="'.$this->modulerecord->id.'" />'.
                     '<input type="hidden" name="edit" value="'.($this->user_is_editing()?'off':'on').'" />'.
                     '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></form></td>';

diff --git a/mod/data/filter.php b/mod/data/filter.php
index 840a7002e95db5b3fbd89a7513b34b92148acd24..924e06ff05c53be9a36d2dfdc3e128d30b774778 100644 (file)
--- 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 @@
                                             '<a class="data autolink" title="'.
                                             $strippedcontent.'" href="'.
                                             $CFG->wwwroot.'/mod/data/view.php?d='. $datacontent->dataid .
-                                            '&amp;rid='. $datacontent->recordid .'" target="'.
-                                            $CFG->framename.'">',
+                                            '&amp;rid='. $datacontent->recordid .'"'.$target.'>',
                                             '</a>', false, true);
                 }
             } // End foreach

diff --git a/mod/data/pagelib.php b/mod/data/pagelib.php
index aee8b984a8c6dee96d76466a2dc19a05d7a64963..059e17a9879419f31b03969225dc1b51f975cecc 100755 (executable)
--- 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 = '<table><tr><td>'.update_module_button($this->modulerecord->id, $this->courserecord->id, get_string('modulename', 'data')).'</td>';
             if(!empty($CFG->showblocksonmodpages)) {
-               $buttons .= '<td><form target="'.$CFG->framename.'" method="get" action="view.php">'.
+                if (empty($CFG->framename) or $CFG->framename=='_top') { 
+                    $target = '';
+                } else {
+                    $target = ' target="'.$CFG->framename.'"';
+                }
+
+                $buttons .= '<td><form'.$target.' method="get" action="view.php">'.
                     '<input type="hidden" name="id" value="'.$this->modulerecord->id.'" />'.
                     '<input type="hidden" name="edit" value="'.($this->user_is_editing()?'off':'on').'" />'.
                     '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></form></td>';

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index f8077dc589b5ed6cabeb6908e4a23b676a5b5c60..ac552140eae79e53d5817d34b12bedcff8720bcb 100644 (file)
--- 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 "<form target=\"$CFG->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 "<form$target method=\"get\" action=\"$CFG->wwwroot/mod/forum/subscribers.php\">".
            "<input type=\"hidden\" name=\"id\" value=\"$forumid\" />".
            "<input type=\"hidden\" name=\"edit\" value=\"$edit\" />".
            "<input type=\"submit\" value=\"$string\" /></form>";

diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 7c099c237df9f13c7af6f9cef17df380798f96a1..d3feb8c19d7f5ac4ee3329dfb01ca4197c11cff5 100644 (file)
--- 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 =  '<table><tr><td>'.$button.
                            '</td><td>'.
-                           '<form target="'. $CFG->framename .'" method="get" action="'. $CFG->wwwroot .'/mod/lesson/lesson.php">'.
+                           '<form'.$target.' method="get" action="'. $CFG->wwwroot .'/mod/lesson/lesson.php">'.
                            '<input type="hidden" name="id" value="'. $cm->id .'" />'.
                            '<input type="hidden" name="action" value="editpage" />'.
                            '<input type="hidden" name="redirect" value="navigation" />'.

diff --git a/mod/quiz/pagelib.php b/mod/quiz/pagelib.php
index 1a1175433ada20ccd0efecbd6f0aabab01cf97b9..957cf4eb32ffde885239d84871616d00d855fefa 100644 (file)
--- a/mod/quiz/pagelib.php
+++ b/mod/quiz/pagelib.php
@@ -67,7 +67,13 @@ class page_quiz extends page_generic_activity {
             $buttons = '<table><tr><td>'.
                update_module_button($this->modulerecord->id, $this->courserecord->id, get_string('modulename', 'quiz')).'</td>';
             if(!empty($CFG->showblocksonmodpages)) {
-               $buttons .= '<td><form target="'.$CFG->framename.'" method="get" action="view.php">'.
+                if (empty($CFG->framename) or $CFG->framename=='_top') { 
+                    $target = '';
+                } else {
+                    $target = ' target="'.$CFG->framename.'"';
+                }
+
+                $buttons .= '<td><form'.$target.' method="get" action="view.php">'.
                     '<input type="hidden" name="id" value="'.$this->modulerecord->id.'" />'.
                     '<input type="hidden" name="edit" value="'.($this->user_is_editing()?'off':'on').'" />'.
                     '<input type="submit" value="'.get_string($this->user_is_editing()?'blockseditoff':'blocksediton').'" /></form></td>';

diff --git a/mod/resource/filter.php b/mod/resource/filter.php
index 3310337947311e2ebd43a06d40fee9f427fe110d..845d9189672de6b3fbba76bad00929646adbef2e 100644 (file)
--- 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,
                             '<a class="resource autolink" title="'.$strippedname.'" href="'.
-                             $CFG->wwwroot.'/mod/resource/view.php?r='.$resource->id.'" target="'.$CFG->framename.'">', 
+                             $CFG->wwwroot.'/mod/resource/view.php?r='.$resource->id.'"'.$target.'>', 
                              '</a>', false, true);
                 }
             }

diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index 604c1abb34826ba23640c59ce7f5a9f3eeb4e022..1dc735e1bd2f555349d4c78d0f908fee8d179843 100644 (file)
--- 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 (empty($CFG->framename) or $CFG->framename=='_top') { 
+            $target = '';
+        } else {
+            $target = ' target="'.$CFG->framename.'"';
+        }
+
         if ($this->course->id != SITEID) {
-            $this->navigation = "<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname}</a> -> ".
-                                "<a target=\"{$CFG->framename}\" href=\"index.php?id={$this->course->id}\">$this->strresources</a> ->";
+            $this->navigation = "<a$target href=\"$CFG->wwwroot/course/view.php?id={$this->course->id}\">{$this->course->shortname}</a> -> ".
+                                "<a$target href=\"index.php?id={$this->course->id}\">$this->strresources</a> ->";
         } else {
-            $this->navigation = "<a target=\"{$CFG->framename}\" href=\"index.php?id={$this->course->id}\">$this->strresources</a> ->";
+            $this->navigation = "<a$target href=\"index.php?id={$this->course->id}\">$this->strresources</a> ->";
         }
 
         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 4ce58c82846102695183fae0f25e6e7d50aed516..41803f1bbd6163e216d48966f674f847cf4fd069 100644 (file)
--- 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 <a title=\"$strdirectlink\" target=\"$CFG->framename\" href=\"$fullurl\"> ".format_string($resource->name,true)."</a>", "", "", 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 <a$target title=\"$strdirectlink\" href=\"$fullurl\"> ".format_string($resource->name,true)."</a>", "", "", 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 24c317a2c85877c95b6835720c19ab4e5b48698c..2be033ca8c6158e00b078753c38c890e7830f52c 100644 (file)
--- 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 (empty($CFG->framename) or $CFG->framename=='_top') { 
+        $target = '';
+    } else {
+        $target = ' target="'.$CFG->framename.'"';
+    }
     if ($resource_obj->course->id != SITEID) {
-        $resource_obj->navigation = "<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/course/view.php?id={$course->id}\">{$course->shortname}</a> -> ".
-                            "<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/mod/resource/index.php?id={$course->id}\">$resource_obj->strresources</a> -> ";
+        $resource_obj->navigation = "<a$target href=\"$CFG->wwwroot/course/view.php?id={$course->id}\">{$course->shortname}</a> -> ".
+                                    "<a$target href=\"$CFG->wwwroot/mod/resource/index.php?id={$course->id}\">$resource_obj->strresources</a> -> ";
     } else {
-        $resource_obj->navigation = "<a target=\"{$CFG->framename}\" href=\"$CFG->wwwroot/mod/resource/index.php?id={$course->id}\">$resource_obj->strresources</a> -> ";
+        $resource_obj->navigation = "<a$target href=\"$CFG->wwwroot/mod/resource/index.php?id={$course->id}\">$resource_obj->strresources</a> -> ";
     }
 
 /// 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 f698fd5cf2277578cf9a4a47e07060e560990ef8..d8b102924932ec3d7db32cb16c7abf3f000fb58c 100644 (file)
--- 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 <a title=\"$strdirectlink\" target=\"$CFG->framename\" href=\"$fullurl\"> ".format_string($resource->name,true)."</a>", "", "", 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 <a$target title=\"$strdirectlink\" href=\"$fullurl\"> ".format_string($resource->name,true)."</a>", "", "", true, update_module_button($cm->id, $course->id, $this->strresource), navmenu($course, $cm, "self"));
 
         }
 
@@ -423,7 +428,7 @@ function display() {
             echo "<center><p>";
             echo '<object classid="CLSID:22D6f312-B0F6-11D0-94AB-0080C74C7E95"';
             echo '        codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701" ';
-            echo '        standby="Loading Microsoft® Windows® Media Player components..." ';
+            echo '        standby="Loading Microsoft� Windows� Media Player components..." ';
             echo '        id="msplayer" align="" type="application/x-oleobject">';
             echo "<param name=\"Filename\" value=\"$fullurl\">";
             echo '<param name="ShowControls" value="true" />';

diff --git a/theme/chameleon/footer.html b/theme/chameleon/footer.html
index a54e3d9567bf053105ac511e2f7193ab3e30e1e9..1e5a62a1e7f6fc6b26ef0cf976c7658b96f08b39 100644 (file)
--- a/theme/chameleon/footer.html
+++ b/theme/chameleon/footer.html
@@ -11,8 +11,14 @@
   }
 ?>
 <?php echo $loggedinas ?>
-<?php echo $homelink ?>
-<!-- <p><div class="homelink"><a target="<?php echo $CFG->framename ?>" href="<?php $CFG->wwwroot ?>/course/view.php?id=<?php $course->id ?>"> <?php $course->shortname ?> </a></div></p> -->
+<?php echo $homelink;
+if (empty($CFG->framename) or $CFG->framename=='_top') { 
+    $target = '';
+} else {
+    $target = ' target="'.$CFG->framename.'"';
+}
+?>
+<!-- <p><div class="homelink"><a<?php echo $target ?> href="<?php $CFG->wwwroot ?>/course/view.php?id=<?php $course->id ?>"> <?php $course->shortname ?> </a></div></p> -->
 <p>
 <!-- <<a href="http://validator.w3.org/check?verbose=1&amp;ss=1&amp;uri=<?php echo urlencode(qualified_me()) ?>"><img src="<?php echo "$CFG->themewww/$CFG->theme" ?>/xhtml_1_0.gif" alt="XHTML Validator" /></a>
 <a href="http://jigsaw.w3.org/css-validator/validator?uri=<?php echo urlencode(qualified_me()) ?>&amp;warning=1&amp;profile=css2&amp;usermedium=all"><img src="<?php echo "$CFG->themewww/$CFG->theme" ?>/css.gif" alt="CSS Validator" /></a>