X-Git-Url: http://git.dj3c1t.com/?a=blobdiff_plain;f=app%2Fcontrollers%2Fusers%2Fpistes.php;h=eeab45b080a71f4bed635904b8040ee2dbe805b3;hb=aa56057fe2634113eb8d1a50ed54b6a8988645a8;hp=0b2d177af68c5cd6f2674ee9b6c4f6345a9fe1c1;hpb=b2437852f60b76e437950c0458149d92686ee38b;p=mw_sourceml

diff --git a/app/controllers/users/pistes.php b/app/controllers/users/pistes.php
index 0b2d177..eeab45b 100644
--- a/app/controllers/users/pistes.php
+++ b/app/controllers/users/pistes.php
@@ -150,7 +150,21 @@
       $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){
+      if(isset($_POST["button_derive"])){
+        if(
+              ($origin_source_id = $_POST["button_derive"])
+          &&  ($origin_source_xml_url = $data->source_xml_url($origin_source_id))
+          &&  ($origin_source_xml_content = $data->get_source_xml($origin_source_id))
+        ){
+          $piste["derivations"][$origin_source_id] = $users_sources_mod->get_source_from_xml(
+            $env,
+            $origin_source_xml_url,
+            $origin_source_xml_content,
+            false
+          );
+        }
+      }
+      elseif($_POST){
         if(!($groupe = $data->groupe($_POST["id_groupe"]))){
           $env->erreur("Impossible de lire les informations du groupe");
           return;
@@ -209,6 +223,8 @@
           );
           $source_infos["date_creation"] = $_POST["annee_date_creation"]."-".$_POST["mois_date_creation"]."-".$_POST["jour_date_creation"];
           $source_infos["description"] = $_POST["description"];
+          $piste["description"] = $source_infos["description"];
+          $piste["date_creation"] = $source_infos["date_creation"];
           foreach($_POST as $post_key => $post_value){
             if(substr($post_key, 0, 13) == "document_nom_"){
               if($id_document = substr($post_key, 13)){
@@ -315,6 +331,9 @@
       }
       if($compositions) foreach($compositions[$piste["id"]] as $id_morceau) { $piste["morceau"] = $id_morceau; break; }
       if($_POST){
+        $permissions = $piste["permissions"];
+        $image = isset($piste["image"]) ? $piste["image"] : null;
+        $image_uri = isset($piste["image_uri"]) ? $piste["image_uri"] : null;
         $source_infos = array(
           "date_inscription" => $_POST["date_inscription"],
           "ordre" => isset($piste["ordre"]) ? $piste["ordre"] : 0
@@ -326,6 +345,10 @@
             "image" => isset($piste["image"]) ? $piste["image"] : ""
           )
         );
+        $piste["permissions"] = $permissions;
+        $piste["date_creation"] = $_POST["annee_date_creation"]."-".$_POST["mois_date_creation"]."-".$_POST["jour_date_creation"];
+        $piste["image"] = $image;
+        $piste["image_uri"] = $image_uri;
         $users_sources_mod = $env->get_controller("users/sources");
         if($_POST["morceau"]){
           if($morceau = $data->source($_POST["morceau"], true)){
@@ -381,6 +404,7 @@
           );
           $source_infos["date_creation"] = $_POST["annee_date_creation"]."-".$_POST["mois_date_creation"]."-".$_POST["jour_date_creation"];
           $source_infos["description"] = $_POST["description"];
+          $piste["description"] = $source_infos["description"];
           foreach($_POST as $post_key => $post_value){
             if(substr($post_key, 0, 13) == "document_nom_"){
               if($id_document = substr($post_key, 13)){
@@ -452,6 +476,7 @@
     }
 
     function maj_xml(){
+      $env = $this->env();
       $data = $env->data();
       if(!($piste = $data->source($_GET[$env->param("id")], true))){
         $env->erreur("Impossible de lire les informations de la piste");
@@ -462,10 +487,11 @@
         $env->erreur("vous n'avez pas la permission d'editer cette piste");
         return;
       }
+
       if
-      (    isset($_GET[$env->param("id")])
-        && isset($_GET[$env->param("xml")])
-        && ($_GET[$env->param("xml")] == "derviation" ? isset($_GET[$env->param("derivation")]) : true)
+      (    !isset($_GET[$env->param("id")])
+        || !isset($_GET[$env->param("xml")])
+        || ($_GET[$env->param("xml")] == "derviation" && !isset($_GET[$env->param("derivation")]))
       ){
         $env->erreur("parametre de fichier xml manquant");
         return;