From 5cb282bb4933f4dd66d5a82ca393427803db667b Mon Sep 17 00:00:00 2001 From: ovclas Date: Wed, 21 Dec 2011 09:15:23 +0000 Subject: [PATCH] issue 740 check sftp enviroment, when called by autoinstaller git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9973 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/autoinstall/autoinstall.admin.controller.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php index 203eebccf..a1d3d34bb 100644 --- a/modules/autoinstall/autoinstall.admin.controller.php +++ b/modules/autoinstall/autoinstall.admin.controller.php @@ -138,10 +138,11 @@ $ftp_password = $_SESSION['ftp_password']; } + $isSftpSupported = function_exists(ssh2_sftp); foreach($packages as $package_srl) { $package = $oModel->getPackage($package_srl); - if($ftp_info->sftp && $ftp_info->sftp == 'Y') + if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported) { $oModuleInstaller = new SFTPModuleInstaller($package); } @@ -243,7 +244,8 @@ } $ftp_info = Context::getFTPInfo(); - if($ftp_info->sftp && $ftp_info->sftp == 'Y') + $isSftpSupported = function_exists(ssh2_sftp); + if($ftp_info->sftp && $ftp_info->sftp == 'Y' && $isSftpSupported) { $oModuleInstaller = new SFTPModuleInstaller($package); }