From b242febf3cb3bb8c91c12fe7bd0a48220e16a7d8 Mon Sep 17 00:00:00 2001 From: Johan Janssens Date: Mon, 1 Jun 2015 00:34:36 +0200 Subject: [PATCH] #116 - Remove the FTP settings --- .../com_config/model/application.php | 9 --- .../com_config/model/form/application.xml | 63 ------------------- .../view/application/tmpl/default.php | 9 --- .../view/application/tmpl/default_ftp.php | 14 ----- .../application/tmpl/default_ftplogin.php | 30 --------- .../language/en-GB/en-GB.com_config.ini | 15 ----- .../language/en-GB/en-GB.com_languages.ini | 2 - .../language/en-GB/en-GB.com_templates.ini | 2 - config/configuration.php-dist | 6 -- .../Pages/System/GlobalConfigurationPage.php | 1 - 10 files changed, 151 deletions(-) delete mode 100644 administrator/components/com_config/view/application/tmpl/default_ftp.php delete mode 100644 administrator/components/com_config/view/application/tmpl/default_ftplogin.php diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php index 03e5105635..dc38e6552d 100644 --- a/administrator/components/com_config/model/application.php +++ b/administrator/components/com_config/model/application.php @@ -218,15 +218,6 @@ public function save($data) $config = new JRegistry('config'); $config->loadArray($data); - // Overwrite the old FTP credentials with the new ones. - $temp = JFactory::getConfig(); - $temp->set('ftp_enable', $data['ftp_enable']); - $temp->set('ftp_host', $data['ftp_host']); - $temp->set('ftp_port', $data['ftp_port']); - $temp->set('ftp_user', $data['ftp_user']); - $temp->set('ftp_pass', $data['ftp_pass']); - $temp->set('ftp_root', $data['ftp_root']); - // Clear cache of com_config component. $this->cleanCache('_system', 0); $this->cleanCache('_system', 1); diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml index 9880105854..34aae3e9fa 100644 --- a/administrator/components/com_config/model/form/application.xml +++ b/administrator/components/com_config/model/form/application.xml @@ -207,69 +207,6 @@ -
- - - - - - - - - - - - - - -
-
diff --git a/administrator/components/com_config/view/application/tmpl/default.php b/administrator/components/com_config/view/application/tmpl/default.php index 744efbc458..d9bc59b7f7 100644 --- a/administrator/components/com_config/view/application/tmpl/default.php +++ b/administrator/components/com_config/view/application/tmpl/default.php @@ -52,9 +52,6 @@
    • - ftp) : ?> -
    • -
    @@ -84,7 +81,6 @@
    loadTemplate('server'); ?> loadTemplate('locale'); ?> - loadTemplate('ftp'); ?> loadTemplate('proxy'); ?>
    @@ -103,11 +99,6 @@ loadTemplate('filters'); ?>
    - ftp) : ?> -
    - loadTemplate('ftplogin'); ?> -
    -
    diff --git a/administrator/components/com_config/view/application/tmpl/default_ftp.php b/administrator/components/com_config/view/application/tmpl/default_ftp.php deleted file mode 100644 index 5025c3d3d9..0000000000 --- a/administrator/components/com_config/view/application/tmpl/default_ftp.php +++ /dev/null @@ -1,14 +0,0 @@ -name = JText::_('COM_CONFIG_FTP_SETTINGS'); -$this->fieldsname = 'ftp'; -echo JLayoutHelper::render('joomla.content.options_default', $this); diff --git a/administrator/components/com_config/view/application/tmpl/default_ftplogin.php b/administrator/components/com_config/view/application/tmpl/default_ftplogin.php deleted file mode 100644 index a287d95598..0000000000 --- a/administrator/components/com_config/view/application/tmpl/default_ftplogin.php +++ /dev/null @@ -1,30 +0,0 @@ - -
    - - - ftp instanceof Exception) : ?> -

    ftp->message); ?>

    - -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index b74e4ccd26..3923be8286 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -80,18 +80,6 @@ COM_CONFIG_FRONTEDITING_MENUSANDMODULES_ADMIN_TOO="Modules & Menus (admin too)" COM_CONFIG_FRONTEDITING_MODULES="Modules" COM_CONFIG_FIELD_FORCE_SSL_DESC="Force site access to always occur under SSL (https) for selected areas. You will not be able to access selected areas under non-ssl. Note, you must have SSL enabled on your server to utilise this option." COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force SSL" -COM_CONFIG_FIELD_FTP_ENABLE_DESC="Enable the built in FTP (File Transfer Protocol) functionality which is needed in some server environments to be used instead of the normal upload functionality of Joomla!" -COM_CONFIG_FIELD_FTP_ENABLE_LABEL="Enable FTP" -COM_CONFIG_FIELD_FTP_HOST_DESC="Enter the name of the host of your FTP server" -COM_CONFIG_FIELD_FTP_HOST_LABEL="FTP Host" -COM_CONFIG_FIELD_FTP_PASSWORD_DESC="Enter your FTP password" -COM_CONFIG_FIELD_FTP_PASSWORD_LABEL="FTP Password" -COM_CONFIG_FIELD_FTP_PORT_DESC="Enter the port that FTP should be accessed by. The default is port 21." -COM_CONFIG_FIELD_FTP_PORT_LABEL="FTP Port" -COM_CONFIG_FIELD_FTP_ROOT_DESC="The path to the root directory of the FTP server. The root directory is the base directory to which the FTP server is allowed access." -COM_CONFIG_FIELD_FTP_ROOT_LABEL="FTP Root" -COM_CONFIG_FIELD_FTP_USERNAME_DESC="The username used to access the FTP server." -COM_CONFIG_FIELD_FTP_USERNAME_LABEL="FTP Username" COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC="Compress buffered output if supported." COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL="Gzip Page Compression" COM_CONFIG_FIELD_HELP_SERVER_DESC="Select the name of the help server from which your system will collect the help screen displays." @@ -200,9 +188,6 @@ COM_CONFIG_FIELD_VALUE_SMTP="SMTP" COM_CONFIG_FIELD_VALUE_SSL="SSL" COM_CONFIG_FIELD_VALUE_SYSTEM_DEFAULT="System Default" COM_CONFIG_FIELD_VALUE_TLS="TLS" -COM_CONFIG_FTP_DETAILS="FTP Login Details" -COM_CONFIG_FTP_DETAILS_TIP="For updating your configuration.php file, Joomla! will most likely need your FTP account details. Please enter them in the form fields below." -COM_CONFIG_FTP_SETTINGS="FTP Settings" COM_CONFIG_GLOBAL_CONFIGURATION="Global Configuration" COM_CONFIG_HELPREFRESH_SUCCESS="The Help Sites list has been refreshed." COM_CONFIG_LOCATION_SETTINGS="Location Settings" diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini index ef99c0817e..d6da680e01 100644 --- a/administrator/language/en-GB/en-GB.com_languages.ini +++ b/administrator/language/en-GB/en-GB.com_languages.ini @@ -41,8 +41,6 @@ COM_LANGUAGES_FIELD_TITLE_DESC="The name of the language as it will appear in th COM_LANGUAGES_FIELD_TITLE_NATIVE_DESC="Title in Native language" COM_LANGUAGES_FIELD_TITLE_NATIVE_LABEL="Title Native" COM_LANGUAGES_FILTER_CLIENT_LABEL="Filter Location:" -COM_LANGUAGES_FTP_DESC="For setting Languages as default, Joomla! will most likely need your FTP account details. Please enter them in the form fields below." -COM_LANGUAGES_FTP_TITLE="FTP Login Details" COM_LANGUAGES_HEADING_AUTHOR_EMAIL="Author Email" COM_LANGUAGES_HEADING_DEFAULT="Default" COM_LANGUAGES_HEADING_LANG_IMAGE="Image Prefix" diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini index 11b6504cc0..035e5c31d5 100644 --- a/administrator/language/en-GB/en-GB.com_templates.ini +++ b/administrator/language/en-GB/en-GB.com_templates.ini @@ -134,8 +134,6 @@ COM_TEMPLATES_FOLDER_ERROR="Not able to create folder." COM_TEMPLATES_FOLDER_EXISTS="Folder with the same name already exists." COM_TEMPLATES_FOLDER_NAME="Folder Name" COM_TEMPLATES_FOLDER_NOT_EXISTS="The folder does not exist." -COM_TEMPLATES_FTP_DESC="For updating the template source files, Joomla! will most likely need your FTP account details. Please enter them in the form fields below." -COM_TEMPLATES_FTP_TITLE="FTP Login Details" COM_TEMPLATES_GRID_UNSET_LANGUAGE="Unset %s Default" COM_TEMPLATES_HOME_BUTTON="Documentation" COM_TEMPLATES_HOME_HEADING="Select a File" diff --git a/config/configuration.php-dist b/config/configuration.php-dist index 22e64db032..4721e1f0d8 100644 --- a/config/configuration.php-dist +++ b/config/configuration.php-dist @@ -36,12 +36,6 @@ class JConfig { public $secret = 'FBVtggIk5lAzEU9H'; // Change this to something more secure public $gzip = '0'; public $error_reporting = 'default'; - public $ftp_host = ''; - public $ftp_port = ''; - public $ftp_user = ''; - public $ftp_pass = ''; - public $ftp_root = ''; - public $ftp_enable = ''; public $tmp_path = '/tmp'; public $log_path = '/var/logs'; public $live_site = ''; // Optional, Full url to Joomla install. diff --git a/tests/system/webdriver/Pages/System/GlobalConfigurationPage.php b/tests/system/webdriver/Pages/System/GlobalConfigurationPage.php index 15bcc9096e..b6eb6793af 100644 --- a/tests/system/webdriver/Pages/System/GlobalConfigurationPage.php +++ b/tests/system/webdriver/Pages/System/GlobalConfigurationPage.php @@ -81,7 +81,6 @@ class GlobalConfigurationPage extends AdminEditPage array('label' => 'Error Reporting', 'id' => 'jform_error_reporting', 'type' => 'select', 'tab' => 'page-server'), array('label' => 'Force SSL', 'id' => 'jform_force_ssl', 'type' => 'select', 'tab' => 'page-server'), array('label' => 'Server Time Zone', 'id' => 'jform_offset', 'type' => 'select', 'tab' => 'page-server'), - array('label' => 'Enable FTP', 'id' => 'jform_ftp_enable', 'type' => 'fieldset', 'tab' => 'page-server'), array('label' => 'Enable Proxy', 'id' => 'jform_proxy_enable', 'type' => 'fieldset', 'tab' => 'page-server'), array('label' => 'Database Type', 'id' => 'jform_dbtype', 'type' => 'select', 'tab' => 'page-server'), array('label' => 'Host', 'id' => 'jform_host', 'type' => 'input', 'tab' => 'page-server'),