L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-20697 removing duplicate error string cannotfindsite, fixing get_site() which is now using exceptions

Browse Source
This commit is contained in:
Petr Skoda
2009-11-01 09:21:41 +00:00
parent 3f77c1584c
commit 2a250a0b2e
26 changed files with 26 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/mnet/delete.php
+1 -3
View File
@@ -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.
admin/mnet/index.php
+1 -6
View File
@@ -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');
admin/mnet/mnet_services.php
+1 -3
View File
@@ -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.
admin/mnet/mnet_themes.php
+1 -3
View File
@@ -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.
admin/mnet/peers.php
+1 -4
View File
@@ -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();
admin/mnet/trustedhosts.php
+1 -4
View File
@@ -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');
admin/register.php
+1 -3
View File
@@ -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');
admin/settings/frontpage.php
+1 -1
View File
@@ -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(
admin/uploadpicture.php
+1 -3
View File
@@ -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');
admin/xmldb/index.php
+1 -3
View File
@@ -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));
auth/mnet/land.php
+1 -3
View File
@@ -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');
auth/shibboleth/login.php
+1 -3
View File
@@ -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 = "";
backup/backup.php
+1 -3
View File
@@ -46,9 +46,7 @@
}
//Check site
if (!$site = get_site()) {
print_error("cannotfindsite");
}
$site = get_site();
//Check necessary functions exists. Thanks to [email protected]
backup_required_functions();
backup/restore.php
+2 -5
View File
@@ -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 [email protected]
backup_required_functions();
backup/try.php
+1 -4
View File
@@ -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 [email protected]
backup_required_functions();
calendar/event.php
+1 -3
View File
@@ -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');
calendar/export.php
+1 -3
View File
@@ -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();
calendar/view.php
+1 -3
View File
@@ -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) {
course/importstudents.php
+1 -3
View File
@@ -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");
enrol/imsenterprise/importnow.php
+1 -3
View File
@@ -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'));
lang/en_utf8/error.php
-1
View File
@@ -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';
lib/adminlib.php
+1 -6
View File
@@ -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);
lib/rsslib.php
+1 -3
View File
@@ -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) {
mod/forum/index.php
+1 -3
View File
@@ -19,9 +19,7 @@ if ($id) {
print_error('invalidcourseid');
}
} else {
if (! $course = get_site()) {
print_error('nosite');
}
$course = get_site();
}
require_course_login($course);
search/query.php
+1 -3
View File
@@ -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');
search/stats.php
+1 -3
View File
@@ -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');