{$lang->ftp_form_title}
+{$lang->ftp_form_title}
{$lang->about_ftp_info}
-diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
new file mode 100644
index 000000000..d02a46d4f
--- /dev/null
+++ b/modules/admin/admin.admin.model.php
@@ -0,0 +1,38 @@
+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)){
+ if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
+ $_list = $oFtp->ftp_rawlist($pwd);
+ $oFtp->ftp_quit();
+ }
+ }
+ }
+
+ if($_list){
+ foreach($_list as $k => $v){
+ if(strpos($v,'d') === 0) $list[] = substr(strrchr($v,' '),1) . '/';
+ }
+ }
+ $this->add('list', $list);
+ }
+ }
+?>
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index fbe939f1f..21305b246 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -271,33 +271,6 @@
$pwd = Context::get('pwd');
if(!$pwd) $pwd = '/';
Context::set('pwd',$pwd);
- require_once(_XE_PATH_.'libs/ftp.class.php');
-
- $ftp_info = Context::getFTPInfo();
- $oFtp = new ftp();
- 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)){
- if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
- $_list = $oFtp->ftp_rawlist($pwd);
- $oFtp->ftp_quit();
- }
- }
- }
- if($_list){
- foreach($_list as $k => $v){
- if(strpos($v,'d') === 0) $list[] = substr(strrchr($v,' '),1) . '/';
- }
- }
-
- Context::set('list',$list);
Context::set('layout','none');
$this->setTemplateFile('config');
}
diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml
index e292da3ba..c5a0470f4 100644
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@@ -8,5 +8,6 @@
{$lang->about_ftp_info}
-