[4.0] Installation - create a name (#25774)

For historical reasons that I bet no one can remember Joomla doesn't currently let you enter the real name of the Super User when installing Joomla. As a result every site on installation has a user with the name "Super User". This regularly causes issues as it gets confused with the usergroup "Super Users". That might be a translation issue or simply because there is just one character difference I don't know and it doesn't really matter. As today there is no valid reason to force the name to be "Super User" and this PR prompts for the real name as well as the username during installation.
2024-07-15 08:23:37 +00:00 · 2019-08-04 21:52:19 +01:00 · 2019-08-04 21:52:19 +01:00 · 94a5c4dd34
commit 94a5c4dd34
parent e1b74974f3
7 changed files with 28 additions and 11 deletions
--- 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",
--- 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"
+		/>
+		<field
+			name="admin_username"
+			type="text"
+			label="INSTL_ADMIN_USERNAME_DESC"
+			id="admin_username"
 			required="true"
 			validate="username"
+			class="form-control"
 			size="30"
 		/>
 		<field
--- a/installation/language/en-GB/en-GB.ini
+++ b/installation/language/en-GB/en-GB.ini
@ -77,7 +77,8 @@ INSTL_LOGIN_DATA="Login Data"
 INSTL_SITE="Main Configuration"
 INSTL_ADMIN_EMAIL_DESC="Enter the email address of the website Super User."
 INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super User account."
-INSTL_ADMIN_USER_DESC="Set the username for your Super User account."
+INSTL_ADMIN_USERNAME_DESC="Set the username for your Super User account."
+INSTL_ADMIN_USER_DESC="Enter the real name of your Super User."
 INSTL_SETUP_SITE_NAME="Setup Site Name"
 INSTL_SITE_DEVMODE_DESC="Check if you wish to delete the installation folder on completion."
 INSTL_SITE_DEVMODE_LABEL="We detected development mode"
--- a/installation/language/en-US/en-US.ini
+++ b/installation/language/en-US/en-US.ini
@ -77,7 +77,8 @@ INSTL_LOGIN_DATA="Login Data"
 INSTL_SITE="Main Configuration"
 INSTL_ADMIN_EMAIL_DESC="Enter the email address of the website Super User."
 INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super User account."
-INSTL_ADMIN_USER_DESC="Set the username for your Super User account."
+INSTL_ADMIN_USERNAME_DESC="Set the username for your Super User account."
+INSTL_ADMIN_USER_DESC="Enter the real name of your Super User."
 INSTL_SETUP_SITE_NAME="Setup Site Name"
 INSTL_SITE_DEVMODE_DESC="Check if you wish to delete the installation folder on completion."
 INSTL_SITE_DEVMODE_LABEL="We detected development mode"
--- a/installation/src/Model/ConfigurationModel.php
+++ b/installation/src/Model/ConfigurationModel.php
@ -310,8 +310,8 @@ class ConfigurationModel extends BaseInstallationModel
 		{
 			$query->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('')
--- a/installation/tmpl/setup/default.php
+++ b/installation/tmpl/setup/default.php
@ -56,6 +56,10 @@ use Joomla\CMS\Language\Text;
 					<?php echo $this->form->getLabel('admin_user'); ?>
 					<?php echo $this->form->getInput('admin_user'); ?>
 				</div>
+				<div class="form-group">
+					<?php echo $this->form->getLabel('admin_username'); ?>
+					<?php echo $this->form->getInput('admin_username'); ?>
+				</div>
 				<div class="form-group">
 					<?php echo $this->form->getLabel('admin_password'); ?>
 					<?php echo $this->form->getInput('admin_password'); ?>
--- 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