From 40309eefeac31fe736cb96af0a131da7e02d48e9 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Fri, 11 Dec 2009 11:30:16 +0000
Subject: [PATCH] [7026] rollback

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7030 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/admin.admin.controller.php      | 24 -------------------
 modules/admin/admin.admin.view.php            | 12 +---------
 modules/admin/conf/module.xml                 |  2 --
 modules/admin/lang/ko.lang.php                |  1 -
 modules/admin/tpl/config.html                 | 19 +++++----------
 modules/admin/tpl/filter/install_ftp_info.xml |  2 +-
 modules/admin/tpl/filter/install_ftp_path.xml |  2 +-
 modules/admin/tpl/js/config.js                |  4 ----
 8 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 4e7d3d4ab..511e29e16 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -48,29 +48,5 @@
             $oMemberController = &getController('member');
             $oMemberController->procMemberLogout();
         }
-
-        /**
-         * @brief Save FTP PATH Info
-         * @return none
-         **/
-        function procSaveFTPPathInfo() {
-            $oInstallAdminController = &getAdminController('install');
-            $ftp_info = Context::getFTPInfo();
-            Context::set('ftp_user', $ftp_info->ftp_user);
-            Context::set('ftp_password', $ftp_info->ftp_password);
-            Context::set('ftp_port', $ftp_info->ftp_port);
-            Context::set('sftp', $ftp_info->sftp);
-            $oInstallAdminController->procInstallAdminSaveFTPInfo();
-        }
-
-        /**
-         * @brief Delete FTP Config Info
-         * @return delete success message
-         **/
-        function procDeleteFTPConfig() {
-            $ftp_config = Context::getFTPConfigFile();
-            FileHandler::removeFile($ftp_config);
-            return new Object(-1, 'success_deleted');
-        }
     }
 ?>
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 971e73c46..173fcf84b 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -257,7 +257,6 @@
          **/
         function dispAdminConfig() {
             $db_info = Context::getDBInfo();
-            $oInstallController = &getController('install');
 
             Context::set('sftp_support', function_exists(ssh2_sftp));
 
@@ -268,17 +267,8 @@
             Context::set('langs', Context::loadLangSupported());
 
             Context::set('lang_selected', Context::loadLangSelected());
-
+            
             $ftp_info = Context::getFTPInfo();
-            // Check if FTP Info is valid.
-            Context::set('ftp_user', $ftp_info->ftp_user);
-            Context::set('ftp_password', $ftp_info->ftp_password);
-            Context::set('ftp_port', $ftp_info->ftp_port);
-            Context::set('sftp', $ftp_info->sftp);
-            !$oInstallController->procInstallCheckFtp()?$ftp_info->is_valid=true:$ftp_info->is_valid=false;
-            Context::set('ftp_user', null);
-            Context::set('ftp_password', null);
-            // Set FTP Info.
             Context::set('ftp_info', $ftp_info);
 
             $site_args->site_srl = 0;
diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml
index 6283a4ce7..c5a0470f4 100644
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@@ -8,8 +8,6 @@
 
         <action name="procAdminRecompileCacheFile" type="controller" standalone="true" />
         <action name="procAdminLogout" type="controller" standalone="true" />
-        <action name="procSaveFTPPathInfo" type="controller" standalone="true" />
-        <action name="procDeleteFTPConfig" type="controller" standalone="true" />
         <action name="getAdminFTPList" type="model" standalone="true" />
     </actions>
 </module>
diff --git a/modules/admin/lang/ko.lang.php b/modules/admin/lang/ko.lang.php
index 5adde78ac..a9e030047 100644
--- a/modules/admin/lang/ko.lang.php
+++ b/modules/admin/lang/ko.lang.php
@@ -79,5 +79,4 @@
     $lang->use_db_session = '인증 세션 DB 사용';
     $lang->about_db_session = '인증 시 사용되는 PHP 세션을 DB로 사용하는 기능입니다.<br/>웹서버의 사용률이 낮은 사이트에서는 비활성화시 사이트 응답 속도가 향상될 수 있습니다.<br/>단 현재 접속자를 구할 수 없어 관련된 기능을 사용할 수 없게 됩니다.';
     $lang->sftp = 'SFTP 사용'; 
-    $lang->about_ftp_info_delete = 'XE가 FTP에 정상적으로 접속할 수 있습니다.<br />FTP 접속 정보 보호를 위해, 현재 저장된 FTP 접속 정보(아이디, 비밀번호, 포트번호)를 수정하시려면 FTP 정보 파일을 삭제하셔야 합니다.<br />FTP 접속 정보 파일을 삭제 하시려면 삭제 버튼을 클릭하세요.';
 ?>
diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html
index 303f6a40c..219d5295c 100644
--- a/modules/admin/tpl/config.html
+++ b/modules/admin/tpl/config.html
@@ -15,16 +15,11 @@
         sObj.value = module_srl;
         obj.value = decodeURIComponent(browser_title.replace(/\+/g," "))+' ('+mid+')';
     }
-<!--@if($ftp_info && $ftp_info->is_valid)-->
+<!--@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'));
-<!--@elseif($ftp_info && !$ftp_info->is_valid && $ftp_info->ftp_user && $ftp_info->ftp_password)-->
-    // if FTP Info is not valid, alert error message.
-    jQuery(function($) {
-        doCheckFTPInfo();
-    });
 <!--@end-->
 </script>
 
@@ -134,7 +129,6 @@
 
     <h4 class="xeAdmin" id="ftpSetup">{$lang->ftp_form_title}</h4>
     <p class="summary">{$lang->about_ftp_info}</p>
-<!--@if(!$ftp_info || !$ftp_info->is_valid)-->
     <form action="./" method="post" onsubmit="return procFilter(this, install_ftp_info);" id="ftp_form">
     {@ $nCols = 3; }
     <table cellspacing="0" class="rowTable">
@@ -163,14 +157,13 @@
     </tr>
     </table>
     </form>
-<!--@elseif($ftp_info && $ftp_info->is_valid)-->
-    <p class="summary">{$lang->msg_ftp_connect_success}</p>
-    <p class="summary">{$lang->about_ftp_info_delete}</p>
-    <span class="button black strong"><button type="button" onclick="doDeleteFTPConfig(); return false;">{$lang->cmd_delete}</button></span>
-<!--@endif-->
-<!--@if($ftp_info && $ftp_info->is_valid)-->
+<!--@if($ftp_info && $ftp_info->ftp_password && $ftp_info->ftp_user)-->
     <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}" />
+    <input type="hidden" name="ftp_port" value="{$ftp_info->ftp_port}" />
+    <input type="hidden" name="sftp" value="{$ftp_info->sftp}" />
 
     <table cellspacing="0" class="rowTable">
     <tr>
diff --git a/modules/admin/tpl/filter/install_ftp_info.xml b/modules/admin/tpl/filter/install_ftp_info.xml
index 695ddb5c8..05160bd69 100644
--- a/modules/admin/tpl/filter/install_ftp_info.xml
+++ b/modules/admin/tpl/filter/install_ftp_info.xml
@@ -2,7 +2,7 @@
     <form>
         <node target="ftp_user" required="true" />
         <node target="ftp_password" required="true" />
-        <node target="ftp_port" />
+        <node target="ftp_port" required="true" />
         <node target="sftp" />
     </form>
     <response callback_func="completeMessage">
diff --git a/modules/admin/tpl/filter/install_ftp_path.xml b/modules/admin/tpl/filter/install_ftp_path.xml
index 970227c06..afaef82e1 100644
--- a/modules/admin/tpl/filter/install_ftp_path.xml
+++ b/modules/admin/tpl/filter/install_ftp_path.xml
@@ -1,4 +1,4 @@
-<filter name="install_ftp_path" module="admin" act="procSaveFTPPathInfo" confirm_msg_code="confirm_submit">
+<filter name="install_ftp_path" module="install" act="procInstallAdminSaveFTPInfo" confirm_msg_code="confirm_submit">
     <form>
         <node target="ftp_root_path" required="true" />
     </form>
diff --git a/modules/admin/tpl/js/config.js b/modules/admin/tpl/js/config.js
index b9fff1351..2d8451d95 100644
--- a/modules/admin/tpl/js/config.js
+++ b/modules/admin/tpl/js/config.js
@@ -38,7 +38,3 @@ function completeGetFtpInfo(ret_obj)
     e.append(jQuery(list));
 }
 
-function doDeleteFTPConfig() {
-  exec_xml('admin','procDeleteFTPConfig');
-  setTimeout(function() { location.reload(); }, 300);
-}