Skip to content

[4.0] Upload & update Joomla via FTP #28029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

[4.0] Upload & update Joomla via FTP #28029

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
48bf8e2
Assignment of FTP fields
twister65 Feb 16, 2020
3573bde
Add or remove "hidden" to the class of FTP elements.
twister65 Feb 23, 2020
9d032bc
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 4…
twister65 Feb 29, 2020
ce9d861
Remove the hint
twister65 Mar 2, 2020
e7f13a5
Fix FTP update
twister65 Mar 2, 2020
e3f0025
Read-only ftp details.
twister65 Mar 2, 2020
15cfc6d
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 4…
twister65 Mar 3, 2020
6c40228
Discard upload method when FTP is disabled
twister65 Mar 8, 2020
0a311c6
Make config file un/writable even if using FTP
twister65 Mar 8, 2020
9a97b1c
Discard update method when FTP is disabled.
twister65 Mar 8, 2020
9ac1c4e
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 4…
twister65 Mar 9, 2020
c72a457
Fix the connect function
twister65 Mar 15, 2020
0447602
Merge branch '4.0-dev' into 4.0-ftpfix
twister65 Jul 12, 2020
87cca07
Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into 4…
twister65 Aug 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions administrator/components/com_config/forms/application.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@
showon="ftp_enable:1"
min="1"
max="65535"
default="21"
hint="21"
validate="number"
filter="integer"
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_joomlaupdate/src/View/Joomlaupdate/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ public function display($tpl = null)
$this->loadHelper('select');

// Assign view variables.
$ftp = $model->getFTPOptions();
$defaultMethod = $ftp['enabled'] ? 'hybrid' : 'direct';
$this->ftp = $model->getFTPOptions();
$defaultMethod = $this->ftp['enabled'] ? 'hybrid' : 'direct';

$this->updateInfo = $model->getUpdateInformation();
$this->methodSelect = JoomlaupdateHelperSelect::getMethods($defaultMethod);
Expand Down
12 changes: 6 additions & 6 deletions build/media_source/com_joomlaupdate/js/default.es5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ Joomla = window.Joomla || {};
'use strict';

Joomla.extractionMethodHandler = function(element, prefix) {
var displayStyle = element.value === 'direct' ? 'hidden' : 'table-row';
var force = element.value === 'direct';

document.getElementById(prefix + '_hostname').classList.add(displayStyle);
document.getElementById(prefix + '_port').classList.add(displayStyle);
document.getElementById(prefix + '_username').classList.add(displayStyle);
document.getElementById(prefix + '_password').classList.add(displayStyle);
document.getElementById(prefix + '_directory').classList.add(displayStyle);
document.getElementById(prefix + '_hostname').classList.toggle('hidden', force);
document.getElementById(prefix + '_port').classList.toggle('hidden', force);
document.getElementById(prefix + '_username').classList.toggle('hidden', force);
document.getElementById(prefix + '_password').classList.toggle('hidden', force);
document.getElementById(prefix + '_directory').classList.toggle('hidden', force);
}

Joomla.submitbuttonUpload = function() {
Expand Down