diff --git a/module/admin/control.php b/module/admin/control.php index c55fa50030..fa89ac9778 100644 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -32,7 +32,7 @@ class admin extends control $this->view->ignore = false; } - $this->app->loadLang('misc'); + $this->loadModel('misc'); $this->view->title = $this->lang->admin->common; $this->view->position[] = $this->lang->admin->index; diff --git a/module/misc/config.php b/module/misc/config.php new file mode 100644 index 0000000000..10d1ead72a --- /dev/null +++ b/module/misc/config.php @@ -0,0 +1,4 @@ +misc->api = 'https://api.zentao.net'; +$config->misc->enApi = 'https://api.zentao.pm'; +$config->misc->qucheng = 'https://www.qucheng.com'; diff --git a/module/misc/control.php b/module/misc/control.php index e762ad7c73..d925b086c9 100644 --- a/module/misc/control.php +++ b/module/misc/control.php @@ -67,10 +67,10 @@ class misc extends control { session_write_close(); - $website = $this->lang->misc->api; + $website = $this->config->misc->api; - if(isset($this->config->qcVersion)) $website = $this->lang->misc->qucheng; - if(isset($this->config->isINT)) $website = $this->lang->misc->enApi; + if(isset($this->config->qcVersion)) $website = $this->config->misc->qucheng; + if(isset($this->config->isINT)) $website = $this->config->misc->enApi; $source = isset($this->config->qcVersion) ? 'qucheng' : 'zentao'; $lang = str_replace('-', '_', $this->app->getClientLang()); diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php index 232980755d..2f4dac3055 100644 --- a/module/misc/lang/de.php +++ b/module/misc/lang/de.php @@ -12,9 +12,6 @@ $lang->misc = new stdclass(); $lang->misc->common = 'Sonstiges'; $lang->misc->ping = 'Ping'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; -$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 91d5d1eae5..8bf4028bbc 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -12,9 +12,6 @@ $lang->misc = new stdclass(); $lang->misc->common = 'Misc'; $lang->misc->ping = 'Ping'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; -$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php index 0b57c255c2..9e31fca34d 100644 --- a/module/misc/lang/fr.php +++ b/module/misc/lang/fr.php @@ -12,9 +12,6 @@ $lang->misc = new stdclass(); $lang->misc->common = 'Misc'; $lang->misc->ping = 'Ping'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; -$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/vi.php b/module/misc/lang/vi.php index ebfe9d2532..51de44ed5b 100644 --- a/module/misc/lang/vi.php +++ b/module/misc/lang/vi.php @@ -12,9 +12,6 @@ $lang->misc = new stdclass(); $lang->misc->common = 'Khác'; $lang->misc->ping = 'Ping'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; -$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Phiên bản %s'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 93a73b89c8..78cad4e023 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -12,9 +12,6 @@ $lang->misc = new stdclass(); $lang->misc->common = '杂项'; $lang->misc->ping = '防超时'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; -$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = '版本%s'; diff --git a/module/misc/lang/zh-tw.php b/module/misc/lang/zh-tw.php index 76054840d0..d65daea3ef 100644 --- a/module/misc/lang/zh-tw.php +++ b/module/misc/lang/zh-tw.php @@ -12,9 +12,6 @@ $lang->misc = new stdclass(); $lang->misc->common = '雜項'; $lang->misc->ping = '防超時'; -$lang->misc->api = 'https://api.zentao.net'; -$lang->misc->enApi = 'https://api.zentao.pm'; -$lang->misc->qucheng = 'https://www.qucheng.com'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = '版本%s'; diff --git a/module/misc/view/links.html.php b/module/misc/view/links.html.php index afa3d0864e..79801b0346 100755 --- a/module/misc/view/links.html.php +++ b/module/misc/view/links.html.php @@ -15,7 +15,7 @@