![[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 d9fcfde6178d04031c78545fbb91e5c7c2ddae39..d2c71a5946dadc093e145ef78618a49b79bb6d5b 100644 (file)
}
}
+ // Search for config flags defined in the config file (MENU section)
+ foreach($this->config->data['MENU'] as $section => $entries){
+ foreach($entries as $entry){
+ if(count($entry) > 2 && isset($entry['CLASS'])){
+ $class = $entry['CLASS'];
+ foreach($entry as $name => $value){
+ if(!in_array($name, array('CLASS','ACL'))){
+ $this->fileStoredProperties[strtolower($class)][strtolower($name)] = $value;
+ }
+ }
+ }
+ }
+ }
+
// 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;
function saveChanges()
{
+ $migrate = array();
foreach($this->properties as $prop){
- $prop->save();
+
+ // Is this property modified
+ if(in_array($prop->getStatus(),array('modified','removed'))){
+
+ // Check if we've to migrate something before we can make the changes effective.
+ if($prop->migrationRequired()){
+ $migrate[] = $prop;
+ }else{
+ $prop->save();
+ }
+ }
}
- $this->reload(TRUE);
+ return($migrate);
}
}
protected $parent = NULL;
protected $data = array();
+ protected $migrationClass = NULL;
+
/*! The current property status
* 'ldap' Property is stored in ldap
* 'file' Property is stored in the config file
protected $attributes = array('name','type','default','description','check',
'migrate','mandatory','group','defaults');
+
+
+
function __construct($parent,$classname,$data)
{
// Set some basic infos
// Initialize with the current value
$this->_restoreCurrentValue();
+
+ }
+
+ function migrationRequired()
+ {
+ // Instantiate migration class
+ if(!empty($this->migrate) && $this->migrationClass == NULL){
+ if(!class_available($this->migrate)){
+ trigger_error("Cannot start migration for gosaProperty::'{$this->getName()}' class not found ({$this->migrate})!");
+ }else{
+ $class = $this->migrate;
+ $tmp = new $class($this->parent->config,$this);
+ if(! $tmp instanceof propertyMigration){
+ trigger_error("Cannot start migration for gosaProperty::'{$this->getName()}' doesn't implement propertyMigration!");
+ }else{
+ $this->migrationClass = $tmp;
+ }
+ }
+ }
+ if(empty($this->migrate) || $this->migrationClass == NULL){
+ return(FALSE);
+ }
+ return($this->migrationClass->checkForIssues());
+ }
+
+ function getMigrationClass()
+ {
+ return($this->migrationClass);
}
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;
}
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;
}
}
static function isBool($message,$class,$name,$value, $type)
{
- return(in_array($value,array('true','false','')));
+ $match = in_array($value,array('true','false',''));
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+ msg_dialog::display(_("Warning"), msgPool::invalid($name,$value,"",_("Use 'true', 'false' or empty if allowed")), WARNING_DIALOG);
+ }
+
+ return($match);
}
static function isString($message,$class,$name,$value, $type)
{
- return(TRUE);
+ $match = TRUE;
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+ msg_dialog::display(_("Warning"), msgPool::invalid($name), WARNING_DIALOG);
+ }
+
+ return($match);
}
static function isInteger($message,$class,$name,$value, $type)
{
- return(is_numeric($value) && !preg_match("/[^0-9]/", $value));
+ $match = is_numeric($value) && !preg_match("/[^0-9]/", $value);
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+ msg_dialog::display(_("Warning"), msgPool::invalid($name, $value,'/[0-9]/'), WARNING_DIALOG);
+ }
+
+ return($match);
}
static function isPath($message,$class,$name,$value, $type)
{
- return(TRUE);
+ $match = TRUE;
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+ msg_dialog::display(_("Warning"), msgPool::invalid($name), WARNING_DIALOG);
+ }
+
+ return($match);
}
static function isWriteablePath($message,$class,$name,$value, $type)
{
- return(!empty($value)&&is_writeable($value));
+ $match = !empty($value)&&is_dir($value)&&is_writeable($value);
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+
+ if(!is_dir($value)){
+ msg_dialog::display(_("Warning"), sprintf(_("The specified folder does not exists '%s'."), $value), WARNING_DIALOG);
+ }elseif(!is_writeable($value)){
+ msg_dialog::display(_("Warning"), sprintf(_("The specified folder cannot be used for writing '%s'."), $value), WARNING_DIALOG);
+ }
+ }
+
+ return($match);
}
static function isReadableFile($message,$class,$name,$value, $type)
{
- return(!empty($value)&&is_readable($value)&&is_file($value));
+ $match = !empty($value) && is_readable($value) && is_file($value);
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+
+ if(!is_file($value)){
+ msg_dialog::display(_("Warning"), sprintf(_("The specified file does not exists '%s'."), $value), WARNING_DIALOG);
+ }elseif(!is_readable($value)){
+ msg_dialog::display(_("Warning"), sprintf(_("The specified file cannot be used for reading '%s'."), $value), WARNING_DIALOG);
+ }
+ }
+
+ return($match);
}
static function isCommand($message,$class,$name,$value, $type)
{
- return(TRUE);
+ $match = TRUE;
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+ msg_dialog::display(_("Warning"), msgPool::cmdinvalid($name,$value), WARNING_DIALOG);
+ }
+
+ return($match);
}
static function isDn($message,$class,$name,$value, $type)
{
- return(preg_match("/^([a-z]*=[^=,]*,)*[^=]*=[^=]*$/i", $value));
+ $match = preg_match("/^([a-z]*=[^=,]*,)*[^=]*=[^=]*$/i", $value);
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+ msg_dialog::display(_("Warning"), msgPool::invalid($name,$value,'','cn=user,ou=people,dc=example,dc=de'), WARNING_DIALOG);
+ }
+
+ return($match);
}
static function isRdn($message,$class,$name,$value, $type)
{
- return(preg_match("/^([a-z]*=[^=,]*,)*[^=]*=[^=]*$/i", $value));
+ $match = preg_match("/^([a-z]*=[^=,]*,)*[^=]*=[^=]*,$/i", $value);
+
+ // Display the reason for failing this check.
+ if($message && ! $match){
+ msg_dialog::display(_("Warning"), msgPool::invalid($name,$value,'','ou=people,'), WARNING_DIALOG);
+ }
+
+ return($match);
}
private function _restoreCurrentValue()
}
// Second check for values in the config file.
- if(isset($this->parent->fileStoredProperties[$this->class][strtolower($this->name)])){
+ if(isset($this->parent->fileStoredProperties[strtolower($this->class)][strtolower($this->name)])){
$this->setStatus('file');
- $this->value = $this->parent->fileStoredProperties[$this->class][strtolower($this->name)];
+ $this->value = $this->parent->fileStoredProperties[strtolower($this->class)][strtolower($this->name)];
return;
}
if(!$ldap->success()){
echo $ldap->get_error();
}
- }
- $this->_restoreCurrentValue();
+ }
+ $this->value = $this->tmp_value;
+ $this->setStatus('ldap');
}elseif($this->getStatus() == 'removed'){
$ldap = $this->parent->config->get_ldap_link();
$ldap->cd($this->parent->config->current['BASE']);
}
}
+
+
+interface propertyMigration
+{
+ function __construct($config,$property);
+}
+
+
?>