X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_configRegistry.inc;h=d97aa66ae8aa2676e76ef3fa22ea049444d72760;hb=5c2d01aab3c13cca9f03b4983a3a00b4ea47ae51;hp=22d84c49bf17ec1c87c5462ad288352857c86179;hpb=6f437b3335f1b7c24f52c7c2218b04e3bdea690c;p=gosa.git

diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index 22d84c49b..d97aa66ae 100644
--- a/gosa-core/include/class_configRegistry.inc
+++ b/gosa-core/include/class_configRegistry.inc
@@ -4,8 +4,6 @@ class configRegistry{
 
     public $config = NULL;
     public $properties = array();
-    public $mapByClass = array();
-    public $mapPropertyToClass = array();
     public $ldapStoredProperties = array(); 
     public $fileStoredProperties = array(); 
     public $classToName = array(); 
@@ -14,7 +12,6 @@ class configRegistry{
 
     function __construct($config)
     {
-        restore_error_handler();
         $this->config = &$config;
         $this->reload();
     }
@@ -30,9 +27,7 @@ class configRegistry{
         $this->ldapStoredProperties = array();
         $this->fileStoredProperties = array();
         $this->properties = array();
-        $this->mapByClass = array();
         $this->mapByName = array();
-        $this->mapPropertyToClass = array();
 
         // Search for config flags defined in the config file (TAB section)
         foreach($this->config->data['TABS'] as $tabname => $tabdefs){
@@ -93,13 +88,13 @@ class configRegistry{
                 // Register Post Events (postmodfiy,postcreate,postremove,checkhook)
                 if(isset($def['plShortName'])){
                     $this->classToName[$cname] = $def['plShortName'];
-                    $data = array('name' => 'postcreate','type' => 'string');
+                    $data = array('name' => 'postcreate','type' => 'command');
                     $this->register($cname, $data);    
-                    $data = array('name' => 'postremove','type' => 'string');
+                    $data = array('name' => 'postremove','type' => 'command');
                     $this->register($cname, $data);    
-                    $data = array('name' => 'postmodify','type' => 'string');
+                    $data = array('name' => 'postmodify','type' => 'command');
                     $this->register($cname, $data);    
-                    $data = array('name' => 'checkhook', 'type' => 'string');
+                    $data = array('name' => 'check', 'type' => 'command');
                     $this->register($cname, $data);    
                 }
 
@@ -116,9 +111,8 @@ class configRegistry{
     {
         $id = count($this->properties);
         $this->properties[$id] = new gosaProperty($this,$class,$data);
-        $this->mapByName[$class][strtolower($data['name'])] = $id;
-        $this->mapByClass[$class][] = $id;
-        $this->mapPropertyToClass[$id] = $class;
+        $p = strtolower("{$class}::{$data['name']}");
+        $this->mapByName[$p] = $id;
     }
 
     public function getAllProperties()
@@ -127,16 +121,18 @@ class configRegistry{
     }
 
     function propertyExists($class,$name)
-    {
-        return(isset($this->mapByName[$class][strtolower($name)]));
+    {       
+        $p = strtolower("{$class}::{$name}");
+        return(isset($this->mapByName[$p]));
     }
 
     private function getId($class,$name)
     {
-        if(!isset($this->mapByName[$class][strtolower($name)])){
+        $p = strtolower("{$class}::{$name}");
+        if(!isset($this->mapByName[$p])){
             return(-1);
         }       
-        return($this->mapByName[$class][strtolower($name)]);    
+        return($this->mapByName[$p]);    
     }
 
     function getProperty($class,$name)
@@ -180,8 +176,10 @@ class gosaProperty
     protected $name = "";
     protected $class = "";
     protected $value = "";
+    protected $tmp_value = "";  // Used when modified but not saved 
     protected $type = "string";
     protected $default = "";
+    protected $defaults = "";
     protected $description = "";
     protected $check = "";
     protected $migrate = "";
@@ -199,7 +197,7 @@ class gosaProperty
     protected $status = 'undefined';
 
     protected $attributes = array('name','type','default','description','check',
-            'migrate','mandatory','group');
+            'migrate','mandatory','group','defaults');
 
     function __construct($parent,$classname,$data)
     {
@@ -219,6 +217,61 @@ class gosaProperty
         $this->_restoreCurrentValue(); 
     }
 
+    function check()
+    {
+        $val = $this->getValue(TRUE);
+        $return = TRUE;
+        if($this->mandatory && empty($val)){
+            msg_dialog::display(_("Error"), msgPool::required(_($this->name)), ERROR_DIALOG);
+            $return = FALSE;
+        }
+
+        $check = $this->getCheck();
+        if(!empty($val) && !empty($check)){
+            $res = call_user_func(preg_split("/::/", $this->check),$messages=TRUE, $this->class,$this->name,$val, $this->type);
+            if(!$res){
+                msg_dialog::display(_("Error"), msgPool::invalid(_($this->name)), ERROR_DIALOG);
+                $return = FALSE;
+            }
+        }
+        return($return);
+    }
+
+    static function isBool($message,$class,$name,$value, $type)
+    {
+        return(in_array($value,array('true','false','')));
+    }
+
+    static function isInteger($message,$class,$name,$value, $type)
+    {
+        return(is_numeric($value) && !preg_match("/[^0-9]/", $value));
+    }
+
+    static function isPath($message,$class,$name,$value, $type)
+    {
+        return(TRUE);
+    }
+
+    static function isWriteablePath($message,$class,$name,$value, $type)
+    {
+        return(!empty($value)&&is_writeable($value));
+    }
+
+    static function isCommand($message,$class,$name,$value, $type)
+    {
+        return(TRUE);
+    }
+
+    static function isDn($message,$class,$name,$value, $type)
+    {
+        return(preg_match("/^([a-z]*=[^=,]*,)*[^=]*=[^=]*$/i", $value));
+    }
+
+    static function isRdn($message,$class,$name,$value, $type)
+    {
+        return(preg_match("/^([a-z]*=[^=,]*,)*[^=]*=[^=]*$/i", $value));
+    }
+
     private function _restoreCurrentValue()
     {
     
@@ -242,7 +295,6 @@ class gosaProperty
         }
     }
 
-    function getValue() { return($this->value); }
     function getMigrate() { return($this->migrate); }
     function getCheck() { return($this->check); }
     function getName() { return($this->name); }
@@ -251,14 +303,26 @@ class gosaProperty
     function getType() { return($this->type); }
     function getDescription() { return($this->description); }
     function getDefault() { return($this->default); }
+    function getDefaults() { return($this->defaults); }
     function getStatus() { return($this->status); }
     function isMandatory() { return($this->mandatory); }
 
     function setValue($str) 
     {
-        if($this->value != $str){
+        if(in_array($this->getStatus(), array('modified'))){
+            $this->tmp_value = $str; 
+        }elseif($this->value != $str){
             $this->setStatus('modified'); 
-            $this->value = $str; 
+            $this->tmp_value = $str; 
+        }
+    }
+
+    function getValue($temporary = FALSE) 
+    { 
+        if($temporary && in_array($this->getStatus(), array('modified'))){
+            return($this->tmp_value); 
+        }else{ 
+            return($this->value); 
         }
     }
 
@@ -274,7 +338,6 @@ class gosaProperty
     function save()
     {
         if($this->getStatus() == 'modified'){
-
             $ldap = $this->parent->config->get_ldap_link();
             $ldap->cd($this->parent->config->current['BASE']);
             $dn = "cn={$this->class},".$this->parent->config->current['CONFIG'];
@@ -284,13 +347,12 @@ class gosaProperty
                 $data = array(
                         'cn' => $this->class, 
                         'objectClass' => array('top','gosaConfig'),
-                        'gosaSetting' => $this->name.":".$this->value);
+                        'gosaSetting' => $this->name.":".$this->tmp_value);
 
                 $ldap->add($data);
                 if(!$ldap->success()){
                     echo $ldap->get_error();
                 }
-                $this->_restoreCurrentValue();
 
             }else{
                 $attrs = $ldap->fetch();
@@ -299,19 +361,19 @@ class gosaProperty
                 for($i = 0;$i<$attrs['gosaSetting']['count']; $i ++){
                     $set = $attrs['gosaSetting'][$i];
                     if(preg_match("/^{$this->name}:/", $set)){
-                        $set = "{$this->name}:{$this->value}";
+                        $set = "{$this->name}:{$this->tmp_value}";
                         $found = true;
                     }
                     $data['gosaSetting'][] = $set;
                 }
-                if(!$found) $data['gosaSetting'][] = "{$this->name}:{$this->value}";
+                if(!$found) $data['gosaSetting'][] = "{$this->name}:{$this->tmp_value}";
                 $ldap->cd($dn);
                 $ldap->modify($data);
                 if(!$ldap->success()){
                     echo $ldap->get_error();
                 }
-                $this->_restoreCurrentValue();
             } 
+            $this->_restoreCurrentValue();
         }elseif($this->getStatus() == 'removed'){
             $ldap = $this->parent->config->get_ldap_link();
             $ldap->cd($this->parent->config->current['BASE']);