diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index acfc29171f768be715469c2cd4e7b5be39e577a4..d97aa66ae8aa2676e76ef3fa22ea049444d72760 100644 (file)
public $config = NULL;
public $properties = array();
public $config = NULL;
public $properties = array();
- public $mapByClass = array();
- public $mapPropertyToClass = array();
public $ldapStoredProperties = array();
public $fileStoredProperties = array();
public $classToName = array();
public $ldapStoredProperties = array();
public $fileStoredProperties = array();
public $classToName = array();
function __construct($config)
{
function __construct($config)
{
- restore_error_handler();
$this->config = &$config;
$this->reload();
}
$this->config = &$config;
$this->reload();
}
$this->ldapStoredProperties = array();
$this->fileStoredProperties = array();
$this->properties = array();
$this->ldapStoredProperties = array();
$this->fileStoredProperties = array();
$this->properties = array();
- $this->mapByClass = array();
$this->mapByName = 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){
// Search for config flags defined in the config file (TAB section)
foreach($this->config->data['TABS'] as $tabname => $tabdefs){
// Register Post Events (postmodfiy,postcreate,postremove,checkhook)
if(isset($def['plShortName'])){
$this->classToName[$cname] = $def['plShortName'];
// 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);
$this->register($cname, $data);
- $data = array('name' => 'postremove','type' => 'string');
+ $data = array('name' => 'postremove','type' => 'command');
$this->register($cname, $data);
$this->register($cname, $data);
- $data = array('name' => 'postmodify','type' => 'string');
+ $data = array('name' => 'postmodify','type' => 'command');
$this->register($cname, $data);
$this->register($cname, $data);
- $data = array('name' => 'checkhook', 'type' => 'string');
+ $data = array('name' => 'check', 'type' => 'command');
$this->register($cname, $data);
}
$this->register($cname, $data);
}
{
$id = count($this->properties);
$this->properties[$id] = new gosaProperty($this,$class,$data);
{
$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()
}
public function getAllProperties()
}
function propertyExists($class,$name)
}
function propertyExists($class,$name)
- {
- return(isset($this->mapByName[$class][$name]));
+ {
+ $p = strtolower("{$class}::{$name}");
+ return(isset($this->mapByName[$p]));
}
private function getId($class,$name)
{
}
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)
}
function getProperty($class,$name)
protected $name = "";
protected $class = "";
protected $value = "";
protected $name = "";
protected $class = "";
protected $value = "";
+ protected $tmp_value = ""; // Used when modified but not saved
protected $type = "string";
protected $default = "";
protected $type = "string";
protected $default = "";
+ protected $defaults = "";
protected $description = "";
protected $check = "";
protected $migrate = "";
protected $description = "";
protected $check = "";
protected $migrate = "";
protected $status = 'undefined';
protected $attributes = array('name','type','default','description','check',
protected $status = 'undefined';
protected $attributes = array('name','type','default','description','check',
- 'migrate','mandatory','group');
+ 'migrate','mandatory','group','defaults');
function __construct($parent,$classname,$data)
{
function __construct($parent,$classname,$data)
{
$this->_restoreCurrentValue();
}
$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()
{
private function _restoreCurrentValue()
{
}
}
}
}
- function getValue() { return($this->value); }
function getMigrate() { return($this->migrate); }
function getCheck() { return($this->check); }
function getName() { return($this->name); }
function getMigrate() { return($this->migrate); }
function getCheck() { return($this->check); }
function getName() { return($this->name); }
function getType() { return($this->type); }
function getDescription() { return($this->description); }
function getDefault() { return($this->default); }
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)
{
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->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);
}
}
}
}
function save()
{
if($this->getStatus() == 'modified'){
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'];
$ldap = $this->parent->config->get_ldap_link();
$ldap->cd($this->parent->config->current['BASE']);
$dn = "cn={$this->class},".$this->parent->config->current['CONFIG'];
$data = array(
'cn' => $this->class,
'objectClass' => array('top','gosaConfig'),
$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();
}
$ldap->add($data);
if(!$ldap->success()){
echo $ldap->get_error();
}
- $this->_restoreCurrentValue();
}else{
$attrs = $ldap->fetch();
}else{
$attrs = $ldap->fetch();
for($i = 0;$i<$attrs['gosaSetting']['count']; $i ++){
$set = $attrs['gosaSetting'][$i];
if(preg_match("/^{$this->name}:/", $set)){
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;
}
$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();
}
$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']);
}elseif($this->getStatus() == 'removed'){
$ldap = $this->parent->config->get_ldap_link();
$ldap->cd($this->parent->config->current['BASE']);