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

MDL-17758 fixed hardcoded /admin/ links

Browse Source
This commit is contained in:
skodak
2009-01-01 14:25:29 +00:00
parent 1ab1b0f22d
commit d1aa1e4855
22 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/cliupgrade.php
+3 -3
View File
@@ -328,14 +328,14 @@ if (!file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
/// check wwwroot
if (ini_get('allow_url_fopen') && false) { /// This was not reliable
if (($fh = @fopen($INSTALL['wwwroot'].'/admin/cliupgrade.php', 'r')) === false) {
if (($fh = @fopen($INSTALL['wwwroot']."/$CFG->admin/cliupgrade.php", 'r')) === false) {
console_write(STDERR,get_string('wwwrooterror'),'install',false);
}
}
if (isset($fh)) fclose($fh);
/// check dirroot
if (($fh = @fopen($INSTALL['dirroot'].'/admin/cliupgrade.php', 'r')) === false ) {
if (($fh = @fopen($INSTALL['dirroot']."/$CFG->admin/cliupgrade.php", 'r')) === false ) {
console_write(STDERR,get_string('dirrooterror'),'install',false);
}
if (isset($fh)) fclose($fh);
@@ -1043,7 +1043,7 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
upgrade_local_db(''); // Don't return anywhere
/// Check for changes to RPC functions
require_once($CFG->dirroot.'/admin/mnet/adminlib.php');
require_once("$CFG->dirroot/$CFG->admin/mnet/adminlib.php");
if ( $verbose > CLI_NO ) {
print_heading(get_string('upgradingrpcfunctions','install'),'',1);
}
admin/portfolio.php
+3 -3
View File
@@ -28,9 +28,9 @@ admin_externalpage_setup($pagename);
require_login(SITEID, false);
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
$baseurl = $CFG->wwwroot . '/admin/settings.php?section=manageportfolios';
$sesskeyurl = $CFG->wwwroot . '/' . $CFG->admin . '/portfolio.php?sesskey=' . sesskey();
$configstr = get_string('manageportfolios', 'portfolio');
$baseurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageportfolios";
$sesskeyurl = "$CFG->wwwroot/$CFG->admin/portfolio.php?sesskey=" . sesskey();
$configstr = get_string('manageportfolios', 'portfolio');
$return = true; // direct back to the main page
admin/report/capability/index.php
+2 -2
View File
@@ -177,10 +177,10 @@ function print_report_tree($contextid, $contexts, $allroles) {
// Start the list item, and print the context name as a link to the place to
// make changes.
if ($contextid == get_system_context()->id) {
$url = $CFG->wwwroot . '/admin/roles/manage.php';
$url = "$CFG->wwwroot/$CFG->admin/roles/manage.php";
$title = get_string('changeroles', 'report_capability');
} else {
$url = $CFG->wwwroot . '/admin/roles/override.php?contextid=' . $contextid;
$url = "$CFG->wwwroot/$CFG->admin/roles/override.php?contextid=$contextid";
$title = get_string('changeoverrides', 'report_capability');
}
echo '<h3><a href="' . $url . '" title="' . $title . '">', print_context_name($contexts[$contextid]), '</a></h3>';
admin/report/unittest/index.php
+1 -1
View File
@@ -46,7 +46,7 @@ if ($testtablesok) {
print_heading(get_string('testtablesok', 'simpletest'));
}
$baseurl = $CFG->wwwroot . '/admin/report/unittest/index.php';
$baseurl = "$CFG->wwwroot/$CFG->admin/report/unittest/index.php";
// Add unittest prefix to config.php if needed
if ($addconfigprefix && !isset($CFG->unittestprefix)) {
admin/repository.php
+2 -2
View File
@@ -30,8 +30,8 @@ admin_externalpage_setup($pagename);
require_login(SITEID, false);
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
$sesskeyurl = $CFG->wwwroot . '/' . $CFG->admin . '/repository.php?sesskey=' . sesskey();
$baseurl = $CFG->wwwroot . '/admin/settings.php?section=managerepositories';
$sesskeyurl = "$CFG->wwwroot/$CFG->admin/repository.php?sesskey=" . sesskey();
$baseurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managerepositories";
$configstr = get_string('managerepositories', 'repository');
admin/repositoryinstance.php
+3 -3
View File
@@ -28,8 +28,8 @@ admin_externalpage_setup($pagename);
require_login(SITEID, false);
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
$sesskeyurl = $CFG->wwwroot . '/' . $CFG->admin . '/repositoryinstance.php?sesskey=' . sesskey();
$baseurl = $CFG->wwwroot . '/admin/repository.php?session='. sesskey() .'&amp;edit=';
$sesskeyurl = "$CFG->wwwroot/$CFG->admin/repositoryinstance.php?sesskey=" . sesskey();
$baseurl = "$CFG->wwwroot/$CFG->admin/repository.php?session=". sesskey() .'&amp;edit=';
if ($new) {
$baseurl .= $new;
}
@@ -124,7 +124,7 @@ if (!empty($edit) || !empty($new)) {
}
exit;
}
notice_yesno(get_string('confirmdelete', 'repository', $instance->name), $sesskeyurl . '&amp;type=' . $type . '&amp;delete=' . $delete . '&amp;sure=yes', $CFG->wwwroot . '/admin/repositoryinstance.php?session='. sesskey());
notice_yesno(get_string('confirmdelete', 'repository', $instance->name), $sesskeyurl . '&amp;type=' . $type . '&amp;delete=' . $delete . '&amp;sure=yes', "$CFG->wwwroot/$CFG->admin/repositoryinstance.php?session=". sesskey());
$return = false;
}
admin/roles/tabs.php
+1 -1
View File
@@ -80,7 +80,7 @@ if ($currenttab != 'update') {
require_login($course);
$navlinks[] = array('name' => get_string('roles'),
'link' => "$CFG->wwwroot/admin/roles/assign.php?contextid=$context->id",
'link' => "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=$context->id",
'type' => 'misc');
$navigation = build_navigation($navlinks);
if (empty($title)) {
course/lib.php
+1 -1
View File
@@ -2961,7 +2961,7 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
}
if (has_capability('moodle/course:managegroups', $modcontext)){
$context = get_context_instance(CONTEXT_MODULE, $mod->id);
$assign = '<a class="editing_assign" title="'.$str->assign.'" href="'.$CFG->wwwroot.'/admin/roles/assign.php?contextid='.
$assign = '<a class="editing_assign" title="'.$str->assign.'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.
$context->id.'"><img src="'.$CFG->pixpath.'/i/roles.gif" alt="'.$str->assign.'" class="iconsmall"/></a>';
} else {
$assign = '';
grade/edit/settings/form.php
+3 -3
View File
@@ -46,7 +46,7 @@ class course_settings_form extends moodleform {
$strchangedefaults = get_string('changedefaults', 'grades');
$mform->addElement('header', 'general', get_string('generalsettings', 'grades'));
if ($can_view_admin_links) {
$link = '<a href="' . $CFG->wwwroot . '/admin/settings.php?section=gradessettings">' . $strchangedefaults . '</a>';
$link = '<a href="' . $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=gradessettings">' . $strchangedefaults . '</a>';
$mform->addElement('static', 'generalsettingslink', $link);
}
$options = array(-1 => get_string('default', 'grades'),
@@ -65,7 +65,7 @@ class course_settings_form extends moodleform {
// Grade item settings
$mform->addElement('header', 'grade_item_settings', get_string('gradeitemsettings', 'grades'));
if ($can_view_admin_links) {
$link = '<a href="' . $CFG->wwwroot . '/admin/settings.php?section=gradeitemsettings">' . $strchangedefaults . '</a>';
$link = '<a href="' . $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=gradeitemsettings">' . $strchangedefaults . '</a>';
$mform->addElement('static', 'gradeitemsettingslink', $link);
}
@@ -100,7 +100,7 @@ class course_settings_form extends moodleform {
if (function_exists($functionname)) {
$mform->addElement('header', 'grade_'.$type.$plugin, get_string('modulename', 'grade'.$type.'_'.$plugin, NULL, $CFG->dirroot.'/grade/'.$type.'/'.$plugin.'/lang/'));
if ($can_view_admin_links) {
$link = '<a href="' . $CFG->wwwroot . '/admin/settings.php?section=gradereport' . $plugin . '">' . $strchangedefaults . '</a>';
$link = '<a href="' . $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=gradereport' . $plugin . '">' . $strchangedefaults . '</a>';
$mform->addElement('static', 'gradeitemsettingslink', $link);
}
$functionname($mform);
lib/adminlib.php
+2 -2
View File
@@ -1422,7 +1422,7 @@ function create_admin_user($user_input=NULL) {
redirect("$CFG->wwwroot/user/editadvanced.php?id=$user->id"); // Edit thyself
}
} else {
redirect("$CFG->wwwroot/admin/report/unittest/index.php?testtablesok=1");
redirect("$CFG->wwwroot/$CFG->admin/report/unittest/index.php?testtablesok=1");
}
} else {
print_error('cannotcreateadminuser', 'debug');
@@ -6102,7 +6102,7 @@ class admin_setting_managerepository extends admin_setting {
$addable = 0;
foreach ($plugins as $p) {
if (!in_array($p, $alreadyplugins)) {
$instancehtml .= '<li><a href="'.$CFG->wwwroot.'/admin/repository.php?sesskey='
$instancehtml .= '<li><a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey='
.$USER->sesskey.'&amp;new='.$p.'">'.get_string('add', 'repository')
.' "'.get_string('repositoryname', 'repository_'.$p).'" '
.'</a></li>';
lib/portfoliolib.php
+1 -1
View File
@@ -946,7 +946,7 @@ function portfolio_insane_notify_admins($insane, $instances=false) {
$a = new StdClass;
$a->sitename = $site->fullname;
$a->fixurl = $CFG->wwwroot . '/admin/settings.php?section=manageportfolios';
$a->fixurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageportfolios";
$a->htmllist = portfolio_report_insane($insane, $instances, true);
$a->textlist = '';
lib/simpletest/portfolio_testclass.php
+2 -5
View File
@@ -35,8 +35,8 @@ if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir . '/portfoliolib.php');
require_once($CFG->dirroot . '/admin/generator.php');
require_once("$CFG->libdir/portfoliolib.php");
require_once("$CFG->dirroot/$CFG->admin/generator.php");
class portfolio_plugin_test extends portfolio_plugin_push_base {
public function expected_time($callertime){
@@ -184,9 +184,6 @@ foreach ($portfolio_plugins as $plugin) {
Mock::generatePartial("portfolio_plugin_$plugin", "partialmock_plugin_$plugin", array('send_package'));
}
require_once($CFG->libdir . '/portfoliolib.php');
require_once($CFG->dirroot . '/admin/generator.php');
class portfoliolib_test extends MoodleUnitTestCase {
function setup() {
lib/simpletest/testrepositorylib.php
+2 -2
View File
@@ -35,8 +35,8 @@ if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->dirroot . '/repository/lib.php');
require_once($CFG->dirroot . '/admin/generator.php');
require_once("$CFG->dirroot/repository/lib.php");
require_once("$CFG->dirroot/$CFG->admin/generator.php");
// Generate a mock class for each plugin subclass present
$repository_plugins = get_list_of_plugins('repository');
lib/weblib.php
+1 -1
View File
@@ -2465,7 +2465,7 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
}
if (file_exists($CFG->dataroot.'/'.SITEID.'/maintenance.html')) {
$button = '<a href="'.$CFG->wwwroot.'/admin/maintenance.php">'.get_string('maintenancemode', 'admin').'</a> '.$button;
$button = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/maintenance.php">'.get_string('maintenancemode', 'admin').'</a> '.$button;
if(!empty($title)) {
$title .= ' - ';
}
mod/assignment/simpletest/test_assignment_portfolio_callers.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php // $Id$
require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
require_once($CFG->dirroot.'/mod/assignment/lib.php');
require_once($CFG->dirroot.'/admin/generator.php');
require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
require_once("$CFG->dirroot/mod/assignment/lib.php");
require_once("$CFG->dirroot/$CFG->admin/generator.php");
Mock::generate('assignment_portfolio_caller', 'mock_caller');
Mock::generate('portfolio_exporter', 'mock_exporter');
mod/chat/simpletest/test_chat_portfolio_callers.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php // $Id$
require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
require_once($CFG->dirroot.'/mod/chat/lib.php');
require_once($CFG->dirroot.'/admin/generator.php');
require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
require_once("$CFG->dirroot/mod/chat/lib.php");
require_once("$CFG->dirroot/$CFG->admin/generator.php");
Mock::generate('chat_portfolio_caller', 'mock_caller');
Mock::generate('portfolio_exporter', 'mock_exporter');
mod/data/simpletest/test_data_portfolio_callers.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php // $Id$
require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
require_once($CFG->dirroot.'/mod/data/lib.php');
require_once($CFG->dirroot.'/admin/generator.php');
require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
require_once("$CFG->dirroot.'/mod/data/lib.php");
require_once("$CFG->dirroot/$CFG->admin/generator.php");
Mock::generate('data_portfolio_caller', 'mock_caller');
Mock::generate('portfolio_exporter', 'mock_exporter');
mod/forum/simpletest/test_forum_portfolio_callers.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php // $Id$
require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
require_once($CFG->dirroot.'/mod/forum/lib.php');
require_once($CFG->dirroot.'/admin/generator.php');
require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
require_once("$CFG->dirroot/mod/forum/lib.php");
require_once("$CFG->dirroot/$CFG->admin/generator.php");
Mock::generate('forum_portfolio_caller', 'mock_caller');
Mock::generate('portfolio_exporter', 'mock_exporter');
mod/glossary/simpletest/test_glossary_portfolio_callers.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php // $Id$
require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
require_once($CFG->dirroot.'/mod/glossary/lib.php');
require_once($CFG->dirroot.'/admin/generator.php');
require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
require_once("$CFG->dirroot/mod/glossary/lib.php");
require_once("$CFG->dirroot/$CFG->admin/generator.php");
Mock::generate('glossary_entry_portfolio_caller', 'mock_entry_caller');
Mock::generate('glossary_csv_portfolio_caller', 'mock_csv_caller');
mod/resource/simpletest/test_resource_portfolio_callers.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php // $Id$
require_once($CFG->libdir.'/simpletest/portfolio_testclass.php');
require_once($CFG->dirroot.'/mod/resource/lib.php');
require_once($CFG->dirroot.'/admin/generator.php');
require_once("$CFG->libdir/simpletest/portfolio_testclass.php");
require_once("$CFG->dirroot/mod/resource/lib.php");
require_once("$CFG->dirroot/$CFG->admin/generator.php");
Mock::generate('resource_portfolio_caller', 'mock_caller');
Mock::generate('portfolio_exporter', 'mock_exporter');
portfolio/type/boxnet/simpletest/testportfoliopluginboxnet.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php // $Id$
require_once($CFG->libdir.'/simpletest/testportfoliolib.php');
require_once($CFG->dirroot.'/portfolio/type/boxnet/lib.php');
require_once($CFG->dirroot.'/admin/generator.php');
require_once("$CFG->libdir/simpletest/testportfoliolib.php");
require_once("$CFG->dirroot/portfolio/type/boxnet/lib.php");
require_once("$CFG->dirroot/$CFG->admin/generator.php");
Mock::generate('boxclient', 'mock_boxclient');
Mock::generatePartial('portfolio_plugin_boxnet', 'mock_boxnetplugin', array('ensure_ticket', 'ensure_account_tree'));
repository/lib.php
+1 -1
View File
@@ -978,7 +978,7 @@ abstract class repository {
//if the context is SYSTEM, so we call it from administration page
$admin = ($context->id == SYSCONTEXTID) ? true : false;
if ($admin) {
$baseurl = $CFG->httpswwwroot . '/admin/repositoryinstance.php?sesskey=' . sesskey();
$baseurl = "$CFG->httpswwwroot/$CFG->admin/repositoryinstance.php?sesskey=" . sesskey();
$output .= "<div ><h2 style='text-align: center'>" . get_string('siteinstances', 'repository') . " ";
$output .= "</h2></div>";
} else {