Commit 91f8745d authored by alban's avatar alban

[fix] m_variables multidimensinal values parsing and better documentation

parent f79daf1f
...@@ -39,6 +39,11 @@ class m_variables { ...@@ -39,6 +39,11 @@ class m_variables {
var $replace_array = array(); var $replace_array = array();
var $cache_conf = array(); var $cache_conf = array();
const TYPE_STRING = "string";
const TYPE_BOOLEAN = "boolean";
const TYPE_INTEGER = "integer";
const TYPE_IP = "ip";
/** /**
* *
* @global string $L_FQDN * @global string $L_FQDN
...@@ -170,10 +175,17 @@ class m_variables { ...@@ -170,10 +175,17 @@ class m_variables {
// Replace needed vars // Replace needed vars
foreach ($variables as $vv => $hh) { foreach ($variables as $vv => $hh) {
if (!isset($hh['value']) || empty($hh['value'])) { if (!isset($hh['value']) || empty($hh['value'])) {
continue; continue;
} }
$variables[$vv]['value'] = strtr($hh['value'], $this->replace_array ); if( is_array($hh['value'])){
foreach($hh["value"] as $key => $val){
$variables[$vv]['value'][$key] = strtr($hh['value'][$key], $this->replace_array );
}
}
else{
$variables[$vv]['value'] = strtr($hh['value'], $this->replace_array );
}
} }
if ($var && isset($variables[$var])) { if ($var && isset($variables[$var])) {
...@@ -199,23 +211,30 @@ class m_variables { ...@@ -199,23 +211,30 @@ class m_variables {
/** /**
* Return a persistent variable. * Return a persistent variable.
* *
* @param string $name * @param string $name The name of the variable to return.
* The name of the variable to return. * @param mixed $default The default value to use if this variable has never been set.
* @param mixed $default * @param string $createit_comment If variable doesn't exist, create it with the default value
* The default value to use if this variable has never been set. * and createit_comment value as comment
* @param string $createit_comment * @param array $type An array defining the variable definition
* If variable doesn't exist, create it with the default value * ex: array("ns1"=>array('desc'=>'ns name','type'=>'string'),"ip"=>array("desc"=>"here an ip", "type"=>"ip")
* and createit_comment value as comment * ex: array('desc'=>'ns name','type'=>'string')
* @return mixed * Types can be either
* The value of the variable. * self::TYPE_BOOLEAN
* self::TYPE_INTEGER
* self::TYPE_IP
* self::TYPE_STRING
*
* @return mixed The value of the variable.
*/ */
function variable_get($name, $default = null, $createit_comment = null, $type=null) { function variable_get($name, $default = null, $createit_comment = null, $type = null) {
$this->variable_init_maybe(); $this->variable_init_maybe();
if (isset($this->cache_conf[$name])) { // Attempts to retrieve $name
return $this->cache_conf[$name]['value']; if (array_key_exists("$name", $this->cache_conf) && !is_null($this->cache_conf["$name"])) {
} elseif (!is_null($createit_comment)) { return $this->cache_conf["$name"]["value"];
}
if (!is_null($createit_comment)) {
$this->variable_update_or_create($name, $default, 'DEFAULT', 'null', 'null', $createit_comment, $type); $this->variable_update_or_create($name, $default, 'DEFAULT', 'null', 'null', $createit_comment, $type);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment