From 02969e979b1fe8a447e38d1d9f1d60b0f015af05 Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Thu, 25 May 2023 17:45:18 +0800
Subject: [PATCH] * Optimize isIntranet.

---
 framework/helper.class.php       |  8 ++++++++
 module/admin/control.php         | 10 ++++------
 module/admin/js/index.js         |  2 +-
 module/admin/view/index.html.php |  1 +
 module/index/js/index.js         |  2 +-
 module/index/view/index.html.php |  1 +
 6 files changed, 16 insertions(+), 8 deletions(-)

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 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('hasInternet', $hasInternet);?>
+<?php js::set('isIntranet',  $isIntranet);?>
 <div id='mainContent' class='main-content admin'>
   <div class="main <?php if(!$hasInternet) echo 'without-internet';?>">
     <div class="settings panel">
diff --git a/module/index/js/index.js b/module/index/js/index.js
index 0cc24c0e0e..78e30a1286 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -895,7 +895,7 @@ $(function()
     });
 
     /* Update patch, plugin, news, publicclass from zetao.net. */
-    if(isAdminUser) $.get(createLink('admin', 'ajaxSetZentaoData'));
+    if(isAdminUser && !isIntranet) $.get(createLink('admin', 'ajaxSetZentaoData'));
 });
 
 /* Change the search object according to the module and method. */
diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php
index bb74a7d06c..e67c0e8787 100644
--- a/module/index/view/index.html.php
+++ b/module/index/view/index.html.php
@@ -22,6 +22,7 @@ js::set('defaultOpen',   (isset($open) and !empty($open)) ? $open : '');
 js::set('manualText',    $lang->manual);
 js::set('manualUrl',     ((!empty($config->isINT)) ? $config->manualUrl['int'] : $config->manualUrl['home']) . '&theme=' . $_COOKIE['theme']);
 js::set('isAdminUser',   $this->app->user->admin);
+js::set('isIntranet',    helper::isIntranet());
 ?>
 <style>
 #versionTitle {margin: 8px 3px 0px 0px; background-image: url(<?php echo $config->webRoot . 'theme/default/images/main/version-upgrade.svg';?>);}