Update master #1

Merged
root merged 49 commits from joomla/Component-Builder:master into master 2024-02-06 12:33:45 +00:00
Showing only changes of commit a77eac9adf - Show all commits

View File

@ -114,12 +114,13 @@ class Ftp implements Serverinterface
// make sure we have a string and it is not default or empty // make sure we have a string and it is not default or empty
if (StringHelper::check($this->details->signature)) if (StringHelper::check($this->details->signature))
{ {
// turn into variables // turn into array of variables
parse_str((string) $this->details->signature); $signature = [];
parse_str((string) $this->details->signature, $signature);
// set options // set options
if (isset($options) && ArrayHelper::check($options)) if (isset($signature['options']) && ArrayHelper::check($signature['options']))
{ {
foreach ($options as $o__p0t1on => $vAln3) foreach ($signature['options'] as $o__p0t1on => $vAln3)
{ {
if ('timeout' === $o__p0t1on) if ('timeout' === $o__p0t1on)
{ {
@ -136,10 +137,10 @@ class Ftp implements Serverinterface
$options = []; $options = [];
} }
// get ftp object // get ftp object
if (isset($host) && $host != 'HOSTNAME' && if (isset($signature['host']) && $signature['host'] != 'HOSTNAME' &&
isset($port) && $port != 'PORT_INT' && isset($signature['port']) && $signature['port'] != 'PORT_INT' &&
isset($username) && $username != 'user@name.com' && isset($signature['username']) && $signature['username'] != 'user@name.com' &&
isset($password) && $password != 'password') isset($signature['password']) && $signature['password'] != 'password')
{ {
// this is a singleton // this is a singleton
return FtpClient::getInstance($host, $port, $options, $username, $password); return FtpClient::getInstance($host, $port, $options, $username, $password);