From: skodak Date: Thu, 1 Jan 2009 14:25:29 +0000 (+0000) Subject: MDL-17758 fixed hardcoded /admin/ links X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d1aa1e4855b24a4d8202ddd887182995ee9a6901;p=moodle.git MDL-17758 fixed hardcoded /admin/ links --- diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php index 7cd87ded5c..7839192389 100644 --- a/admin/cliupgrade.php +++ b/admin/cliupgrade.php @@ -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); } diff --git a/admin/portfolio.php b/admin/portfolio.php index fd36268b3d..d79367fa13 100644 --- a/admin/portfolio.php +++ b/admin/portfolio.php @@ -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 diff --git a/admin/report/capability/index.php b/admin/report/capability/index.php index a1482e7bb5..1a6aab4711 100644 --- a/admin/report/capability/index.php +++ b/admin/report/capability/index.php @@ -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 '

', print_context_name($contexts[$contextid]), '

'; diff --git a/admin/report/unittest/index.php b/admin/report/unittest/index.php index 53560ad65c..e0ad35dc85 100644 --- a/admin/report/unittest/index.php +++ b/admin/report/unittest/index.php @@ -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)) { diff --git a/admin/repository.php b/admin/repository.php index 88a732d631..9d3876d600 100644 --- a/admin/repository.php +++ b/admin/repository.php @@ -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'); diff --git a/admin/repositoryinstance.php b/admin/repositoryinstance.php index 62800563e2..b6fa19320e 100644 --- a/admin/repositoryinstance.php +++ b/admin/repositoryinstance.php @@ -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() .'&edit='; +$sesskeyurl = "$CFG->wwwroot/$CFG->admin/repositoryinstance.php?sesskey=" . sesskey(); +$baseurl = "$CFG->wwwroot/$CFG->admin/repository.php?session=". sesskey() .'&edit='; if ($new) { $baseurl .= $new; } @@ -124,7 +124,7 @@ if (!empty($edit) || !empty($new)) { } exit; } - notice_yesno(get_string('confirmdelete', 'repository', $instance->name), $sesskeyurl . '&type=' . $type . '&delete=' . $delete . '&sure=yes', $CFG->wwwroot . '/admin/repositoryinstance.php?session='. sesskey()); + notice_yesno(get_string('confirmdelete', 'repository', $instance->name), $sesskeyurl . '&type=' . $type . '&delete=' . $delete . '&sure=yes', "$CFG->wwwroot/$CFG->admin/repositoryinstance.php?session=". sesskey()); $return = false; } diff --git a/admin/roles/tabs.php b/admin/roles/tabs.php index 830004dcc4..c86fe4edfc 100755 --- a/admin/roles/tabs.php +++ b/admin/roles/tabs.php @@ -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)) { diff --git a/course/lib.php b/course/lib.php index 42b8090d06..9046e262dd 100644 --- a/course/lib.php +++ b/course/lib.php @@ -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 = ''.$str->assign.''; } else { $assign = ''; diff --git a/grade/edit/settings/form.php b/grade/edit/settings/form.php index bf3b5ae7eb..8de83303bb 100644 --- a/grade/edit/settings/form.php +++ b/grade/edit/settings/form.php @@ -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 = '' . $strchangedefaults . ''; + $link = '' . $strchangedefaults . ''; $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 = '' . $strchangedefaults . ''; + $link = '' . $strchangedefaults . ''; $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 = '' . $strchangedefaults . ''; + $link = '' . $strchangedefaults . ''; $mform->addElement('static', 'gradeitemsettingslink', $link); } $functionname($mform); diff --git a/lib/adminlib.php b/lib/adminlib.php index dbf59e2e86..8cd4178ebc 100644 --- a/lib/adminlib.php +++ b/lib/adminlib.php @@ -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 .= '
  • wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' .$USER->sesskey.'&new='.$p.'">'.get_string('add', 'repository') .' "'.get_string('repositoryname', 'repository_'.$p).'" ' .'
    • '; diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php index 24d4b1088c..f7fdf8400e 100644 --- a/lib/portfoliolib.php +++ b/lib/portfoliolib.php @@ -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 = ''; diff --git a/lib/simpletest/portfolio_testclass.php b/lib/simpletest/portfolio_testclass.php index df570f114e..7b45ce51da 100644 --- a/lib/simpletest/portfolio_testclass.php +++ b/lib/simpletest/portfolio_testclass.php @@ -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() { diff --git a/lib/simpletest/testrepositorylib.php b/lib/simpletest/testrepositorylib.php index bb63c3456f..d7e1a44cfd 100644 --- a/lib/simpletest/testrepositorylib.php +++ b/lib/simpletest/testrepositorylib.php @@ -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'); diff --git a/lib/weblib.php b/lib/weblib.php index 313132cb5c..fac80a4a55 100644 --- a/lib/weblib.php +++ b/lib/weblib.php @@ -2465,7 +2465,7 @@ function print_header ($title='', $heading='', $navigation='', $focus='', } if (file_exists($CFG->dataroot.'/'.SITEID.'/maintenance.html')) { - $button = ''.get_string('maintenancemode', 'admin').' '.$button; + $button = ''.get_string('maintenancemode', 'admin').' '.$button; if(!empty($title)) { $title .= ' - '; } diff --git a/mod/assignment/simpletest/test_assignment_portfolio_callers.php b/mod/assignment/simpletest/test_assignment_portfolio_callers.php index dd4a41de84..681daa5bdf 100644 --- a/mod/assignment/simpletest/test_assignment_portfolio_callers.php +++ b/mod/assignment/simpletest/test_assignment_portfolio_callers.php @@ -1,7 +1,7 @@ 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'); diff --git a/mod/chat/simpletest/test_chat_portfolio_callers.php b/mod/chat/simpletest/test_chat_portfolio_callers.php index 14e9565267..6583e2281a 100644 --- a/mod/chat/simpletest/test_chat_portfolio_callers.php +++ b/mod/chat/simpletest/test_chat_portfolio_callers.php @@ -1,7 +1,7 @@ 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'); diff --git a/mod/data/simpletest/test_data_portfolio_callers.php b/mod/data/simpletest/test_data_portfolio_callers.php index 5e4954e9e0..8f1360cc1e 100644 --- a/mod/data/simpletest/test_data_portfolio_callers.php +++ b/mod/data/simpletest/test_data_portfolio_callers.php @@ -1,7 +1,7 @@ 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'); diff --git a/mod/forum/simpletest/test_forum_portfolio_callers.php b/mod/forum/simpletest/test_forum_portfolio_callers.php index e741313c60..ab53f35fd9 100644 --- a/mod/forum/simpletest/test_forum_portfolio_callers.php +++ b/mod/forum/simpletest/test_forum_portfolio_callers.php @@ -1,7 +1,7 @@ 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'); diff --git a/mod/glossary/simpletest/test_glossary_portfolio_callers.php b/mod/glossary/simpletest/test_glossary_portfolio_callers.php index c8f255eecb..2ef4abf696 100644 --- a/mod/glossary/simpletest/test_glossary_portfolio_callers.php +++ b/mod/glossary/simpletest/test_glossary_portfolio_callers.php @@ -1,7 +1,7 @@ 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'); diff --git a/mod/resource/simpletest/test_resource_portfolio_callers.php b/mod/resource/simpletest/test_resource_portfolio_callers.php index 1ad23ca767..c462095936 100644 --- a/mod/resource/simpletest/test_resource_portfolio_callers.php +++ b/mod/resource/simpletest/test_resource_portfolio_callers.php @@ -1,7 +1,7 @@ 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'); diff --git a/portfolio/type/boxnet/simpletest/testportfoliopluginboxnet.php b/portfolio/type/boxnet/simpletest/testportfoliopluginboxnet.php index e396bbebc2..b9116dbbd5 100644 --- a/portfolio/type/boxnet/simpletest/testportfoliopluginboxnet.php +++ b/portfolio/type/boxnet/simpletest/testportfoliopluginboxnet.php @@ -1,7 +1,7 @@ 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')); diff --git a/repository/lib.php b/repository/lib.php index f99127cbc6..19c4e872d0 100644 --- a/repository/lib.php +++ b/repository/lib.php @@ -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 .= "

    " . get_string('siteinstances', 'repository') . " "; $output .= "

    "; } else {