syntaxe POO (visibilite) et maj indentation

[mw_sourceml] / app / controllers / users / pistes.php

diff --git a/app/controllers/users/pistes.php b/app/controllers/users/pistes.php
index 7269cbb..fa2dbae 100644 (file)
--- a/app/controllers/users/pistes.php
+++ b/app/controllers/users/pistes.php
@@ -2,14 +2,13 @@
 
   class mw_users_pistes extends mw_controller{
 
-    var $user;
+    public $user;
+    public $status;
+    public $album_status_id;
+    public $morceau_status_id;
+    public $piste_status_id;
 
-    var $status;
-    var $album_status_id;
-    var $morceau_status_id;
-    var $piste_status_id;
-
-    function validate(){
+    public function validate(){
       $env = $this->env();
       $data = $env->data();
       if(($this->status = $data->source_status()) === false){
@@ -34,7 +33,7 @@
       return true;
     }
 
-    function index(){
+    public function index(){
       $env = $this->env();
       $data = $env->data();
       if(($groupes = $data->groupes($this->user["id"])) === false){
@@ -110,7 +109,7 @@
       $env->set_out("pistes", $pistes);
     }
 
-    function add(){
+    public function add(){
       $env = $this->env();
       $data = $env->data();
       $piste = $data->empty_source();
@@ -281,7 +280,7 @@
       $env->set_out("morceau", $morceau);
     }
 
-    function edit(){
+    public function edit(){
       $env = $this->env();
       $data = $env->data();
       if(($groupes = $data->groupes($this->user["id"])) === false){
@@ -330,7 +329,10 @@
         $env->erreur("Impossible de lire la liste des compositions");
         return;
       }
-      if($compositions) foreach($compositions[$piste["id"]] as $id_morceau) { $piste["morceau"] = $id_morceau; break; }
+      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;
@@ -476,7 +478,7 @@
       $env->set_out("piste", $piste);
     }
 
-    function maj_xml(){
+    public function maj_xml(){
       $env = $this->env();
       $data = $env->data();
       if(!($piste = $data->source($_GET[$env->param("id")], true))){
@@ -540,7 +542,7 @@
       $env->run("users/pistes/edit", array("get" => array("id" => $piste["id"])));
     }
 
-    function del(){
+    public function del(){
       $env = $this->env();
       $data = $env->data();
       if(!($piste = $data->source($_GET[$env->param("id")], true))){
@@ -562,7 +564,7 @@
       );
     }
 
-    function groupes(){
+    public function groupes(){
       $env = $this->env();
       if(
             !($sources_invitations_controller = $env->get_controller("users/sources_invitations"))
@@ -575,5 +577,3 @@
     }
 
   }
-
-?>
\ No newline at end of file