diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php index 62d08bd87..4f3f56e42 100644 --- a/modules/autoinstall/autoinstall.admin.view.php +++ b/modules/autoinstall/autoinstall.admin.view.php @@ -56,6 +56,8 @@ function dispAutoinstallAdminInstall() { $package_srl = Context::get('package_srl'); if(!$package_srl) return $this->dispAutoinstallAdminIndex(); + $ftp_info = Context::getFTPInfo(); + if(!$ftp_info->ftp_root_path) Context::set('show_ftp_note', true); $params["act"] = "getResourceapiInstallInfo"; $params["package_srl"] = $package_srl; @@ -70,6 +72,7 @@ $package->title = $xmlPackage->title->body; $package->package_description = $xmlPackage->package_description->body; $package->version = $xmlPackage->version->body; + $package->path = $xmlPackage->path->body; if($xmlPackage->depends) { if(!is_array($xmlPackage->depends->item)) $xmlPackage->depends->item = array($xmlPackage->depends->item); @@ -80,6 +83,7 @@ $dep_item->package_srl = $item->package_srl->body; $dep_item->title = $item->title->body; $dep_item->version = $item->version->body; + $dep_item->path = $item->path->body; $package->depends[] = $dep_item; $targetpackages[$dep_item->package_srl] = 1; } @@ -121,7 +125,8 @@ function dispAutoinstallAdminIndex() { $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('autoinstall'); - if(!$config || !$config->ftp_root_path) Context::set('show_ftp_note', true); + $ftp_info = Context::getFTPInfo(); + if(!$ftp_info->ftp_root_path) Context::set('show_ftp_note', true); $this->setTemplateFile('index'); diff --git a/modules/autoinstall/lang/en.lang.php b/modules/autoinstall/lang/en.lang.php index daba5ab48..c273a0d84 100644 --- a/modules/autoinstall/lang/en.lang.php +++ b/modules/autoinstall/lang/en.lang.php @@ -25,4 +25,6 @@ $lang->require_update = "Update is required."; $lang->require_installation = "Installation is required."; $lang->description_install = "Installation process also install/update programs which this program depends on"; + $lang->description_download = "When FTP is disabled, you should download it and extract it into target path. (if target path is ./modules/board, extract it at ./modules)"; + $lang->path = "Path"; ?> diff --git a/modules/autoinstall/lang/ko.lang.php b/modules/autoinstall/lang/ko.lang.php index e8e20bc49..0d71fd533 100644 --- a/modules/autoinstall/lang/ko.lang.php +++ b/modules/autoinstall/lang/ko.lang.php @@ -25,4 +25,6 @@ $lang->require_update = "업데이트가 필요합니다."; $lang->require_installation = "설치가 필요합니다."; $lang->description_install = "설치를 진행하면, 이 프로그램이 의존하고 있는 모든 프로그램을 업데이트/설치 합니다."; + $lang->description_download = "FTP를 이용할 수 없는 경우, 직접 다운로드 하여 해당 path에 설치하셔야 합니다. (한칸 상위에서 압축을 푸시면 됩니다. ./modules/board의 경우 ./modules에서 tar를 푸세요)"; + $lang->path = "설치경로"; ?> diff --git a/modules/autoinstall/lang/zh-CN.lang.php b/modules/autoinstall/lang/zh-CN.lang.php index 35293c843..87adc73a8 100644 --- a/modules/autoinstall/lang/zh-CN.lang.php +++ b/modules/autoinstall/lang/zh-CN.lang.php @@ -20,5 +20,11 @@ $lang->description_update = "新安装(更新)模块的版本信息,点击Update按钮后才能正常显示。"; $lang->install = "Install"; $lang->update = "Update"; + $lang->depending_programs = "This program depends on "; + $lang->require_update = "Update is required."; + $lang->require_installation = "Installation is required."; + $lang->description_install = "Installation process also install/update programs which this program depends on"; $lang->current_version = "Installed version"; + $lang->description_download = "When FTP is disabled, you should download it and extract it into target path. (if target path is ./modules/board, extract it at ./modules)"; + $lang->path = "Path"; ?> diff --git a/modules/autoinstall/tpl/header.html b/modules/autoinstall/tpl/header.html index 2c675ea89..6d226d988 100644 --- a/modules/autoinstall/tpl/header.html +++ b/modules/autoinstall/tpl/header.html @@ -1 +1 @@ -
{$lang->description_ftp_note} FTP Setup
+{$lang->description_ftp_note} FTP Setup
{$lang->need_update}
diff --git a/modules/autoinstall/tpl/install.html b/modules/autoinstall/tpl/install.html index 41b25d12a..65798ef2d 100644 --- a/modules/autoinstall/tpl/install.html +++ b/modules/autoinstall/tpl/install.html @@ -6,13 +6,19 @@{$lang->description_download}. (FTP Setup)
+{$lang->path} : {$package->path}
+ +{$lang->description_install}.
+