Changeset 112276 in spip-zone

Timestamp:

Nov 2, 2018, 4:24:08 PM (2 years ago)

Author:

marcimat@…

Message:

Fix #4205 : À l’installation, il n’y a pas encore de fichier de sauvegarde des actions SVP. Du coup, il pouvait y avoir un petit bug en tentant de les lire.
(Francky).

File:

• _core_/plugins/svp/inc/svp_actionner.php (modified) (4 diffs)

_core_/plugins/svp/inc/svp_actionner.php

@@ -208 +208 @@
          * @param string $nom Nom de la librairie
          * @param string $source URL pour obtenir la librairie
+         * @return bool
          */
         public function add_lib($nom, $source) {
@@ -747 +748 @@
                 }
 
-                if (isset($this->end) and count($this->end)) {
+                if (count($this->end)) {
                         $todo = "<ul>";
                         foreach ($this->end as $i) {
@@ -884 +885 @@
          **/
         public function get_actions() {
-                lire_fichier(_DIR_TMP . 'stp_actions.txt', $contenu);
-                $infos = unserialize($contenu);
-                $this->end = $infos['todo'];
-                $this->work = $infos['work'];
-                $this->done = $infos['done'];
-                $this->err = $infos['err'];
-                $this->lock = $infos['lock'];
+                if (
+                        lire_fichier(_DIR_TMP . 'stp_actions.txt', $contenu)
+                        and $contenu
+                        and $infos = unserialize($contenu)
+                        and is_array($infos)
+                ) {
+                        $this->end = $infos['todo'];
+                        $this->work = $infos['work'];
+                        $this->done = $infos['done'];
+                        $this->err = $infos['err'];
+                        $this->lock = $infos['lock'];
+                }
         }
 
@@ -899 +905 @@
          **/
         public function nettoyer_actions() {
-                $this->todo = array();
+                $this->end = array();
                 $this->done = array();
                 $this->work = array();