syntaxe POO (visibilité)

diff --git a/app/controllers/config/actions_logs.php b/app/controllers/config/actions_logs.php
index 7a29629..8967339 100644 (file)
--- a/app/controllers/config/actions_logs.php
+++ b/app/controllers/config/actions_logs.php
@@ -2,11 +2,13 @@
 
   class mw_config_actions_logs extends mw_controller{
 
-    function index(&$env){
+    public function index(){
+      $env = $this->env();
       $env->run("config/actions_logs/historique");
     }
 
-    function historique(&$env){
+    public function historique(){
+      $env = $this->env();
       $env->set_config(array("max_list" => 20));
       $data = $env->data();
       if(
@@ -32,7 +34,8 @@
       $env->set_out("historique", $historique);
     }
 
-    function del_historique(&$env){
+    public function del_historique(){
+      $env = $this->env();
       $data = $env->data();
       if(!$data->clear_actions_logs()){
         $env->erreur("impossible de vider l'historique");
@@ -44,7 +47,8 @@
       );
     }
 
-    function config(&$env){
+    public function config(){
+      $env = $this->env();
       $data = $env->data();
       if(($actions_logs_config = $data->get_actions_logs_config()) === false){
         $env->erreur("impossible de lire la configuration");
@@ -67,7 +71,8 @@
       $env->set_out("actions_logs_config", $actions_logs_config);
     }
 
-    function logs_actions(&$env){
+    public function logs_actions(){
+      $env = $this->env();
       $data = $env->data();
       if(($actions_logs_config = $data->get_actions_logs_config()) === false){
         $env->erreur("impossible de lire la configuration");
@@ -100,7 +105,8 @@
       $env->set_out("logs_actions", $logs_actions);
     }
 
-    function add_log_action(&$env){
+    public function add_log_action(){
+      $env = $this->env();
       $data = $env->data();
       if(($actions_logs_config = $data->get_actions_logs_config()) === false){
         $env->erreur("impossible de lire la configuration");
@@ -144,7 +150,8 @@
       $env->set_out("log_action", $log_action);
     }
 
-    function del_log_action(&$env){
+    public function del_log_action(){
+      $env = $this->env();
       $data = $env->data();
       if(!($log_action = $data->get_logs_actions("id", $_GET[$env->param("id")]))){
         $env->erreur("impossible de lire les informations de cette action dans la liste");
@@ -160,7 +167,8 @@
       );
     }
 
-    function del_logs_actions(&$env){
+    public function del_logs_actions(){
+      $env = $this->env();
       $data = $env->data();
       if(!$data->clear_logs_actions()){
         $env->erreur("impossible de vider la liste");
@@ -173,5 +181,3 @@
     }
 
   }
-
-?>
\ No newline at end of file

diff --git a/app/data/modules/sql/mw_data_actions_logs.php b/app/data/modules/sql/mw_data_actions_logs.php
index 2a7902e..86eee85 100644 (file)
--- a/app/data/modules/sql/mw_data_actions_logs.php
+++ b/app/data/modules/sql/mw_data_actions_logs.php
@@ -6,7 +6,7 @@
     //                                                                               config
     //
 
-    function get_actions_logs_config(){
+    public function get_actions_logs_config(){
       $env = $this->env();
       return array(
         "do_log" => $env->config("actions_logs_do_log") ? true : false,
@@ -16,7 +16,7 @@
       );
     }
 
-    function set_actions_logs_config($params = array()){
+    public function set_actions_logs_config($params = array()){
       if(isset($params["do_log"])){
         if(!$this->set_config("actions_logs_do_log", $params["do_log"] ? 1 : 0)){
           return false;
@@ -44,7 +44,7 @@
     //                                                                              actions
     //
 
-    function clear_logs_actions(){
+    public function clear_logs_actions(){
       $sgbd = $this->sgbd();
       try{
         $sgbd->query("DELETE FROM #--logs_actions");
@@ -57,7 +57,7 @@
     //                                                                                 logs
     //
 
-    function add_action_log($params = array()){
+    public function add_action_log($params = array()){
       $env = $this->env();
       $sgbd = $this->sgbd();
       $log = array();
@@ -83,7 +83,7 @@
       return true;
     }
 
-    function clear_actions_logs(){
+    public function clear_actions_logs(){
       $sgbd = $this->sgbd();
       try{
         $sgbd->query("DELETE FROM #--actions_logs");
@@ -93,5 +93,3 @@
     }
 
   }
-
-?>
\ No newline at end of file

diff --git a/app/observers/mw_observer_actions_logs.php b/app/observers/mw_observer_actions_logs.php
index 2759921..42d5943 100644 (file)
--- a/app/observers/mw_observer_actions_logs.php
+++ b/app/observers/mw_observer_actions_logs.php
@@ -2,16 +2,16 @@
 
   class mw_observer_actions_logs extends mw_observer{
 
-    var $config;
+    public $config;
 
-    function init_actions_logs(){
+    public function init_actions_logs(){
       $env = $this->env();
       $data = $env->data();
       if(($this->config = $data->get_actions_logs_config()) === false) return false;
       return true;
     }
 
-    function before_action(){
+    public function before_action(){
       $env = $this->env();
       $data = $env->data();
       $user = $env->user();
@@ -49,9 +49,7 @@
       }
     }
 
-    function after_action(){
+    public function after_action(){
     }
 
   }
-
-?>
\ No newline at end of file

diff --git a/mw_actions_logs.php b/mw_actions_logs.php
index 63584ed..fb84cd4 100644 (file)
--- a/mw_actions_logs.php
+++ b/mw_actions_logs.php
@@ -2,30 +2,30 @@
 
   class mw_actions_logs extends mw_plugin{
 
-    function title(){
+    public function title(){
       return "Actions logs";
     }
 
-    function description(){
+    public function description(){
       return "Enregistre un historique des actions sur le site";
     }
 
-    function init($env){
+    public function init($env){
       $env->set_link("config/actions_logs", $env->url("config/actions_logs/historique"), "Historique des actions", 50);
       $env->set_link("config/actions_logs/config", $env->url("config/actions_logs/config"), "Configuration des logs", 20);
       $env->set_link("config/actions_logs/logs_actions", $env->url("config/actions_logs/logs_actions"), "Liste des actions", 30);
       return true;
     }
 
-    function enable($env){
+    public function enable($env){
       return true;
     }
 
-    function disable($env){
+    public function disable($env){
       return true;
     }
 
-    function install($env){
+    public function install($env){
       if($env->bdd("sgbd") == "xml") return "ce plugin necessite un stockage de données sql";
       $data = $env->data();
       $sgbd = $data->sgbd();
@@ -72,7 +72,7 @@
       return true;
     }
 
-    function uninstall($env){
+    public function uninstall($env){
       $data = $env->data();
       $sgbd = $data->sgbd();
       if(!$this->disable($env)) return "impossible de desactiver le plugin";
@@ -118,5 +118,3 @@
     }
 
   }
-
-?>
\ No newline at end of file