|
@@ -100,7 +110,9 @@
|
- id); ?>
+
+ id); ?>
+
|
diff --git a/administrator/language/en-GB/en-GB.com_cpanel.ini b/administrator/language/en-GB/en-GB.com_cpanel.ini
index 9071156762e0c..febcd3169f6e4 100644
--- a/administrator/language/en-GB/en-GB.com_cpanel.ini
+++ b/administrator/language/en-GB/en-GB.com_cpanel.ini
@@ -32,6 +32,8 @@ COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update"
COM_CPANEL_MSG_ROBOTS_BODY="A change to the default robots.txt files was made in Joomla! 3.3 to allow Google to access templates and media files by default to improve SEO. This change is not applied automatically on upgrades and users are recommended to review the changes in the robots.txt.dist file and implement these changes in their own robots.txt file."
COM_CPANEL_MSG_STATS_COLLECTION_BODY=" Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system. This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without affecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords. In the interest of full transparency and to help developers this data is publicly available. An API and graphs will show the Joomla version, PHP versions and database engines in use. If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics. "
COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla"
+COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_BODY="As part of our security team's review, we have made some changes to the default settings in a new Joomla installation. As these changes are only applied to new installations, we strongly recommend that you review these changes and update your site. The changed settings are: - Global Configuration > Text Filters: The default \"Administrator\" user group has changed from \"No Filtering\" to \"Default Blacklist\"
- Users > Send Password: The option to send a user their password in plain text when an account is created is now disabled by default
- Media Manager: Flash files (\"swf\" file extension and \"application/x-shockwave-flash\" MIME Type) are not allowed to be uploaded
- Articles > Show Email: The option to show an email icon with articles is disabled by default
We have created a dedicated documentation page explaining these changes. "
+COM_CPANEL_MSG_UPDATEDEFAULTSETTINGS_TITLE="Updated site security recommendations"
COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="Community resources are available for new users. "
COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
COM_CPANEL_XML_DESCRIPTION="Control Panel component"
diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index 4e1ee9fe69113..d5820fc5dbf64 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -9088,8 +9088,6 @@ input:focus,
margin-bottom: 15px;
width: 100%;
list-style: none;
- -webkit-column-break-inside: avoid;
- -webkit-backface-visibility: hidden;
}
#menu-assignment .menu-links-block {
background-color: #fafafa;
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index c7ae130221745..2e2ec4a34e187 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -9088,8 +9088,6 @@ input:focus,
margin-bottom: 15px;
width: 100%;
list-style: none;
- -webkit-column-break-inside: avoid;
- -webkit-backface-visibility: hidden;
}
#menu-assignment .menu-links-block {
background-color: #fafafa;
diff --git a/administrator/templates/isis/html/com_media/imageslist/default_folder.php b/administrator/templates/isis/html/com_media/imageslist/default_folder.php
index 6fd2b12f53dd1..fb0b77403e6f6 100644
--- a/administrator/templates/isis/html/com_media/imageslist/default_folder.php
+++ b/administrator/templates/isis/html/com_media/imageslist/default_folder.php
@@ -12,7 +12,7 @@
$input = JFactory::getApplication()->input;
?>
-
+
diff --git a/administrator/templates/isis/html/com_media/imageslist/default_image.php b/administrator/templates/isis/html/com_media/imageslist/default_image.php
index 6a5eea836df14..5f1597b350b21 100644
--- a/administrator/templates/isis/html/com_media/imageslist/default_image.php
+++ b/administrator/templates/isis/html/com_media/imageslist/default_image.php
@@ -17,14 +17,14 @@
?>
-
+
- baseURL . '/' . $this->_tmp_img->path_relative, JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->_tmp_img->title, JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_60, 'height' => $this->_tmp_img->height_60)); ?>
+ baseURL . '/' . $this->escape($this->_tmp_img->path_relative), JText::sprintf('COM_MEDIA_IMAGE_TITLE', $this->_tmp_img->title, JHtml::_('number.bytes', $this->_tmp_img->size)), array('width' => $this->_tmp_img->width_60, 'height' => $this->_tmp_img->height_60)); ?>
- _tmp_img->name, 10, false); ?>
+ escape($this->_tmp_img->name), 10, false); ?>
diff --git a/administrator/templates/isis/html/com_media/medialist/thumbs_folders.php b/administrator/templates/isis/html/com_media/medialist/thumbs_folders.php
index 2a62670982838..192c4f14abb6b 100644
--- a/administrator/templates/isis/html/com_media/medialist/thumbs_folders.php
+++ b/administrator/templates/isis/html/com_media/medialist/thumbs_folders.php
@@ -13,22 +13,22 @@
folders as $i => $folder) : ?>
canDelete):?>
- ×
+ ×
- name, false, 'rm', 'cb-folder'); ?>
+ escape($folder->name), false, 'rm', 'cb-folder'); ?>
diff --git a/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php b/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php
index ae1afdcc39ea2..6297e67ab6466 100644
--- a/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php
+++ b/administrator/templates/isis/html/com_media/medialist/thumbs_imgs.php
@@ -22,23 +22,23 @@
canDelete):?>
+ href="index.php?option=com_media&task=file.delete&tmpl=index&=1&folder=state->folder); ?>&rm[]=escape($img->name); ?>"
+ rel="escape($img->name); ?>" title="">
canDelete):?>
- name, false, 'rm', 'cb-image'); ?>
+ escape($img->name), false, 'rm', 'cb-image'); ?>
diff --git a/administrator/templates/isis/less/pages/_com_templates.less b/administrator/templates/isis/less/pages/_com_templates.less
index 69d17fc920a14..7f8d76e7a99df 100644
--- a/administrator/templates/isis/less/pages/_com_templates.less
+++ b/administrator/templates/isis/less/pages/_com_templates.less
@@ -17,8 +17,6 @@
margin-bottom: 15px;
width: 100%;
list-style: none;
- -webkit-column-break-inside: avoid;
- -webkit-backface-visibility: hidden;
}
}
.menu-links-block {
diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml
index ac4a3d675b0bd..7e094ee1fdf63 100644
--- a/build/phpcs/Joomla/ruleset.xml
+++ b/build/phpcs/Joomla/ruleset.xml
@@ -157,6 +157,7 @@
templates/*
layouts/*
tests/*
+ administrator/components/*
diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index e3b730003f467..4e570c328e679 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -73,7 +73,8 @@ public static function email($article, $params, $attribs = array(), $legacy = fa
$link = $base . JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language), false);
$url = 'index.php?option=com_mailto&tmpl=component&template=' . $template . '&link=' . MailtoHelper::addLink($link);
- $status = 'width=400,height=350,menubar=yes,resizable=yes';
+ $height = JFactory::getApplication()->get('captcha', '0') === '0' ? 450 : 550;
+ $status = 'width=400,height=' . $height . ',menubar=yes,resizable=yes';
$text = JLayoutHelper::render('joomla.content.icons.email', array('params' => $params, 'legacy' => $legacy));
diff --git a/components/com_finder/helpers/html/filter.php b/components/com_finder/helpers/html/filter.php
index 402959561e073..74eba0960e3d1 100644
--- a/components/com_finder/helpers/html/filter.php
+++ b/components/com_finder/helpers/html/filter.php
@@ -187,10 +187,9 @@ public static function slider($options = array())
// Build a node.
$html .= '';
$html .= ' ';
- $html .= ' ';
diff --git a/components/com_mailto/controller.php b/components/com_mailto/controller.php
index 3f2b861feab1d..9d82d9ce74556 100644
--- a/components/com_mailto/controller.php
+++ b/components/com_mailto/controller.php
@@ -12,9 +12,7 @@
/**
* Mailer Component Controller.
*
- * @package Joomla.Site
- * @subpackage com_mailto
- * @since 1.5
+ * @since 1.5
*/
class MailtoController extends JControllerLegacy
{
@@ -23,12 +21,10 @@ class MailtoController extends JControllerLegacy
*
* @return void
*
- * @since 1.5
+ * @since 1.5
*/
public function mailto()
{
- $session = JFactory::getSession();
- $session->set('com_mailto.formtime', time());
$this->input->set('view', 'mailto');
$this->display();
}
@@ -46,24 +42,34 @@ public function send()
$this->checkToken();
$app = JFactory::getApplication();
- $session = JFactory::getSession();
- $timeout = $session->get('com_mailto.formtime', 0);
+ $model = $this->getModel('mailto');
+ $data = $model->getData();
- if ($timeout == 0 || time() - $timeout < 20)
+ // Validate the posted data.
+ $form = $model->getForm();
+
+ if (!$form)
{
- JError::raiseNotice(500, JText::_('COM_MAILTO_EMAIL_NOT_SENT'));
+ JError::raiseError(500, $model->getError());
- return $this->mailto();
+ return false;
}
- $SiteName = $app->get('sitename');
- $link = MailtoHelper::validateHash($this->input->get('link', '', 'post'));
-
- // Verify that this is a local link
- if (!$link || !JUri::isInternal($link))
+ if (!$model->validate($form, $data))
{
- // Non-local url...
- JError::raiseNotice(500, JText::_('COM_MAILTO_EMAIL_NOT_SENT'));
+ $errors = $model->getErrors();
+
+ foreach ($errors as $error)
+ {
+ $errorMessage = $error;
+
+ if ($error instanceof Exception)
+ {
+ $errorMessage = $error->getMessage();
+ }
+
+ $app->enqueueMessage($errorMessage, 'error');
+ }
return $this->mailto();
}
@@ -77,24 +83,16 @@ public function send()
'cc:'
);
- // An array of the input fields to scan for injected headers
- $fields = array(
- 'mailto',
- 'sender',
- 'from',
- 'subject',
- );
-
/*
* Here is the meat and potatoes of the header injection test. We
* iterate over the array of form input and check for header strings.
* If we find one, send an unauthorized header and die.
*/
- foreach ($fields as $field)
+ foreach ($data as $key => $value)
{
foreach ($headers as $header)
{
- if (strpos($_POST[$field], $header) !== false)
+ if (strpos($value, $header) !== false)
{
JError::raiseError(403, '');
}
@@ -106,25 +104,36 @@ public function send()
*/
unset($headers, $fields);
- $email = $this->input->post->getString('mailto', '');
- $sender = $this->input->post->getString('sender', '');
- $from = $this->input->post->getString('from', '');
- $subject_default = JText::sprintf('COM_MAILTO_SENT_BY', $sender);
- $subject = $this->input->post->getString('subject', '') !== '' ? $this->input->post->getString('subject') : $subject_default;
+ $siteName = $app->get('sitename');
+ $link = MailtoHelper::validateHash($this->input->post->get('link', '', 'post'));
+
+ // Verify that this is a local link
+ if (!$link || !JUri::isInternal($link))
+ {
+ // Non-local url...
+ JError::raiseNotice(500, JText::_('COM_MAILTO_EMAIL_NOT_SENT'));
+
+ return $this->mailto();
+ }
+
+ $subject_default = JText::sprintf('COM_MAILTO_SENT_BY', $data['sender']);
+ $subject = $data['subject'] !== '' ? $data['subject'] : $subject_default;
// Check for a valid to address
$error = false;
- if (!$email || !JMailHelper::isEmailAddress($email))
+ if (!$data['emailto'] || !JMailHelper::isEmailAddress($data['emailto']))
{
- $error = JText::sprintf('COM_MAILTO_EMAIL_INVALID', $email);
+ $error = JText::sprintf('COM_MAILTO_EMAIL_INVALID', $data['emailto']);
+
JError::raiseWarning(0, $error);
}
// Check for a valid from address
- if (!$from || !JMailHelper::isEmailAddress($from))
+ if (!$data['emailfrom'] || !JMailHelper::isEmailAddress($data['emailfrom']))
{
- $error = JText::sprintf('COM_MAILTO_EMAIL_INVALID', $from);
+ $error = JText::sprintf('COM_MAILTO_EMAIL_INVALID', $data['emailfrom']);
+
JError::raiseWarning(0, $error);
}
@@ -135,19 +144,19 @@ public function send()
// Build the message to send
$msg = JText::_('COM_MAILTO_EMAIL_MSG');
- $body = sprintf($msg, $SiteName, $sender, $from, $link);
+ $body = sprintf($msg, $siteName, $data['sender'], $data['emailfrom'], $link);
// Clean the email data
$subject = JMailHelper::cleanSubject($subject);
$body = JMailHelper::cleanBody($body);
// To send we need to use punycode.
- $from = JStringPunycode::emailToPunycode($from);
- $from = JMailHelper::cleanAddress($from);
- $email = JStringPunycode::emailToPunycode($email);
+ $data['emailfrom'] = JStringPunycode::emailToPunycode($data['emailfrom']);
+ $data['emailfrom'] = JMailHelper::cleanAddress($data['emailfrom']);
+ $data['emailto'] = JStringPunycode::emailToPunycode($data['emailto']);
// Send the email
- if (JFactory::getMailer()->sendMail($from, $sender, $email, $subject, $body) !== true)
+ if (JFactory::getMailer()->sendMail($data['emailfrom'], $data['sender'], $data['emailto'], $subject, $body) !== true)
{
JError::raiseNotice(500, JText::_('COM_MAILTO_EMAIL_NOT_SENT'));
diff --git a/components/com_mailto/models/forms/mailto.xml b/components/com_mailto/models/forms/mailto.xml
new file mode 100644
index 0000000000000..0469129f7f509
--- /dev/null
+++ b/components/com_mailto/models/forms/mailto.xml
@@ -0,0 +1,51 @@
+
+
diff --git a/components/com_mailto/models/mailto.php b/components/com_mailto/models/mailto.php
new file mode 100644
index 0000000000000..428c157456367
--- /dev/null
+++ b/components/com_mailto/models/mailto.php
@@ -0,0 +1,104 @@
+loadForm('com_mailto.mailto', 'mailto', array('load_data' => $loadData));
+
+ if (empty($form))
+ {
+ return false;
+ }
+
+ return $form;
+ }
+
+ /**
+ * Method to get the data that should be injected in the form.
+ *
+ * @return array The default data is an empty array.
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ protected function loadFormData()
+ {
+ $user = JFactory::getUser();
+ $app = JFactory::getApplication();
+ $data = $app->getUserState('mailto.mailto.form.data', array());
+
+ $data['link'] = urldecode($app->input->get('link', '', 'BASE64'));
+
+ if ($data['link'] == '')
+ {
+ JError::raiseError(403, JText::_('COM_MAILTO_LINK_IS_MISSING'));
+
+ return false;
+ }
+
+ // Load with previous data, if it exists
+ $data['sender'] = $app->input->post->getString('sender', '');
+ $data['subject'] = $app->input->post->getString('subject', '');
+ $data['emailfrom'] = JStringPunycode::emailToPunycode($app->input->post->getString('emailfrom', ''));
+ $data['emailto'] = JStringPunycode::emailToPunycode($app->input->post->getString('emailto', ''));
+
+ if (!$user->guest)
+ {
+ $data['sender'] = $user->name;
+ $data['emailfrom'] = $user->email;
+ }
+
+ $app->setUserState('mailto.mailto.form.data', $data);
+
+ $this->preprocessData('com_mailto.mailto', $data);
+
+ return $data;
+ }
+
+ /**
+ * Get the request data
+ *
+ * @return array The requested data
+ *
+ * @since __DEPLOY_VERSION__
+ */
+ public function getData()
+ {
+ $input = JFactory::getApplication()->input;
+
+ $data['emailto'] = $input->get('emailto', '', 'string');
+ $data['sender'] = $input->get('sender', '', 'string');
+ $data['emailfrom'] = $input->get('emailfrom', '', 'string');
+ $data['subject'] = $input->get('subject', '', 'string');
+
+ return $data;
+ }
+}
diff --git a/components/com_mailto/views/mailto/tmpl/default.php b/components/com_mailto/views/mailto/tmpl/default.php
index dce72c893fc78..5a828e75112eb 100644
--- a/components/com_mailto/views/mailto/tmpl/default.php
+++ b/components/com_mailto/views/mailto/tmpl/default.php
@@ -12,23 +12,6 @@
JHtml::_('behavior.core');
JHtml::_('behavior.keepalive');
-$data = $this->get('data');
-
-JFactory::getDocument()->addScriptDeclaration("
- Joomla.submitbutton = function(pressbutton)
- {
- var form = document.getElementById('mailtoForm');
-
- // do field validation
- if (form.mailto.value == '' || form.from.value == '')
- {
- alert('" . JText::_('COM_MAILTO_EMAIL_ERR_NOINFO', true) . "');
- return false;
- }
- form.submit();
- }
-");
-
?>
@@ -41,44 +24,29 @@
-
Mogelijk is het op sommige servers noodzakelijk uw FTP-gegevens in te vullen voor het voltooien van de installatie. Indien u problemen ondervindt bij het voltooien van de installatie zonder deze gegevens, controleer dan bij uw webhost of het instellen van de FTP-laag nodig is. Om veiligheidsredenen is het het beste om (als deze optie voor u beschikbaar is) een aparte FTP-gebruikersaccount aan te maken die alleen toegang heeft tot de Joomla! installatie en niet de gehele server. Uw webhost kan u hierbij behulpzaam zijn. Opmerking: Wanneer de installatie op een Windows-systeem wordt geïnstalleerd is de FTP-laag niet vereist. "
+INSTL_FTP_DESC="Mogelijk is het op sommige servers noodzakelijk uw FTP-gegevens in te vullen voor het voltooien van de installatie. Indien u problemen ondervindt bij het voltooien van de installatie zonder deze gegevens, controleer dan bij uw webhost of het instellen van de FTP-laag nodig is. Om veiligheidsredenen is het het beste om, als deze optie voor u beschikbaar is, een aparte FTP-gebruikersaccount aan te maken die alleen toegang heeft tot de Joomla! installatie en niet de gehele server. Uw webhost kan u hierbij behulpzaam zijn. Opmerking: Wanneer de installatie op een Windows-systeem wordt geïnstalleerd is de FTP-laag niet vereist. "
INSTL_FTP_ENABLE_LABEL="FTP-laag inschakelen"
INSTL_FTP_HOST_LABEL="FTP host"
INSTL_FTP_PASSWORD_LABEL="FTP wachtwoord"
@@ -90,7 +90,7 @@ INSTL_SAMPLE_BROCHURE_SET="Brochure Engelse (GB) voorbeelddata"
INSTL_SAMPLE_DATA_SET="Standaard Engelse (GB) voorbeelddata"
INSTL_SAMPLE_LEARN_SET="Leer Joomla Engelse (GB) voorbeelddata"
INSTL_SAMPLE_TESTING_SET="Test Engelse (GB) voorbeelddata"
-INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installeer Joomla met slechts één menu en inlogformulier en zonder verdere content."
+INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installeer Joomla met één menu en inlogformulier en zonder verdere content."
INSTL_SAMPLE_BLOG_SET_DESC="Installeer Joomla met enkele artikelen en blog gerelateerde modules zoals Oudere artikelen, Bloglijst, Meest gelezen artikelen."
INSTL_SAMPLE_BROCHURE_SET_DESC="Installeer Joomla met enkele pagina's (een menu met de pagina's Home, Over ons, Nieuws, Contact) en modules zoals Zoeken, Speciaal, Inlogformulier."
INSTL_SAMPLE_DATA_SET_DESC="Installeer Joomla met één pagina (een menu met een link) en modules zoals Nieuwste artikel, Inlogformulier."
@@ -204,7 +204,7 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="SQL Server 2008 R2 (10.50.1600.1) of hoge
INSTL_DATABASE_INVALID_SQLZURE_VERSION="SQL Server 2008 R2 (10.50.1600.1) of hoger is vereist om de installatie te vervolgen. Uw versie is: %s"
INSTL_DATABASE_INVALID_TYPE="Selecteer een databasetype"
INSTL_DATABASE_NAME_TOO_LONG="De MySQL databasenaam mag maximaal 64 tekens bevatten."
-INSTL_DATABASE_INVALID_NAME="In MySQL versies ouder dan 5.1.6 mag de naam geen punten of andere "_QQ_"speciale"_QQ_" tekens bevatten. Uw versie is: %s"
+INSTL_DATABASE_INVALID_NAME="In MySQL versies ouder dan 5.1.6 mogen in de naam geen punten of andere "_QQ_"speciale"_QQ_" tekens bevatten. Uw versie is: %s"
INSTL_DATABASE_NAME_INVALID_SPACES="MySQL databasenamen en tabelnamen mogen niet beginnen of eindigen met een spatie."
INSTL_DATABASE_NAME_INVALID_CHAR="Een MySQL identifier kan geen NULL ASCII(0x00) bevatten."
INSTL_DATABASE_FILE_DOES_NOT_EXIST="Bestand %s bestaat niet"
@@ -250,10 +250,8 @@ INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC uitgeschakeld"
INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
INSTL_MB_LANGUAGE_IS_DEFAULT="MB taal is standaard"
INSTL_MB_STRING_OVERLOAD_OFF="MB string overload uitgeschakeld"
-INSTL_MCRYPT_SUPPORT_AVAILABLE="Mcrypt ondersteuning"
INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring taal is niet ingesteld op neutral. Voeg de regel php_value mbstring.language neutral toe aan uw .htaccess bestand."
INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is ingesteld. Dit kan lokaal uitgeschakeld worden door de regel php_value mbstring.func_overload 0 in het .htaccess bestand op te nemen."
-INSTL_NOTICEMCRYPTNOTAVAILABLE="Waarschuwing! PHP-mcrypt extensie moet geïnstalleerd of ingeschakeld zijn. Indien dit niet het geval is zullen sommige functies van Joomla niet beschikbaar zijn."
INSTL_NOTICEYOUCANSTILLINSTALL="
U kunt nog steeds de installatie voortzetten. Aan het einde van de installatie zullen de configuratie instellingen weergegeven worden. U dient enkel de code handmatig te uploaden. Klik in het tekstveld om de gehele weergegeven code te selecteren en kopieer en plak deze in een nieuw tekstbestand. Noem dit bestand 'configuration.php' en upload het naar de rootmap van uw website."
INSTL_OUTPUT_BUFFERING="Gebufferde uitvoer"
INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser ondersteuning"
diff --git a/installation/model/configuration.php b/installation/model/configuration.php
index c31a544911a76..44e080f7f5bce 100644
--- a/installation/model/configuration.php
+++ b/installation/model/configuration.php
@@ -59,6 +59,8 @@ public function setup($options)
*/
public function createConfiguration($options)
{
+ $saveFtp = isset($options->ftp_save) && $options->ftp_save;
+
// Create a new registry to build the configuration options.
$registry = new Registry;
@@ -81,7 +83,7 @@ public function createConfiguration($options)
$registry->set('dbtype', $options->db_type);
$registry->set('host', $options->db_host);
$registry->set('user', $options->db_user);
- $registry->set('password', $options->db_pass);
+ $registry->set('password', $options->db_pass_plain);
$registry->set('db', $options->db_name);
$registry->set('dbprefix', $options->db_prefix);
@@ -93,9 +95,9 @@ public function createConfiguration($options)
$registry->set('helpurl', $options->helpurl);
$registry->set('ftp_host', isset($options->ftp_host) ? $options->ftp_host : '');
$registry->set('ftp_port', isset($options->ftp_host) ? $options->ftp_port : '');
- $registry->set('ftp_user', (isset($options->ftp_save) && $options->ftp_save && isset($options->ftp_user)) ? $options->ftp_user : '');
- $registry->set('ftp_pass', (isset($options->ftp_save) && $options->ftp_save && isset($options->ftp_pass)) ? $options->ftp_pass : '');
- $registry->set('ftp_root', (isset($options->ftp_save) && $options->ftp_save && isset($options->ftp_root)) ? $options->ftp_root : '');
+ $registry->set('ftp_user', ($saveFtp && isset($options->ftp_user)) ? $options->ftp_user : '');
+ $registry->set('ftp_pass', ($saveFtp && isset($options->ftp_pass_plain)) ? $options->ftp_pass_plain : '');
+ $registry->set('ftp_root', ($saveFtp && isset($options->ftp_root)) ? $options->ftp_root : '');
$registry->set('ftp_enable', isset($options->ftp_host) ? $options->ftp_enable : 0);
// Locale settings.
@@ -192,7 +194,7 @@ public function createConfiguration($options)
{
// Connect the FTP client.
$ftp = JClientFtp::getInstance($options->ftp_host, $options->ftp_port);
- $ftp->login($options->ftp_user, $options->ftp_pass);
+ $ftp->login($options->ftp_user, $options->ftp_pass_plain);
// Translate path for the FTP account.
$file = JPath::clean(str_replace(JPATH_CONFIGURATION, $options->ftp_root, $path), '/');
@@ -241,7 +243,7 @@ private function createRootUser($options)
$options->db_type,
$options->db_host,
$options->db_user,
- $options->db_pass,
+ $options->db_pass_plain,
$options->db_name,
$options->db_prefix
);
@@ -253,7 +255,7 @@ private function createRootUser($options)
return false;
}
- $cryptpass = JUserHelper::hashPassword($options->admin_password);
+ $cryptpass = JUserHelper::hashPassword($options->admin_password_plain);
// Take the admin user id.
$userId = InstallationModelDatabase::getUserId();
diff --git a/installation/model/database.php b/installation/model/database.php
index 22a90ca811eda..271366371c3ed 100644
--- a/installation/model/database.php
+++ b/installation/model/database.php
@@ -280,7 +280,7 @@ public function initialise($options)
$options->db_type,
$options->db_host,
$options->db_user,
- $options->db_pass,
+ $options->db_pass_plain,
$options->db_name,
$options->db_prefix,
$options->db_select
@@ -350,7 +350,7 @@ public function createDatabase($options)
'driver' => $options->db_type,
'host' => $options->db_host,
'user' => $options->db_user,
- 'password' => $options->db_pass,
+ 'password' => $options->db_pass_plain,
'prefix' => $options->db_prefix,
'select' => $options->db_select,
);
diff --git a/installation/model/ftp.php b/installation/model/ftp.php
index 44af989665cf2..d376108f03fa2 100644
--- a/installation/model/ftp.php
+++ b/installation/model/ftp.php
@@ -46,7 +46,7 @@ public function detectFtpRoot($options)
return false;
}
- if (!$ftp->login($options->get('ftp_user'), $options->get('ftp_pass')))
+ if (!$ftp->login($options->get('ftp_user'), $options->get('ftp_pass_plain')))
{
JFactory::getApplication()->enqueueMessage(JText::_('INSTL_FTP_NOLOGIN'), 'error');
@@ -162,7 +162,7 @@ public function verifyFtpSettings($options)
return false;
}
- if (!$ftp->login($options->get('ftp_user'), $options->get('ftp_pass')))
+ if (!$ftp->login($options->get('ftp_user'), $options->get('ftp_pass_plain')))
{
$ftp->quit();
JFactory::getApplication()->enqueueMessage(JText::_('INSTL_FTP_NOLOGIN'), 'error');
diff --git a/installation/model/setup.php b/installation/model/setup.php
index adfd24a6c967a..a90bd98e2908a 100644
--- a/installation/model/setup.php
+++ b/installation/model/setup.php
@@ -48,6 +48,19 @@ public function storeOptions($options)
$options['language'] = JFactory::getLanguage()->getTag();
}
+ // Store passwords as a separate key that is not used in the forms
+ foreach (array('admin_password', 'db_pass', 'ftp_pass') as $passwordField)
+ {
+ if (isset($options[$passwordField]))
+ {
+ $plainTextKey = $passwordField . '_plain';
+
+ $options[$plainTextKey] = $options[$passwordField];
+
+ unset($options[$passwordField]);
+ }
+ }
+
// Get the session
$session = JFactory::getSession();
$options['helpurl'] = $session->get('setup.helpurl', null);
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index f74f8a66b35ee..7ac92c317d80d 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -509,7 +509,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
(19, 0, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","search_phrases":"1","search_areas":"1","show_date":"1","opensearch_name":"","opensearch_description":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(20, 0, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css,scss,sass","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(22, 0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"0","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(23, 0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"NONE","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(23, 0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(24, 0, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(25, 0, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"0","new_usertype":"2","guest_usergroup":"9","sendpassword":"0","useractivation":"2","mail_to_admin":"1","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"4","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
(27, 0, 'com_finder', 'component', 'com_finder', '', 1, 1, 0, 0, '', '{"enabled":"0","show_description":"1","description_length":255,"allow_empty_query":"0","show_url":"1","show_autosuggest":"1","show_suggested_query":"1","show_explained_query":"1","show_advanced":"1","show_advanced_tips":"1","expand_advanced":"0","show_date_filters":"0","sort_order":"relevance","sort_direction":"desc","highlight_terms":"1","opensearch_name":"","opensearch_description":"","batch_size":"50","memory_table_limit":30000,"title_multiplier":"1.7","text_multiplier":"0.7","meta_multiplier":"1.2","path_multiplier":"2.0","misc_multiplier":"0.3","stem":"1","stemmer":"snowball","enable_logging":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 9b1a80d66dcc6..55c721cfda6e8 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -523,7 +523,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
(19, 0, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","search_phrases":"1","search_areas":"1","show_date":"1","opensearch_name":"","opensearch_description":""}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
(20, 0, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css,scss,sass","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
(22, 0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"0","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(23, 0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"NONE","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(23, 0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
(24, 0, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
(25, 0, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"0","new_usertype":"2","guest_usergroup":"9","sendpassword":"0","useractivation":"2","mail_to_admin":"1","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"4","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
(27, 0, 'com_finder', 'component', 'com_finder', '', 1, 1, 0, 0, '', '{"enabled":"0","show_description":"1","description_length":255,"allow_empty_query":"0","show_url":"1","show_autosuggest":"1","show_suggested_query":"1","show_explained_query":"1","show_advanced":"1","show_advanced_tips":"1","expand_advanced":"0","show_date_filters":"0","sort_order":"relevance","sort_direction":"desc","highlight_terms":"1","opensearch_name":"","opensearch_description":"","batch_size":"50","memory_table_limit":30000,"title_multiplier":"1.7","text_multiplier":"0.7","meta_multiplier":"1.2","path_multiplier":"2.0","misc_multiplier":"0.3","stem":"1","stemmer":"snowball","enable_logging":"0"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index 0f39ef82a2da8..e24e15f75af56 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -738,7 +738,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
(19, 0, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '', '{"enabled":"0","search_phrases":"1","search_areas":"1","show_date":"1","opensearch_name":"","opensearch_description":""}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
(20, 0, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css,scss,sass","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
(22, 0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"0","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
-(23, 0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"NONE","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
+(23, 0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
(24, 0, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0),
(25, 0, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"0","new_usertype":"2","guest_usergroup":"9","sendpassword":"0","useractivation":"2","mail_to_admin":"1","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"4","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
(27, 0, 'com_finder', 'component', 'com_finder', '', 1, 1, 0, 0, '', '{"enabled":"0","show_description":"1","description_length":255,"allow_empty_query":"0","show_url":"1","show_autosuggest":"1","show_suggested_query":"1","show_explained_query":"1","show_advanced":"1","show_advanced_tips":"1","expand_advanced":"0","show_date_filters":"0","sort_order":"relevance","sort_direction":"desc","highlight_terms":"1","opensearch_name":"","opensearch_description":"","batch_size":"50","memory_table_limit":30000,"title_multiplier":"1.7","text_multiplier":"0.7","meta_multiplier":"1.2","path_multiplier":"2.0","misc_multiplier":"0.3","stem":"1","stemmer":"snowball","enable_logging":"0"}', '', '', 0, '1900-01-01 00:00:00', 0, 0),
diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php
index 32227981a1e0c..9d961ea6c6e49 100644
--- a/installation/view/summary/tmpl/default.php
+++ b/installation/view/summary/tmpl/default.php
@@ -119,14 +119,6 @@
options['admin_user']; ?>
|
-