Merge remote-tracking branch 'origin/release-20.0'

framework/base/helper.class.php

@@ -15,6 +15,17 @@ declare(strict_types=1);
  */
 class baseHelper
 {
+
+    /**
+     * 已加载的目录.
+     * The loaded directories.
+     *
+     * @static
+     * @var array
+     * @access public
+     */
+    static $loadedDirs = array();
+
     /**
      * 设置一个对象的成员变量。
      * Set the member's value of one object.
@@ -665,6 +676,7 @@ class baseHelper
     static public function ls($dir, $pattern = '')
     {
         if(empty($dir)) return array();
+        if(isset(self::$loadedDirs[$dir][$pattern])) return self::$loadedDirs[$dir][$pattern];
 
         $files = array();
         $dir   = realpath($dir);
@@ -672,7 +684,10 @@ class baseHelper
         if($dir === false) return array();
 
         if(is_dir($dir)) $files = glob($dir . DIRECTORY_SEPARATOR . '*' . $pattern);
-        return empty($files) ? array() : $files;
+
+        self::$loadedDirs[$dir][$pattern] = $files ?: array();
+
+        return self::$loadedDirs[$dir][$pattern];
     }
 
     /**

framework/base/router.class.php

@@ -287,6 +287,16 @@ class baseRouter
      */
     static $loadedLangs = array();
 
+    /**
+     * 已加载的模块.
+     * Modules loaded.
+     *
+     * @static
+     * @var array
+     * @access public
+     */
+    static $loadedModules = array();
+
     /**
      * 全局$lang对象。
      * The global $lang object.
@@ -466,9 +476,6 @@ class baseRouter
      */
     public function setClient(): void
     {
-        $this->setOpenApp();
-        $this->setSuperVars();
-
         $this->startSession();
 
         if($this->config->framework->multiSite)     $this->setSiteCode() && $this->loadExtraConfig();
@@ -480,6 +487,9 @@ class baseRouter
 
         if($this->config->framework->multiLanguage) $this->loadLang('common');
         if($this->config->framework->multiTheme)    $this->setClientTheme();
+
+        $this->setOpenApp();
+        $this->setSuperVars();
     }
 
     /**
@@ -859,7 +869,7 @@ class baseRouter
         $account = isset($_SESSION['user']) ? $_SESSION['user']->account : '';
         if(empty($account) and isset($_POST['account'])) $account = $_POST['account'];
         if(empty($account) and isset($_GET['account']))  $account = $_GET['account'];
-        if(empty($account))                              $account = $this->cookie->za;
+        if(empty($account) and isset($_COOKIE['za']))    $account = $_COOKIE['za'];
 
         $vision = '';
         $sql    = new sql();
@@ -1308,8 +1318,9 @@ class baseRouter
     {
         $this->clientDevice = 'desktop';
 
-        if($this->cookie->device == 'mobile')  $this->clientDevice = 'mobile';
-        if($this->cookie->device == 'desktop') $this->clientDevice = 'desktop';
+        $cookieDevice = zget($_COOKIE, 'device', 'desktop');
+        if($cookieDevice == 'mobile')  $this->clientDevice = 'mobile';
+        if($cookieDevice == 'desktop') $this->clientDevice = 'desktop';
 
         if(empty($this->cookie->device) || !str_contains('mobile,desktop', (string) $this->cookie->device))
         {
@@ -2917,30 +2928,35 @@ class baseRouter
      * 加载语言文件，返回全局$lang对象。
      * Load lang and return it as the global lang object.
      *
-     * @param   string $moduleName     the module name
+     * @param   string $moduleName  the module name
      * @param   string $appName     the app name
      * @access  public
-     * @return  bool|object the lang object or false.
+     * @return  object              the lang object
      */
-    public function loadLang(string $moduleName, string $appName = ''): bool|object
+    public function loadLang(string $moduleName, string $appName = ''): object
     {
-        /* 计算最终要加载的语言文件。 Get the lang files to be loaded. */
-        $langFilesToLoad = $this->getMainAndExtFiles($moduleName, $appName, 'lang');
-        if(empty($langFilesToLoad)) return false;
-
         /* 加载语言文件。Load lang files. */
         global $lang;
         if(!is_object($lang)) $lang = new language();
         if(!isset($lang->$moduleName)) $lang->$moduleName = new stdclass();
 
+        if(isset(self::$loadedModules[$moduleName])) return $lang;
+
+        self::$loadedModules[$moduleName] = $moduleName;
+
+        /* 计算最终要加载的语言文件。 Get the lang files to be loaded. */
+        $langFilesToLoad = $this->getMainAndExtFiles($moduleName, $appName, 'lang');
+        if(empty($langFilesToLoad)) return $lang;
+
         foreach($langFilesToLoad as $langFile)
         {
-            if(in_array($langFile, self::$loadedLangs)) continue;
+            if(isset(self::$loadedLangs[$langFile])) continue;
             include $langFile;
-            self::$loadedLangs[] = $langFile;
+            self::$loadedLangs[$langFile] = $langFile;
         }
 
         $this->lang = $lang;
+
         return $lang;
     }
 

framework/helper.class.php

@@ -717,8 +717,8 @@ function initItemActions(object &$item, string $actionMenu, array $actionList, o
             $module = $actionConfig['url']['module'];
             if(!$notLoadModel)
             {
-                $rowModule = $module == 'projectbuild' ? 'build' : $module;
-                $model = $app->control->loadModel($rowModule);
+                $rawModule = $module == 'projectbuild' ? 'build' : $module;
+                $model = $app->control->loadModel($rawModule);
             }
         }
 

framework/router.class.php

@@ -122,9 +122,9 @@ class router extends baseRouter
      * @param   string $moduleName  the module name
      * @param   string $appName     the app name
      * @access  public
-     * @return  bool|object the lang object or false.
+     * @return  object              the lang object or false.
      */
-    public function loadLang($moduleName, $appName = ''): bool|object
+    public function loadLang($moduleName, $appName = ''): object
     {
         global $lang;
         if(!is_object($lang)) $lang = new language();
@@ -296,7 +296,7 @@ class router extends baseRouter
         $config->executionLink = 'execution-task';
 
         /* Get user preference. */
-        $account     = $this->session->user->account ?? '';
+        $account     = $_SESSION['user']->account ?? '';
         $userSetting = array();
         if($this->dbh and !empty($this->config->db->name) and $account)
         {