Skip to content

Commit

Permalink
Merge branch 'MDL-65485-master' of git://github.com/bmbrands/moodle
Browse files Browse the repository at this point in the history
  • Loading branch information
@abgreeve
abgreeve committed May 7, 2019
2 parents ba235a9 + 530e8e9 commit 3e35a57
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 49 deletions.
94 changes: 58 additions & 36 deletions install.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,43 +427,56 @@
$strdbport = get_string('databaseport', 'install');
$strdbsocket = get_string('databasesocket', 'install');

echo '<div class="userinput">';
echo '<div class="row mb-4">';

$disabled = empty($distro->dbhost) ? '' : 'disabled="disabled';
echo '<div class="fitem"><div class="fitemtitle"><label for="id_dbhost">'.$strdbhost.'</label></div>';
echo '<div class="fitemelement"><input id="id_dbhost" name="dbhost" '.$disabled.' type="text" class="text-ltr" value="'.s($config->dbhost).'" size="50" /></div>';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_dbhost">'.$strdbhost.'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_dbhost" name="dbhost" '.$disabled.' type="text" class="form-control text-ltr" value="'.s($config->dbhost).'" size="50" /></div>';
echo '</div>';

echo '<div class="fitem"><div class="fitemtitle"><label for="id_dbname">'.$strdbname.'</label></div>';
echo '<div class="fitemelement"><input id="id_dbname" name="dbname" type="text" class="text-ltr" value="'.s($config->dbname).'" size="50" /></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_dbname">'.$strdbname.'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_dbname" name="dbname" type="text" class="form-control text-ltr" value="'.s($config->dbname).'" size="50" /></div>';
echo '</div>';

$disabled = empty($distro->dbuser) ? '' : 'disabled="disabled';
echo '<div class="fitem"><div class="fitemtitle"><label for="id_dbuser">'.$strdbuser.'</label></div>';
echo '<div class="fitemelement"><input id="id_dbuser" name="dbuser" '.$disabled.' type="text" class="text-ltr" value="'.s($config->dbuser).'" size="50" /></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_dbuser">'.$strdbuser.'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_dbuser" name="dbuser" '.$disabled.' type="text" class="form-control text-ltr" value="'.s($config->dbuser).'" size="50" /></div>';
echo '</div>';

echo '<div class="fitem"><div class="fitemtitle"><label for="id_dbpass">'.$strdbpass.'</label></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_dbpass">'.$strdbpass.'</label></div>';
// no password field here, the password may be visible in config.php if we can not write it to disk
echo '<div class="fitemelement"><input id="id_dbpass" name="dbpass" type="text" class="text-ltr" value="'.s($config->dbpass).'" size="50" /></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_dbpass" name="dbpass" type="text" class="form-control text-ltr" value="'.s($config->dbpass).'" size="50" /></div>';
echo '</div>';

echo '<div class="fitem"><div class="fitemtitle"><label for="id_prefix">'.$strprefix.'</label></div>';
echo '<div class="fitemelement"><input id="id_prefix" name="prefix" type="text" class="text-ltr" value="'.s($config->prefix).'" size="10" /></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_prefix">'.$strprefix.'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_prefix" name="prefix" type="text" class="form-control text-ltr" value="'.s($config->prefix).'" size="10" /></div>';
echo '</div>';

echo '<div class="fitem"><div class="fitemtitle"><label for="id_prefix">'.$strdbport.'</label></div>';
echo '<div class="fitemelement"><input id="id_dbport" name="dbport" type="text" class="text-ltr" value="'.s($config->dbport).'" size="10" /></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_prefix">'.$strdbport.'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_dbport" name="dbport" type="text" class="form-control text-ltr" value="'.s($config->dbport).'" size="10" /></div>';
echo '</div>';

if (!(stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin'))) {
echo '<div class="fitem"><div class="fitemtitle"><label for="id_dbsocket">'.$strdbsocket.'</label></div>';
echo '<div class="fitemelement"><input id="id_dbsocket" name="dbsocket" type="text" class="text-ltr" value="'.s($config->dbsocket).'" size="50" /></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_dbsocket">'.$strdbsocket.'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_dbsocket" name="dbsocket" type="text" class="form-control text-ltr" value="'.s($config->dbsocket).'" size="50" /></div>';
echo '</div>';
}

if ($hint_database !== '') {
echo '<div class="alert alert-error">'.$hint_database.'</div>';
echo '<div class="alert alert-danger">'.$hint_database.'</div>';
}
echo '</div>';
install_print_footer($config);
Expand All @@ -486,9 +499,10 @@
'sqlsrv' => moodle_database::get_driver_instance('sqlsrv', 'native'), // MS SQL*Server PHP driver
);

echo '<div class="userinput">';
echo '<div class="fitem"><div class="fitemtitle"><label for="dbtype">'.get_string('dbtype', 'install').'</label></div>';
echo '<div class="fitemelement"><select id="dbtype" name="dbtype">';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="dbtype">'.get_string('dbtype', 'install').'</label></div>';
echo '<div class="col-md-9" data-fieldtype="select">';
echo '<select class="form-control" id="dbtype" name="dbtype">';
$disabled = array();
$options = array();
foreach ($databases as $type=>$database) {
Expand All @@ -506,7 +520,6 @@
echo '</optgroup>';
}
echo '</select></div></div>';
echo '</div>';

install_print_footer($config);
die;
Expand Down Expand Up @@ -565,28 +578,36 @@
$strdataroot = get_string('dataroot', 'install');
$stradmindirname = get_string('admindirname', 'install');

echo '<div class="userinput">';
echo '<div class="fitem"><div class="fitemtitle"><label for="id_wwwroot">'.$paths['wwwroot'].'</label></div>';
echo '<div class="fitemelement"><input id="id_wwwroot" name="wwwroot" type="text" class="text-ltr" value="'.s($CFG->wwwroot).'" disabled="disabled" size="70" /></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_wwwroot">'.$paths['wwwroot'].'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_wwwroot" name="wwwroot" type="text" class="form-control text-ltr" value="'.s($CFG->wwwroot).'" disabled="disabled" size="70" /></div>';
echo '</div>';

echo '<div class="fitem"><div class="fitemtitle"><label for="id_dirroot">'.$paths['dirroot'].'</label></div>';
echo '<div class="fitemelement"><input id="id_dirroot" name="dirroot" type="text" class="text-ltr" value="'.s($CFG->dirroot).'" disabled="disabled" size="70" /></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_dirroot">'.$paths['dirroot'].'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_dirroot" name="dirroot" type="text" class="form-control text-ltr" value="'.s($CFG->dirroot).'" disabled="disabled" size="70" /></div>';
echo '</div>';

echo '<div class="fitem"><div class="fitemtitle"><label for="id_dataroot">'.$paths['dataroot'].'</label></div>';
echo '<div class="fitemelement"><input id="id_dataroot" name="dataroot" type="text" class="text-ltr" value="'.s($config->dataroot).'" size="70" /></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_dataroot">'.$paths['dataroot'].'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_dataroot" name="dataroot" type="text" class="form-control text-ltr" value="'.s($config->dataroot).'" size="70" /></div>';
echo '</div>';
if ($hint_dataroot !== '') {
echo '<div class="alert alert-error">'.$hint_dataroot.'</div>';
echo '<div class="alert alert-danger">'.$hint_dataroot.'</div>';
}
echo '</div>';


if (!file_exists("$CFG->dirroot/admin/environment.xml")) {
echo '<div class="fitem"><div class="fitemtitle"><label for="id_admin">'.$paths['admindir'].'</label></div>';
echo '<div class="fitemelement"><input id="id_admin" name="admin" type="text" class="text-ltr" value="'.s($config->admin).'" size="10" /></div>';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="id_admin">'.$paths['admindir'].'</label></div>';
echo '<div class="col-md-9" data-fieldtype="text">';
echo '<input id="id_admin" name="admin" type="text" class="form-control text-ltr" value="'.s($config->admin).'" size="10" /></div>';
echo '</div>';
if ($hint_admindir !== '') {
echo '<div class="alert alert-error">'.$hint_admindir.'</div>';
echo '<div class="alert alert-danger">'.$hint_admindir.'</div>';
}
echo '</div>';
}
Expand Down Expand Up @@ -617,14 +638,15 @@
}

$languages = get_string_manager()->get_list_of_translations();
echo '<div class="userinput">';
echo '<div class="fitem"><div class="fitemtitle"><label for="langselect">'.get_string('language').'</label></div>';
echo '<div class="fitemelement"><select id="langselect" name="lang" onchange="this.form.submit()">';
echo '<div class="row mb-4">';
echo '<div class="col-md-3 text-md-right pt-1"><label for="langselect">'.get_string('language').'</label></div>';
echo '<div class="col-md-9" data-fieldtype="select">';
echo '<select id="langselect" class="form-control" name="lang" onchange="this.form.submit()">';
foreach ($languages as $name=>$value) {
$selected = ($name == $CFG->lang) ? 'selected="selected"' : '';
echo '<option value="'.s($name).'" '.$selected.'>'.$value.'</option>';
}
echo '</select></div></div>';
echo '</select></div>';
echo '</div>';

install_print_footer($config);
Expand Down
1 change: 0 additions & 1 deletion install/css.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
}
#installdiv {
width: 800px;
margin-left:auto;
margin-right:auto;
padding: 5px;
Expand Down
19 changes: 7 additions & 12 deletions lib/installlib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,18 +343,13 @@ function install_print_header($config, $stagename, $heading, $stagetext, $stagec
<meta http-equiv="expires" content="0" />';

echo '</head><body class="notloggedin">
<div id="page" class="stage'.$config->stage.'">
<div id="page" class="mt-0 container stage'.$config->stage.'">
<div id="page-header">
<div id="header" class=" clearfix">
<h1 class="headermain">'.get_string('installation','install').'</h1>
<div class="headermenu">&nbsp;</div>
</div>
<div class="navbar clearfix">
<nav class="breadcrumb-nav">
<ul class="breadcrumb"><li class="first">'.$stagename.'</li></ul>
</nav>
<div class="navbutton">&nbsp;</div>
</div>
<div class="bg-light p-3 mb-3"><h3 class="m-0">'.$stagename.'</h3></div>
</div>
<!-- END OF HEADER -->
<div id="installdiv">';
Expand Down Expand Up @@ -385,9 +380,9 @@ function install_print_footer($config, $reload=false) {
global $CFG;

if ($config->stage > INSTALL_WELCOME) {
$first = '<input type="submit" id="previousbutton" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
$first = '<input type="submit" id="previousbutton" class="btn btn-secondary" name="previous" value="&laquo; '.s(get_string('previous')).'" />';
} else {
$first = '<input type="submit" id="previousbutton" name="next" value="'.s(get_string('reload')).'" />';
$first = '<input type="submit" id="previousbutton" class="btn btn-secondary" name="next" value="'.s(get_string('reload')).'" />';
$first .= '<script type="text/javascript">
//<![CDATA[
var first = document.getElementById("previousbutton");
Expand All @@ -398,12 +393,12 @@ function install_print_footer($config, $reload=false) {
}

if ($reload) {
$next = '<input type="submit" id="nextbutton" class="btn btn-primary" name="next" value="'.s(get_string('reload')).'" />';
$next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1" name="next" value="'.s(get_string('reload')).'" />';
} else {
$next = '<input type="submit" id="nextbutton" class="btn btn-primary" name="next" value="'.s(get_string('next')).' &raquo;" />';
$next = '<input type="submit" id="nextbutton" class="btn btn-primary ml-1" name="next" value="'.s(get_string('next')).' &raquo;" />';
}

echo '</fieldset><fieldset id="nav_buttons">'.$first.$next.'</fieldset>';
echo '</fieldset><fieldset id="nav_buttons" class="mb-3">'.$first.$next.'</fieldset>';

$homelink = '<div class="sitelink">'.
'<a title="Moodle '. $CFG->target_release .'" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">'.
Expand Down

0 comments on commit 3e35a57

Please sign in to comment.