diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index 3e9cb3b275bbc7873ac2148d4252c1c5eb3634c0..0f623ee08366720af8f7c422d76a23d7750183fa 100644 (file)
public $config = NULL;
public $properties = array();
- public $mapByClass = array();
- public $mapPropertyToClass = array();
public $ldapStoredProperties = array();
public $fileStoredProperties = array();
public $classToName = array();
$this->ldapStoredProperties = array();
$this->fileStoredProperties = array();
$this->properties = array();
- $this->mapByClass = array();
- $this->mapPropertyToClass = array();
-
- // Search for config flags defined in the config file
+ $this->mapByName = array();
+
+ // Search for config flags defined in the config file (TAB section)
foreach($this->config->data['TABS'] as $tabname => $tabdefs){
foreach($tabdefs as $info){
}
}
+ // Search for config flags defined in the config file (MAIN section)
+ foreach($this->config->data['MAIN'] as $name => $value){
+ $this->fileStoredProperties['core'][strtolower($name)] = $value;
+ }
+
+ // Search for config flags defined in the config file (Current LOCATION section)
+ if(isset($this->config->current)){
+ foreach($this->config->current as $name => $value){
+ $this->fileStoredProperties['core'][strtolower($name)] = $value;
+ }
+ }
+
// Search for all config flags defined in the LDAP - BUT only if we ARE logged in.
if(!empty($this->config->current['CONFIG'])){
$ldap = $this->config->get_ldap_link();
}
$this->status = 'finished';
}
-
+
global $class_mapping;
foreach ($class_mapping as $cname => $path){
$cmethods = get_class_methods($cname);
{
$id = count($this->properties);
$this->properties[$id] = new gosaProperty($this,$class,$data);
- $this->mapByName[$class][$data['name']] = $id;
- $this->mapByClass[$class][] = $id;
- $this->mapPropertyToClass[$id] = $class;
+ $p = strtolower("{$class}::{$data['name']}");
+ $this->mapByName[$p] = $id;
}
public function getAllProperties()
}
function propertyExists($class,$name)
- {
- return(isset($this->mapByName[$class][$name]));
+ {
+ $p = strtolower("{$class}::{$name}");
+ return(isset($this->mapByName[$p]));
}
private function getId($class,$name)
{
- return($this->mapByName[$class][$name]);
+ $p = strtolower("{$class}::{$name}");
+ if(!isset($this->mapByName[$p])){
+ return(-1);
+ }
+ return($this->mapByName[$p]);
}
function getProperty($class,$name)
foreach($this->properties as $prop){
$prop->save();
}
+ $this->reload(TRUE);
}
}
if(isset($data[$aName])){
$this->$aName = $data[$aName];
}
- }
+ }
+
+ // Initialize with the current value
+ $this->_restoreCurrentValue();
+ }
+ private function _restoreCurrentValue()
+ {
+
// First check for values in the LDAP Database.
if(isset($this->parent->ldapStoredProperties[$this->class][$this->name])){
$this->setStatus('ldap');
$this->value = $this->parent->ldapStoredProperties[$this->class][$this->name];
+ return;
}
// Second check for values in the config file.
- if(isset($this->parent->fileStoredProperties[$this->class][$this->name])){
+ if(isset($this->parent->fileStoredProperties[$this->class][strtolower($this->name)])){
$this->setStatus('file');
- $this->value = $this->parent->fileStoredProperties[$this->class][$this->name];
+ $this->value = $this->parent->fileStoredProperties[$this->class][strtolower($this->name)];
+ return;
}
// If there still wasn't found anything then fallback to the default.
function setValue($str)
{
- $this->setStatus('modified');
- $this->value = $str;
+ if($this->value != $str){
+ $this->setStatus('modified');
+ $this->value = $str;
+ }
}
function restoreDefault()
{
- $this->setStatus('removed');
+ if(in_array($this->getStatus(),array('ldap'))){
+ $this->setStatus('removed');
+ }elseif(in_array($this->getStatus(),array('modified'))){
+ $this->_restoreCurrentValue();
+ }
}
function save()
if(!$ldap->count()){
$ldap->cd($dn);
$data = array(
- 'cn' => $this->class,
- 'objectClass' => array('top','gosaConfig'),
- 'gosaSetting' => $this->name.":".$this->value);
+ 'cn' => $this->class,
+ 'objectClass' => array('top','gosaConfig'),
+ 'gosaSetting' => $this->name.":".$this->value);
$ldap->add($data);
- if($ldap->success()){
- $this->status = 'ldap';
- }else{
+ if(!$ldap->success()){
echo $ldap->get_error();
}
+ $this->_restoreCurrentValue();
+
}else{
$attrs = $ldap->fetch();
$data = array();
if(!$found) $data['gosaSetting'][] = "{$this->name}:{$this->value}";
$ldap->cd($dn);
$ldap->modify($data);
- if($ldap->success()){
- $this->status = 'ldap';
- }else{
+ if(!$ldap->success()){
echo $ldap->get_error();
}
+ $this->_restoreCurrentValue();
}
}elseif($this->getStatus() == 'removed'){
$ldap = $this->parent->config->get_ldap_link();
$dn = "cn={$this->class},".$this->parent->config->current['CONFIG'];
$ldap->cat($dn);
$attrs = $ldap->fetch();
- $data = array();
+ $data = array('gosaSetting' => array());
for($i = 0;$i<$attrs['gosaSetting']['count']; $i ++){
$set = $attrs['gosaSetting'][$i];
if(preg_match("/^{$this->name}:/", $set)){
}
$ldap->cd($dn);
$ldap->modify($data);
- if($ldap->success()){
- $this->status = 'undefined';
-
- // Second check for values in the config file.
- if(isset($this->parent->fileStoredProperties[$this->class][$this->name])){
- $this->setStatus('file');
- $this->value = $this->parent->fileStoredProperties[$this->class][$this->name];
- }
-
- // If there still wasn't found anything then fallback to the default.
- if($this->getStatus() == 'undefined'){
- $this->value = $this->getDefault();
- }
-
- }else{
+ if(!$ldap->success()){
echo $ldap->get_error();
}
+ $this->_restoreCurrentValue();
}
}