From a2a57aeaa1e056105ed7710cab7460c66125c6e4 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Sun, 15 Nov 2009 14:09:52 +0000
Subject: [PATCH] #18429537 : Using AJAX, make it working even if FTPport is
 wronly set to SFTP port

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6938 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/admin.admin.model.php | 38 +++++++++++++++++++++++++++++
 modules/admin/admin.admin.view.php  | 27 --------------------
 modules/admin/conf/module.xml       |  1 +
 modules/admin/tpl/config.html       | 25 ++++++++++---------
 modules/admin/tpl/css/admin.css     |  2 +-
 modules/admin/tpl/js/config.js      | 14 +++++++++++
 6 files changed, 67 insertions(+), 40 deletions(-)
 create mode 100644 modules/admin/admin.admin.model.php
 create mode 100644 modules/admin/tpl/js/config.js

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 @@
+<?php
+
+    class adminAdminModel extends admin
+    {
+        function getAdminFTPList()
+        {
+            set_time_limit(5);
+            require_once(_XE_PATH_.'libs/ftp.class.php');
+            $ftp_info =  Context::getFTPInfo();
+            $pwd = Context::get('pwd');
+
+            $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) . '/';
+                }
+            }
+            $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 @@
 
         <action name="procAdminRecompileCacheFile" type="controller" standalone="true" />
         <action name="procAdminLogout" type="controller" standalone="true" />
+        <action name="getAdminFTPList" type="model" standalone="true" />
     </actions>
 </module>
diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html
index 51b3da5c0..a17ac510c 100644
--- a/modules/admin/tpl/config.html
+++ b/modules/admin/tpl/config.html
@@ -6,6 +6,7 @@
 <!--%import("./filter/install_ftp_path.xml")-->
 <!--%import("../../install/lang")-->
 <!--%import("../../install/tpl/js/install_admin.js",optimized=false)-->
+<!--%import("./js/config.js")-->
 
 <script type="text/javascript">
     function insertSelectedModule(id, module_srl, mid, browser_title) {
@@ -14,6 +15,12 @@
         sObj.value = module_srl;
         obj.value = browser_title+' ('+mid+')';
     }
+<!--@if($ftp_info && $ftp_info->ftp_password && $ftp_info->ftp_user)-->
+    var pwd = '{$pwd}';
+    params = new Array();
+    params['pwd'] = pwd; 
+    exec_xml('admin','getAdminFTPList', params, completeGetFtpInfo, new Array('list','error','message'));
+<!--@end-->
 </script>
 
 <div class="content">
@@ -120,7 +127,7 @@
     </table>
     </form>
 
-    <h4 class="xeAdmin">{$lang->ftp_form_title}</h4>
+    <h4 class="xeAdmin" id="ftpSetup">{$lang->ftp_form_title}</h4>
     <p class="summary">{$lang->about_ftp_info}</p>
     <form action="./" method="post" onsubmit="return procFilter(this, install_ftp_info);" id="ftp_form">
     <table cellspacing="0" class="rowTable">
@@ -143,7 +150,7 @@
     </table>
     </form>
 <!--@if($ftp_info && $ftp_info->ftp_password && $ftp_info->ftp_user)-->
-    <h4 class="xeAdmin" id="ftp_setup">{$lang->ftp_path_title}</h4>
+    <h4 class="xeAdmin" id="ftpSetup">{$lang->ftp_path_title}</h4>
     <form action="./" method="get" onsubmit="return procFilter(this, install_ftp_path)">
     <input type="hidden" name="ftp_user" value="{$ftp_info->ftp_user}" />
     <input type="hidden" name="ftp_password" value="{$ftp_info->ftp_password}" />
@@ -161,17 +168,11 @@
             <input type="text" name="ftp_root_path" value="<!--@if($pwd && $pwd!='/')-->{$pwd}<!--@else-->{$ftp_info->ftp_root_path}<!--@end-->" class="inputTypeText w400" /> 
         </td>
     </tr>
-    <tr>
+    <tr id="ftplist">
         <td>
-        <!--@if($list)-->
-                <ul>
-        <!--@foreach($list as $k => $v)-->
-            <!--@if($v)-->
-                    <li> <a href="{getUrl('pwd',$pwd.$v)}#ftp_setup">{$v}</a></li>
-            <!--@end-->
-        <!--@end-->
-                </ul>
-        <!--@end-->
+            <div class="serverresponse">
+            Waiting to load information
+            </div>
         </td>
     </tr>
     <tr class="row2">
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index 1c3673e02..f16f8a808 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -200,4 +200,4 @@
 
 .adminLeftContent { float:left; width:60%; margin-right:2%; _margin-right:1.9%;}
 .adminRightExtra { float:left; width:38%; }
-
+.serverresponse { background: #FFFFFF url(../../../../common/tpl/images/loading.gif) no-repeat scroll 5px 5px; height:30px; padding-left:25px; padding-top:5px;  }
diff --git a/modules/admin/tpl/js/config.js b/modules/admin/tpl/js/config.js
new file mode 100644
index 000000000..739e59042
--- /dev/null
+++ b/modules/admin/tpl/js/config.js
@@ -0,0 +1,14 @@
+function completeGetFtpInfo(ret_obj)
+{
+
+    var e = jQuery("#ftplist").empty();
+    var list = "";
+    for(var i=0;i<ret_obj['list']['item'].length;i++)
+    {   
+        var v = ret_obj['list']['item'][i];
+        list = list + "<li><a href='"+current_url.setQuery('pwd',pwd+v)+"#ftpSetup'>"+v+"</a></li>";
+    }
+    list = "<td><ul>"+list+"</ul></td>";
+    e.append(jQuery(list));
+}
+