From 2a250a0b2e179ffb87705bb213798c3ab6d09c06 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Sun, 1 Nov 2009 09:21:41 +0000
Subject: [PATCH] MDL-20697 removing duplicate error string cannotfindsite,
fixing get_site() which is now using exceptions
---
admin/mnet/delete.php | 4 +---
admin/mnet/index.php | 7 +------
admin/mnet/mnet_services.php | 4 +---
admin/mnet/mnet_themes.php | 4 +---
admin/mnet/peers.php | 5 +----
admin/mnet/trustedhosts.php | 5 +----
admin/register.php | 4 +---
admin/settings/frontpage.php | 2 +-
admin/uploadpicture.php | 4 +---
admin/xmldb/index.php | 4 +---
auth/mnet/land.php | 4 +---
auth/shibboleth/login.php | 4 +---
backup/backup.php | 4 +---
backup/restore.php | 7 ++-----
backup/try.php | 5 +----
calendar/event.php | 4 +---
calendar/export.php | 4 +---
calendar/view.php | 4 +---
course/importstudents.php | 4 +---
enrol/imsenterprise/importnow.php | 4 +---
lang/en_utf8/error.php | 1 -
lib/adminlib.php | 7 +------
lib/rsslib.php | 4 +---
mod/forum/index.php | 4 +---
search/query.php | 4 +---
search/stats.php | 4 +---
26 files changed, 26 insertions(+), 85 deletions(-)
diff --git a/admin/mnet/delete.php b/admin/mnet/delete.php
index 0b8a466c32..ec33908d3b 100644
--- 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 beda619e34..badc0c9256 100644
--- 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 6f83781143..9240e31aa8 100644
--- 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 ba214fa0ba..126e22705e 100644
--- 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 4b8b86cf54..1ac9fbfa06 100644
--- 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 f8ed9176f6..061d0304cf 100644
--- 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 a2e0f5b83e..d328045400 100644
--- 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 93069394bf..dd97783d9b 100644
--- 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 de87fe7aa0..8f3e9ed72c 100644
--- 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 6a4723793d..ae1fa6361c 100644
--- 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 bb95440a21..96ba3e9acb 100644
--- 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 dd57528e26..328c32ae03 100644
--- 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 f5fb93d0e1..294ee65c66 100644
--- 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 f75c2c1fd6..e852229590 100644
--- 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 46b5f82a3f..5bd9b7aacc 100644
--- 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 945aa5a70d..87deb6d5ec 100644
--- 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 50a8bb3dcb..19b81fb57f 100644
--- 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 ffa054e995..e3ce44bb52 100644
--- 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 1d54c0e30e..0a2421cf78 100644
--- 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 15f6a78092..6262c0dc84 100644
--- 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 c97964fb8d..d42363f9ac 100644
--- 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 654be2d43e..ddd7b7ee5f 100644
--- 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 251c5dea21..e3f57e6064 100644
--- 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 e877715632..1824d24259 100644
--- 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 1c95442b34..f05f1d60fb 100644
--- 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 1f84c950ca..c28f73cef3 100644
--- 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');
--
2.39.5