fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 02:31:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

update truck and tag 1.4.2.3

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7503 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-06-08 08:29:56 +00:00
parent 6900f96319
commit 762ebbf445
127 changed files with 303 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/install/install.model.php
View file

@ -40,7 +40,6 @@ class installModel extends install {
function getInstallFTPList()
{
require_once(_XE_PATH_.'libs/ftp.class.php');
$ftp_info = Context::getRequestVars();
if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
{
@ -57,16 +56,40 @@ class installModel extends install {
return $this->getSFTPList();
}
$oFtp = new ftp();
if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)){
if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
$_list = $oFtp->ftp_rawlist($this->pwd);
$oFtp->ftp_quit();
}
else
if(function_exists(ftp_connect))
{
$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
if(!$connection) return new Object(-1, 'msg_ftp_not_connected');
$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password);
if(!$login_result)
{
ftp_close($connection);
return new Object(-1,'msg_ftp_invalid_auth_info');
}
if($ftp_info->ftp_pasv != "N")
{
ftp_pasv($connection, true);
}
$_list = ftp_rawlist($connection, $this->pwd);
ftp_close($connection);
}
else
{
require_once(_XE_PATH_.'libs/ftp.class.php');
$oFtp = new ftp();
if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)){
if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
$_list = $oFtp->ftp_rawlist($this->pwd);
$oFtp->ftp_quit();
}
else
{
$oFtp->ftp_quit();
return new Object(-1,'msg_ftp_invalid_auth_info');
}
}
}
$list = array();