syntaxe POO (visibilite) et maj indentation

[mw_sourceml] / app / controllers / admin / sourceml.php

diff --git a/app/controllers/admin/sourceml.php b/app/controllers/admin/sourceml.php
index cc674c1..7764cc0 100644 (file)
--- a/app/controllers/admin/sourceml.php
+++ b/app/controllers/admin/sourceml.php
@@ -1,33 +1,34 @@
 <?php
 
-  class mw_admin_sourceml extends mw_controller
-  {
+  class mw_admin_sourceml extends mw_controller{
 
-    var $groupes;
-    var $albums;
-    var $status;
-    var $album_status_id;
+    public $groupes;
+    public $albums;
+    public $status;
+    public $album_status_id;
 
-    function validate(){
+    public function validate(){
       $env = $this->env();
       $data = $env->data();
-      if(($this->status = $data->source_status()) === false)
-      { return "Impossible de lire la liste des status de source";
+      if(($this->status = $data->source_status()) === false){
+        return "Impossible de lire la liste des status de source";
       }
-      foreach($this->status as $id_source_status => $source_status)
-      { if($source_status["nom"] == "album") $this->album_status_id = $id_source_status;
+      foreach($this->status as $id_source_status => $source_status){
+        if($source_status["nom"] == "album") $this->album_status_id = $id_source_status;
         if(isset($this->album_status_id) && isset($this->morceau_status_id)) break;
       }
       if(!isset($this->album_status_id)) return "Type de source inconnu: album";
-      if(($this->groupes = $data->groupes()) === false)
-      { return "Impossible de lire la liste des groupes";
+      if(($this->groupes = $data->groupes()) === false){
+        return "Impossible de lire la liste des groupes";
       }
       $select = array("status" => $this->album_status_id);
-      if(($this->albums = $data->sources($select)) === false) return "impossible de lire la liste des albums";
+      if(($this->albums = $data->sources($select)) === false){
+        return "impossible de lire la liste des albums";
+      }
       return true;
     }
 
-    function index(){
+    public function index(){
       $env = $this->env();
       $data = $env->data();
       if(!($groupes = $this->groupes)){
@@ -93,5 +94,3 @@
     }
 
   }
-
-?>
\ No newline at end of file