From 71a4c1099d8319d8c4b40fdb6f723129fc17dc99 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 26 May 2022 10:39:16 +0000
Subject: [PATCH] * Adjust the prompt text for plugin expiration.

---
 module/extension/model.php      | 17 +++++++++++++----
 module/misc/lang/en.php         |  3 ++-
 module/misc/lang/zh-cn.php      |  3 ++-
 module/user/control.php         |  2 +-
 module/user/view/login.html.php | 14 ++++++++++----
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/module/extension/model.php b/module/extension/model.php
index 12f89ef04d..2a17a5e7ae 100644
--- a/module/extension/model.php
+++ b/module/extension/model.php
@@ -914,14 +914,15 @@ class extensionModel extends model
     /**
      * Get plugins that are about to expire or have expired.
      *
+     * @param  bool    $category
      * @access public
-     * @return array()
+     * @return array
      */
-    public function getExpiringPlugins()
+    public function getExpiringPlugins($category = false)
     {
         $extensions = $this->getLocalExtensions('installed');
 
-        $plugins = array();
+        $plugins = $category ? array('expiring' => array(), 'expired' => array()) : array();
         $today   = helper::today();
         foreach($extensions as $extension)
         {
@@ -929,7 +930,15 @@ class extensionModel extends model
             if(!empty($expiredDate))
             {
                 $dateDiff = helper::diffDate($expiredDate, $today);
-                if($dateDiff == 30 or $dateDiff == 14 or $dateDiff <= 7) $plugins[] = $extension->name;
+                if($category)
+                {
+                    if($dateDiff == 30 or $dateDiff == 14 or ($dateDiff <= 7 and $dateDiff >= 0)) $plugins['expiring'][] = $extension->name;
+                    if($dateDiff <= -1) $plugins['expired'][] = $extension->name;
+                }
+                else
+                {
+                    if($dateDiff == 30 or $dateDiff == 14 or $dateDiff <= 7) $plugins[] = $extension->name;
+                }
             }
         }
         return $plugins;
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 63388026e6..99fae3f206 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -74,7 +74,8 @@ $lang->misc->remind      = 'New feature reminders';
 
 $lang->misc->expiredTipsTitle    = 'Dear system administrator, hello:';
 $lang->misc->expiredCountTips    = 'There are <span class="expired-tips text-blue" data-toggle="tooltip" data-placement="bottom" title="%s">%s plug-ins</span> in the system that will expire soon. To avoid affecting your regular use, please get in touch with the administrator to renew or uninstall them in time.';
-$lang->misc->expiredPluginTips   = 'The plug-ins that will expire are: %s.';
+$lang->misc->expiredPluginTips   = 'Expired plugins are: %s; ';
+$lang->misc->expiringPluginTips  = 'The plug-ins that will expire are: %s.';
 $lang->misc->expiredTipsForAdmin = 'There are %s plug-ins in the current system that will expire soon. To avoid affecting the regular use of the function, please renew or uninstall them in the system background plug-in management as soon as possible.';
 
 $lang->misc->noticeRepair = "<h5>If you are not Administrator, contact your ZenTao Administrator to repair tables.</h5>
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 86ab3b2ef7..7a40761973 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -74,7 +74,8 @@ $lang->misc->remind      = '新功能提醒';
 
 $lang->misc->expiredTipsTitle    = '尊敬的系统管理员，您好：';
 $lang->misc->expiredCountTips    = '系统中有<span class="expired-tips text-blue" data-toggle="tooltip" data-placement="bottom" title="%s">%s个插件</span>即将到期，为避免影响您的正常使用，请联系管理员及时续费或卸载。';
-$lang->misc->expiredPluginTips   = '即将到期的插件为：%s。';
+$lang->misc->expiredPluginTips   = '已到期的插件为：%s；';
+$lang->misc->expiringPluginTips  = '即将到期的插件为：%s。';
 $lang->misc->expiredTipsForAdmin = '当前系统中有%s个插件即将到期，为避免影响功能的正常使用，请尽快到系统后台插件管理中进行续费或卸载处理。';
 
 $lang->misc->noticeRepair = "<h5>普通用户请联系管理员进行修复</h5>
diff --git a/module/user/control.php b/module/user/control.php
index 644b6b51a1..8ee813f090 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -969,7 +969,7 @@ class user extends control
             $this->view->keepLogin     = $this->cookie->keepLogin ? $this->cookie->keepLogin : 'off';
             $this->view->rand          = $this->user->updateSessionRandom();
             $this->view->unsafeSites   = $this->misc->checkOneClickPackage();
-            $this->view->plugins       = $this->extension->getExpiringPlugins();
+            $this->view->plugins       = $this->extension->getExpiringPlugins(true);
             $this->display();
         }
     }
diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php
index 41c07730a0..fc8960ddf7 100644
--- a/module/user/view/login.html.php
+++ b/module/user/view/login.html.php
@@ -72,12 +72,18 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
           </form>
         </div>
       </div>
-      <?php if(count($plugins) > 0):?>
+      <?php if(count($plugins['expired']) > 0 or count($plugins['expiring']) > 0):?>
       <div class="table-row-extension">
         <div id="notice" class="alert alert-info">
-        <?php $pluginName = implode('、', $plugins)?>
-        <?php $expiredPluginTips = sprintf($lang->misc->expiredPluginTips, $pluginName);?>
-        <div class="content"><i class="icon-exclamation-sign text-blue"></i>&nbsp;<?php echo sprintf($lang->misc->expiredCountTips, $expiredPluginTips, count($plugins));?></div>
+        <?php $expiredPlugins  = implode('、', $plugins['expired']);?>
+        <?php $expiringPlugins = implode('、', $plugins['expiring']);?>
+        <?php $expiredTips     = sprintf($lang->misc->expiredPluginTips, $expiredPlugins);?>
+        <?php $expiringTips    = sprintf($lang->misc->expiringPluginTips, $expiringPlugins);?>
+        <?php if($expiredPlugins)  $pluginTips = $expiredTips;?>
+        <?php if($expiringPlugins) $pluginTips = $expiringTips;?>
+        <?php if($expiredPlugins and $expiringPlugins) $pluginTips = $expiredTips . $pluginTips;?>
+        <?php $pluginTotal = count($plugins['expired']) + count($plugins['expiring']);?>
+        <div class="content"><i class="icon-exclamation-sign text-blue"></i>&nbsp;<?php echo sprintf($lang->misc->expiredCountTips, $pluginTips, $pluginTotal);?></div>
         </div>
       </div>
       <?php endif;?>