From 057b915513469795a11b9f4817e377e983f2739f Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sat, 21 Aug 2021 08:56:08 +0200 Subject: [PATCH] Fonction setPage --- core/core.php | 9 ++++++--- core/include/update.inc.php | 3 ++- core/module/page/page.php | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/core/core.php b/core/core.php index 60224418..b86a6974 100755 --- a/core/core.php +++ b/core/core.php @@ -481,10 +481,11 @@ class common { * Ecrire les données de la page * @param string pageId * @param string contenu de la page + * @param return nombre d'octets écrits ou erreur */ public function setPage($page, $value, $lang) { - file_put_contents(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $page, 'content']), $value); + return file_put_contents(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $page, 'content']), $value); } @@ -577,11 +578,13 @@ class common { if ($sampleSite === true) { foreach(init::$siteContent as $key => $value) { // Creation du contenu de la page - file_put_contents(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $key, 'content']), $value); + // file_put_contents(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $key, 'content']), $value); + $this->setPage($this->getData(['page', $key, 'content']), $value, $lang); } } else { // Créer la page d'accueil - file_put_contents(self::DATA_DIR . $lang . '/content/' . 'accueil.html', '

Contenu de votre nouvelle page.

'); + // file_put_contents(self::DATA_DIR . $lang . '/content/' . 'accueil.html', '

Contenu de votre nouvelle page.

'); + $this->setPage('accueil.html', '

Contenu de votre nouvelle page.

', $lang); } } } diff --git a/core/include/update.inc.php b/core/include/update.inc.php index 91f264f3..17020eb2 100644 --- a/core/include/update.inc.php +++ b/core/include/update.inc.php @@ -632,7 +632,8 @@ if ($this->getData(['core', 'dataVersion']) < 11000) { } foreach ($pageList as $parentKey => $parent) { $content = $this->getData(['page', $parent, 'content']); - file_put_contents(self::DATA_DIR . self::$i18n . '/content/' . $parent . '.html', $content); + // file_put_contents(self::DATA_DIR . self::$i18n . '/content/' . $parent . '.html', $content); + $this->setPage($parent, $content, self::$i18n); $this->setData(['page', $parent, 'content', $parent . '.html']); } diff --git a/core/module/page/page.php b/core/module/page/page.php index e9eccc4f..0b4dd0ff 100644 --- a/core/module/page/page.php +++ b/core/module/page/page.php @@ -155,7 +155,8 @@ class page extends common { if (!is_dir(self::DATA_DIR . self::$i18n . '/content')) { mkdir(self::DATA_DIR . self::$i18n . '/content'); } - file_put_contents(self::DATA_DIR . self::$i18n . '/content/' . $pageId . '.html', '

Contenu de votre nouvelle page.

'); + //file_put_contents(self::DATA_DIR . self::$i18n . '/content/' . $pageId . '.html', '

Contenu de votre nouvelle page.

'); + $this->setPage($pageId, '

Contenu de votre nouvelle page.

', self::$i18N,); // Met à jour le site map $this->createSitemap('all'); // Valeurs en sortie @@ -439,7 +440,8 @@ class page extends common { mkdir(self::DATA_DIR . self::$i18n . '/content'); } $content = empty($this->getInput('pageEditContent', null)) ? '

' : str_replace('

', '

 

', $this->getInput('pageEditContent', null)); - file_put_contents( self::DATA_DIR . self::$i18n . '/content/' . $pageId . '.html' , $content ); + // file_put_contents( self::DATA_DIR . self::$i18n . '/content/' . $pageId . '.html' , $content ); + $this->setPage($pageId, $content, self::$i18n); // Barre renommée : changement le nom de la barre dans les pages mères if ($this->getinput('pageEditBlock') === 'bar') { foreach ($this->getHierarchy() as $eachPageId=>$parentId) {