From 7ccf96fda45971e385fda1c32160374a22e9a5b0 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Mon, 23 Nov 2009 06:38:45 +0000
Subject: [PATCH] #18454344 : modify link to parent directory

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6958 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/tpl/config.html  |  2 +-
 modules/admin/tpl/js/config.js | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html
index 9898ac867..5aaa6c305 100644
--- a/modules/admin/tpl/config.html
+++ b/modules/admin/tpl/config.html
@@ -174,7 +174,7 @@
     <tr>
         <th scope="col" rowspan="2"><div>{$lang->msg_ftp_installed_ftp_realpath}</div></th>
         <td>
-            <input type="text" name="ftp_root_path" value="<!--@if($pwd && $pwd!='/')-->{$pwd}<!--@else-->{$ftp_info->ftp_root_path}<!--@end-->" class="inputTypeText w400" /> 
+            <input type="text" name="ftp_root_path" value="<!--@if($pwd)-->{$pwd}<!--@else-->{$ftp_info->ftp_root_path}<!--@end-->" class="inputTypeText w400" /> 
         </td>
     </tr>
     <tr id="ftplist">
diff --git a/modules/admin/tpl/js/config.js b/modules/admin/tpl/js/config.js
index 739e59042..d0cd2ef1a 100644
--- a/modules/admin/tpl/js/config.js
+++ b/modules/admin/tpl/js/config.js
@@ -6,7 +6,28 @@ function completeGetFtpInfo(ret_obj)
     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>";
+        if(v == "../")
+        {
+            if(pwd == "/")
+            {
+                continue;
+            }
+
+            arr = pwd.split("/");
+            arr.pop();
+            arr.pop();
+            arr.push("");
+            target = arr.join("/");
+            list = list + "<li><a href='"+current_url.setQuery('pwd',target)+"#ftpSetup'>"+v+"</a></li>";
+        } 
+        else if( v == "./")
+        {
+            continue;
+        }
+        else
+        {
+            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));