syntaxe POO (visibilite) et maj indentation

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

diff --git a/app/controllers/users/albums.php b/app/controllers/users/albums.php
index 767ba19..97db03f 100644 (file)
--- a/app/controllers/users/albums.php
+++ b/app/controllers/users/albums.php
@@ -2,12 +2,11 @@
 
   class mw_users_albums extends mw_controller{
 
-    var $user;
+    public $user;
+    public $status;
+    public $album_status_id;
 
-    var $status;
-    var $album_status_id;
-
-    function validate(){
+    public function validate(){
       $env = $this->env();
       $data = $env->data();
       if(($this->status = $data->source_status()) === false){
@@ -28,7 +27,7 @@
       return true;
     }
 
-    function index(){
+    public function index(){
       $env = $this->env();
       $data = $env->data();
       if(($groupes = $data->groupes($this->user["id"])) === false){
@@ -77,7 +76,7 @@
       $env->set_out("albums", $albums);
     }
 
-    function add(){
+    public function add(){
       $env = $this->env();
       $data = $env->data();
       $album = $data->empty_source();
@@ -150,7 +149,7 @@
             return;
           }
           $env->redirect(
-            $env->url("users/albums"),
+            $env->url("users/albums/edit", array("id" => $id_source)),
             "l'album a été ajouté"
           );
         }
@@ -162,7 +161,7 @@
       $env->set_out("groupe", $groupe);
     }
 
-    function edit(){
+    public function edit(){
       $env = $this->env();
       $data = $env->data();
       if(($groupes = $data->groupes($this->user["id"])) === false){
@@ -272,7 +271,7 @@
       $env->set_out("album", $album);
     }
 
-    function del(){
+    public function del(){
       $env = $this->env();
       $data = $env->data();
       if(!($album = $data->source($_GET[$env->param("id")], true))){
@@ -294,6 +293,16 @@
       );
     }
 
-  }
+    public function groupes(){
+      $env = $this->env();
+      if(
+            !($sources_invitations_controller = $env->get_controller("users/sources_invitations"))
+        ||  !$sources_invitations_controller->validate()
+      ){
+        $env->erreur("impossible de valider le controleur users/sources_invitations");
+        return;
+      }
+      $sources_invitations_controller->source_groupes();
+    }
 
-?>
\ No newline at end of file
+  }