X-Git-Url: http://git.dj3c1t.com/?p=mw_sourceml;a=blobdiff_plain;f=app%2Fcontrollers%2Fcontent%2Fsources.php;fp=app%2Fcontrollers%2Fcontent%2Fsources.php;h=9bc0d20cf43fefc423ca9635ce33f83bbb65234b;hp=82d9b6d0556de118b6e6e70ec234a60a1455b17c;hb=0b1ecd8b7536944d54d74ffc836982de3654d98b;hpb=3647c6bed06b3a1e3e014ef5a21074e7a6192899

diff --git a/app/controllers/content/sources.php b/app/controllers/content/sources.php
index 82d9b6d..9bc0d20 100644
--- a/app/controllers/content/sources.php
+++ b/app/controllers/content/sources.php
@@ -1,22 +1,20 @@
 <?php
 
-  class mw_content_sources extends mw_controller
-  {
-    var $status;
-    var $album_status_id;
-    var $morceau_status_id;
-    var $piste_status_id;
-    var $url_params;
-    var $source_param;
-    var $licences;
+  class mw_content_sources extends mw_controller{
 
-    var $groupe;
-    var $source;
-    var $source_controller;
+    public $status;
+    public $album_status_id;
+    public $morceau_status_id;
+    public $piste_status_id;
+    public $url_params;
+    public $source_param;
+    public $licences;
+    public $groupe;
+    public $source;
+    public $source_controller;
+    public $validation_result;
 
-    var $validation_result;
-
-    function validate(){
+    public function validate(){
       $env = $this->env();
       $this->validation_result = true;
       $this->validate_status($env);
@@ -24,13 +22,13 @@
       return true;
     }
 
-    function validate_status(){
+    public function validate_status(){
       $env = $this->env();
-      if($this->validation_result === true)
-      { $data = $env->data();
-        if(($this->status = $data->source_status()) !== false)
-        { foreach($this->status as $id_source_status => $source_status)
-          { if($source_status["nom"] == "album") $this->album_status_id = $id_source_status;
+      if($this->validation_result === true){
+        $data = $env->data();
+        if(($this->status = $data->source_status()) !== false){
+          foreach($this->status as $id_source_status => $source_status){
+            if($source_status["nom"] == "album") $this->album_status_id = $id_source_status;
             if($source_status["nom"] == "morceau") $this->morceau_status_id = $id_source_status;
             if($source_status["nom"] == "piste") $this->piste_status_id = $id_source_status;
             if(isset($this->album_status_id) && isset($this->morceau_status_id) && isset($this->piste_status_id)) break;
@@ -43,24 +41,23 @@
       }
     }
 
-    function validate_licences(){
+    public function validate_licences(){
       $env = $this->env();
-      if($this->validation_result === true)
-      { $data = $env->data();
-        if(($this->licences = $data->licences()) !== false)
-        { $env->set_out("licences", $this->licences);
+      if($this->validation_result === true){
+        $data = $env->data();
+        if(($this->licences = $data->licences()) !== false){
+          $env->set_out("licences", $this->licences);
         }
         else $this->validation_result = "Impossible de lire la liste des licences";
       }
     }
 
-    function validate_source(){
+    public function validate_source(){
       $env = $this->env();
-      if($this->validation_result === true)
-      { $data = $env->data();
-        if(isset($_GET[$env->param("id")]) && $_GET[$env->param("id")])
-        { if($this->source = $data->source($_GET[$env->param("id")]))
-          {
+      if($this->validation_result === true){
+        $data = $env->data();
+        if(isset($_GET[$env->param("id")]) && $_GET[$env->param("id")]){
+          if($this->source = $data->source($_GET[$env->param("id")])){
           }
           else $this->validation_result = "Impossible de lire les informations de la source";
         }
@@ -68,15 +65,15 @@
       }
     }
 
-    function validate_groupes(){
+    public function validate_groupes(){
       $env = $this->env();
-      if($this->validation_result === true)
-      { $data = $env->data();
-        if(($groupes = $data->groupes()) !== false)
-        { $env->set_out("groupes", $groupes);
-          if(isset($_GET[$env->param("groupe")]) && $_GET[$env->param("groupe")])
-          { if(($this->groupe = $data->groupe($_GET[$env->param("groupe")])) !== false)
-            { $env->set_out("groupe", $groupe);
+      if($this->validation_result === true){
+        $data = $env->data();
+        if(($groupes = $data->groupes()) !== false){
+          $env->set_out("groupes", $groupes);
+          if(isset($_GET[$env->param("groupe")]) && $_GET[$env->param("groupe")]){
+            if(($this->groupe = $data->groupe($_GET[$env->param("groupe")])) !== false){
+              $env->set_out("groupe", $groupe);
             }
             else $this->validation_result = "Impossible de lire les informations du groupe";
           }
@@ -85,41 +82,41 @@
       }
     }
 
-    function sources(){
+    public function sources(){
       $env = $this->env();
       $this->validate_source($env);
-      if($this->validation_result === true)
-      { $data = $env->data();
+      if($this->validation_result === true){
+        $data = $env->data();
         $sources = array("list" => array(), "total" => 0);
-        if($this->source)
-        { if(($source_ariane = $data->source_ariane($this->source["id"])) !== false)
-          { $this->url_params = array();
-            foreach($source_ariane as $id_composition => $composition)
-            { if($composition["status"] == $this->morceau_status_id) $this->url_params["morceau"] = $id_composition;
+        if($this->source){
+          if(($source_ariane = $data->source_ariane($this->source["id"])) !== false){
+            $this->url_params = array();
+            foreach($source_ariane as $id_composition => $composition){
+              if($composition["status"] == $this->morceau_status_id) $this->url_params["morceau"] = $id_composition;
               elseif($composition["status"] == $this->album_status_id) $this->url_params["album"] = $id_composition;
             }
-            if($this->source["status"] == $this->morceau_status_id)
-            { $this->source_param = $env->set_out("source_param", "piste");
+            if($this->source["status"] == $this->morceau_status_id){
+              $this->source_param = $env->set_out("source_param", "piste");
               $this->source_controller = $env->set_out("source_controller", "piste");
               $this->url_params["morceau"] = $this->source["id"];
             }
-            elseif($this->source["status"] == $this->album_status_id)
-            { $this->source_param = $env->set_out("source_param", "morceau");
+            elseif($this->source["status"] == $this->album_status_id){
+              $this->source_param = $env->set_out("source_param", "morceau");
               $this->source_controller = $env->set_out("source_controller", "morceau");
               $this->url_params["album"] = $this->source["id"];
             }
             $env->set_out("url_params", $this->url_params);
-            if(($_sources = $data->source_compositions(array("id_composition" => $this->source["id"]))) !== false)
-            { if(isset($_sources[$this->source["id"]]) && $_sources[$this->source["id"]])
-              { foreach($_sources[$this->source["id"]] as $id_source)
-                { if(($sources["list"][$id_source] = $data->source($id_source, true)) !== false)
-                  { if(!isset($sources["list"][$id_source]["ordre"])){
+            if(($_sources = $data->source_compositions(array("id_composition" => $this->source["id"]))) !== false){
+              if(isset($_sources[$this->source["id"]]) && $_sources[$this->source["id"]]){
+                foreach($_sources[$this->source["id"]] as $id_source){
+                  if(($sources["list"][$id_source] = $data->source($id_source, true)) !== false){
+                    if(!isset($sources["list"][$id_source]["ordre"])){
                       $sources["list"][$id_source]["ordre"] = 0;
                     }
                     $sources["total"]++;
                   }
-                  else
-                  { $this->erreur("Impossible de lire les informations de l'une des sources");
+                  else{
+                    $this->erreur("Impossible de lire les informations de l'une des sources");
                     break;
                   }
                 }
@@ -136,37 +133,37 @@
       else $this->erreur($this->validation_result);
     }
 
-    function derivations(){
+    public function derivations(){
       $env = $this->env();
       $this->validate_source($env);
-      if($this->validation_result === true)
-      { $data = $env->data();
+      if($this->validation_result === true){
+        $data = $env->data();
         $derivations = array("list" => array(), "total" => 0);
-        if($this->source)
-        { if(($source_ariane = $data->source_ariane($this->source["id"])) !== false)
-          { $this->url_params = array();
-            foreach($source_ariane as $id_composition => $composition)
-            { if($composition["status"] == $this->morceau_status_id) $this->url_params["morceau"] = $id_composition;
+        if($this->source){
+          if(($source_ariane = $data->source_ariane($this->source["id"])) !== false){
+            $this->url_params = array();
+            foreach($source_ariane as $id_composition => $composition){
+              if($composition["status"] == $this->morceau_status_id) $this->url_params["morceau"] = $id_composition;
               elseif($composition["status"] == $this->album_status_id) $this->url_params["album"] = $id_composition;
             }
-            if($this->source["status"] == $this->piste_status_id)
-            { $this->source_param = $env->set_out("source_param", "piste");
+            if($this->source["status"] == $this->piste_status_id){
+              $this->source_param = $env->set_out("source_param", "piste");
               $this->source_controller = $env->set_out("source_controller", "piste");
               $this->url_params["piste"] = $this->source["id"];
             }
-            elseif($this->source["status"] == $this->morceau_status_id)
-            { $this->source_param = $env->set_out("source_param", "morceau");
+            elseif($this->source["status"] == $this->morceau_status_id){
+              $this->source_param = $env->set_out("source_param", "morceau");
               $this->source_controller = $env->set_out("source_controller", "morceau");
               $this->url_params["morceau"] = $this->source["id"];
             }
             $env->set_out("url_params", $this->url_params);
-            if(($_derivations = $data->source_derivations(array("derivation" => $this->source["id"]))) !== false)
-            { foreach($_derivations as $id_derivation => $derivation)
-              { if(($derivations["list"][$id_derivation] = $data->source($id_derivation, true)) !== false)
-                { $derivations["total"]++;
+            if(($_derivations = $data->source_derivations(array("derivation" => $this->source["id"]))) !== false){
+              foreach($_derivations as $id_derivation => $derivation){
+                if(($derivations["list"][$id_derivation] = $data->source($id_derivation, true)) !== false){
+                  $derivations["total"]++;
                 }
-                else
-                { $this->erreur("Impossible de lire les informations de l'une des derivations");
+                else{
+                  $this->erreur("Impossible de lire les informations de l'une des derivations");
                   break;
                 }
               }
@@ -182,28 +179,42 @@
       else $this->erreur($this->validation_result);
     }
 
-    function xml_form(){
+    public function xml_form(){
       $env = $this->env();
-      if(isset($_GET[$env->param("form")]))
-      { $data = $env->data();
+      if(isset($_GET[$env->param("form")])){
+        $data = $env->data();
         $form_params = array();
-        if(isset($_GET[$env->param("derivation")]))
-        { if($_GET[$env->param("form")] == "edit")
-          { if(($source_derivation = $data->source_derivation($_GET[$env->param("derivation")])) !== false)
-            { $source = array
-              ( "id" => $source_derivation["id"],
-                "xml" => array
-                ( "url" => $source_derivation["derivation"],
+        if(isset($_GET[$env->param("derivation")])){
+          if($_GET[$env->param("form")] == "edit"){
+            if(($source_derivation = $data->source_derivation($_GET[$env->param("derivation")])) !== false){
+              $source = array(
+                "id" => $source_derivation["id"],
+                "xml" => array(
+                  "url" => $source_derivation["derivation"],
                   "content" => "",
                   "use_edit_content" => false
                 )
               );
               $derivation_edit_file = $data->derivation_edit_xml_path($source_derivation["id_source"], $source_derivation["id"]);
-              if(file_exists($derivation_edit_file))
-              { if(($derivation_edit_content = $data->get_edit_derivation_content($source_derivation["id_source"], $source_derivation["id"])) !== false)
-                { if(($source = $data->source_xml_read($source_derivation["derivation"], $derivation_edit_content)) !==false)
-                  { $source["xml"] = array
-                    ( "url" => $source_derivation["derivation"],
+              if(file_exists($derivation_edit_file)){
+                if(
+                  (
+                    $derivation_edit_content = $data->get_edit_derivation_content(
+                      $source_derivation["id_source"],
+                      $source_derivation["id"]
+                    )
+                  ) !== false
+                ){
+                  if(
+                    (
+                      $source = $data->source_xml_read(
+                        $source_derivation["derivation"],
+                        $derivation_edit_content
+                      )
+                    ) !==false
+                  ){
+                    $source["xml"] = array(
+                      "url" => $source_derivation["derivation"],
                       "content" => $derivation_edit_content,
                       "use_edit_content" => true
                     );
@@ -212,9 +223,9 @@
                 }
                 else $this->erreur("Impossible de lire le XML de la source");
               }
-              else
-              { if(($source = $data->source_xml_read($source_derivation["derivation"])) === false)
-                { $source = $data->empty_source();
+              else{
+                if(($source = $data->source_xml_read($source_derivation["derivation"])) === false){
+                  $source = $data->empty_source();
                 }
               }
               $source["id_source"] = $source_derivation["id_source"];
@@ -235,8 +246,7 @@
           $form_params["can_delete"] = true;
           $form_params["id"] = $_GET[$env->param("derivation")];
         }
-        elseif(isset($_GET[$env->param("reference")]))
-        { 
+        elseif(isset($_GET[$env->param("reference")])){
         }
         $env->set_out("form_params", $form_params);
         $env->set_out("xml_form_source", $source);
@@ -244,18 +254,18 @@
       else $this->erreur("Parametres invalides pour le formulaire");
     }
 
-    function xml(){
+    public function xml(){
       $env = $this->env();
       $this->validate_source($env);
-      if($this->validation_result === true)
-      { $data = $env->data();
+      if($this->validation_result === true){
+        $data = $env->data();
         $xml = "";
-        if($this->source)
-        { if($this->source = $data->load_source($this->source))
-          { $xml =
+        if($this->source){
+          if($this->source = $data->load_source($this->source)){
+            $xml =
              "<pre>"
-            .htmlentities
-            ( $this->source["reference"] ? $this->source["reference"]["xml"]["content"] : $this->source["xml"]["content"],
+            .htmlentities(
+              $this->source["reference"] ? $this->source["reference"]["xml"]["content"] : $this->source["xml"]["content"],
               ENT_COMPAT,
               "UTF-8"
             )
@@ -270,11 +280,9 @@
       exit;
     }
 
-    function erreur($content)
-    { echo $content;
+    public function erreur($content){
+      echo $content;
       exit;
     }
 
   }
-
-?>
\ No newline at end of file