From 23d2631fd71dedbfb05f6bb913040fa7b8ec22ba Mon Sep 17 00:00:00 2001
From: "CORSAIR\\remij" <remi.jean@outlook.com>
Date: Sun, 29 Sep 2024 23:20:47 +0200
Subject: [PATCH] Common cache optimization

---
 core/core.php | 58 ++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/core/core.php b/core/core.php
index ad9afc0d..2f46e0a6 100644
--- a/core/core.php
+++ b/core/core.php
@@ -331,32 +331,29 @@ class common
 	 */
 	public function __construct()
 	{
-		// Construct cache
-		if(isset($GLOBALS['common_construct'])) {
-			$this->input['_POST'] = $GLOBALS['common_construct']['input']['_POST'];
-			$this->input['_COOKIE'] = $GLOBALS['common_construct']['input']['_COOKIE'];
-			self::$siteContent = $GLOBALS['common_construct']['siteContent'];
-			$this->dataFiles = $GLOBALS['common_construct']['dataFiles'];
-			$this->user = $GLOBALS['common_construct']['user'];
-			self::$i18nUI = $GLOBALS['common_construct']['i18nUI'];
-			$this->hierarchy = $GLOBALS['common_construct']['hierarchy'];
-			$this->url = $GLOBALS['common_construct']['url'];
-			self::$dialog = $GLOBALS['common_construct']['dialog'];
+		// Récupération du cache des propriétés
+		if(isset($GLOBALS['common_cache'])) {
+			$this->input['_POST'] = $GLOBALS['common_cache']['input']['_POST'];
+			$this->input['_COOKIE'] = $GLOBALS['common_cache']['input']['_COOKIE'];
+			self::$siteContent = $GLOBALS['common_cache']['siteContent'];
+			$this->dataFiles = $GLOBALS['common_cache']['dataFiles'];
+			$this->user = $GLOBALS['common_cache']['user'];
+			self::$i18nUI = $GLOBALS['common_cache']['i18nUI'];
+			$this->hierarchy = $GLOBALS['common_cache']['hierarchy'];
+			$this->url = $GLOBALS['common_cache']['url'];
+			self::$dialog = $GLOBALS['common_cache']['dialog'];
 			return;
 		}
 
 		// Extraction des données http
 		if (isset($_POST)) {
 			$this->input['_POST'] = $_POST;
-			// Cache
-			$GLOBALS['common_construct']['input']['_POST'] = $this->input['_POST'];
 		}
 		if (isset($_COOKIE)) {
 			$this->input['_COOKIE'] = $_COOKIE;
-			// Cache
-			$GLOBALS['common_construct']['input']['_COOKIE'] = $this->input['_COOKIE'];
 		}
 
+
 		// Déterminer la langue du contenu du site
 		if (isset($_SESSION['ZWII_SITE_CONTENT'])) {
 			// Déterminé par la session présente
@@ -371,17 +368,12 @@ class common
 				}
 			}
 		}
-		// Cache
-		$GLOBALS['common_construct']['siteContent'] = self::$siteContent;
 
 		// Localisation
 		\setlocale(LC_ALL, self::$siteContent . '.UTF8');
 
 		// Instanciation de la classe des entrées / sorties
 		$this->jsonDB(self::$siteContent);
-		// Cache
-		$GLOBALS['common_construct']['dataFiles'] = $this->dataFiles;
-
 
 		// Installation fraîche, initialisation des modules
 		if ($this->user === []) {
@@ -400,8 +392,6 @@ class common
 		if ($this->user === []) {
 			$this->user = $this->getData(['user', $this->getInput('ZWII_USER_ID')]);
 		}
-		// Cache
-		$GLOBALS['common_construct']['user'] = $this->user;
 
 		// Langue de l'administration si le user est connecté
 		if ($this->getData(['user', $this->getUser('id'), 'language'])) {
@@ -423,15 +413,11 @@ class common
 		}
 		// Stocker le cookie de langue pour l'éditeur de texte
 		setcookie('ZWII_UI', self::$i18nUI, time() + 3600, helper::baseUrl(false, false), '', false, false);
-		// Cache
-		$GLOBALS['common_construct']['i18nUI'] = self::$i18nUI;
 
 		// Construit la liste des pages parents/enfants
 		if ($this->hierarchy['all'] === []) {
 			$this->buildHierarchy();
 		}
-		// Cache
-		$GLOBALS['common_construct']['hierarchy'] = $this->hierarchy;
 
 		// Construit l'url
 		if ($this->url === '') {
@@ -441,8 +427,6 @@ class common
 				$this->url = $this->getData(['locale', 'homePageId']);
 			}
 		}
-		// Cache
-		$GLOBALS['common_construct']['url'] = $this->url;
 
 		// Chargement des dialogues
 		if (!file_exists(self::I18N_DIR . self::$i18nUI . '.json')) {
@@ -463,9 +447,6 @@ class common
 			}
 		}
 
-		// Cache
-		$GLOBALS['common_construct']['dialog'] = self::$dialog;
-
 		// Données de proxy
 		$proxy = $this->getData(['config', 'proxyType']) . $this->getData(['config', 'proxyUrl']) . ':' . $this->getData(['config', 'proxyPort']);
 		if (
@@ -487,6 +468,21 @@ class common
 			stream_context_set_default($context);
 		}
 
+		// Mise en cache des propriétés
+		$GLOBALS['common_cache'] = [
+			'input' => [
+				'_POST' => $this->input['_POST'],
+				'_COOKIE' => $this->input['_COOKIE'],
+			],
+			'siteContent' => self::$siteContent,
+			'dataFiles' => $this->dataFiles,
+			'user' => $this->user,
+			'i18nUI' => self::$i18nUI,
+			'hierarchy' => $this->hierarchy,
+			'url' => $this->url,
+			'dialog' => self::$dialog,
+		];
+
 		// Mise à jour des données core
 		include('core/include/update.inc.php');