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

MDL-30381 Fixed the tempdir and cachedir value calculation

Browse Source 
Instead of using the default dataroot location, the tempdir and cachedir
are now set under the real dataroot location specified via the argument
and/or the interactive session.

The patch also adds a PARAM_PATH check for the dataroot specified.
This commit is contained in:
David Mudrak
2011-11-21 16:01:18 +01:00
parent 12812ad5da
commit b907d3f58c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/cli/install.php
+8 -6
View File
@@ -133,9 +133,6 @@ $CFG->dirroot = dirname(dirname(dirname(__FILE__)));
$CFG->libdir = "$CFG->dirroot/lib";
$CFG->wwwroot = "http://localhost";
$CFG->httpswwwroot = $CFG->wwwroot;
$CFG->dataroot = str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata');
$CFG->tempdir = $CFG->dataroot.'/temp';
$CFG->cachedir = $CFG->dataroot.'/cache';
$CFG->docroot = 'http://docs.moodle.org';
$CFG->running_installer = true;
$CFG->early_install_lang = true;
@@ -186,7 +183,7 @@ list($options, $unrecognized) = cli_get_params(
'chmod' => '2777',
'lang' => $CFG->lang,
'wwwroot' => '',
'dataroot' => $CFG->dataroot,
'dataroot' => str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata'),
'dbtype' => $defaultdb,
'dbhost' => 'localhost',
'dbname' => 'moodle',
@@ -330,9 +327,12 @@ $CFG->httpswwwroot = $CFG->wwwroot;
//We need dataroot before lang download
if (!empty($options['dataroot'])) {
$CFG->dataroot = $options['dataroot'];
$dataroot = clean_param($options['dataroot'], PARAM_PATH);
if ($dataroot !== $options['dataroot']) {
$a = (object)array('option' => 'dataroot', 'value' => $options['dataroot']);
cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
}
$CFG->dataroot = $dataroot;
if ($interactive) {
cli_separator();
$i=0;
@@ -380,6 +380,8 @@ if ($interactive) {
cli_error(get_string('pathserrcreatedataroot', 'install', $a));
}
}
$CFG->tempdir = $CFG->dataroot.'/temp';
$CFG->cachedir = $CFG->dataroot.'/cache';
// download required lang packs
if ($CFG->lang !== 'en') {