X-Git-Url: http://git.dj3c1t.com/index.cgi?a=blobdiff_plain;f=mw%2Fenv%2Fmodules%2Fmw_env_messages.php;h=7f3ad9fb94ebcfcf00bdd335ea36886501316750;hb=HEAD;hp=ed7d3a5df8db5a956e17531cf7a6609f24aca2ed;hpb=36ed114046cbe3d72a3589230e9f306a54fcc79d;p=mtweb

diff --git a/mw/env/modules/mw_env_messages.php b/mw/env/modules/mw_env_messages.php
index ed7d3a5..7f3ad9f 100644
--- a/mw/env/modules/mw_env_messages.php
+++ b/mw/env/modules/mw_env_messages.php
@@ -2,39 +2,45 @@
 
   class mw_env_messages extends mw_env{
 
-    function erreur($message, $EXIT = false){
-      if($EXIT){
+    public function erreur($message, $EXIT = false){
+      if($EXIT === true){
         echo "[erreur] ".$message;
         exit();
       }
       else{
-        $this->set_etat("reponses/html/erreur", false);
         $erreur = $this->out("erreur");
         if(!isset($erreur)) $erreur = array("messages" => array());
         $erreur["messages"][] = $message;
-        $this->set_out("erreur", $erreur);
+        if($EXIT === false){
+          $this->set_etat("reponses/html/erreur", false);
+          $this->set_out("erreur", $erreur);
+        }
+        else{
+          if(($etat = $this->valid_etat($EXIT)) !== false){
+            $this->set_etat($etat["mod"]."/".$etat["controller"]."/".$etat["action"], false);
+            foreach($erreur["messages"] as $_message) $this->message($_message);
+          }
+        }
       }
     }
 
-    function erreurs(){
+    public function erreurs(){
       $erreurs = $this->out("erreur");
       if(isset($erreurs)) return $erreurs;
       return array();
     }
 
-    function message($message){
+    public function message($message){
       $messages = $this->out("messages");
       if(!isset($messages)) $messages = array();
       $messages[] = $message;
       $this->set_out("messages", $messages);
     }
 
-    function messages(){
+    public function messages(){
       $messages = $this->out("messages");
       if(isset($messages)) return $messages;
       return array();
     }
 
   }
-
-?>
\ No newline at end of file