MDL-20697 removing duplicate error string cannotfindsite, fixing get_site() which...

diff --git a/admin/mnet/delete.php b/admin/mnet/delete.php
index 0b8a466c32af1ef82ab07ac013c093c7b65e5f3e..ec33908d3b5bd3408ce974c2e84a5f1c70ce5e40 100644 (file)
--- a/admin/mnet/delete.php
+++ b/admin/mnet/delete.php
@@ -14,9 +14,7 @@
     
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
-    if (!$site = get_site()) {
-        print_error('nosite', 'error');
-    }
+    $site = get_site();
 
 /// Initialize variables.
 

diff --git a/admin/mnet/index.php b/admin/mnet/index.php
index beda619e34a5d2b5aecc683e8005a2999547209d..badc0c9256befad3d2e42851d8dac140e7b56cc9 100644 (file)
--- a/admin/mnet/index.php
+++ b/admin/mnet/index.php
@@ -13,6 +13,7 @@
 
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
+    $site = get_site();
 
     if (!extension_loaded('openssl')) {
         admin_externalpage_print_header();
@@ -20,12 +21,6 @@
         print_error('requiresopenssl', 'mnet');
     }
 
-    if (!$site = get_site()) {
-        admin_externalpage_print_header();
-        set_config('mnet_dispatcher_mode', 'off');
-        print_error('nosite');
-    }
-
     if (!function_exists('curl_init') ) {
         admin_externalpage_print_header();
         set_config('mnet_dispatcher_mode', 'off');

diff --git a/admin/mnet/mnet_services.php b/admin/mnet/mnet_services.php
index 6f837811430727c2a14efcd0fe2d819f99a1572e..9240e31aa8250f98285a2b2241b9e909d55513b9 100644 (file)
--- a/admin/mnet/mnet_services.php
+++ b/admin/mnet/mnet_services.php
@@ -12,9 +12,7 @@
 
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
-    if (!$site = get_site()) {
-        print_error('nosite', '', '', NULL, true);
-    }
+    $site = get_site();
 
 /// Initialize variables.
 

diff --git a/admin/mnet/mnet_themes.php b/admin/mnet/mnet_themes.php
index ba214fa0ba7818237859d934adfa7f72dfa27769..126e22705e064a92265ff32ca097e12b9d3b18f3 100644 (file)
--- a/admin/mnet/mnet_themes.php
+++ b/admin/mnet/mnet_themes.php
@@ -11,9 +11,7 @@
 
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
-    if (!$site = get_site()) {
-        print_error('nosite', '', '', NULL, true);
-    }
+    $site = get_site();
 
 /// Initialize variables.
 

diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php
index 4b8b86cf543e9e5a12008ed552a3041ebeaa8a1b..1ac9fbfa06947ca5ace657e18cfb92e0acbb09c1 100644 (file)
--- a/admin/mnet/peers.php
+++ b/admin/mnet/peers.php
@@ -18,10 +18,7 @@ if (!extension_loaded('openssl')) {
     print_error('requiresopenssl', 'mnet');
 }
 
-if (!$site = get_site()) {
-    admin_externalpage_print_header();
-    print_error('nosite', 'error');
-}
+$site = get_site();
 
 if (!function_exists('curl_init') ) {
     admin_externalpage_print_header();

diff --git a/admin/mnet/trustedhosts.php b/admin/mnet/trustedhosts.php
index f8ed9176f604266d927b1a19e5f9abf8362a8aac..061d0304cf52edccad5244c59f097b4f2331e394 100644 (file)
--- a/admin/mnet/trustedhosts.php
+++ b/admin/mnet/trustedhosts.php
@@ -17,10 +17,7 @@
         print_error('requiresopenssl', 'mnet', '', NULL, true);
     }
     
-    if (!$site = get_site()) {
-        admin_externalpage_print_header();
-        print_error('nosite', '', '', NULL, true);
-    }
+    $site = get_site();
 
     $trusted_hosts = '';//array();
     $old_trusted_hosts = get_config('mnet', 'mnet_trusted_hosts');

diff --git a/admin/register.php b/admin/register.php
index a2e0f5b83ec262a96b7683868837adc7be074e8a..d328045400fd95161d7ecb6f2809cbd96f6be4ac 100644 (file)
--- a/admin/register.php
+++ b/admin/register.php
@@ -11,9 +11,7 @@
 
     admin_externalpage_setup('adminregistration');
 
-    if (!$site = get_site()) {
-        redirect("index.php");
-    }
+    $site = get_site();
 
     if (!$admin = get_admin()) {
         print_error('noadmins', 'error');

diff --git a/admin/settings/frontpage.php b/admin/settings/frontpage.php
index 93069394bfcdafd32e7458e893751d86c11bb8a8..dd97783d9bac25297f6297e581c8d7516ec817fd 100644 (file)
--- a/admin/settings/frontpage.php
+++ b/admin/settings/frontpage.php
@@ -2,7 +2,7 @@
 
 // This file defines everything related to frontpage
 
-if (get_site()) { //do not use during installation
+if (!empty($CFG->version)) { //do not use during installation
     $frontpagecontext = get_context_instance(CONTEXT_COURSE, SITEID);
 
     if ($hassiteconfig or has_any_capability(array(

diff --git a/admin/uploadpicture.php b/admin/uploadpicture.php
index de87fe7aa04984406347f0a93812269eba41dd14..8f3e9ed72c28fadc83cb724c9ef45676deebb3d2 100644 (file)
--- a/admin/uploadpicture.php
+++ b/admin/uploadpicture.php
@@ -36,9 +36,7 @@ require_login();
 
 require_capability('moodle/site:uploadusers', get_context_instance(CONTEXT_SYSTEM));
 
-if (!$site = get_site()) {
-    print_error('cannotfindsite', 'error');
-}
+$site = get_site();
 
 if (!$adminuser = get_admin()) {
     print_error('noadmins', 'error');

diff --git a/admin/xmldb/index.php b/admin/xmldb/index.php
index 6a4723793d9bbd7de9b8965e8d2e087207e83eec..ae1fa6361c89f8e1da2cc8348cb87d5318194d09 100644 (file)
--- a/admin/xmldb/index.php
+++ b/admin/xmldb/index.php
@@ -51,9 +51,7 @@
     }
 
 /// Some previous checks
-    if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/$CFG->admin/index.php");
-    }
+    $site = get_site();
 
     require_login();
     require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

diff --git a/auth/mnet/land.php b/auth/mnet/land.php
index bb95440a219e7703402c8bfb1d79e6835c526dd3..96ba3e9acbc61dc46b0721ea0fd022bf7868fb62 100644 (file)
--- a/auth/mnet/land.php
+++ b/auth/mnet/land.php
@@ -25,9 +25,7 @@ $url = new moodle_url($CFG->wwwroot.'/auth/mnet/jump.php', array('token'=>$token
 if ($wantsremoteurl !== false) $url->param('remoteurl', $wantsremoteurl);
 $PAGE->set_url($url);
 
-if (!$site = get_site()) {
-    print_error('mnet_session_prohibited', 'mnet', '', '');
-}
+$site = get_site();
 
 if (!is_enabled_auth('mnet')) {
     print_error('mnetdisable');

diff --git a/auth/shibboleth/login.php b/auth/shibboleth/login.php
index dd57528e269c83fcf4abd6529f1f2a6943e032d4..328c32ae03506a2f2d69b6b7049e9538c6c1e0b2 100644 (file)
--- a/auth/shibboleth/login.php
+++ b/auth/shibboleth/login.php
@@ -19,9 +19,7 @@
 httpsrequired();
 
 /// Define variables used in page
-    if (!$site = get_site()) {
-        print_error('nosite');
-    }
+    $site = get_site();
 
     if (empty($CFG->langmenu)) {
         $langmenu = "";

diff --git a/backup/backup.php b/backup/backup.php
index f5fb93d0e12697127ba5cd66957e8ae1a92ce962..294ee65c66669d4d49988122863bb21c242aafe4 100644 (file)
--- a/backup/backup.php
+++ b/backup/backup.php
@@ -46,9 +46,7 @@
     }
 
     //Check site
-    if (!$site = get_site()) {
-        print_error("cannotfindsite");
-    }
+    $site = get_site();
 
     //Check necessary functions exists. Thanks to gregb@crowncollege.edu
     backup_required_functions();

diff --git a/backup/restore.php b/backup/restore.php
index f75c2c1fd6928e9f5444d33ef8b549a3e95dfc44..e852229590263603e0b8da20fcabbf85da1bf98b 100644 (file)
--- a/backup/restore.php
+++ b/backup/restore.php
@@ -46,8 +46,7 @@
     }
     $PAGE->set_url($url);
 
-    //Check login
-    require_login();
+    $site = get_site();
 
 /// With method=manual, we come from the FileManager so we delete all the backup/restore/import session structures
     if ($method == 'manual') {
@@ -93,9 +92,7 @@
     }
 
     //Check site
-    if (!$site = get_site()) {
-        print_error("cannotfindsite");
-    }
+    $site = get_site();
 
     //Check necessary functions exists. Thanks to gregb@crowncollege.edu
     backup_required_functions();

diff --git a/backup/try.php b/backup/try.php
index 46b5f82a3f33fd8809f577438958a65956cac324..5bd9b7aacc4d8c6c0e4ca8f4cb97e675acc3cb60 100644 (file)
--- a/backup/try.php
+++ b/backup/try.php
@@ -8,10 +8,7 @@
 
     require_capability('moodle/site:restore', get_context_instance(CONTEXT_SYSTEM));
 
-    //Check site
-    if (!$site = get_site()) {
-        print_error("cannotfindsite");
-    }
+    $site = get_site();
 
     //Check necessary functions exists. Thanks to gregb@crowncollege.edu
     backup_required_functions();

diff --git a/calendar/event.php b/calendar/event.php
index 945aa5a70d2dd9a769883c57f2c7ac1ab7777fe9..87deb6d5ece45f4b7970c6799a42a0322ec47eee 100644 (file)
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -77,9 +77,7 @@ if (has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM),
 
 $focus = '';
 
-if(!$site = get_site()) {
-    redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php');
-}
+$site = get_site();
 
 $strcalendar = get_string('calendar', 'calendar');
 

diff --git a/calendar/export.php b/calendar/export.php
index 50a8bb3dcb86ce28969820f0ea490160cfb9b911..19b81fb57f161a889da8616dfa52b1467172b017 100644 (file)
--- a/calendar/export.php
+++ b/calendar/export.php
@@ -85,9 +85,7 @@ if (empty($CFG->enablecalendarexport)) {
     die('no export');
 }
 
-if(!$site = get_site()) {
-    redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php');
-}
+$site = get_site();
 
 // Initialize the session variables
 calendar_session_vars();

diff --git a/calendar/view.php b/calendar/view.php
index ffa054e995d289410d4500cd39a04d47774c634b..e3ce44bb5255cdc1d07922de72b8542146ea4477 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -50,9 +50,7 @@ $day  = optional_param('cal_d', 0, PARAM_INT);
 $mon  = optional_param('cal_m', 0, PARAM_INT);
 $yr   = optional_param('cal_y', 0, PARAM_INT);
 
-if(!$site = get_site()) {
-    redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php');
-}
+$site = get_site();
 
 $url = new moodle_url($CFG->wwwroot.'/calendar/view.php');
 if ($courseid !== 0) {

diff --git a/course/importstudents.php b/course/importstudents.php
index 1d54c0e30ee446c0740f4684a1f1e7f71b4d0915..0a2421cf78e4a17f40b74086885309d35d5e0357 100644 (file)
--- a/course/importstudents.php
+++ b/course/importstudents.php
@@ -55,9 +55,7 @@
     }
     $PAGE->set_url($url);
 
-    if (! $site = get_site()) {
-        redirect("$CFG->wwwroot/$CFG->admin/index.php");
-    }
+    $site = get_site();
 
     if (!$course = $DB->get_record('course', array('id'=>$id))) {
         print_error("invalidcourseid");

diff --git a/enrol/imsenterprise/importnow.php b/enrol/imsenterprise/importnow.php
index 15f6a78092f242db9ed1d620d774f1402cf26d07..6262c0dc84add3c765f7a293a2fbe0e6fa780fcb 100644 (file)
--- a/enrol/imsenterprise/importnow.php
+++ b/enrol/imsenterprise/importnow.php
@@ -3,9 +3,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
 require_login();
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
-if (!$site = get_site()) {
-    redirect("index.php");
-}
+$site = get_site();
 
 /// get language strings
 $str = get_strings(array('enrolments', 'users', 'administration', 'settings'));

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index c97964fb8df9e1f8a7d2e1cfb9e58f612a53f596..d42363f9ac887ddc9a207e835f3196c388d05e1f 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -67,7 +67,6 @@ $string['cannotfindgroup'] = 'Unable to find group';
 $string['cannotfindhelp'] = 'Cannot find \"$a\" language help files';
 $string['cannotfindinfo'] = 'Cannot find info for: \"$a\"';
 $string['cannotfindlang'] = 'Cannot find \"$a\" language pack!';
-$string['cannotfindsite'] = 'Cannot find site-level course';
 $string['cannotfindteacher'] = 'Cannot find teacher';
 $string['cannotfinduser'] = 'Cannot find user named \"$a\"';
 $string['cannotgetblock'] = 'Could not retrieve blocks from the database';

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 654be2d43e8d11116152dc3821af6836c5b61e0f..ddd7b7ee5f21524ea8a07ba8af5ff4550d0f96f8 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -5181,12 +5181,7 @@ function admin_externalpage_setup($section, $extrabutton = '',
     $extraurlparams = array(), $actualurl = '') {
     global $CFG, $PAGE, $USER;
 
-    if ($site = get_site()) {
-        require_login();
-    } else {
-        redirect($CFG->wwwroot.'/'.$CFG->admin.'/index.php');
-        die;
-    }
+    $site = get_site();
 
     $adminroot = admin_get_root(false, false); // settings not required for external pages
     $extpage = $adminroot->locate($section);

diff --git a/lib/rsslib.php b/lib/rsslib.php
index 251c5dea21b110186f61463fdbc767b1782bb3e3..e3f57e6064f5abdcbbc6c557d42dd24310a0e846 100644 (file)
--- a/lib/rsslib.php
+++ b/lib/rsslib.php
@@ -174,9 +174,7 @@ function rss_standard_header($title = NULL, $link = NULL, $description = NULL) {
     $status = true;
     $result = "";
 
-    if (!$site = get_site()) {
-        $status = false;
-    }
+    $site = get_site();
 
     if ($status) {
 

diff --git a/mod/forum/index.php b/mod/forum/index.php
index e87771563299e3e74e7cf6401d1f8984451c09ed..1824d242593ee18468383b488a381f5821f0f244 100644 (file)
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -19,9 +19,7 @@ if ($id) {
         print_error('invalidcourseid');
     }
 } else {
-    if (! $course = get_site()) {
-        print_error('nosite');
-    }
+    $course = get_site();
 }
 
 require_course_login($course);

diff --git a/search/query.php b/search/query.php
index 1c95442b3473924891185b359539a070f3cd0c03..f05f1d60fbba84e062c2cc1beab1c9b90c585c47 100644 (file)
--- a/search/query.php
+++ b/search/query.php
@@ -158,9 +158,7 @@
     Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive());
     $sq = new SearchQuery($query_string, $page_number, 10, false);
 
-    if (!$site = get_site()) {
-        redirect("index.php");
-    }
+    $site = get_site();
 
     $strsearch = get_string('search', 'search');
     $strquery  = get_string('enteryoursearchquery', 'search');

diff --git a/search/stats.php b/search/stats.php
index 1f84c950ca554f77926ecbcd9b2deb41b6f9e822..c28f73cef3bcd42ce58c69db0e029091562b17b1 100644 (file)
--- a/search/stats.php
+++ b/search/stats.php
@@ -37,9 +37,7 @@ require_once($CFG->dirroot.'/search/lib.php');
 
     $indexinfo = new IndexInfo();
 
-    if (!$site = get_site()) {
-        redirect($CFG->wwwroot.'index.php');
-    }
+    $site = get_site();
 
     $strsearch = get_string('search', 'search');
     $strquery  = get_string('statistics', 'search');