diff --git a/framework/helper.class.php b/framework/helper.class.php index cb474da2c8..6ed7d08873 100644 --- a/framework/helper.class.php +++ b/framework/helper.class.php @@ -348,6 +348,14 @@ class helper extends baseHelper } return $dateInterval; } + + /** + * @return bool + */ + public static function isIntranet() + { + return !defined('USE_INTRANET') ? false : USE_INTRANET; + } } /** diff --git a/module/admin/control.php b/module/admin/control.php index aaba97d16c..fdc3d5356a 100755 --- a/module/admin/control.php +++ b/module/admin/control.php @@ -53,19 +53,17 @@ class admin extends control $this->loadModel('misc'); - $clientLang = $this->app->getClientLang(); $langNotCN = common::checkNotCN(); $dateUsed = $this->admin->genDateUsed(); - - $zentaoData = $this->admin->getZentaoData(); - $hasInternet = $zentaoData->hasData; + $zentaoData = $this->admin->getZentaoData(); $this->view->title = $this->lang->admin->common; $this->view->position[] = $this->lang->admin->index; $this->view->plugins = $zentaoData->plugins; $this->view->patches = $zentaoData->patches; $this->view->dateUsed = $dateUsed; - $this->view->hasInternet = $hasInternet; + $this->view->hasInternet = $zentaoData->hasData; + $this->view->isIntranet = helper::isIntranet(); $this->view->dynamics = $zentaoData->news; $this->view->publicClass = $zentaoData->publicclass; $this->view->langNotCN = $langNotCN; @@ -80,7 +78,7 @@ class admin extends control */ public function ajaxSetZentaoData() { - if(defined('USE_INTRANET')) return $this->send(array('result' => 'success')); + if(helper::isIntranet()) return $this->send(array('result' => 'fail')); $hasInternet = $this->admin->checkInternet(); diff --git a/module/admin/js/index.js b/module/admin/js/index.js index fed2be7c68..fa27bd7e50 100644 --- a/module/admin/js/index.js +++ b/module/admin/js/index.js @@ -11,5 +11,5 @@ $(function() window.open($(this).data('link')); }); - if(!hasInternet) $.get(createLink('admin', 'ajaxSetZentaoData')); + if(!hasInternet && !isIntranet) $.get(createLink('admin', 'ajaxSetZentaoData')); }); diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php index cc7e7ec861..c81b141f1c 100755 --- a/module/admin/view/index.html.php +++ b/module/admin/view/index.html.php @@ -12,6 +12,7 @@ ?> +