From 7723ab06be1169381b79ac13cc03ca290367d765 Mon Sep 17 00:00:00 2001
From: root <root@dj3c1t.net>
Date: Fri, 15 Mar 2013 21:33:44 +0100
Subject: [PATCH] mise a jour pour mtweb.0.7.1

---
 app/out/default/functions.php           |  1 +
 app/out/default/views/pages/colonne.php |  6 ++++--
 mw_pages.php                            | 18 +++++++++---------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/out/default/functions.php b/app/out/default/functions.php
index 17d24cc..81c0529 100644
--- a/app/out/default/functions.php
+++ b/app/out/default/functions.php
@@ -87,6 +87,7 @@
   if(!function_exists("pages_arbo_start_select_options")) :
   function pages_arbo_start_select_options($env, $arbo, $current_start_action, $current_start_action_params, $indent_increment = "", $indent = ""){
     $arbo["id"] = isset($arbo["id"]) ? $arbo["id"] : "";
+    $content = "";
     if($arbo["id"]){
       $content =
        "<option"
diff --git a/app/out/default/views/pages/colonne.php b/app/out/default/views/pages/colonne.php
index 70be0b0..37d4662 100644
--- a/app/out/default/views/pages/colonne.php
+++ b/app/out/default/views/pages/colonne.php
@@ -1,5 +1,7 @@
 <?php if($this->out["arbo"]) : $current_page_id = isset($_GET[$this->param("id")]) ? $_GET[$this->param("id")] : null; ?>
-<ul class="menu">
+<div class="menu">
+  <ul>
 <?php echo pages_arbo_navig_lis($this, $this->out["arbo"], $this->out["ariane"]); ?>
-</ul>
+  </ul>
+</div>
 <?php endif; ?>
diff --git a/mw_pages.php b/mw_pages.php
index c50660c..d1c1664 100644
--- a/mw_pages.php
+++ b/mw_pages.php
@@ -97,7 +97,7 @@
       if(!$sgbd->create_data("pages")){
         return "imposible de creer la table #--pages";
       }
-      if(!$sgbd->add_data("action_status", array("action" => "pages/admin", "id_status" => "1"))){
+      if(!$sgbd->add_data("actions_roles", array("action" => "pages/admin", "id_role" => "1"))){
         $sgbd->remove_data("pages");
         return "impossible d'ajouter un statut pour l'action pages/admin";
       }
@@ -137,7 +137,7 @@
       }
       $DELETE_TABLE = false;
       try{
-        $sgbd->query("INSERT INTO #--action_status(action, id_status) VALUES('pages/admin', 1)");
+        $sgbd->query("INSERT INTO #--actions_roles(action, id_role) VALUES('pages/admin', 1)");
       }
       catch(Exception $e){
         try{
@@ -181,7 +181,7 @@
         return "imposible de creer la table #--pages";
       }
       try{
-        $sgbd->query("INSERT INTO #--action_status(action, id_status) VALUES('pages/admin', 1)");
+        $sgbd->query("INSERT INTO #--actions_roles(action, id_role) VALUES('pages/admin', 1)");
       }
       catch(Exception $e){
         try{
@@ -219,7 +219,7 @@
         return "imposible de supprimer la table #--pages";
       }
       $ids = array();
-      if($rst = $sgbd->open_data("action_status")){
+      if($rst = $sgbd->open_data("actions_roles")){
         while($v_rst = $sgbd->fetch_data($rst)){
           if(isset($v_rst)){
             if(isset($v_rst["action"]) && isset($v_rst["id"]) && $v_rst["action"] == "pages/admin"){
@@ -232,7 +232,7 @@
       }
       if($ids !== false){
         foreach($ids as $id){
-          $sgbd->del_data("action_status", $id);
+          $sgbd->del_data("actions_roles", $id);
         }
       }
       return true;
@@ -261,12 +261,12 @@
         }
       }
       try{
-        $sgbd->query("DELETE FROM #--action_status WHERE action='pages/admin'");
+        $sgbd->query("DELETE FROM #--actions_roles WHERE action='pages/admin'");
       }
       catch(Exception $e){
         return
          "Le plugin a bien &eacute;t&eacute; d&eacute;sinstall&eacute;"
-        ." mais impossible d'enlever les droits pages/admin/* de la table action_status";
+        ." mais impossible d'enlever les droits pages/admin/* de la table actions_roles";
       }
       return true;
     }
@@ -294,12 +294,12 @@
         }
       }
       try{
-        $sgbd->query("DELETE FROM #--action_status WHERE action='pages/admin'");
+        $sgbd->query("DELETE FROM #--actions_roles WHERE action='pages/admin'");
       }
       catch(Exception $e){
         return
          "Le plugin a bien &eacute;t&eacute; d&eacute;sinstall&eacute;"
-        ." mais impossible d'enlever les droits pages/admin/* de la table action_status";
+        ." mais impossible d'enlever les droits pages/admin/* de la table actions_roles";
       }
       return true;
     }
-- 
2.1.4