From b3e3ead5ac2b6c0f39f1e045693daf09ed10b15c Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Tue, 23 Apr 2024 17:15:20 +0200 Subject: [PATCH] self devient common --- core/class/router.class.php | 100 ++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/core/class/router.class.php b/core/class/router.class.php index 0fa2c8ec..62e44011 100644 --- a/core/class/router.class.php +++ b/core/class/router.class.php @@ -15,12 +15,12 @@ class core extends common } // Fuseau horaire - self::$timezone = $this->getData(['config', 'timezone']); // Utile pour transmettre le timezone à la classe helper - date_default_timezone_set(self::$timezone); + common::$timezone = $this->getData(['config', 'timezone']); // Utile pour transmettre le timezone à la classe helper + date_default_timezone_set(common::$timezone); // Supprime les fichiers temporaires $lastClearTmp = mktime(0, 0, 0); if ($lastClearTmp > $this->getData(['core', 'lastClearTmp']) + 86400) { - $iterator = new DirectoryIterator(self::TEMP_DIR); + $iterator = new DirectoryIterator(common::TEMP_DIR); foreach ($iterator as $fileInfos) { if ( $fileInfos->isFile() && @@ -43,11 +43,11 @@ class core extends common and $this->getData(['user']) // Pas de backup pendant l'installation ) { // Copie des fichier de données - helper::autoBackup(self::BACKUP_DIR, ['backup', 'tmp', 'file']); + helper::autoBackup(common::BACKUP_DIR, ['backup', 'tmp', 'file']); // Date du dernier backup $this->setData(['core', 'lastBackup', $lastBackup]); // Supprime les backups de plus de 30 jours - $iterator = new DirectoryIterator(self::BACKUP_DIR); + $iterator = new DirectoryIterator(common::BACKUP_DIR); foreach ($iterator as $fileInfos) { if ( $fileInfos->isFile() @@ -60,23 +60,23 @@ class core extends common } // Crée le fichier de personnalisation avancée - if (file_exists(self::DATA_DIR . 'custom.css') === false) { - $this->secure_file_put_contents(self::DATA_DIR . 'custom.css', file_get_contents('core/module/theme/resource/custom.css')); - chmod(self::DATA_DIR . 'custom.css', 0755); + if (file_exists(common::DATA_DIR . 'custom.css') === false) { + $this->secure_file_put_contents(common::DATA_DIR . 'custom.css', file_get_contents('core/module/theme/resource/custom.css')); + chmod(common::DATA_DIR . 'custom.css', 0755); } // Crée le fichier de personnalisation - if (file_exists(self::DATA_DIR . 'theme.css') === false) { - $this->secure_file_put_contents(self::DATA_DIR . 'theme.css', ''); - chmod(self::DATA_DIR . 'theme.css', 0755); + if (file_exists(common::DATA_DIR . 'theme.css') === false) { + $this->secure_file_put_contents(common::DATA_DIR . 'theme.css', ''); + chmod(common::DATA_DIR . 'theme.css', 0755); } // Crée le fichier de personnalisation de l'administration - if (file_exists(self::DATA_DIR . 'admin.css') === false) { - $this->secure_file_put_contents(self::DATA_DIR . 'admin.css', ''); - chmod(self::DATA_DIR . 'admin.css', 0755); + if (file_exists(common::DATA_DIR . 'admin.css') === false) { + $this->secure_file_put_contents(common::DATA_DIR . 'admin.css', ''); + chmod(common::DATA_DIR . 'admin.css', 0755); } // Check la version rafraichissement du theme - $cssVersion = preg_split('/\*+/', file_get_contents(self::DATA_DIR . 'theme.css')); + $cssVersion = preg_split('/\*+/', file_get_contents(common::DATA_DIR . 'theme.css')); if (empty($cssVersion[1]) or $cssVersion[1] !== md5(json_encode($this->getData(['theme'])))) { // Version $css = '/*' . md5(json_encode($this->getData(['theme']))) . '*/'; @@ -92,7 +92,7 @@ class core extends common // Fonts disponibles $fontsAvailable['files'] = $this->getData(['font', 'files']); $fontsAvailable['imported'] = $this->getData(['font', 'imported']); - $fontsAvailable['websafe'] = self::$fontsWebSafe; + $fontsAvailable['websafe'] = common::$fontsWebSafe; // Fontes installées $fonts = [ @@ -273,7 +273,7 @@ class core extends common $css .= '#footerCopyright{text-align:' . $this->getData(['theme', 'footer', 'copyrightAlign']) . '}'; // Enregistre la personnalisation - $this->secure_file_put_contents(self::DATA_DIR . 'theme.css', $css); + $this->secure_file_put_contents(common::DATA_DIR . 'theme.css', $css); // Effacer le cache pour tenir compte de la couleur de fond TinyMCE header("Expires: Tue, 01 Jan 2000 00:00:00 GMT"); @@ -284,7 +284,7 @@ class core extends common } // Check la version rafraichissement du theme admin - $cssVersion = preg_split('/\*+/', file_get_contents(self::DATA_DIR . 'admin.css')); + $cssVersion = preg_split('/\*+/', file_get_contents(common::DATA_DIR . 'admin.css')); if (empty($cssVersion[1]) or $cssVersion[1] !== md5(json_encode($this->getData(['admin'])))) { // Version @@ -293,7 +293,7 @@ class core extends common // Fonts disponibles $fontsAvailable['files'] = $this->getData(['font', 'files']); $fontsAvailable['imported'] = $this->getData(['font', 'imported']); - $fontsAvailable['websafe'] = self::$fontsWebSafe; + $fontsAvailable['websafe'] = common::$fontsWebSafe; /** * Import des polices de caractères @@ -367,7 +367,7 @@ class core extends common // Bordure du contour TinyMCE $css .= '.mce-tinymce{border: 1px solid ' . $this->getData(['admin', 'borderBlockColor']) . '!important;}'; // Enregistre la personnalisation - $this->secure_file_put_contents(self::DATA_DIR . 'admin.css', $css); + $this->secure_file_put_contents(common::DATA_DIR . 'admin.css', $css); } } /** @@ -383,8 +383,8 @@ class core extends common require 'core/module/' . $classPath; } // Module - elseif (is_readable(self::MODULE_DIR . $classPath)) { - require self::MODULE_DIR . $classPath; + elseif (is_readable(common::MODULE_DIR . $classPath)) { + require common::MODULE_DIR . $classPath; } // Librairie elseif (is_readable('core/vendor/' . $classPath)) { @@ -416,7 +416,7 @@ class core extends common // Force la déconnexion des membres bannis ou d'une seconde session if ( $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') - and ($this->getUser('group') === self::GROUP_BANNED + and ($this->getUser('group') === common::GROUP_BANNED or ($_SESSION['csrf'] !== $this->getData(['user', $this->getUser('id'), 'accessCsrf']) and $this->getData(['config', 'connect', 'autoDisconnect']) === true) ) @@ -431,7 +431,7 @@ class core extends common and $this->getUrl(1) !== 'login' and ($this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') or ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') - and $this->getUser('group') < self::GROUP_ADMIN + and $this->getUser('group') < common::GROUP_ADMIN ) ) ) { @@ -446,12 +446,12 @@ class core extends common // Pour éviter une 404 sur une langue étrangère, bascule dans la langue correcte. if (is_null($this->getData(['page', $this->getUrl(0)]))) { - foreach (self::$languages as $key => $value) { + foreach (common::$languages as $key => $value) { if ( - is_dir(self::DATA_DIR . $key) && - file_exists(self::DATA_DIR . $key . '/page.json') + is_dir(common::DATA_DIR . $key) && + file_exists(common::DATA_DIR . $key . '/page.json') ) { - $pagesId = json_decode(file_get_contents(self::DATA_DIR . $key . '/page.json'), true); + $pagesId = json_decode(file_get_contents(common::DATA_DIR . $key . '/page.json'), true); if ( is_array($pagesId['page']) && array_key_exists($this->getUrl(0), $pagesId['page']) @@ -468,7 +468,7 @@ class core extends common $access = null; if ($this->getData(['page', $this->getUrl(0)]) !== null) { if ( - $this->getData(['page', $this->getUrl(0), 'group']) === self::GROUP_VISITOR + $this->getData(['page', $this->getUrl(0), 'group']) === common::GROUP_VISITOR or ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') // and $this->getUser('group') >= $this->getData(['page', $this->getUrl(0), 'group']) // Modification qui tient compte du profil de la page @@ -489,7 +489,7 @@ class core extends common and $this->getUser('password') !== $this->getInput('ZWII_USER_PASSWORD') ) or ($this->getData(['page', $this->getUrl(0), 'disable']) === true and $this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') - and $this->getUser('group') < self::GROUP_EDITOR + and $this->getUser('group') < common::GROUP_EDITOR ) ) { $access = false; @@ -515,9 +515,9 @@ class core extends common $this->getUser('id') && $userId !== $this->getUser('id') && $this->getData(['user', $userId, 'accessUrl']) === $this->getUrl() && - array_intersect($t, self::$concurrentAccess) && - //array_intersect($t, self::$accessExclude) !== false && - time() < $this->getData(['user', $userId, 'accessTimer']) + self::ACCESS_TIMER + array_intersect($t, common::$concurrentAccess) && + //array_intersect($t, common::$accessExclude) !== false && + time() < $this->getData(['user', $userId, 'accessTimer']) + common::ACCESS_TIMER ) { $access = false; $accessInfo['userName'] = $this->getData(['user', $userId, 'lastname']) . ' ' . $this->getData(['user', $userId, 'firstname']); @@ -554,10 +554,10 @@ class core extends common $inlineScript[] = $this->getData(['page', $this->getUrl(0), 'js']) === null ? '' : $this->getData(['page', $this->getUrl(0), 'js']); // Importe le contenu, le CSS et le script des barres - $contentRight = $this->getData(['page', $this->getUrl(0), 'barRight']) ? $this->getPage($this->getData(['page', $this->getUrl(0), 'barRight']), self::$siteContent) : ''; + $contentRight = $this->getData(['page', $this->getUrl(0), 'barRight']) ? $this->getPage($this->getData(['page', $this->getUrl(0), 'barRight']), common::$siteContent) : ''; $inlineStyle[] = $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'css']) === null ? '' : $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'css']); $inlineScript[] = $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'js']) === null ? '' : $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barRight']), 'js']); - $contentLeft = $this->getData(['page', $this->getUrl(0), 'barLeft']) ? $this->getPage($this->getData(['page', $this->getUrl(0), 'barLeft']), self::$siteContent) : ''; + $contentLeft = $this->getData(['page', $this->getUrl(0), 'barLeft']) ? $this->getPage($this->getData(['page', $this->getUrl(0), 'barLeft']), common::$siteContent) : ''; $inlineStyle[] = $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'css']) === null ? '' : $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'css']); $inlineScript[] = $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'js']) === null ? '' : $this->getData(['page', $this->getData(['page', $this->getUrl(0), 'barLeft']), 'js']); @@ -575,7 +575,7 @@ class core extends common $this->addOutput([ 'title' => $title, - 'content' => $this->getPage($this->getUrl(0), self::$siteContent), + 'content' => $this->getPage($this->getUrl(0), common::$siteContent), 'metaDescription' => $this->getData(['page', $this->getUrl(0), 'metaDescription']), 'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']), 'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']), @@ -601,7 +601,7 @@ class core extends common : $this->getData(['page', $this->getUrl(0), 'metaDescription']); // Importe le CSS de la page principale - $pageContent = $this->getPage($this->getUrl(0), self::$siteContent); + $pageContent = $this->getPage($this->getUrl(0), common::$siteContent); $this->addOutput([ 'title' => $title, @@ -646,7 +646,7 @@ class core extends common $output = $module->output; // Check le groupe de l'utilisateur if ( - ($module::$actions[$action] === self::GROUP_VISITOR + ($module::$actions[$action] === common::GROUP_VISITOR or ($this->getUser('password') === $this->getInput('ZWII_USER_PASSWORD') and $this->getUser('group') >= $module::$actions[$action] and $this->getUser('permission', $moduleId, $action) @@ -659,10 +659,10 @@ class core extends common foreach ($_POST as $postId => $postValue) { if (is_array($postValue)) { foreach ($postValue as $subPostId => $subPostValue) { - self::$inputBefore[$postId . '_' . $subPostId] = $subPostValue; + common::$inputBefore[$postId . '_' . $subPostId] = $subPostValue; } } else { - self::$inputBefore[$postId] = $postValue; + common::$inputBefore[$postId] = $postValue; } } } @@ -702,9 +702,9 @@ class core extends common // Contenu par vue elseif ($output['view']) { // Chemin en fonction d'un module du coeur ou d'un module - $modulePath = in_array($moduleId, self::$coreModuleIds) ? 'core/' : ''; + $modulePath = in_array($moduleId, common::$coreModuleIds) ? 'core/' : ''; // CSS - $stylePath = $modulePath . self::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.css'; + $stylePath = $modulePath . common::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.css'; if (file_exists($stylePath)) { $this->addOutput([ 'style' => file_get_contents($stylePath) @@ -717,7 +717,7 @@ class core extends common } // JS - $scriptPath = $modulePath . self::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.js.php'; + $scriptPath = $modulePath . common::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.js.php'; if (file_exists($scriptPath)) { ob_start(); include $scriptPath; @@ -726,7 +726,7 @@ class core extends common ]); } // Vue - $viewPath = $modulePath . self::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.php'; + $viewPath = $modulePath . common::MODULE_DIR . $moduleId . '/view/' . $output['view'] . '/' . $output['view'] . '.php'; if (file_exists($viewPath)) { ob_start(); include $viewPath; @@ -844,25 +844,25 @@ class core extends common } switch ($this->output['display']) { // Layout brut - case self::DISPLAY_RAW: + case common::DISPLAY_RAW: echo $this->output['content']; break; // Layout vide - case self::DISPLAY_LAYOUT_BLANK: + case common::DISPLAY_LAYOUT_BLANK: require 'core/layout/blank.php'; break; // Affichage en JSON - case self::DISPLAY_JSON: + case common::DISPLAY_JSON: header('Content-Type: application/json'); echo json_encode($this->output['content']); break; // RSS feed - case self::DISPLAY_RSS: + case common::DISPLAY_RSS: header('Content-type: application/rss+xml; charset=UTF-8'); echo $this->output['content']; break; // Layout allégé - case self::DISPLAY_LAYOUT_LIGHT: + case common::DISPLAY_LAYOUT_LIGHT: ob_start(); require 'core/layout/light.php'; $content = ob_get_clean(); @@ -873,7 +873,7 @@ class core extends common echo $content; break; // Layout principal - case self::DISPLAY_LAYOUT_MAIN: + case common::DISPLAY_LAYOUT_MAIN: ob_start(); require 'core/layout/main.php'; $content = ob_get_clean();