ftp_mkdir($ftp_path);
+ $oFtp->ftp_site("CHMOD 755 ".$path);
+ }
+ }
+ $oFtp->ftp_put($target_dir .'/'. $file, FileHandler::getRealPath($this->download_path."/".$org_file));
+ }
+ $oFtp->ftp_quit();
+
+ return new Object();
+ }
+ }
+
+?>
diff --git a/modules/autoinstall/lang/en.lang.php b/modules/autoinstall/lang/en.lang.php
index 9045a2807..4410f41fc 100644
--- a/modules/autoinstall/lang/en.lang.php
+++ b/modules/autoinstall/lang/en.lang.php
@@ -29,4 +29,5 @@
$lang->path = "Path";
$lang->cmd_download = "Download";
$lang->view_installed_packages = "Installed Packages";
+ $lang->msg_ftp_password_input = "Please input FTP password.";
?>
diff --git a/modules/autoinstall/lang/jp.lang.php b/modules/autoinstall/lang/jp.lang.php
index dea87600f..b22567405 100644
--- a/modules/autoinstall/lang/jp.lang.php
+++ b/modules/autoinstall/lang/jp.lang.php
@@ -29,4 +29,5 @@
$lang->path = "インストールパス";
$lang->cmd_download = "ダウンロード";
$lang->view_installed_packages = "Installed Packages";
+ $lang->msg_ftp_password_input = "Please input FTP password.";
?>
diff --git a/modules/autoinstall/lang/ko.lang.php b/modules/autoinstall/lang/ko.lang.php
index 59777b64b..9d9363565 100644
--- a/modules/autoinstall/lang/ko.lang.php
+++ b/modules/autoinstall/lang/ko.lang.php
@@ -29,4 +29,5 @@
$lang->path = "설치경로";
$lang->cmd_download = "다운로드";
$lang->view_installed_packages = "설치된 패키지";
+ $lang->msg_ftp_password_input = "FTP 비밀번호를 입력해주세요";
?>
diff --git a/modules/autoinstall/lang/vi.lang.php b/modules/autoinstall/lang/vi.lang.php
index 6be1bcde8..bbbd63ebb 100644
--- a/modules/autoinstall/lang/vi.lang.php
+++ b/modules/autoinstall/lang/vi.lang.php
@@ -29,4 +29,5 @@
$lang->path = "Đường dẫn";
$lang->cmd_download = "Download";
$lang->view_installed_packages = "Installed Packages";
+ $lang->msg_ftp_password_input = "Please input FTP password.";
?>
diff --git a/modules/autoinstall/lang/zh-CN.lang.php b/modules/autoinstall/lang/zh-CN.lang.php
index d2e077526..a8a9dbee8 100644
--- a/modules/autoinstall/lang/zh-CN.lang.php
+++ b/modules/autoinstall/lang/zh-CN.lang.php
@@ -29,4 +29,5 @@
$lang->path = "Path";
$lang->cmd_download = "Download";
$lang->view_installed_packages = "Installed Packages";
+ $lang->msg_ftp_password_input = "Please input FTP password.";
?>
diff --git a/modules/autoinstall/lang/zh-TW.lang.php b/modules/autoinstall/lang/zh-TW.lang.php
index 53dc0a6bb..fc07ce535 100644
--- a/modules/autoinstall/lang/zh-TW.lang.php
+++ b/modules/autoinstall/lang/zh-TW.lang.php
@@ -29,4 +29,5 @@
$lang->path = "路徑";
$lang->cmd_download = "下載";
$lang->view_installed_packages = "已安裝套裝軟體";
+ $lang->msg_ftp_password_input = "Please input FTP password.";
?>
diff --git a/modules/autoinstall/tpl/install.html b/modules/autoinstall/tpl/install.html
index cf7f79f40..df1bac164 100644
--- a/modules/autoinstall/tpl/install.html
+++ b/modules/autoinstall/tpl/install.html
@@ -12,13 +12,19 @@
+
+
{$lang->description_download}. (FTP Setup)
{$lang->path} : {$package->path}
{$lang->cmd_download}
{$lang->description_install}.
- {$lang->install}
+
+
+
+ {$package->installed?$lang->update:$lang->install}
+
diff --git a/modules/autoinstall/tpl/js/autoinstall.js b/modules/autoinstall/tpl/js/autoinstall.js
index 4e65fd53f..10534b04d 100644
--- a/modules/autoinstall/tpl/js/autoinstall.js
+++ b/modules/autoinstall/tpl/js/autoinstall.js
@@ -11,6 +11,12 @@ function doUpdate() {
function doInstallPackage(package_srl) {
var params = new Array();
params['package_srl'] = package_srl;
+ var e = jQuery("#ftp_password").get(0)
+ if(typeof(e) != "undefined")
+ {
+ params['ftp_password'] = e.value;
+ }
+
exec_xml('autoinstall', 'procAutoinstallAdminPackageinstall', params, completeInstall);
}
@@ -20,6 +26,7 @@ function completeUpdateNoMsg(ret_obj) {
function completeInstall(ret_obj) {
alert(ret_obj['message']);
+ if(ret_obj['error'] != 0) return;
var params = new Array();
exec_xml('autoinstall', 'procAutoinstallAdminUpdateinfo', params, completeUpdateNoMsg);
}
diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml
index 75b648386..16474a979 100644
--- a/modules/install/conf/module.xml
+++ b/modules/install/conf/module.xml
@@ -16,6 +16,6 @@
-
+
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index 855ed5d4c..c6831c904 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -114,12 +114,24 @@
$this->setMessage('success_updated');
}
+
+ function procInstallAdminRemoveFTPInfo() {
+ $ftp_config_file = Context::getFTPConfigFile();
+ if(file_exists($ftp_config_file)) unlink($ftp_config_file);
+ if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+ $this->setMessage('success_deleted');
+ }
+
function procInstallAdminSaveFTPInfo() {
$ftp_info = Context::getFTPInfo();
$ftp_info->ftp_user = Context::get('ftp_user');
- $ftp_info->ftp_password = Context::get('ftp_password');
$ftp_info->ftp_port = Context::get('ftp_port');
$ftp_info->sftp = Context::get('sftp');
+ $ftp_info->ftp_root_path = Context::get('ftp_root_path');
+ if(ini_get('safe_mode')) {
+ $ftp_info->ftp_password = Context::get('ftp_password');
+ }
+
$buff = ' $val) {
if(!$val) continue;
@@ -131,20 +143,5 @@
$this->setMessage('success_updated');
}
- /**
- * @brief FTP 정보 등록
- **/
- function procInstallAdminSaveFTPPath() {
- $ftp_info = Context::getFTPInfo();
- $ftp_info->ftp_root_path = Context::get('ftp_root_path');
- $buff = ' $val) {
- $buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
- }
- $buff .= "?>";
- $config_file = Context::getFTPConfigFile();
- FileHandler::WriteFile($config_file, $buff);
- $this->setMessage('success_updated');
- }
}
?>