syntaxe POO (visibilite)

[mw_pages] / app / controllers / pages / admin.php

diff --git a/app/controllers/pages/admin.php b/app/controllers/pages/admin.php
index 321d9cd..7ae7279 100644 (file)
--- a/app/controllers/pages/admin.php
+++ b/app/controllers/pages/admin.php
@@ -2,7 +2,8 @@
 
   class mw_pages_admin extends mw_controller{
 
-    function index(&$env){
+    public function index(){
+      $env = $this->env();
       $data = $env->data();
       if(($arbo = $data->pages_arbo()) !== false){
         $env->set_out("arbo", $arbo);
@@ -34,7 +35,8 @@
       else $env->erreur("impossible de lire l'arborescence des pages");
     }
 
-    function validate_POST_page(&$env, $page = null){
+    protected function validate_POST_page($page = null){
+      $env = $this->env();
       $page = isset($page) ? $page : array();
       $_page = array();
       if(($user = $env->user()) && $user["id"]){
@@ -51,7 +53,8 @@
       return $_page;
     }
 
-    function add(&$env){
+    public function add(){
+      $env = $this->env();
       $data = $env->data();
       $_SESSION["upload_dir"] = $env->path("web").($env->path("web") ? "" : "/").$env->path("content")."uploads";
       if(($arbo = $data->pages_arbo()) !== false){
@@ -61,7 +64,7 @@
           "content" => ""
         );
         if($_POST){
-          $page = $this->validate_POST_page($env);
+          $page = $this->validate_POST_page();
           if(!$env->messages()){
             if(($id_page = $data->add_page($page)) !== false){
               $env->redirect(
@@ -77,14 +80,15 @@
       else $env->erreur("impossible de lire l'arborescence des pages");
     }
 
-    function edit(&$env){
+    public function edit(){
+      $env = $this->env();
       $data = $env->data();
       $_SESSION["upload_dir"] = $env->path("web").($env->path("web") ? "" : "/").$env->path("content")."uploads";
       if($page = $data->page($_GET[$env->param("id")])){
         if(($arbo = $data->pages_arbo()) !== false){
           $env->set_out("arbo", $arbo);
           if($_POST){
-            $page = $this->validate_POST_page($env, $page);
+            $page = $this->validate_POST_page($page);
             if(!$env->messages()){
               if($data->set_page($_GET[$env->param("id")], $page)){
                 $env->redirect(
@@ -102,7 +106,8 @@
       else $env->erreur("impossible de lire les informations de la page");
     }
 
-    function edit_pages(&$env){
+    public function edit_pages(){
+      $env = $this->env();
       if(($user = $env->user()) && $user["id"]){
         if($_POST){
           $data = $env->data();
@@ -131,7 +136,8 @@
       else $env->erreur("impossible de lire les informations de l'utilisateur");
     }
 
-    function set_accueil(&$env){
+    public function set_accueil(){
+      $env = $this->env();
       if(($user = $env->user()) && $user["id"]){
         $data = $env->data();
         $start_action = "";
@@ -164,7 +170,8 @@
       else $env->erreur("impossible de lire les informations de l'utilisateur");
     }
 
-    function del(&$env){
+    public function del(){
+      $env = $this->env();
       $data = $env->data();
       if($page = $data->page($_GET[$env->param("id")])){
         if($data->del_page($page["id"])){
@@ -179,5 +186,3 @@
     }
 
   }
-
-?>
\ No newline at end of file