X-Git-Url: http://git.dj3c1t.com/?a=blobdiff_plain;f=app%2Fcontrollers%2Fusers%2Fmorceaux.php;h=8c9585681184ca8e32f197fa24eef610a604df70;hb=refs%2Ftags%2Fsourceml.0.15.3;hp=abd7e2c964f53c914a67e3704a711db6eacd525f;hpb=2802d2dbcb5a1ea3c269d6fb4df9fbfb0f13f93d;p=mw_sourceml

diff --git a/app/controllers/users/morceaux.php b/app/controllers/users/morceaux.php
index abd7e2c..8c95856 100644
--- a/app/controllers/users/morceaux.php
+++ b/app/controllers/users/morceaux.php
@@ -142,6 +142,7 @@
         return;
       }
       $web_path = $env->path("web");
+      $upload_dir = $env->path("content")."uploads/".$this->user["id"];
       $_SESSION["upload_dir"] = $web_path.($web_path ? "" : "/").$env->path("content")."uploads/".$this->user["id"];
       $users_sources_mod = $env->get_controller("users/sources");
       if($_POST){
@@ -172,11 +173,11 @@
                 $env,
                 $xml_url,
                 (
-                  $_POST["use_edit_derivation_content_".$id_source_derivation] ?
+                  isset($_POST["use_edit_derivation_content_".$id_source_derivation]) ?
                     $_POST["edit_derivation_content_".$id_source_derivation]
                   : ($xml_url ? $data->get_source_xml_from_url($xml_url) : "")
                 ),
-                $_POST["use_edit_derivation_content_".$id_source_derivation] ? true : false
+                isset($_POST["use_edit_derivation_content_".$id_source_derivation]) ? true : false
               );
             }
           }
@@ -187,11 +188,11 @@
             $env,
             $xml_url,
             (
-              $_POST["use_edit_reference_content"] ?
+              isset($_POST["use_edit_reference_content"]) ?
                 $_POST["edit_reference_content"]
               : ($xml_url ? $data->get_source_xml_from_url($xml_url) : "")
             ),
-            $_POST["use_edit_reference_content"] ? true : false
+            isset($_POST["use_edit_reference_content"]) ? true : false
           );
         }
         else{
@@ -215,6 +216,11 @@
           }
         }
         if(!$env->messages()){
+          if(($image = $data->upload("image", $upload_dir)) === false){
+            $env->erreur("erreur lors de l'envoi de l'image. le morceau n'a pas été ajouté");
+            return;
+          }
+          if($image) $source_infos["image"] = $this->user["id"]."/".$image;
           if(
             (
               $id_source = $data->add_source(
@@ -296,6 +302,7 @@
         return;
       }
       $web_path = $env->path("web");
+      $upload_dir = $env->path("content")."uploads/".$this->user["id"];
       $_SESSION["upload_dir"] = $web_path.($web_path ? "" : "/").$env->path("content")."uploads/".$this->user["id"];
       if(($compositions = $data->source_compositions(array("id_source" => $morceau["id"]))) === false){
         $env->erreur("Impossible de lire la liste des compositions");
@@ -310,7 +317,8 @@
         $morceau = $data->empty_source(
           array(
             "id" => $morceau["id"],
-            "groupes" => $morceau["groupes"]
+            "groupes" => $morceau["groupes"],
+            "image" => isset($morceau["image"]) ? $morceau["image"] : ""
           )
         );
         $users_sources_mod = $env->get_controller("users/sources");
@@ -337,11 +345,11 @@
                 $env,
                 $xml_url,
                 (
-                  $_POST["use_edit_derivation_content_".$id_source_derivation] ?
+                  isset($_POST["use_edit_derivation_content_".$id_source_derivation]) ?
                     $_POST["edit_derivation_content_".$id_source_derivation]
                   : ($xml_url ? $data->get_source_xml_from_url($xml_url) : "")
                 ),
-                $_POST["use_edit_derivation_content_".$id_source_derivation] ? true : false
+                isset($_POST["use_edit_derivation_content_".$id_source_derivation]) ? true : false
               );
             }
           }
@@ -352,11 +360,11 @@
             $env,
             $xml_url,
             (
-              $_POST["use_edit_reference_content"] ?
+              isset($_POST["use_edit_reference_content"]) ?
                 $_POST["edit_reference_content"]
               : ($xml_url ? $data->get_source_xml_from_url($xml_url) : "")
             ),
-            $_POST["use_edit_reference_content"] ? true : false
+            isset($_POST["use_edit_reference_content"]) ? true : false
           );
         }
         else{
@@ -380,6 +388,23 @@
           }
         }
         if(!$env->messages()){
+          if(isset($_POST["del_image"])){
+            if($morceau["image"]){
+              if(!@unlink($env->path("content")."uploads/".$morceau["image"])){
+                $env->erreur("Impossible d'effacer l'image du morceau");
+                return;
+              }
+            }
+            $morceau["image"] = "";
+          }
+          else{
+            if(($up_image = $data->upload("image", $upload_dir)) === false){
+              $env->erreur("Impossible d'uploader l'image");
+              return;
+            }
+            if($up_image) $morceau["image"] = $this->user["id"]."/".$up_image;
+          }
+          if($morceau["image"]) $source_infos["image"] = $morceau["image"];
           if(
             (
               $data->set_source(