Variable non définie

CHANGES.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## Version 11.5.09
+### Corrections : 
+- Problème de génération de l'exemple du site.
+- Dépréciations de fonctions PHP 8.1
+
+## Version 11.5.08
+### Corrections : 
+- Bugs divers et dépréciations PHP 8.1
+- Ajout d'une classe spécifique strftime suite à sa dépréciation.
+
 ## Version 11.5.07
 ### Correction :
 - Création du dossier des fontes personnalisées en cas d'absence.

README.md

@@ -1,4 +1,4 @@
-# ZwiiCMS 11.5.07
+# ZwiiCMS 11.5.09
 
 Zwii est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.
 

core/class/autoload.php

@@ -12,5 +12,6 @@ class autoload {
         require_once 'core/class/phpmailer/SMTP.class.php';
         require_once "core/class/jsondb/Dot.class.php";
         require_once "core/class/jsondb/JsonDb.class.php";
+        require_once "core/class/strftime/php-8.1-strftime.class.php";
     }
 }

core/class/helper.class.php

@@ -333,7 +333,7 @@ class helper {
 	 * @return string
 	 */
 	public static function filter($text, $filter) {
-		$text = trim($text);
+		$text = is_null($text) ? $text : trim($text);
 		switch($filter) {
 			case self::FILTER_BOOLEAN:
 				$text = (bool) $text;
@@ -379,10 +379,10 @@ class helper {
 				$text = password_hash($text, PASSWORD_BCRYPT);
 				break;
 			case self::FILTER_STRING_LONG:
-				$text = mb_substr(filter_var($text, FILTER_SANITIZE_STRING), 0, 500000);
+				$text = mb_substr(filter_var($text, FILTER_SANITIZE_FULL_SPECIAL_CHARS), 0, 500000);
 				break;
 			case self::FILTER_STRING_SHORT:
-				$text = mb_substr(filter_var($text, FILTER_SANITIZE_STRING), 0, 500);
+				$text = mb_substr(filter_var($text, FILTER_SANITIZE_FULL_SPECIAL_CHARS), 0, 500);
 				break;
 			case self::FILTER_TIMESTAMP:
 				$text = date('Y-m-d H:i:s', $text);

core/class/jsondb/Dot.class.php

@@ -10,7 +10,7 @@ use ArrayAccess;
  * This class provides dot notation access to arrays, so it's easy to handle
  * multidimensional data in a clean way.
  */
-class Dot implements ArrayAccess
+class Dot implements \ArrayAccess, \Iterator, \Countable
 {
 
     /** @var array Data */
@@ -94,9 +94,14 @@ class Dot implements ArrayAccess
      */
     public static function addValue(&$array, $key, $value = null, $pop = false)
     {
-        if (is_string($key)) {
+        if (is_array($key)) {
+            // Iterate array of paths and values
+            foreach ($key as $k => $v) {
+                self::addValue($array, $k, $v);
+            }
+        } else {
             // Iterate path
-            $keys = explode('.', $key);
+            $keys = explode('.', (string)$key);
             if ($pop === true) {
                 array_pop($keys);
             }
@@ -108,11 +113,6 @@ class Dot implements ArrayAccess
             }
             // Add value to path
             $array[] = $value;
-        } elseif (is_array($key)) {
-            // Iterate array of paths and values
-            foreach ($key as $k => $v) {
-                self::addValue($array, $k, $v);
-            }
         }
     }
 
@@ -154,9 +154,14 @@ class Dot implements ArrayAccess
      * @param  mixed|null $default Default value
      * @return mixed               Value of path
      */
-    public function get($key = null, $default = null)
+    public function get($key, $default = null, $asObject = false)
     {
-        return self::getValue($this->data, $key, $default);
+        $value = self::getValue($this->data, $key, $default);
+        if ($asObject && is_array($value)) {
+            return new self($value);
+        }
+
+        return $value;
     }
 
     /**
@@ -164,10 +169,12 @@ class Dot implements ArrayAccess
      *
      * @param mixed $key Path or array of paths and values
      * @param mixed|null $value Value to set if path is not an array
+     * @return $this
      */
     public function set($key, $value = null)
     {
-        return self::setValue($this->data, $key, $value);
+        self::setValue($this->data, $key, $value);
+        return $this;
     }
 
     /**
@@ -176,10 +183,12 @@ class Dot implements ArrayAccess
      * @param mixed $key Path or array of paths and values
      * @param mixed|null $value Value to set if path is not an array
      * @param boolean $pop Helper to pop out last key if value is an array
+     * @return $this
      */
     public function add($key, $value = null, $pop = false)
     {
-        return self::addValue($this->data, $key, $value, $pop);
+        self::addValue($this->data, $key, $value);
+        return $this;
     }
 
     /**
@@ -206,10 +215,42 @@ class Dot implements ArrayAccess
      * Delete path or array of paths
      *
      * @param mixed $key Path or array of paths to delete
+     * @return $this
      */
     public function delete($key)
     {
-        return self::deleteValue($this->data, $key);
+        self::deleteValue($this->data, $key);
+        return $this;
+    }
+
+    /**
+     * Increase numeric value
+     *
+     * @param string $key
+     * @param float $number
+     * @return float
+     */
+    public function plus(string $key, float $number): float
+    {
+        $newAmount = $this->get($key, 0) + $number;
+        $this->set($key, $newAmount);
+
+        return $newAmount;
+    }
+
+    /**
+     * Reduce numeric value
+     *
+     * @param string $key
+     * @param float $number
+     * @return float
+     */
+    public function minus(string $key, float $number): float
+    {
+        $newAmount = $this->get($key, 0) - $number;
+        $this->set($key, $newAmount);
+
+        return $newAmount;
     }
 
     /**
@@ -269,24 +310,33 @@ class Dot implements ArrayAccess
     }
 
     /**
-     * ArrayAccess abstract methods
+     * @inheritDoc
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->set($offset, $value);
     }
 
-    public function offsetExists($offset)
+    /**
+     * @inheritDoc
+     */
+    public function offsetExists($offset): bool
     {
         return $this->has($offset);
     }
 
-    public function offsetGet($offset)
+    /**
+     * @inheritDoc
+     */
+    public function offsetGet($offset): mixed
     {
         return $this->get($offset);
     }
 
-    public function offsetUnset($offset)
+    /**
+     * @inheritDoc
+     */
+    public function offsetUnset($offset): void
     {
         $this->delete($offset);
     }
@@ -313,4 +363,115 @@ class Dot implements ArrayAccess
     {
         $this->delete($key);
     }
+
+    /**
+     * Check for emptiness
+     *
+     * @return bool
+     */
+    public function isEmpty(): bool
+    {
+        return !(bool)count($this->data);
+    }
+
+    /**
+     * Return all data as array
+     *
+     * @return array
+     */
+    public function toArray(): array
+    {
+        return $this->data;
+    }
+
+    /**
+     * Return as json string
+     *
+     * @return false|string
+     */
+    public function toJson()
+    {
+        return json_encode($this->data, JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT);
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return $this->toJson();
+    }
+
+    /**
+     * @return array
+     */
+    public function __toArray(): array
+    {
+        return $this->toArray();
+    }
+
+    /**
+     * Return the current element
+     * @link https://php.net/manual/en/iterator.current.php
+     * @return mixed Can return any type.
+     * @since 5.0.0
+     */
+    public function current(): mixed
+    {
+        return current($this->data);
+    }
+
+    /**
+     * Move forward to next element
+     * @link https://php.net/manual/en/iterator.next.php
+     * @return void Any returned value is ignored.
+     * @since 5.0.0
+     */
+    public function next(): void
+    {
+        next($this->data);
+    }
+
+    /**
+     * Return the key of the current element
+     * @link https://php.net/manual/en/iterator.key.php
+     * @return mixed scalar on success, or null on failure.
+     * @since 5.0.0
+     */
+    public function key(): mixed
+    {
+        return key($this->data);
+    }
+
+    /**
+     * Checks if current position is valid
+     * @link https://php.net/manual/en/iterator.valid.php
+     * @return bool The return value will be casted to boolean and then evaluated.
+     * Returns true on success or false on failure.
+     * @since 5.0.0
+     */
+    public function valid(): bool
+    {
+        $key = key($this->data);
+        return ($key !== NULL && $key !== FALSE);
+    }
+
+    /**
+     * Rewind the Iterator to the first element
+     * @link https://php.net/manual/en/iterator.rewind.php
+     * @return void Any returned value is ignored.
+     * @since 5.0.0
+     */
+    public function rewind(): void
+    {
+        reset($this->data);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function count(): int
+    {
+        return count($this->data);
+    }
 }

core/class/strftime/php-8.1-strftime.class.php

@@ -0,0 +1,217 @@
+<?php
+  namespace PHP81_BC;
+
+  use DateTime;
+  use DateTimeZone;
+  use DateTimeInterface;
+  use Exception;
+  use IntlDateFormatter;
+  use IntlGregorianCalendar;
+  use InvalidArgumentException;
+
+  /**
+   * Locale-formatted PHP81_BC\strftime using IntlDateFormatter (PHP 8.1 compatible)
+   * This provides a cross-platform alternative to PHP81_BC\strftime() for when it will be removed from PHP.
+   * Note that output can be slightly different between libc sprintf and this function as it is using ICU.
+   *
+   * Usage:
+   * use function \PHP81_BC\PHP81_BC\strftime;
+   * echo PHP81_BC\strftime('%A %e %B %Y %X', new \DateTime('2021-09-28 00:00:00'), 'fr_FR');
+   *
+   * Original use:
+   * \setlocale(LC_TIME, 'fr_FR.UTF-8');
+   * echo \PHP81_BC\strftime('%A %e %B %Y %X', strtotime('2021-09-28 00:00:00'));
+   *
+   * @param  string $format Date format
+   * @param  integer|string|DateTime $timestamp Timestamp
+   * @return string
+   * @author BohwaZ <https://bohwaz.net/>
+   */
+  function strftime (string $format, $timestamp = null, ?string $locale = null) : string {
+    if (!($timestamp instanceof DateTimeInterface)) {
+      $timestamp = is_int($timestamp) ? '@' . $timestamp : (string) $timestamp;
+
+      try {
+        $timestamp = new DateTime($timestamp);
+      } catch (Exception $e) {
+        throw new InvalidArgumentException('$timestamp argument is neither a valid UNIX timestamp, a valid date-time string or a DateTime object.', 0, $e);
+      }
+    }
+
+    $timestamp->setTimezone(new DateTimeZone(date_default_timezone_get()));
+
+    if (empty($locale)) {
+      // get current locale
+      $locale = setlocale(LC_TIME, '0');
+    }
+    // remove trailing part not supported by ext-intl locale
+    $locale = preg_replace('/[^\w-].*$/', '', $locale);
+
+    $intl_formats = [
+      '%a' => 'EEE',	// An abbreviated textual representation of the day	Sun through Sat
+      '%A' => 'EEEE',	// A full textual representation of the day	Sunday through Saturday
+      '%b' => 'MMM',	// Abbreviated month name, based on the locale	Jan through Dec
+      '%B' => 'MMMM',	// Full month name, based on the locale	January through December
+      '%h' => 'MMM',	// Abbreviated month name, based on the locale (an alias of %b)	Jan through Dec
+    ];
+
+    $intl_formatter = function (DateTimeInterface $timestamp, string $format) use ($intl_formats, $locale) {
+      $tz = $timestamp->getTimezone();
+      $date_type = IntlDateFormatter::FULL;
+      $time_type = IntlDateFormatter::FULL;
+      $pattern = '';
+
+      switch ($format) {
+        // %c = Preferred date and time stamp based on locale
+        // Example: Tue Feb 5 00:45:10 2009 for February 5, 2009 at 12:45:10 AM
+        case '%c':
+          $date_type = IntlDateFormatter::LONG;
+          $time_type = IntlDateFormatter::SHORT;
+          break;
+
+        // %x = Preferred date representation based on locale, without the time
+        // Example: 02/05/09 for February 5, 2009
+        case '%x':
+          $date_type = IntlDateFormatter::SHORT;
+          $time_type = IntlDateFormatter::NONE;
+          break;
+
+        // Localized time format
+        case '%X':
+          $date_type = IntlDateFormatter::NONE;
+          $time_type = IntlDateFormatter::MEDIUM;
+          break;
+
+        default:
+          $pattern = $intl_formats[$format];
+      }
+
+      // In October 1582, the Gregorian calendar replaced the Julian in much of Europe, and
+      //  the 4th October was followed by the 15th October.
+      // ICU (including IntlDateFormattter) interprets and formats dates based on this cutover.
+      // Posix (including PHP81_BC\strftime) and timelib (including DateTimeImmutable) instead use
+      //  a "proleptic Gregorian calendar" - they pretend the Gregorian calendar has existed forever.
+      // This leads to the same instants in time, as expressed in Unix time, having different representations
+      //  in formatted strings.
+      // To adjust for this, a custom calendar can be supplied with a cutover date arbitrarily far in the past.
+      $calendar = IntlGregorianCalendar::createInstance();
+      $calendar->setGregorianChange(PHP_INT_MIN);
+
+      return (new IntlDateFormatter($locale, $date_type, $time_type, $tz, $calendar, $pattern))->format($timestamp);
+    };
+
+    // Same order as https://www.php.net/manual/en/function.PHP81_BC\strftime.php
+    $translation_table = [
+      // Day
+      '%a' => $intl_formatter,
+      '%A' => $intl_formatter,
+      '%d' => 'd',
+      '%e' => function ($timestamp) {
+        return sprintf('% 2u', $timestamp->format('j'));
+      },
+      '%j' => function ($timestamp) {
+        // Day number in year, 001 to 366
+        return sprintf('%03d', $timestamp->format('z')+1);
+      },
+      '%u' => 'N',
+      '%w' => 'w',
+
+      // Week
+      '%U' => function ($timestamp) {
+        // Number of weeks between date and first Sunday of year
+        $day = new DateTime(sprintf('%d-01 Sunday', $timestamp->format('Y')));
+        return sprintf('%02u', 1 + ($timestamp->format('z') - $day->format('z')) / 7);
+      },
+      '%V' => 'W',
+      '%W' => function ($timestamp) {
+        // Number of weeks between date and first Monday of year
+        $day = new DateTime(sprintf('%d-01 Monday', $timestamp->format('Y')));
+        return sprintf('%02u', 1 + ($timestamp->format('z') - $day->format('z')) / 7);
+      },
+
+      // Month
+      '%b' => $intl_formatter,
+      '%B' => $intl_formatter,
+      '%h' => $intl_formatter,
+      '%m' => 'm',
+
+      // Year
+      '%C' => function ($timestamp) {
+        // Century (-1): 19 for 20th century
+        return floor($timestamp->format('Y') / 100);
+      },
+      '%g' => function ($timestamp) {
+        return substr($timestamp->format('o'), -2);
+      },
+      '%G' => 'o',
+      '%y' => 'y',
+      '%Y' => 'Y',
+
+      // Time
+      '%H' => 'H',
+      '%k' => function ($timestamp) {
+        return sprintf('% 2u', $timestamp->format('G'));
+      },
+      '%I' => 'h',
+      '%l' => function ($timestamp) {
+        return sprintf('% 2u', $timestamp->format('g'));
+      },
+      '%M' => 'i',
+      '%p' => 'A', // AM PM (this is reversed on purpose!)
+      '%P' => 'a', // am pm
+      '%r' => 'h:i:s A', // %I:%M:%S %p
+      '%R' => 'H:i', // %H:%M
+      '%S' => 's',
+      '%T' => 'H:i:s', // %H:%M:%S
+      '%X' => $intl_formatter, // Preferred time representation based on locale, without the date
+
+      // Timezone
+      '%z' => 'O',
+      '%Z' => 'T',
+
+      // Time and Date Stamps
+      '%c' => $intl_formatter,
+      '%D' => 'm/d/Y',
+      '%F' => 'Y-m-d',
+      '%s' => 'U',
+      '%x' => $intl_formatter,
+    ];
+
+    $out = preg_replace_callback('/(?<!%)%([_#-]?)([a-zA-Z])/', function ($match) use ($translation_table, $timestamp) {
+      $prefix = $match[1];
+      $char = $match[2];
+      $pattern = '%'.$char;
+      if ($pattern == '%n') {
+        return "\n";
+      } elseif ($pattern == '%t') {
+        return "\t";
+      }
+
+      if (!isset($translation_table[$pattern])) {
+        throw new InvalidArgumentException(sprintf('Format "%s" is unknown in time format', $pattern));
+      }
+
+      $replace = $translation_table[$pattern];
+
+      if (is_string($replace)) {
+        $result = $timestamp->format($replace);
+      } else {
+        $result = $replace($timestamp, $pattern);
+      }
+
+      switch ($prefix) {
+        case '_':
+          // replace leading zeros with spaces but keep last char if also zero
+          return preg_replace('/\G0(?=.)/', ' ', $result);
+        case '#':
+        case '-':
+          // remove leading zeros but keep last char if also zero
+          return preg_replace('/^0+(?=.)/', '', $result);
+      }
+
+      return $result;
+    }, $format);
+
+    $out = str_replace('%%', '%', $out);
+    return $out;
+  }

core/module/addon/addon.php

@@ -316,9 +316,9 @@ class addon extends common {
 					$store[$key]['category'],
 					'<a href="' . self::BASEURL_STORE . self::MODULE_STORE . $key . '" target="_blank" >'.$store[$key]['title'].'</a>',
 					$store[$key]['version'],
-					mb_detect_encoding(strftime('%d %B %Y', $store[$key]['versionDate']), 'UTF-8', true)
-					? strftime('%d %B %Y', $store[$key]['versionDate'])
-					: utf8_encode(strftime('%d %B %Y', $store[$key]['versionDate'])),
+					mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y', $store[$key]['versionDate']), 'UTF-8', true)
+					? \PHP81_BC\strftime('%d %B %Y', $store[$key]['versionDate'])
+					: utf8_encode(\PHP81_BC\strftime('%d %B %Y', $store[$key]['versionDate'])),
 					implode(', ', array_keys($inPagesTitle,$key)),
 					template::button('moduleExport' . $key, [
 							'class' => $class,
@@ -342,9 +342,9 @@ class addon extends common {
 	public function item() {
 		$store = json_decode(helper::getUrlContents(self::BASEURL_STORE . self::MODULE_STORE . 'list'), true);
 		self::$storeItem = $store [$this->getUrl(2)] ;
-		self::$storeItem ['fileDate'] = mb_detect_encoding(strftime('%d %B %Y',self::$storeItem ['fileDate']), 'UTF-8', true)
-										? strftime('%d %B %Y', self::$storeItem ['fileDate'])
-										: utf8_encode(strftime('%d %B %Y', self::$storeItem ['fileDate']));
+		self::$storeItem ['fileDate'] = mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y',self::$storeItem ['fileDate']), 'UTF-8', true)
+										? \PHP81_BC\strftime('%d %B %Y', self::$storeItem ['fileDate'])
+										: utf8_encode(\PHP81_BC\strftime('%d %B %Y', self::$storeItem ['fileDate']));
 		// Valeurs en sortie
 		$this->addOutput([
 			'title' =>'Module ' . self::$storeItem['title'],

core/module/config/config.php

@@ -734,9 +734,9 @@ class config extends common {
 			$d = $this->getData(['blacklist']);
 			$data = '';
 			foreach ($d as $key => $item) {
-				$data .= mb_detect_encoding(strftime('%d/%m/%y',$item['lastFail']), 'UTF-8', true)
-						? strftime('%d/%m/%y',$item['lastFail']) . ';' . utf8_encode(strftime('%R',$item['lastFail'])) . ';'
-						: utf8_encode(strftime('%d/%m/%y',$item['lastFail'])) . ';' . utf8_encode(strftime('%R',$item['lastFail'])) . ';' ;
+				$data .= mb_detect_encoding(\PHP81_BC\strftime('%d/%m/%y',$item['lastFail']), 'UTF-8', true)
+						? \PHP81_BC\strftime('%d/%m/%y',$item['lastFail']) . ';' . utf8_encode(\PHP81_BC\strftime('%R',$item['lastFail'])) . ';'
+						: utf8_encode(\PHP81_BC\strftime('%d/%m/%y',$item['lastFail'])) . ';' . utf8_encode(\PHP81_BC\strftime('%R',$item['lastFail'])) . ';' ;
 				$data .= $key  . ';' . $item['ip'] . ';' .  $item['connectFail']  . PHP_EOL;
 			}
 			file_put_contents($fileName,$data,FILE_APPEND);

core/module/install/view/index/index.php

@@ -45,7 +45,7 @@
 	</div>
 	<div class="row">
 		<div class="col12">
-			<?php echo template::checkbox('installDefaultData',true , 'Ne pas charger l\'exemple de site (utilisateurs avancés)', [
+			<?php echo template::checkbox('installDefaultData', true, 'Ne pas charger l\'exemple de site (utilisateurs avancés)', [
 				'checked' => false
 			]);
 			?>

core/module/user/user.php

@@ -13,7 +13,8 @@
  * @link http://zwiicms.fr/
  */
 
-class user extends common {
+class user extends common
+{
 
 	public static $actions = [
 		'add' => self::GROUP_ADMIN,
@@ -50,18 +51,19 @@ class user extends common {
 	/**
 	 * Ajout
 	 */
-	public function add() {
+	public function add()
+	{
 		// Soumission du formulaire
-		if($this->isPost()) {
-			$check=true;
+		if ($this->isPost()) {
+			$check = true;
 			// L'identifiant d'utilisateur est indisponible
 			$userId = $this->getInput('userAddId', helper::FILTER_ID, true);
-			if($this->getData(['user', $userId])) {
+			if ($this->getData(['user', $userId])) {
 				self::$inputNotices['userAddId'] = 'Identifiant déjà utilisé';
-				$check=false;
+				$check = false;
 			}
 			// Double vérification pour le mot de passe
-			if($this->getInput('userAddPassword', helper::FILTER_STRING_SHORT, true) !== $this->getInput('userAddConfirmPassword', helper::FILTER_STRING_SHORT, true)) {
+			if ($this->getInput('userAddPassword', helper::FILTER_STRING_SHORT, true) !== $this->getInput('userAddConfirmPassword', helper::FILTER_STRING_SHORT, true)) {
 				self::$inputNotices['userAddConfirmPassword'] = 'Incorrect';
 				$check = false;
 			}
@@ -94,7 +96,7 @@ class user extends common {
 
 			// Envoie le mail
 			$sent = true;
-			if($this->getInput('userAddSendMail', helper::FILTER_BOOLEAN) && $check === true) {
+			if ($this->getInput('userAddSendMail', helper::FILTER_BOOLEAN) && $check === true) {
 				$sent = $this->sendMail(
 					$userMail,
 					'Compte créé sur ' . $this->getData(['locale', 'title']),
@@ -122,13 +124,14 @@ class user extends common {
 	/**
 	 * Suppression
 	 */
-	public function delete() {
+	public function delete()
+	{
 		// Accès refusé
-		if(
+		if (
 			// L'utilisateur n'existe pas
 			$this->getData(['user', $this->getUrl(2)]) === null
 			// Groupe insuffisant
-			AND ($this->getUrl('group') < self::GROUP_MODERATOR)
+			and ($this->getUrl('group') < self::GROUP_MODERATOR)
 		) {
 			// Valeurs en sortie
 			$this->addOutput([
@@ -144,7 +147,7 @@ class user extends common {
 			]);
 		}
 		// Bloque la suppression de son propre compte
-		elseif($this->getUser('id') === $this->getUrl(2)) {
+		elseif ($this->getUser('id') === $this->getUrl(2)) {
 			// Valeurs en sortie
 			$this->addOutput([
 				'redirect' => helper::baseUrl() . 'user',
@@ -166,9 +169,12 @@ class user extends common {
 	/**
 	 * Édition
 	 */
-	public function edit() {
-		if ($this->getUrl(3) !== $_SESSION['csrf'] &&
-			$this->getUrl(4) !== $_SESSION['csrf']) {
+	public function edit()
+	{
+		if (
+			$this->getUrl(3) !== $_SESSION['csrf'] &&
+			$this->getUrl(4) !== $_SESSION['csrf']
+		) {
 			// Valeurs en sortie
 			$this->addOutput([
 				'redirect' => helper::baseUrl() . 'user',
@@ -176,18 +182,17 @@ class user extends common {
 			]);
 		}
 		// Accès refusé
-		if(
+		if (
 			// L'utilisateur n'existe pas
 			$this->getData(['user', $this->getUrl(2)]) === null
 			// Droit d'édition
-			AND (
+			and (
 				// Impossible de s'auto-éditer
-				(
-					$this->getUser('id') === $this->getUrl(2)
-					AND $this->getUrl('group') <= self::GROUP_VISITOR
+				($this->getUser('id') === $this->getUrl(2)
+					and $this->getUrl('group') <= self::GROUP_VISITOR
 				)
 				// Impossible d'éditer un autre utilisateur
-				OR ($this->getUrl('group') < self::GROUP_MODERATOR)
+				or ($this->getUrl('group') < self::GROUP_MODERATOR)
 			)
 		) {
 			// Valeurs en sortie
@@ -198,45 +203,41 @@ class user extends common {
 		// Accès autorisé
 		else {
 			// Soumission du formulaire
-			if($this->isPost()) {
+			if ($this->isPost()) {
 				// Double vérification pour le mot de passe
 				$newPassword = $this->getData(['user', $this->getUrl(2), 'password']);
-				if($this->getInput('userEditNewPassword')) {
+				if ($this->getInput('userEditNewPassword')) {
 					// L'ancien mot de passe est correct
-					if(password_verify($this->getInput('userEditOldPassword'), $this->getData(['user', $this->getUrl(2), 'password']))) {
+					if (password_verify($this->getInput('userEditOldPassword'), $this->getData(['user', $this->getUrl(2), 'password']))) {
 						// La confirmation correspond au mot de passe
-						if($this->getInput('userEditNewPassword') === $this->getInput('userEditConfirmPassword')) {
+						if ($this->getInput('userEditNewPassword') === $this->getInput('userEditConfirmPassword')) {
 							$newPassword = $this->getInput('userEditNewPassword', helper::FILTER_PASSWORD, true);
 							// Déconnexion de l'utilisateur si il change le mot de passe de son propre compte
-							if($this->getUser('id') === $this->getUrl(2)) {
+							if ($this->getUser('id') === $this->getUrl(2)) {
 								helper::deleteCookie('ZWII_USER_ID');
 								helper::deleteCookie('ZWII_USER_PASSWORD');
 							}
-						}
-						else {
+						} else {
 							self::$inputNotices['userEditConfirmPassword'] = 'Incorrect';
 						}
-					}
-					else {
+					} else {
 						self::$inputNotices['userEditOldPassword'] = 'Incorrect';
 					}
 				}
 				// Modification du groupe
-				if(
+				if (
 					$this->getUser('group') === self::GROUP_ADMIN
-					AND $this->getUrl(2) !== $this->getUser('id')
+					and $this->getUrl(2) !== $this->getUser('id')
 				) {
 					$newGroup = $this->getInput('userEditGroup', helper::FILTER_INT, true);
-				}
-				else {
+				} else {
 					$newGroup = $this->getData(['user', $this->getUrl(2), 'group']);
 				}
 				// Modification de nom Prénom
-				if($this->getUser('group') === self::GROUP_ADMIN){
+				if ($this->getUser('group') === self::GROUP_ADMIN) {
 					$newfirstname = $this->getInput('userEditFirstname', helper::FILTER_STRING_SHORT, true);
 					$newlastname = $this->getInput('userEditLastname', helper::FILTER_STRING_SHORT, true);
-				}
-				else{
+				} else {
 					$newfirstname = $this->getData(['user', $this->getUrl(2), 'firstname']);
 					$newlastname = $this->getData(['user', $this->getUrl(2), 'lastname']);
 				}
@@ -253,20 +254,20 @@ class user extends common {
 						'signature' => $this->getInput('userEditSignature', helper::FILTER_INT, true),
 						'mail' => $this->getInput('userEditMail', helper::FILTER_MAIL, true),
 						'password' => $newPassword,
-						'connectFail' => $this->getData(['user',$this->getUrl(2),'connectFail']),
-						'connectTimeout' => $this->getData(['user',$this->getUrl(2),'connectTimeout']),
-						'accessUrl' => $this->getData(['user',$this->getUrl(2),'accessUrl']),
-						'accessTimer' => $this->getData(['user',$this->getUrl(2),'accessTimer']),
-						'accessCsrf' => $this->getData(['user',$this->getUrl(2),'accessCsrf']),
+						'connectFail' => $this->getData(['user', $this->getUrl(2), 'connectFail']),
+						'connectTimeout' => $this->getData(['user', $this->getUrl(2), 'connectTimeout']),
+						'accessUrl' => $this->getData(['user', $this->getUrl(2), 'accessUrl']),
+						'accessTimer' => $this->getData(['user', $this->getUrl(2), 'accessTimer']),
+						'accessCsrf' => $this->getData(['user', $this->getUrl(2), 'accessCsrf']),
 						'files' => $this->getInput('userEditFiles', helper::FILTER_BOOLEAN)
 					]
 				]);
 				// Redirection spécifique si l'utilisateur change son mot de passe
-				if($this->getUser('id') === $this->getUrl(2) AND $this->getInput('userEditNewPassword')) {
+				if ($this->getUser('id') === $this->getUrl(2) and $this->getInput('userEditNewPassword')) {
 					$redirect = helper::baseUrl() . 'user/login/' . str_replace('/', '_', $this->getUrl());
 				}
 				// Redirection si retour en arrière possible
-				elseif($this->getUser('group') === 3) {
+				elseif ($this->getUser('group') === 3) {
 					$redirect = helper::baseUrl() . 'user';
 				}
 				// Redirection normale
@@ -291,11 +292,12 @@ class user extends common {
 	/**
 	 * Mot de passe perdu
 	 */
-	public function forgot() {
+	public function forgot()
+	{
 		// Soumission du formulaire
-		if($this->isPost()) {
+		if ($this->isPost()) {
 			$userId = $this->getInput('userForgotId', helper::FILTER_ID, true);
-			if($this->getData(['user', $userId])) {
+			if ($this->getData(['user', $userId])) {
 				// Enregistre la date de la demande dans le compte utilisateur
 				$this->setData(['user', $userId, 'forgot', time()]);
 				// Crée un id unique pour la réinitialisation
@@ -335,22 +337,23 @@ class user extends common {
 	/**
 	 * Liste des utilisateurs
 	 */
-	public function index() {
+	public function index()
+	{
 		$userIdsFirstnames = helper::arrayColumn($this->getData(['user']), 'firstname');
 		ksort($userIdsFirstnames);
-		foreach($userIdsFirstnames as $userId => $userFirstname) {
+		foreach ($userIdsFirstnames as $userId => $userFirstname) {
 			if ($this->getData(['user', $userId, 'group'])) {
 				self::$users[] = [
 					$userId,
 					$userFirstname . ' ' . $this->getData(['user', $userId, 'lastname']),
 					self::$groups[$this->getData(['user', $userId, 'group'])],
 					template::button('userEdit' . $userId, [
-						'href' => helper::baseUrl() . 'user/edit/' . $userId . '/back/'. $_SESSION['csrf'],
+						'href' => helper::baseUrl() . 'user/edit/' . $userId . '/back/' . $_SESSION['csrf'],
 						'value' => template::ico('pencil')
 					]),
 					template::button('userDelete' . $userId, [
 						'class' => 'userDelete buttonRed',
-						'href' => helper::baseUrl() . 'user/delete/' . $userId. '/' . $_SESSION['csrf'],
+						'href' => helper::baseUrl() . 'user/delete/' . $userId . '/' . $_SESSION['csrf'],
 						'value' => template::ico('cancel')
 					])
 				];
@@ -366,17 +369,18 @@ class user extends common {
 	/**
 	 * Connexion
 	 */
-	public function login() {
+	public function login()
+	{
 		// Soumission du formulaire
 		$logStatus = '';
-		if($this->isPost()) {
+		if ($this->isPost()) {
 			// Lire Id du compte
 			$userId = $this->getInput('userLoginId', helper::FILTER_ID, true);
 			// Check le captcha
-			if(
-				$this->getData(['config','connect','captcha'])
-				AND password_verify($this->getInput('userLoginCaptcha', helper::FILTER_INT), $this->getInput('userLoginCaptchaResult') ) === false )
-			{
+			if (
+				$this->getData(['config', 'connect', 'captcha'])
+				and password_verify($this->getInput('userLoginCaptcha', helper::FILTER_INT), $this->getInput('userLoginCaptchaResult')) === false
+			) {
 				$captcha = false;
 			} else {
 				$captcha = true;
@@ -384,22 +388,24 @@ class user extends common {
 			/**
 			 * Aucun compte existant
 			 */
-			if ( !$this->getData(['user', $userId])) {
+			if (!$this->getData(['user', $userId])) {
 				$logStatus = 'Compte inconnu';
 				//Stockage de l'IP
 				$this->setData([
 					'blacklist',
 					$userId,
 					[
-						'connectFail' => $this->getData(['blacklist',$userId,'connectFail']) + 1,
+						'connectFail' => $this->getData(['blacklist', $userId, 'connectFail']) + 1,
 						'lastFail' => time(),
 						'ip' => helper::getIp()
 					]
 				]);
 				// Verrouillage des IP
 				$ipBlackList = helper::arrayColumn($this->getData(['blacklist']), 'ip');
-				if ( $this->getData(['blacklist',$userId,'connectFail']) >= $this->getData(['config', 'connect', 'attempt'])
-					AND in_array($this->getData(['blacklist',$userId,'ip']),$ipBlackList) ) {
+				if (
+					$this->getData(['blacklist', $userId, 'connectFail']) >= $this->getData(['config', 'connect', 'attempt'])
+					and in_array($this->getData(['blacklist', $userId, 'ip']), $ipBlackList)
+				) {
 					$logStatus = 'Compte inconnu verrouillé';
 					// Valeurs en sortie
 					$this->addOutput([
@@ -418,35 +424,37 @@ class user extends common {
 				 */
 			} else {
 				// Cas 4 : le délai de  blocage est  dépassé et le compte est au max - Réinitialiser
-				if ($this->getData(['user',$userId,'connectTimeout'])  + $this->getData(['config', 'connect', 'timeout']) < time()
-					AND $this->getData(['user',$userId,'connectFail']) === $this->getData(['config', 'connect', 'attempt']) ) {
-					$this->setData(['user',$userId,'connectFail',0 ]);
-					$this->setData(['user',$userId,'connectTimeout',0 ]);
+				if (
+					$this->getData(['user', $userId, 'connectTimeout'])  + $this->getData(['config', 'connect', 'timeout']) < time()
+					and $this->getData(['user', $userId, 'connectFail']) === $this->getData(['config', 'connect', 'attempt'])
+				) {
+					$this->setData(['user', $userId, 'connectFail', 0]);
+					$this->setData(['user', $userId, 'connectTimeout', 0]);
 				}
 				// Check la présence des variables et contrôle du blocage du compte si valeurs dépassées
 				// Vérification du mot de passe et du groupe
 				if (
-					( $this->getData(['user',$userId,'connectTimeout']) + $this->getData(['config', 'connect', 'timeout'])  ) < time()
-					AND $this->getData(['user',$userId,'connectFail']) < $this->getData(['config', 'connect', 'attempt'])
-					AND password_verify($this->getInput('userLoginPassword', helper::FILTER_STRING_SHORT, true), $this->getData(['user', $userId, 'password']))
-					AND $this->getData(['user', $userId, 'group']) >= self::GROUP_MEMBER
-					AND $captcha === true
+					($this->getData(['user', $userId, 'connectTimeout']) + $this->getData(['config', 'connect', 'timeout'])) < time()
+					and $this->getData(['user', $userId, 'connectFail']) < $this->getData(['config', 'connect', 'attempt'])
+					and password_verify($this->getInput('userLoginPassword', helper::FILTER_STRING_SHORT, true), $this->getData(['user', $userId, 'password']))
+					and $this->getData(['user', $userId, 'group']) >= self::GROUP_MEMBER
+					and $captcha === true
 				) {
 					// RAZ
-					$this->setData(['user',$userId,'connectFail',0 ]);
-					$this->setData(['user',$userId,'connectTimeout',0 ]);
+					$this->setData(['user', $userId, 'connectFail', 0]);
+					$this->setData(['user', $userId, 'connectTimeout', 0]);
 					// Expiration
 					$expire = $this->getInput('userLoginLongTime') ? strtotime("+1 year") : 0;
 					$c = $this->getInput('userLoginLongTime', helper::FILTER_BOOLEAN) === true ? 'true' : 'false';
-					setcookie('ZWII_USER_ID', $userId, $expire, helper::baseUrl(false, false)  , '', helper::isHttps(), true);
+					setcookie('ZWII_USER_ID', $userId, $expire, helper::baseUrl(false, false), '', helper::isHttps(), true);
 					setcookie('ZWII_USER_PASSWORD', $this->getData(['user', $userId, 'password']), $expire, helper::baseUrl(false, false), '', helper::isHttps(), true);
 					setcookie('ZWII_USER_LONGTIME', $c, $expire, helper::baseUrl(false, false), '', helper::isHttps(), true);
 					// Accès multiples avec le même compte
-					$this->setData(['user',$userId,'accessCsrf',$_SESSION['csrf']]);
+					$this->setData(['user', $userId, 'accessCsrf', $_SESSION['csrf']]);
 					// Valeurs en sortie lorsque le site est en maintenance et que l'utilisateur n'est pas administrateur
-					if(
+					if (
 						$this->getData(['config', 'maintenance'])
-						AND $this->getData(['user', $userId, 'group']) < self::GROUP_ADMIN
+						and $this->getData(['user', $userId, 'group']) < self::GROUP_ADMIN
 					) {
 						$this->addOutput([
 							'notification' => 'Seul un administrateur peut se connecter lors d\'une maintenance',
@@ -457,7 +465,7 @@ class user extends common {
 						$logStatus = 'Connexion réussie';
 						// Valeurs en sortie
 						$this->addOutput([
-							'notification' => 'Bienvenue ' . $this->getData(['user',$userId,'firstname']) . ' ' . $this->getData(['user',$userId,'lastname']) ,
+							'notification' => 'Bienvenue ' . $this->getData(['user', $userId, 'firstname']) . ' ' . $this->getData(['user', $userId, 'lastname']),
 							'redirect' => helper::baseUrl() . str_replace('_', '/', str_replace('__', '#', $this->getUrl(2))),
 							'state' => true
 						]);
@@ -467,15 +475,15 @@ class user extends common {
 					$notification = 'Captcha, identifiant ou mot de passe incorrects';
 					$logStatus = $captcha === true ? 'Erreur de mot de passe' : 'Erreur de captcha';
 					// Cas 1 le nombre de connexions est inférieur aux tentatives autorisées : incrément compteur d'échec
-					if ($this->getData(['user',$userId,'connectFail']) < $this->getData(['config', 'connect', 'attempt'])) {
-						$this->setData(['user',$userId,'connectFail',$this->getdata(['user',$userId,'connectFail']) + 1 ]);
+					if ($this->getData(['user', $userId, 'connectFail']) < $this->getData(['config', 'connect', 'attempt'])) {
+						$this->setData(['user', $userId, 'connectFail', $this->getdata(['user', $userId, 'connectFail']) + 1]);
 					}
 					// Cas 2 la limite du nombre de connexion est atteinte : placer le timer
-					if ( $this->getdata(['user',$userId,'connectFail']) == $this->getData(['config', 'connect', 'attempt'])	) {
-							$this->setData(['user',$userId,'connectTimeout', time()]);
+					if ($this->getdata(['user', $userId, 'connectFail']) == $this->getData(['config', 'connect', 'attempt'])) {
+						$this->setData(['user', $userId, 'connectTimeout', time()]);
 					}
 					// Cas 3 le délai de bloquage court
-					if ($this->getData(['user',$userId,'connectTimeout'])  + $this->getData(['config', 'connect', 'timeout']) > time() ) {
+					if ($this->getData(['user', $userId, 'connectTimeout'])  + $this->getData(['config', 'connect', 'timeout']) > time()) {
 						$notification = 'Accès bloqué ' . ($this->getData(['config', 'connect', 'timeout']) / 60) . ' minutes.';
 					}
 
@@ -486,18 +494,20 @@ class user extends common {
 				}
 			}
 		}
+
 		// Journalisation
-		$dataLog = mb_detect_encoding(strftime('%d/%m/%y',time()), 'UTF-8', true)
-				? strftime('%d/%m/%y',time()) . ';' . strftime('%R',time()) . ';'
-				: utf8_encode(strftime('%d/%m/%y',time())) . ';' . utf8_encode(strftime('%R',time())) . ';' ;
-		$dataLog .= helper::getIp($this->getData(['config','connect','anonymousIp'])) . ';';
-		$dataLog .= $this->getInput('userLoginId', helper::FILTER_ID) . ';' ;
-		$dataLog .= $this->getUrl() .';' ;
-		$dataLog .= $logStatus ;
+		$dataLog = mb_detect_encoding(\PHP81_BC\strftime('%d/%m/%y', time()), 'UTF-8', true)
+			? \PHP81_BC\strftime('%d/%m/%y', time()) . ';' . \PHP81_BC\strftime('%R', time()) . ';'
+			: utf8_encode(\PHP81_BC\strftime('%d/%m/%y', time())) . ';' . utf8_encode(\PHP81_BC\strftime('%R', time())) . ';';
+		$dataLog .= helper::getIp($this->getData(['config', 'connect', 'anonymousIp'])) . ';';
+		$dataLog .=  empty($this->getInput('userLoginId')) ? ';' : $this->getInput('userLoginId', helper::FILTER_ID)  . ';';
+		$dataLog .= $this->getUrl() . ';';
+		$dataLog .= $logStatus;
 		$dataLog .= PHP_EOL;
-		if ($this->getData(['config','connect','log'])) {
+		if ($this->getData(['config', 'connect', 'log'])) {
 			file_put_contents(self::DATA_DIR . 'journal.log', $dataLog, FILE_APPEND);
 		}
+
 		// Stockage des cookies
 		if (!empty($_COOKIE['ZWII_USER_ID'])) {
 			self::$userId = $_COOKIE['ZWII_USER_ID'];
@@ -516,10 +526,13 @@ class user extends common {
 	/**
 	 * Déconnexion
 	 */
-	public function logout() {
+	public function logout()
+	{
 		// Ne pas effacer l'identifiant mais seulement le mot de passe
-		if (array_key_exists('ZWII_USER_LONGTIME',$_COOKIE)
-			AND $_COOKIE['ZWII_USER_LONGTIME'] !== 'true' ) {
+		if (
+			array_key_exists('ZWII_USER_LONGTIME', $_COOKIE)
+			and $_COOKIE['ZWII_USER_LONGTIME'] !== 'true'
+		) {
 			helper::deleteCookie('ZWII_USER_ID');
 			helper::deleteCookie('ZWII_USER_LONGTIME');
 		}
@@ -536,15 +549,16 @@ class user extends common {
 	/**
 	 * Réinitialisation du mot de passe
 	 */
-	public function reset() {
+	public function reset()
+	{
 		// Accès refusé
-		if(
+		if (
 			// L'utilisateur n'existe pas
 			$this->getData(['user', $this->getUrl(2)]) === null
 			// Lien de réinitialisation trop vieux
-			OR $this->getData(['user', $this->getUrl(2), 'forgot']) + 86400 < time()
+			or $this->getData(['user', $this->getUrl(2), 'forgot']) + 86400 < time()
 			// Id unique incorrecte
-			OR $this->getUrl(3) !== md5(json_encode($this->getData(['user', $this->getUrl(2)])))
+			or $this->getUrl(3) !== md5(json_encode($this->getData(['user', $this->getUrl(2)])))
 		) {
 			// Valeurs en sortie
 			$this->addOutput([
@@ -554,15 +568,14 @@ class user extends common {
 		// Accès autorisé
 		else {
 			// Soumission du formulaire
-			if($this->isPost()) {
+			if ($this->isPost()) {
 				// Double vérification pour le mot de passe
-				if($this->getInput('userResetNewPassword')) {
+				if ($this->getInput('userResetNewPassword')) {
 					// La confirmation ne correspond pas au mot de passe
-					if($this->getInput('userResetNewPassword', helper::FILTER_STRING_SHORT, true) !== $this->getInput('userResetConfirmPassword', helper::FILTER_STRING_SHORT, true)) {
+					if ($this->getInput('userResetNewPassword', helper::FILTER_STRING_SHORT, true) !== $this->getInput('userResetConfirmPassword', helper::FILTER_STRING_SHORT, true)) {
 						$newPassword = $this->getData(['user', $this->getUrl(2), 'password']);
 						self::$inputNotices['userResetConfirmPassword'] = 'Incorrect';
-					}
-					else {
+					} else {
 						$newPassword = $this->getInput('userResetNewPassword', helper::FILTER_PASSWORD, true);
 					}
 					// Modifie le mot de passe
@@ -570,8 +583,8 @@ class user extends common {
 					// Réinitialise la date de la demande
 					$this->setData(['user', $this->getUrl(2), 'forgot', 0]);
 					// Réinitialise le blocage
-					$this->setData(['user', $this->getUrl(2),'connectFail',0 ]);
-					$this->setData(['user', $this->getUrl(2),'connectTimeout',0 ]);
+					$this->setData(['user', $this->getUrl(2), 'connectFail', 0]);
+					$this->setData(['user', $this->getUrl(2), 'connectTimeout', 0]);
 					// Valeurs en sortie
 					$this->addOutput([
 						'notification' => 'Nouveau mot de passe enregistré',
@@ -593,66 +606,69 @@ class user extends common {
 	/**
 	 * Importation CSV d'utilisateurs
 	 */
-	public function import() {
+	public function import()
+	{
 		// Soumission du formulaire
 		$notification = '';
 		$success = true;
-		if($this->isPost()) {
+		if ($this->isPost()) {
 			// Lecture du CSV et construction du tableau
-			$file = $this->getInput('userImportCSVFile',helper::FILTER_STRING_SHORT, true);
+			$file = $this->getInput('userImportCSVFile', helper::FILTER_STRING_SHORT, true);
 			$filePath = self::FILE_DIR . 'source/' . $file;
-			if ($file AND file_exists($filePath)) {
+			if ($file and file_exists($filePath)) {
 				// Analyse et extraction du CSV
-				$rows   = array_map(function($row) {   return str_getcsv($row, $this->getInput('userImportSeparator') ); }, file($filePath));
+				$rows   = array_map(function ($row) {
+					return str_getcsv($row, $this->getInput('userImportSeparator'));
+				}, file($filePath));
 				$header = array_shift($rows);
 				$csv    = array();
-				foreach($rows as $row) {
+				foreach ($rows as $row) {
 					$csv[] = array_combine($header, $row);
 				}
 				// Traitement des données
-				foreach($csv as $item ) {
+				foreach ($csv as $item) {
 					// Données valides
-					if( array_key_exists('id', $item)
-					AND array_key_exists('prenom',$item)
-					AND array_key_exists('nom',$item)
-					AND array_key_exists('groupe',$item)
-					AND array_key_exists('email',$item)
-					AND $item['nom']
-					AND $item['prenom']
-					AND $item['id']
-					AND $item['email']
-					AND $item['groupe']
+					if (
+						array_key_exists('id', $item)
+						and array_key_exists('prenom', $item)
+						and array_key_exists('nom', $item)
+						and array_key_exists('groupe', $item)
+						and array_key_exists('email', $item)
+						and $item['nom']
+						and $item['prenom']
+						and $item['id']
+						and $item['email']
+						and $item['groupe']
 					) {
 						// Validation du groupe
 						$item['groupe'] = (int) $item['groupe'];
-						$item['groupe'] =   ( $item['groupe'] >= self::GROUP_BANNED AND $item['groupe'] <= self::GROUP_ADMIN )
+						$item['groupe'] =   ($item['groupe'] >= self::GROUP_BANNED and $item['groupe'] <= self::GROUP_ADMIN)
 							? $item['groupe'] : 1;
 						// L'utilisateur existe
-						if ( $this->getData(['user',helper::filter($item['id'] , helper::FILTER_ID)]))
-						{
+						if ($this->getData(['user', helper::filter($item['id'], helper::FILTER_ID)])) {
 							// Notification du doublon
 							$item['notification'] = template::ico('cancel');
 							// Création du tableau de confirmation
 							self::$users[] = [
-								helper::filter($item['id'] , helper::FILTER_ID),
+								helper::filter($item['id'], helper::FILTER_ID),
 								$item['nom'],
 								$item['prenom'],
 								self::$groups[$item['groupe']],
 								$item['prenom'],
-								helper::filter($item['email'] , helper::FILTER_MAIL),
+								helper::filter($item['email'], helper::FILTER_MAIL),
 								$item['notification']
 							];
 							// L'utilisateur n'existe pas
 						} else {
 							// Nettoyage de l'identifiant
-							$userId = helper::filter($item['id'] , helper::FILTER_ID);
+							$userId = helper::filter($item['id'], helper::FILTER_ID);
 							// Enregistre le user
 							$create = $this->setData([
 								'user',
 								$userId, [
 									'firstname' => $item['prenom'],
 									'forgot' => 0,
-									'group' => $item['groupe'] ,
+									'group' => $item['groupe'],
 									'lastname' => $item['nom'],
 									'mail' => $item['email'],
 									'pseudo' => $item['prenom'],
@@ -663,12 +679,15 @@ class user extends common {
 									"accessUrl" => null,
 									"accessTimer" => null,
 									"accessCsrf" => null
-							]]);
+								]
+							]);
 							// Icône de notification
 							$item['notification'] = $create  ? template::ico('check') : template::ico('cancel');
 							// Envoi du mail
-							if ($create
-								AND $this->getInput('userImportNotification',helper::FILTER_BOOLEAN) === true) {
+							if (
+								$create
+								and $this->getInput('userImportNotification', helper::FILTER_BOOLEAN) === true
+							) {
 								$sent = $this->sendMail(
 									$item['email'],
 									'Compte créé sur ' . $this->getData(['locale', 'title']),
@@ -679,7 +698,7 @@ class user extends common {
 								);
 								if ($sent === true) {
 									// Mail envoyé changement de l'icône
-									$item['notification'] = template::ico('mail') ;
+									$item['notification'] = template::ico('mail');
 								}
 							}
 							// Création du tableau de confirmation
@@ -696,10 +715,10 @@ class user extends common {
 					}
 				}
 				if (empty(self::$users)) {
-					$notification =  'Rien à importer, erreur de format ou fichier incorrect' ;
+					$notification =  'Rien à importer, erreur de format ou fichier incorrect';
 					$success = false;
 				} else {
-					$notification =  'Importation effectuée' ;
+					$notification =  'Importation effectuée';
 					$success = true;
 				}
 			} else {
@@ -715,5 +734,4 @@ class user extends common {
 			'state' => $success
 		]);
 	}
-
 }

module/blog/blog.php

@@ -15,7 +15,7 @@
 
 class blog extends common {
 
-	const VERSION = '5.3';
+	const VERSION = '5.4';
 	const REALNAME = 'Blog';
 	const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json)
 
@@ -109,7 +109,8 @@ class blog extends common {
 	 */
 	private function update() {
 		// Version 5.0
-		if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '5.0', '<') ) {
+		if (is_null($this->getData(['module', $this->getUrl(0), 'config', 'versionData'])) ||
+			version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '5.0', '<') ) {
 			$this->setData(['module', $this->getUrl(0), 'config', 'itemsperPage', 6]);
 			$this->setData(['module', $this->getUrl(0), 'config', 'versionData','5.0']);
 		}
@@ -202,7 +203,7 @@ class blog extends common {
 				$this->getUrl(0),
 				'posts',
 				$articleId, [
-					'comment' => $this->getData(['module', $this->getUrl(0),  'posts', $this->getUrl(2), 'comment']),
+					'comment' => [],
 					'content' => $this->getInput('blogAddContent', null),
 					'picture' => $this->getInput('blogAddPicture', helper::FILTER_STRING_SHORT, true),
 					'hidePicture' => $this->getInput('blogAddHidePicture', helper::FILTER_BOOLEAN),
@@ -278,9 +279,9 @@ class blog extends common {
 				]);
 			}
 			self::$comments[] = [
-				mb_detect_encoding(strftime('%d %B %Y - %H:%M', $comment['createdOn']), 'UTF-8', true)
-				? strftime('%d %B %Y - %H:%M', $comment['createdOn'])
-				: utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn'])),
+				mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y - %H:%M', $comment['createdOn']), 'UTF-8', true)
+				? \PHP81_BC\strftime('%d %B %Y - %H:%M', $comment['createdOn'])
+				: utf8_encode(\PHP81_BC\strftime('%d %B %Y - %H:%M', $comment['createdOn'])),
 				$comment['content'],
 				$comment['userId'] ? $this->getData(['user', $comment['userId'], 'firstname']) . ' ' . $this->getData(['user', $comment['userId'], 'lastname']) : $comment['author'],
 				$buttonApproval,
@@ -456,12 +457,12 @@ class blog extends common {
 					$approved = count($this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i],'comment']));
 				}
 				// Met en forme le tableau
-				$date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
-					? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
-					: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
-				$heure =   mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
-				? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
-				: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
+				$date = mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+					? \PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
+					: utf8_encode(\PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
+				$heure =   mb_detect_encoding(\PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+					? \PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
+					: utf8_encode(\PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
 				self::$articles[] = [
 					'<a href="' . helper::baseurl() . $this->getUrl(0) . '/' . $articleIds[$i] . '" target="_blank" >' .
 					$this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'title']) .

module/blog/view/article/article.php

@@ -14,12 +14,12 @@
 		<!-- bloc signature et date -->
 		<?php echo $module::$articleSignature . ' - ';?>
 		<?php echo template::ico('calendar-empty'); ?>
-		<?php $date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
-						? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
-						: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
-				$heure =  mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
-						? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
-						:  utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
+		<?php $date = mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
+						? \PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
+						: utf8_encode(\PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
+				$heure =  mb_detect_encoding(\PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
+						? \PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
+						:  utf8_encode(\PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
 				echo $date . ' à ' . $heure;
 		?>
 		<!-- Bloc edition -->
@@ -143,9 +143,9 @@
 		<?php foreach($module::$comments as $commentId => $comment): ?>
 			<div class="block">
 				<h4><?php echo $module::$commentsSignature[$commentId]; ?>
-				le <?php  echo mb_detect_encoding(strftime('%d %B %Y - %H:%M', $comment['createdOn']), 'UTF-8', true)
-										? strftime('%d %B %Y - %H:%M', $comment['createdOn'])
-										: utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn']));
+				le <?php  echo mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y - %H:%M', $comment['createdOn']), 'UTF-8', true)
+										? \PHP81_BC\strftime('%d %B %Y - %H:%M', $comment['createdOn'])
+										: utf8_encode(\PHP81_BC\strftime('%d %B %Y - %H:%M', $comment['createdOn']));
 				?>
 				</h4>
 				<?php echo $comment['content']; ?>

module/blog/view/index/index.php

@@ -36,9 +36,9 @@
 						</div>
 						<div class="blogDate">
 							<?php echo template::ico('calendar-empty'); ?>
-							<?php echo mb_detect_encoding(strftime('%d %B %Y - %H:%M',  $article['publishedOn']), 'UTF-8', true)
-										? strftime('%d %B %Y', $article['publishedOn'])
-										: utf8_encode(strftime('%d %B %Y', $article['publishedOn']));  ?>
+							<?php echo mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y - %H:%M',  $article['publishedOn']), 'UTF-8', true)
+										? \PHP81_BC\strftime('%d %B %Y', $article['publishedOn'])
+										: utf8_encode(\PHP81_BC\strftime('%d %B %Y', $article['publishedOn']));  ?>
 						</div>
 						<p class="blogContent">
 							<?php echo helper::subword(strip_tags($article['content'],'<br><p>'), 0, 400); ?>...

module/gallery/gallery.php

@@ -367,6 +367,7 @@ class gallery extends common {
 				// définir une vignette par défaut
 				$directory = $this->getInput('galleryConfigDirectory', helper::FILTER_STRING_SHORT, true);
 				$iterator = new DirectoryIterator($directory);
+				$homePicture = '';
 				foreach($iterator as $fileInfos) {
 					if($fileInfos->isDot() === false AND $fileInfos->isFile() AND @getimagesize($fileInfos->getPathname())) {
 						// Créer la miniature si manquante
@@ -422,6 +423,7 @@ class gallery extends common {
 				// définir une vignette par défaut
 				$directory = $this->getInput('galleryAddDirectory', helper::FILTER_STRING_SHORT, true);
 				$iterator = new DirectoryIterator($directory);
+				$homePicture = '';
 				foreach($iterator as $fileInfos) {
 					if($fileInfos->isDot() === false AND $fileInfos->isFile() AND @getimagesize($fileInfos->getPathname())) {
 						// Créer la miniature si manquante

module/news/news.php

@@ -240,21 +240,21 @@ class news extends common {
 			// News en fonction de la pagination
 			for($i = $pagination['first']; $i < $pagination['last']; $i++) {
 				// Met en forme le tableau
-				$dateOn = mb_detect_encoding(strftime('%d %B %Y',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
-						? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
-						: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
+				$dateOn = mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
+						? \PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
+						: utf8_encode(\PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
 				$dateOn .= ' à ';
-				$dateOn .= mb_detect_encoding(strftime('%H:%M',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
-						? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
-						: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
+				$dateOn .= mb_detect_encoding(\PHP81_BC\strftime('%H:%M',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])), 'UTF-8', true)
+						? \PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn']))
+						: utf8_encode(\PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOn'])));
 				if ($this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])) {
-					$dateOff = mb_detect_encoding(strftime('%d %B %Y',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
-						? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
-						: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
+					$dateOff = mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
+						? \PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
+						: utf8_encode(\PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
 					$dateOff .=	' à ';
-					$dateOff .= mb_detect_encoding(strftime('%H:%M',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
-						? strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
-						: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
+					$dateOff .= mb_detect_encoding(\PHP81_BC\strftime('%H:%M',  $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])), 'UTF-8', true)
+						? \PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff']))
+						: utf8_encode(\PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i], 'publishedOff'])));
 				} else {
 					$dateOff = 'Permanent';
 				}

module/news/view/article/article.php

@@ -8,12 +8,12 @@
 		<!-- bloc signature et date -->
 		<?php echo $module::$articleSignature . ' - ';?>
 		<?php echo template::ico('calendar-empty'); ?>
-		<?php $date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
-						? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
-						: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
-				$heure =  mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
-						? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
-						:  utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
+		<?php $date = mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
+						? \PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
+						: utf8_encode(\PHP81_BC\strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
+				$heure =  mb_detect_encoding(\PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
+						? \PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
+						:  utf8_encode(\PHP81_BC\strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
 				echo $date . ' à ' . $heure; 
 		?>
 		<!-- Bloc edition -->

module/news/view/index/index.php

@@ -14,9 +14,9 @@
 				</div>
 				<div class="newsSignature">
 					<?php echo template::ico('calendar-empty'); ?>
-					<?php echo mb_detect_encoding(strftime('%d %B %Y', $news['publishedOn']), 'UTF-8', true)
-								? strftime('%d %B %Y', $news['publishedOn'])
-								: utf8_encode(strftime('%d %B %Y', $news['publishedOn'])); ?>
+					<?php echo mb_detect_encoding(\PHP81_BC\strftime('%d %B %Y', $news['publishedOn']), 'UTF-8', true)
+								? \PHP81_BC\strftime('%d %B %Y', $news['publishedOn'])
+								: utf8_encode(\PHP81_BC\strftime('%d %B %Y', $news['publishedOn'])); ?>
 							- <?php echo $news['userId']; ?>
 							<!-- Bloc edition -->
 							<?php if (