From 214032dbea350d2701ba2a80817c61677147b4b2 Mon Sep 17 00:00:00 2001 From: zhangjialiang Date: Wed, 20 Aug 2025 09:22:14 +0800 Subject: [PATCH] * [task#147913,doing,0.2h] Format code. --- module/misc/model.php | 11 +++++++++-- module/setting/model.php | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/module/misc/model.php b/module/misc/model.php index 679c1d0540..07b0dd3edb 100644 --- a/module/misc/model.php +++ b/module/misc/model.php @@ -357,10 +357,17 @@ class miscModel extends model */ public function sendInstallEvent($data) { + if(!$data->location || !$data->fingerprint) return false; $apiRoot = $this->config->misc->zentaonet; $apiURL = $apiRoot . "/zentaoevent-install.json"; - $sn = $this->loadModel('setting')->setSN(); - + if(empty($this->config->global->sn)) + { + $sn = $this->loadModel('setting')->setSN(); + } + else + { + $sn = $this->config->global->sn; + } $httpData['sn'] = $sn; $httpData['location'] = $data->location; $httpData['fingerprint'] = $data->fingerprint; diff --git a/module/setting/model.php b/module/setting/model.php index 3ae18a01e8..d104e59af7 100644 --- a/module/setting/model.php +++ b/module/setting/model.php @@ -324,14 +324,14 @@ class settingModel extends model */ public function setSN() { - $sn = $_COOKIE['sn']; + $sn = $this->cookie->sn; if(!isset($this->config->installed) || !$this->config->installed) { if(!$sn) $sn = ''; if($this->snNeededUpdate($sn)) { $sn = $this->computeSN(); - setCookie('sn', $sn); + helper::setcookie('sn', $sn, 0); } } else @@ -347,7 +347,7 @@ class settingModel extends model $this->setItem('system.common.global.sn', $sn); if(!isset($this->config->global)) $this->config->global = new stdclass(); $this->config->global->sn = $sn; - setCookie('sn', $sn); + helper::setcookie('sn', $sn, 0); } return $sn; }