public attr / function, constructeurs __construct

[mtweb] / mw / env / modules / mw_env_cli.php

diff --git a/mw/env/modules/mw_env_cli.php b/mw/env/modules/mw_env_cli.php
index 33dd0fb..adac17d 100644 (file)
--- a/mw/env/modules/mw_env_cli.php
+++ b/mw/env/modules/mw_env_cli.php
@@ -2,14 +2,14 @@
 
   class mw_env_cli extends mw_env{
 
-    var $argv;
-    var $etat;
-    var $login;
-    var $password;
-    var $params;
-    var $INITED;
+    public $argv;
+    public $etat;
+    public $login;
+    public $password;
+    public $params;
+    public $INITED;
 
-    function run_cli($argv){
+    public function run_cli($argv){
       if(PHP_SAPI != "cli"){
         $this->INITED = false;
         return "php cli uniquement";
@@ -34,11 +34,11 @@
       return true;
     }
 
-    function inited(){
+    public function inited(){
       return isset($this->INITED) && $this->INITED;
     }
 
-    function parse_cli_arguments(){
+    public function parse_cli_arguments(){
       if(!$this->inited()) return "cli not inited";
       $FIRST = false;
       $SECOND = false;
@@ -61,11 +61,24 @@
           }
         }
         if(strlen($cmd_arg)){
+          $param_name = "";
+          $param_value = "";
           if(($k = strpos($cmd_arg, "=")) === false){
-            $this->params[$cmd_arg] = "";
+            foreach($this->get_PARAMS() as $_key => $_value) if(strcmp($cmd_arg, $_value) == 0){
+              $param_name = $_key;
+              break;
+            }
           }
           elseif($k != 0){
-            $this->params[substr($cmd_arg, 0, $k)] = substr($cmd_arg, $k + 1);
+            $_cmd_arg = substr($cmd_arg, 0, $k);
+            foreach($this->get_PARAMS() as $_key => $_value) if(strcmp($_cmd_arg, $_value) == 0){
+              $param_name = $_key;
+              $param_value = substr($cmd_arg, $k + 1);
+              break;
+            }
+          }
+          if($param_name){
+            $this->params[$param_name] = $param_value;
           }
         }
       }
@@ -74,7 +87,7 @@
       return true;
     }
 
-    function init_cli_user(){
+    public function init_cli_user(){
       if(!$this->inited()) return "cli not inited";
       $data = $this->data();
       if($this->login){
@@ -102,7 +115,7 @@
       return true;
     }
 
-    function cmd_prompt($prompt, $SILENT = false){
+    public function cmd_prompt($prompt, $SILENT = false){
       if(preg_match('/^win/i', PHP_OS)){
         $vbscript = sys_get_temp_dir().'prompt_password.vbs';
         file_put_contents(
@@ -128,5 +141,3 @@
     }
 
   }
-
-?>
\ No newline at end of file