X-Git-Url: http://git.dj3c1t.com/?a=blobdiff_plain;f=app%2Fcontrollers%2Fusers%2Fpistes.php;h=60190def5cf3aec75bc582c99bcfbb6f809cf897;hb=37049b502efdf68a562ce63d8f37a820c66bc887;hp=c1a70dfbfffa69b74ba2f22ef41b82e37b5c22f2;hpb=f58d0d306acdf88245f47573bf78dc5497aa03d7;p=mw_sourceml

diff --git a/app/controllers/users/pistes.php b/app/controllers/users/pistes.php
index c1a70df..60190de 100644
--- a/app/controllers/users/pistes.php
+++ b/app/controllers/users/pistes.php
@@ -128,7 +128,8 @@
       if($groupes["total"] > 0){
         $select = array(
           "status" => $this->morceau_status_id,
-          "id_user" => $this->user["id"]
+          "id_user" => $this->user["id"],
+          "is_reference" => false
         );
         foreach($groupes["list"] as $id_groupe => $groupe){
           $select["id_groupe"] = $id_groupe;
@@ -160,7 +161,7 @@
             $env,
             $origin_source_xml_url,
             $origin_source_xml_content,
-            true
+            false
           );
         }
       }
@@ -223,6 +224,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)){
@@ -246,7 +249,7 @@
                 $piste["groupes"],
                 $piste["titre"],
                 $this->piste_status_id,
-                $piste["licence"]["id"],
+                isset($piste["licence"]["id"]) ? $piste["licence"]["id"] : null,
                 $piste["documents"],
                 $piste["reference"],
                 $piste["derivations"],
@@ -329,6 +332,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
@@ -340,6 +346,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)){
@@ -395,6 +405,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)){
@@ -466,6 +477,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");
@@ -476,10 +488,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;