diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 372de91c1..fbe939f1f 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -275,28 +275,23 @@ $ftp_info = Context::getFTPInfo(); $oFtp = new ftp(); - if(!$oFtp->ftp_connect('localhost', $ftp_info->ftp_port)) return new Object(-1,'msg_ftp_not_connected'); - if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) { - $oFtp->ftp_quit(); - return new Object(-1,'msg_ftp_invalid_auth_info'); - } - - $_list = $oFtp->ftp_rawlist($pwd); - $oFtp->ftp_quit(); - + if($oFtp->ftp_connect('localhost', $ftp_info->ftp_port)){ + if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) { + $_list = $oFtp->ftp_rawlist($pwd); + $oFtp->ftp_quit(); + } + } $list = array(); if(count($_list) == 0 || !$_list[0]) { $oFtp = new ftp(); - if(!$oFtp->ftp_connect($_SERVER['SERVER_NAME'], $ftp_info->ftp_port)) return new Object(-1,'msg_ftp_not_connected'); - if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) { - $oFtp->ftp_quit(); - return new Object(-1,'msg_ftp_invalid_auth_info'); - } - - $_list = $oFtp->ftp_rawlist($pwd); - $oFtp->ftp_quit(); + if($oFtp->ftp_connect($_SERVER['SERVER_NAME'], $ftp_info->ftp_port)){ + if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) { + $_list = $oFtp->ftp_rawlist($pwd); + $oFtp->ftp_quit(); + } + } } - if($_list){ + if($_list){ foreach($_list as $k => $v){ if(strpos($v,'d') === 0) $list[] = substr(strrchr($v,' '),1) . '/'; }