Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [refac] Refactor the baseRouter::startSession() method to reuse web session in api mode.

Browse Source
This commit is contained in:
liugang
2025-10-21 14:37:39 +08:00
parent 55944ff395
commit ef7155f844
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/helper.class.php
-7
View File
@@ -848,13 +848,6 @@ class baseHelper
if(empty($sessionID)) $sessionID = sha1((string)mt_rand(0, mt_getrandmax()));
session_write_close();
if(ini_get('session.save_handler') == 'user')
{
$ztSessionHandler = new ztSessionHandler();
session_set_save_handler($ztSessionHandler, true);
}
session_id($sessionID);
session_start();
framework/base/router.class.php
+3 -4
View File
@@ -1196,7 +1196,7 @@ class baseRouter
if(defined('SESSION_STARTED')) return;
/* API session use tmp/apisession directory. */
$apiMode = (defined('RUN_MODE') && RUN_MODE == 'api') || isset($_GET[$this->config->sessionVar]);
$apiMode = (defined('RUN_MODE') && RUN_MODE == 'api') && !isset($_GET[$this->config->sessionVar]);
if(ini_get('session.save_handler') == 'files' || $apiMode)
{
@@ -1217,18 +1217,17 @@ class baseRouter
session_set_cookie_params(0, $this->config->webRoot, '', $this->config->cookieSecure, true);
if(!session_id()) session_start();
$this->sessionID = isset($ztSessionHandler) ? $ztSessionHandler->getSessionID() : session_id();
if(isset($_SERVER['HTTP_TOKEN'])) // If request header has token, use it as session for authentication.
{
helper::restartSession($_SERVER['HTTP_TOKEN']);
$this->sessionID = isset($ztSessionHandler) ? $ztSessionHandler->getSessionID() : session_id();
}
elseif(isset($_GET[$this->config->sessionVar]))
{
helper::restartSession($_GET[$this->config->sessionVar]);
}
$this->sessionID = isset($ztSessionHandler) ? $ztSessionHandler->getSessionID() : session_id();
define('SESSION_STARTED', true);
}