diff --git a/core/class/jsondb/JsonDb.class.php b/core/class/jsondb/JsonDb.class.php index 11223ac..14f3aa7 100644 --- a/core/class/jsondb/JsonDb.class.php +++ b/core/class/jsondb/JsonDb.class.php @@ -121,17 +121,17 @@ class JsonDb extends \Prowebcraft\Dot } else { if ($this->config['backup']) { try { + //todo make backup of database copy($this->config['dir'] . DIRECTORY_SEPARATOR . $this->config['name'], $this->config['dir'] . DIRECTORY_SEPARATOR . $this->config['name'] . '.backup'); } catch (\Exception $e) { - error_log('Erreur de chargement : ' . $e); - exit('Erreur de chargement : ' . $e); + } } } $this->data = json_decode(file_get_contents($this->db), true); - if (!$this->data === null && json_last_error() !== JSON_ERROR_NONE) { - throw new \InvalidArgumentException('Le fichier ' . $this->db - . ' contient des données invalides.'); + if (!$this->data === null) { + throw new \InvalidArgumentException('Database file ' . $this->db + . ' contains invalid json object. Please validate or remove file'); } } return $this->data; @@ -142,14 +142,10 @@ class JsonDb extends \Prowebcraft\Dot */ public function save() { - $v = json_encode($this->data, JSON_UNESCAPED_UNICODE | JSON_FORCE_OBJECT | JSON_PRETTY_PRINT); + $v = json_encode($this->data, JSON_UNESCAPED_UNICODE | JSON_FORCE_OBJECT ); // $v = json_encode($this->data, JSON_UNESCAPED_UNICODE | JSON_FORCE_OBJECT); $l = strlen($v); $t = 0; - if ($v === false) { - error_log('Erreur d\'encodage JSON : ' . json_last_error_msg()); - exit ('Erreur d\'encodage JSON : ' . json_last_error_msg()); - } while ($t < 5) { $w = file_put_contents($this->db, $v); // Multi user get a locker if ($w == $l) { diff --git a/core/core.php b/core/core.php index 41aff3a..5042924 100644 --- a/core/core.php +++ b/core/core.php @@ -51,7 +51,7 @@ class common const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '1.7.08'; + const ZWII_VERSION = '1.7.09'; // URL autoupdate const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/';