hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-771 #time 2h

Browse Source 
report de PHRAS-750 (connect to ftp via a auth proxy)
This commit is contained in:
Jean-Yves Gaulier
2015-10-15 17:02:04 +02:00
parent cb98ac8216
commit ddf977465c
5 changed files with 93 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Core/Provider/FtpServiceProvider.php
View File

@@ -21,9 +21,11 @@ class FtpServiceProvider implements ServiceProviderInterface
*/
public function register(Application $app)
{
$app['phraseanet.ftp.client'] = $app->protect(function ($host, $port = 21, $timeout = 90, $ssl = false, $proxy = false, $proxyport = false) {
return new \ftpclient($host, $port, $timeout, $ssl, $proxy, $proxyport);
});
$app['phraseanet.ftp.client'] = $app->protect(
function ($host, $port = 21, $timeout = 90, $ssl = false, $proxy = false, $proxyport = false, $proxyuser = false, $proxypwd = false) {
return new \ftpclient($host, $port, $timeout, $ssl, $proxy, $proxyport, $proxyuser, $proxypwd);
}
);
}
/**

4
lib/Alchemy/Phrasea/TaskManager/Editor/FtpEditor.php
View File

@@ -41,6 +41,8 @@ class FtpEditor extends AbstractEditor
<tasksettings>
<proxy></proxy>
<proxyport></proxyport>
<proxyuser></proxyuser>
<proxypwd></proxypwd>
</tasksettings>
EOF;
}
@@ -53,6 +55,8 @@ EOF;
return [
'proxy' => static::FORM_TYPE_STRING,
'proxyport' => static::FORM_TYPE_STRING,
'proxyuser' => static::FORM_TYPE_STRING,
'proxypwd' => static::FORM_TYPE_STRING,
];
}
}

11
lib/Alchemy/Phrasea/TaskManager/Job/FtpJob.php
View File

@@ -11,6 +11,7 @@
namespace Alchemy\Phrasea\TaskManager\Job;
use ftpclient;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Application\Helper\NotifierAware;
use Alchemy\Phrasea\Model\Serializer\CaptionSerializer;
@@ -95,6 +96,8 @@ class FtpJob extends AbstractJob
$proxy = (string) $settings->proxy;
$proxyport = (string) $settings->proxyport;
$proxyuser = (string) $settings->proxyuser;
$proxypwd = (string) $settings->proxypwd;
$state = "";
$ftp_server = $export->getAddr();
@@ -122,7 +125,11 @@ class FtpJob extends AbstractJob
try {
$ssl = $export->isSsl();
$ftp_client = $app['phraseanet.ftp.client']($ftp_server, 21, 300, $ssl, $proxy, $proxyport);
/** @var \ftpClient $ftp_client */
$ftp_client = $app['phraseanet.ftp.client'](
$ftp_server, 21, 300, $ssl, $proxy, $proxyport,
$proxyuser, $proxypwd
);
$ftp_client->login($ftp_user_name, $ftp_user_pass);
if ($export->isPassif()) {
@@ -261,7 +268,7 @@ class FtpJob extends AbstractJob
if ($export->isLogfile()) {
$this->log('debug', "logfile ");
$date = new DateTime();
$date = new \DateTime();
$buffer = '#transfert finished ' . $date->format(DATE_ATOM) . "\n\n";
foreach ($export->getElements() as $exportElement) {