diff --git a/composer.lock b/composer.lock index 1f116a20b59..c3afd1663fc 100644 --- a/composer.lock +++ b/composer.lock @@ -2476,7 +2476,7 @@ }, { "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" + "email": "backendtea@gmail.com" } ], "description": "Symfony polyfill for ctype functions", @@ -5375,12 +5375,12 @@ "source": { "type": "git", "url": "https://github.com/joomla-projects/joomla-browser.git", - "reference": "f33a41a193aee1491df51af8f02fce86477ef451" + "reference": "c3098ca8c942a85a27ec044679a4bf4b19adf839" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/f33a41a193aee1491df51af8f02fce86477ef451", - "reference": "f33a41a193aee1491df51af8f02fce86477ef451", + "url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/c3098ca8c942a85a27ec044679a4bf4b19adf839", + "reference": "c3098ca8c942a85a27ec044679a4bf4b19adf839", "shasum": "" }, "require": { @@ -5418,7 +5418,7 @@ "acceptance testing", "joomla" ], - "time": "2019-07-11T16:09:14+00:00" + "time": "2019-08-04T11:01:36+00:00" }, { "name": "joomla-projects/robo-joomla", diff --git a/installation/forms/setup.xml b/installation/forms/setup.xml index 7a2f8db3540..a7bd9e79d31 100644 --- a/installation/forms/setup.xml +++ b/installation/forms/setup.xml @@ -31,9 +31,18 @@ type="text" label="INSTL_ADMIN_USER_DESC" id="admin_user" + required="true" class="form-control" + size="30" + /> + clear() ->update($db->quoteName('#__users')) - ->set($db->quoteName('name') . ' = ' . $db->quote('Super User')) - ->set($db->quoteName('username') . ' = ' . $db->quote(trim($options->admin_user))) + ->set($db->quoteName('name') . ' = ' . $db->quote(trim($options->admin_user))) + ->set($db->quoteName('username') . ' = ' . $db->quote(trim($options->admin_username))) ->set($db->quoteName('email') . ' = ' . $db->quote($options->admin_email)) ->set($db->quoteName('password') . ' = ' . $db->quote($cryptpass)) ->set($db->quoteName('block') . ' = 0') @@ -325,7 +325,8 @@ class ConfigurationModel extends BaseInstallationModel else { $columns = array( - $db->quoteName('id'), $db->quoteName('name'), + $db->quoteName('id'), + $db->quoteName('name'), $db->quoteName('username'), $db->quoteName('email'), $db->quoteName('password'), @@ -340,7 +341,7 @@ class ConfigurationModel extends BaseInstallationModel ->insert('#__users', true) ->columns($columns) ->values( - $db->quote($userId) . ', ' . $db->quote('Super User') . ', ' . $db->quote(trim($options->admin_user)) . ', ' . + $db->quote($userId) . ', ' . $db->quote(trim($options->admin_user)) . ', ' . $db->quote(trim($options->admin_username)) . ', ' . $db->quote($options->admin_email) . ', ' . $db->quote($cryptpass) . ', ' . $db->quote('0') . ', ' . $db->quote('1') . ', ' . $db->quote($installdate) . ', ' . $db->quote($nullDate) . ', ' . $db->quote('0') . ', ' . $db->quote('') diff --git a/installation/tmpl/setup/default.php b/installation/tmpl/setup/default.php index 64726750825..e56a4dcf297 100644 --- a/installation/tmpl/setup/default.php +++ b/installation/tmpl/setup/default.php @@ -56,6 +56,10 @@ use Joomla\CMS\Language\Text; form->getLabel('admin_user'); ?> form->getInput('admin_user'); ?> +
+ form->getLabel('admin_username'); ?> + form->getInput('admin_username'); ?> +
form->getLabel('admin_password'); ?> form->getInput('admin_password'); ?> diff --git a/tests/Codeception/acceptance.suite.yml b/tests/Codeception/acceptance.suite.yml index 6110a9471f4..b6315417e39 100644 --- a/tests/Codeception/acceptance.suite.yml +++ b/tests/Codeception/acceptance.suite.yml @@ -18,6 +18,7 @@ modules: capabilities: 'goog:chromeOptions': args: ["headless", "disable-gpu", "no-sandbox", "window-size=1920x1080"] + name: 'jane doe' # Name for the Administrator username: 'admin' # UserName for the Administrator password: 'admin' # Password for the Administrator database host: 'mysql' # place where the Application is Hosted #server Address