From 252ad1ef8e2aa726543eb08d810feeee0361baf9 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Wed, 19 Dec 2018 11:12:28 +0800 Subject: [PATCH] * Adjust for task #5162. --- module/misc/control.php | 37 +++++++++++------------- module/misc/lang/en.php | 5 ++-- module/misc/lang/zh-cn.php | 5 ++-- module/misc/view/downloadclient.html.php | 16 +++++----- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/module/misc/control.php b/module/misc/control.php index 1ade939165..44d0ab26e6 100644 --- a/module/misc/control.php +++ b/module/misc/control.php @@ -90,15 +90,13 @@ class misc extends control * @access public * @param string $action * @param string $os - * @param string $version * @return void */ - public function downloadClient($action = 'check', $os = '', $version = '') + public function downloadClient($action = 'check', $os = '') { if($_POST) { - $version = $this->post->version; - $os = $this->post->os; + $os = $this->post->os; die(js::locate($this->createLink('misc', 'downloadClient', "action=getPackage&os=$os"), 'parent')); } @@ -144,7 +142,7 @@ class misc extends control if($action == 'getPackage') { - $this->view->os = $os; + $this->view->os = $os; $this->view->account = $this->app->user->account; } @@ -167,7 +165,7 @@ class misc extends control $account = $this->app->user->account; $clientDir = $this->app->getBasePath() . 'tmp/cache/client/' . "$account/"; - $clientFile = $clientDir . 'zentaoClient.zip'; + $clientFile = $clientDir . 'zentaoclient.zip'; $zipContent = file_get_contents($clientFile); if(is_dir($clientDir)) { @@ -175,7 +173,7 @@ class misc extends control $zfile->removeDir($clientDir); } - $this->fetch('file', 'sendDownHeader', array('fileName' => 'client.zip', 'zip', $zipContent)); + $this->fetch('file', 'sendDownHeader', array('fileName' => 'zentaoclient.zip', 'zip', $zipContent)); } $this->view->action = $action; @@ -186,11 +184,10 @@ class misc extends control * Ajax get client package. * * @param string $os - * @param string $version * @access public * @return void */ - public function ajaxGetClientPackage($os = '', $version = '') + public function ajaxGetClientPackage($os = '') { set_time_limit (0); session_write_close(); @@ -206,17 +203,18 @@ class misc extends control $tmpDir = $clientDir . "/$account/"; if(!is_dir($tmpDir)) mkdir($tmpDir, 0755, true); - if($os == 'windows64') $clientName = "xuanxuan.win64.zip"; - if($os == 'windows32') $clientName = "xuanxuan.win32.zip"; - if($os == 'linux64') $clientName = "xuanxuan.linux.x64.zip"; - if($os == 'linux32') $clientName = "xuanxuan.linux.ia32.zip"; - if($os == 'mac') $clientName = "xuanxuan.mac.zip"; + if($os == 'windows64') $clientName = "zentaoclient.win64.zip"; + if($os == 'windows32') $clientName = "zentaoclient.win32.zip"; + if($os == 'linux64') $clientName = "zentaoclient.linux.x64.zip"; + if($os == 'linux32') $clientName = "zentaoclient.linux.ia32.zip"; + if($os == 'mac') $clientName = "zentaoclient.mac.zip"; $needCache = false; + $version = $this->config->xuanxuan->version; $packageFile = $clientDir . $clientName; if(!file_exists($packageFile)) { - $url = "http://dl.pts.com/xuanxuan/"; + $url = "http://dl.cnezsoft.com/zentaoclient/$version/"; $xxFile = $url . $clientName; $needCache = true; } @@ -225,7 +223,7 @@ class misc extends control $xxFile = $packageFile; } - $clientFile = $tmpDir . 'zentaoClient.zip'; + $clientFile = $tmpDir . 'zentaoclient.zip'; if($xxHd = fopen($xxFile, "rb")) { if($clientHd = fopen($clientFile, "wb")) @@ -266,11 +264,10 @@ class misc extends control * Ajax set client config to client package. * * @param string $os - * @param string $version * @access public * @return void */ - public function ajaxSetClientConfig($os = '', $version = '') + public function ajaxSetClientConfig($os = '') { $response['result'] = 'success'; @@ -292,7 +289,7 @@ class misc extends control define('PCLZIP_TEMPORARY_DIR', $clientDir); $this->app->loadClass('pclzip', true); - $clientFile = $clientDir . 'zentaoClient.zip'; + $clientFile = $clientDir . 'zentaoclient.zip'; $archive = new pclzip($clientFile); if($os == 'mac') @@ -323,7 +320,7 @@ class misc extends control public function ajaxGetPackageSize() { $account = $this->app->user->account; - $packageFile = $this->app->getBasePath() . 'tmp/cache/client/' . $account . '/zentaoClient.zip'; + $packageFile = $this->app->getBasePath() . 'tmp/cache/client/' . $account . '/zentaoclient.zip'; $size = 0; if(file_exists($packageFile)) diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index ad5e460340..3124219929 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -16,12 +16,13 @@ $lang->misc->api = 'https://api.zentao.net'; $lang->misc->enApi = 'http://api.zentao.pm'; $lang->misc->client = new stdclass(); -$lang->misc->client->version = 'Select Version'; +$lang->misc->client->version = 'Client Version'; $lang->misc->client->os = 'Select OS'; $lang->misc->client->download = 'Download'; $lang->misc->client->downloading = 'Downloading:'; $lang->misc->client->downloaded = 'Downloaded successful!'; -$lang->misc->client->setConfig = 'Set config successful!'; +$lang->misc->client->setting = 'Setting config info.'; +$lang->misc->client->setted = 'Set config info successful!'; $lang->misc->client->osList['windows64'] = 'Windows 64'; $lang->misc->client->osList['windows32'] = 'Windows 32'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index f7adfb4b09..14100a02ec 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -16,12 +16,13 @@ $lang->misc->api = 'https://api.zentao.net'; $lang->misc->enApi = 'http://api.zentao.pm'; $lang->misc->client = new stdclass(); -$lang->misc->client->version = '选择版本'; +$lang->misc->client->version = '客户端版本'; $lang->misc->client->os = '操作系统'; $lang->misc->client->download = '下载'; $lang->misc->client->downloading = '正在获取安装包:'; $lang->misc->client->downloaded = '成功获取安装包'; -$lang->misc->client->setConfig = '成功设置配置信息'; +$lang->misc->client->setting = '正在设置配置信息'; +$lang->misc->client->setted = '成功设置配置信息'; $lang->misc->client->osList['windows64'] = 'Windows 64位'; $lang->misc->client->osList['windows32'] = 'Windows 32位'; diff --git a/module/misc/view/downloadclient.html.php b/module/misc/view/downloadclient.html.php index 2f5c5517ab..9ed512c6a3 100644 --- a/module/misc/view/downloadclient.html.php +++ b/module/misc/view/downloadclient.html.php @@ -16,8 +16,8 @@
- - + + @@ -36,10 +36,11 @@
  • misc->client->downloading;?>0M
    • - - - - + + + + +
@@ -61,13 +62,14 @@ clearInterval(progress); $('#downloading').addClass('hidden'); $('#downloaded').removeClass('hidden'); + $('#setting').removeClass('hidden'); var link = createLink('misc', 'ajaxSetClientConfig', 'os=' + os); $.getJSON(link, function(response) { if(response.result == 'success') { - $('#setConfig').removeClass('hidden'); + $('#setted').removeClass('hidden'); var link = createLink('misc', 'downloadClient', "action=downloadPackage" + '&os=' + os); parent.$.closeModal(); location.href = link;
misc->client->version;?>misc->client->versionList, '', "class='form-control chosen'");?>misc->client->version;?>xuanxuan->version;?>
misc->client->os;?>