public attr / function, constructeurs __construct

[mtweb] / mw / app / data / impl / mw_xml.php

diff --git a/mw/app/data/impl/mw_xml.php b/mw/app/data/impl/mw_xml.php
index 335e974..3d09caf 100644 (file)
--- a/mw/app/data/impl/mw_xml.php
+++ b/mw/app/data/impl/mw_xml.php
@@ -2,19 +2,16 @@
 
   class mw_xml{
 
-    var $host;
-    var $base;
-    var $user;
-    var $password;
-
-    var $EXTENTION_OK;
-
-    var $xml_data;
-
-    var $data_handlers;
-    var $last_data_handler;
-
-    function mw_xml($params = array()){
+    public $host;
+    public $base;
+    public $user;
+    public $password;
+    public $EXTENTION_OK;
+    public $xml_data;
+    public $data_handlers;
+    public $last_data_handler;
+
+    public function __construct($params = array()){
       $this->init_xml_env(
         isset($params["host"]) ? $params["host"] : "content/data/xml",
         isset($params["base"]) ? $params["base"] : "mw",
@@ -24,7 +21,7 @@
       $this->EXTENTION_OK = true;
     }
 
-    function extention_ok(&$env){
+    public function extention_ok(&$env){
       if($this->EXTENTION_OK){
         if(
              file_exists($env->app_file("data/impl/xml/mw_xml_data.php"))
@@ -45,11 +42,15 @@
       return $this->EXTENTION_OK;
     }
 
-    function authentication_required() { return false; }
+    public function authentication_required(){
+      return false;
+    }
 
-    function sgbd_name() { return "XML"; }
+    public function sgbd_name(){
+      return "XML";
+    }
 
-    function init_xml_env($host, $base, $user, $password){
+    public function init_xml_env($host, $base, $user, $password){
       $this->host = $host.($host && substr($host, -1) != "/" ? "/" : "");
       $this->base = $base.($base && substr($base, -1) != "/" ? "/" : "");
       $this->user = $user;
@@ -58,7 +59,7 @@
       $this->last_data_handler = 0;
     }
 
-    function connect($host, $base, $user, $password){
+    public function connect($host, $base, $user, $password){
       if($host.$base && is_dir($host.$base) && is_writable($host.$base)){
         $this->init_xml_env($host, $base, $user, $password);
         $this->xml_data = new mw_xml_data($this->host, $this->base);
@@ -67,16 +68,16 @@
       return null;
     }
 
-    function select_db($base){
+    public function select_db($base){
       $this->base = $base.($base && substr($base, -1) != "/" ? "/" : "");
       return $this->connect($this->host, $this->base, $this->user, $this->password);
     }
 
-    function data_exists($data_path){
+    public function data_exists($data_path){
       return is_dir($this->host.$this->base.$data_path);
     }
 
-    function create_data($data_path){
+    public function create_data($data_path){
       if(!is_dir($this->host.$this->base.$data_path)) @mkdir($this->host.$this->base.$data_path);
       if(is_dir($this->host.$this->base.$data_path)){
         if($dh = $this->open_data($data_path, false)){
@@ -87,7 +88,7 @@
       return null;
     }
 
-    function get_data($data_path, $data_id){
+    public function get_data($data_path, $data_id){
       $dh = ++$this->last_data_handler;
       $this->data_handlers[$dh] = new mw_xml_data_handler($this->xml_data, $data_path);
       if($this->data_handlers[$dh]->open_data(false)){
@@ -98,7 +99,7 @@
       return null;
     }
 
-    function open_data($data_path, $FETCH = true){
+    public function open_data($data_path, $FETCH = true){
       $dh = ++$this->last_data_handler;
       $this->data_handlers[$dh] = new mw_xml_data_handler($this->xml_data, $data_path);
       if($this->data_handlers[$dh]->open_data($FETCH)){
@@ -108,14 +109,14 @@
       return null;
     }
 
-    function fetch_data($dh){
+    public function fetch_data($dh){
       if(isset($this->data_handlers[$dh])){
         return $this->data_handlers[$dh]->fetch_assoc();
       }
       return false;
     }
 
-    function add_data($data_path, $data, $index = null){
+    public function add_data($data_path, $data, $index = null){
       $dh = ++$this->last_data_handler;
       $this->data_handlers[$dh] = new mw_xml_data_handler($this->xml_data, $data_path);
       if($this->data_handlers[$dh]->open_data(false)){
@@ -127,14 +128,14 @@
       return null;
     }
 
-    function last_index($dh){
+    public function last_index($dh){
       if(isset($this->data_handlers[$dh])){
         return $this->data_handlers[$dh]->last_index;
       }
       return null;
     }
 
-    function set_data($data_path, $data_id, $data){
+    public function set_data($data_path, $data_id, $data){
       $dh = ++$this->last_data_handler;
       $this->data_handlers[$dh] = new mw_xml_data_handler($this->xml_data, $data_path);
       if($this->data_handlers[$dh]->open_data(false)){
@@ -145,7 +146,7 @@
       return null;
     }
 
-    function del_data($data_path, $data_id){
+    public function del_data($data_path, $data_id){
       $dh = ++$this->last_data_handler;
       $this->data_handlers[$dh] = new mw_xml_data_handler($this->xml_data, $data_path);
       if($this->data_handlers[$dh]->open_data(false)){
@@ -156,14 +157,14 @@
       return null;
     }
 
-    function close_data($dh){
+    public function close_data($dh){
       if(isset($this->data_handlers[$dh])){
         $this->data_handlers[$dh]->close_data();
         unset($this->data_handlers[$dh]);
       }
     }
 
-    function remove_data($data_path){
+    public function remove_data($data_path){
       $OK = strlen($data_path) > 0;
       if($OK && is_dir($this->host.$this->base.$data_path) && is_writable($this->host.$this->base.$data_path)){
         $data_path .= substr($data_path, -1) == "/" ? "" : "/";
@@ -184,5 +185,3 @@
     }
 
   }
-
-?>
\ No newline at end of file