mise a jour pour mtweb.0.6.0

[mw_pages] / app / mods / pages / admin.php

diff --git a/app/mods/pages/admin.php b/app/mods/pages/admin.php
index 3498dca..551d9c8 100644 (file)
--- a/app/mods/pages/admin.php
+++ b/app/mods/pages/admin.php
@@ -43,8 +43,8 @@
           $_page["title"] = isset($_POST["title"]) ? $_POST["title"] : ($page["title"] ? $page["title"] : null);
           $_page["content"] = isset($_POST["content"]) ? $_POST["content"] : ($page["content"] ? $page["content"] : null);
           $_page["user"] = $user["id"];
-          $_page["enabled"] = isset($_POST["enabled"]) ? $_POST["enabled"] : ($page["enabled"] ? $page["enabled"] : 1);
-          $_page["position"] = isset($_POST["position"]) ? $_POST["position"] : ($page["position"] ? $page["position"] : 0);
+          $_page["enabled"] = isset($_POST["enabled"]) ? $_POST["enabled"] : (isset($page["enabled"]) ? $page["enabled"] : 1);
+          $_page["position"] = isset($_POST["position"]) ? $_POST["position"] : (isset($page["position"]) ? $page["position"] : 0);
         }
       }
       else $env->message("impossible de lire les informations de l'utilisateur");
@@ -53,9 +53,13 @@
 
     function add(&$env){
       $data = $env->data();
+      $_SESSION["upload_dir"] = $env->path("web").($env->path("web") ? "" : "/").$env->path("content")."uploads";
       if(($arbo = $data->pages_arbo()) !== false){
         $env->set_out("arbo", $arbo);
-        $page = array();
+        $page = array(
+          "title" => "",
+          "content" => ""
+        );
         if($_POST){
           $page = $this->validate_POST_page($env);
           if(!$env->messages()){
@@ -75,6 +79,7 @@
 
     function edit(&$env){
       $data = $env->data();
+      $_SESSION["upload_dir"] = $env->path("web").($env->path("web") ? "" : "/").$env->path("content")."uploads";
       if($page = $data->page($_GET[$env->param("id")])){
         if(($arbo = $data->pages_arbo()) !== false){
           $env->set_out("arbo", $arbo);