![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index 1b9cacde23e74fe6491f13dbd8122f78f09c2a7b..22e3e16c2264a9a80c937a316c7373f88b925f1b 100644 (file)
public $config = NULL;
public $properties = array();
- public $mapByClass = array();
- public $mapPropertyToClass = array();
public $ldapStoredProperties = array();
public $fileStoredProperties = array();
public $classToName = array();
// Do not reload the properties everytime, once we have
// everything loaded and registrered skip the reload.
// Status is 'finished' once we had a ldap connection (logged in)
-
- $force = TRUE;
-
if(!$force && $this->status == 'finished') return;
// Reset everything
$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)
}
return("");
}
+
+ function saveChanges()
+ {
+ foreach($this->properties as $prop){
+ $prop->save();
+ }
+ $this->reload(TRUE);
+ }
}
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 = "";
protected $mandatory = FALSE;
+ protected $group = "default";
protected $parent = NULL;
protected $data = array();
protected $status = 'undefined';
protected $attributes = array('name','type','default','description','check',
- 'migrate','mandatory');
+ 'migrate','mandatory','group','defaults');
function __construct($parent,$classname,$data)
{
if(isset($data[$aName])){
$this->$aName = $data[$aName];
}
- }
+ }
+
+ // Initialize with the current value
+ $this->_restoreCurrentValue();
+ }
+
+ 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(TRUE);
+ }
+
+ static function isRdn($message,$class,$name,$value, $type)
+ {
+ return(TRUE);
+ }
+
+ 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 getValue() { return($this->value); }
+ function getMigrate() { return($this->migrate); }
+ function getCheck() { return($this->check); }
function getName() { return($this->name); }
function getClass() { return($this->class); }
+ function getGroup() { return($this->group); }
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)
{
- $this->setStatus('modified');
- $this->value = $str;
+ if($this->value != $str){
+ $this->setStatus('modified');
+ $this->tmp_value = $str;
+ }
+ }
+
+ function getValue($temporary = FALSE)
+ {
+ if($temporary && in_array($this->getStatus(), array('modified'))){
+ return($this->tmp_value);
+ }else{
+ return($this->value);
+ }
+ }
+
+ function restoreDefault()
+ {
+ if(in_array($this->getStatus(),array('ldap'))){
+ $this->setStatus('removed');
+ }elseif(in_array($this->getStatus(),array('modified'))){
+ $this->_restoreCurrentValue();
+ }
}
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'];
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->tmp_value);
$ldap->add($data);
- if($ldap->success()){
- $this->status = 'ldap';
- }else{
+ if(!$ldap->success()){
echo $ldap->get_error();
}
+
}else{
$attrs = $ldap->fetch();
$data = array();
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()){
- $this->status = 'ldap';
- }else{
+ if(!$ldap->success()){
echo $ldap->get_error();
}
}
+ $this->_restoreCurrentValue();
+ }elseif($this->getStatus() == 'removed'){
+ $ldap = $this->parent->config->get_ldap_link();
+ $ldap->cd($this->parent->config->current['BASE']);
+ $dn = "cn={$this->class},".$this->parent->config->current['CONFIG'];
+ $ldap->cat($dn);
+ $attrs = $ldap->fetch();
+ $data = array('gosaSetting' => array());
+ for($i = 0;$i<$attrs['gosaSetting']['count']; $i ++){
+ $set = $attrs['gosaSetting'][$i];
+ if(preg_match("/^{$this->name}:/", $set)){
+ continue;
+ }
+ $data['gosaSetting'][] = $set;
+ }
+ $ldap->cd($dn);
+ $ldap->modify($data);
+ if(!$ldap->success()){
+ echo $ldap->get_error();
+ }
+ $this->_restoreCurrentValue();
}
}
private function setStatus($state)
{
- if(!in_array($state, array('ldap','file','undefined','modified'))) {
+ if(!in_array($state, array('ldap','file','undefined','modified','removed'))) {
trigger_error("Unknown property status given '{$state}' for {$this->class}:{$this->name}!");
}else{
$this->status = $state;