Merge pull request #117 from nooku/feature/116-configuration

Remove the FTP settings

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);

administrator/components/com_config/model/form/application.xml

@@ -207,69 +207,6 @@
 		</field>
 	</fieldset>
 
-	<fieldset
-		name="ftp"
-		label="CONFIG_FTP_SETTINGS_LABEL">
-		<field
-			name="ftp_enable"
-			type="radio"
-			class="btn-group btn-group-yesno"
-			default="0"
-			label="COM_CONFIG_FIELD_FTP_ENABLE_LABEL"
-			description="COM_CONFIG_FIELD_FTP_ENABLE_DESC"
-			filter="integer">
-			<option value="1">JYES</option>
-			<option value="0">JNO</option>
-		</field>
-
-		<field
-			name="ftp_host"
-			type="text"
-			label="COM_CONFIG_FIELD_FTP_HOST_LABEL"
-			description="COM_CONFIG_FIELD_FTP_HOST_DESC"
-			filter="string"
-			showon="ftp_enable:1"
-			size="14" />
-
-		<field
-			name="ftp_port"
-			type="text"
-			label="COM_CONFIG_FIELD_FTP_PORT_LABEL"
-			description="COM_CONFIG_FIELD_FTP_PORT_DESC"
-			filter="string"
-			showon="ftp_enable:1"
-			size="8" />
-
-		<field
-			name="ftp_user"
-			type="text"
-			label="COM_CONFIG_FIELD_FTP_USERNAME_LABEL"
-			description="COM_CONFIG_FIELD_FTP_USERNAME_DESC"
-			filter="string"
-			showon="ftp_enable:1"
-			autocomplete="off"
-			size="25" />
-
-		<field
-			name="ftp_pass"
-			type="password"
-			label="COM_CONFIG_FIELD_FTP_PASSWORD_LABEL"
-			description="COM_CONFIG_FIELD_FTP_PASSWORD_DESC"
-			filter="raw"
-			showon="ftp_enable:1"
-			autocomplete="off"
-			size="25" />
-
-		<field
-			name="ftp_root"
-			type="text"
-			label="COM_CONFIG_FIELD_FTP_ROOT_LABEL"
-			showon="ftp_enable:1"
-			description="COM_CONFIG_FIELD_FTP_ROOT_DESC"
-			filter="string"
-			size="50" />
-	</fieldset>
-
 	<fieldset
 		name="proxy"
 		label="CONFIG_PROXY_SETTINGS_LABEL">

administrator/components/com_config/view/application/tmpl/default.php

@@ -52,9 +52,6 @@
 				<li><a href="#page-server" data-toggle="tab"><?php echo JText::_('COM_CONFIG_SERVER'); ?></a></li>
 				<li><a href="#page-permissions" data-toggle="tab"><?php echo JText::_('COM_CONFIG_PERMISSIONS'); ?></a></li>
 				<li><a href="#page-filters" data-toggle="tab"><?php echo JText::_('COM_CONFIG_TEXT_FILTERS'); ?></a></li>
-				<?php if ($this->ftp) : ?>
-					<li><a href="#page-ftp" data-toggle="tab"><?php echo JText::_('COM_CONFIG_FTP_SETTINGS'); ?></a></li>
-				<?php endif; ?>
 			</ul>
 			<div id="config-document" class="tab-content">
 				<div id="page-site" class="tab-pane active">
@@ -84,7 +81,6 @@
 						<div class="span6">
 							<?php echo $this->loadTemplate('server'); ?>
 							<?php echo $this->loadTemplate('locale'); ?>
-							<?php echo $this->loadTemplate('ftp'); ?>
 							<?php echo $this->loadTemplate('proxy'); ?>
 						</div>
 						<div class="span6">
@@ -103,11 +99,6 @@
 						<?php echo $this->loadTemplate('filters'); ?>
 					</div>
 				</div>
-				<?php if ($this->ftp) : ?>
-					<div id="page-ftp" class="tab-pane">
-						<?php echo $this->loadTemplate('ftplogin'); ?>
-					</div>
-				<?php endif; ?>
 				<input type="hidden" name="task" value="" />
 				<?php echo JHtml::_('form.token'); ?>
 			</div>

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"

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"

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"

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.

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'),