X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_configRegistry.inc;h=8f882a58eb469f8276fa745214e7694f4e4320bd;hb=d6c14bd5b34b7721593cd1b97eebff5bfc865922;hp=6cf1d32e2436663ed96c61f1049bc08fc18ce479;hpb=06b78bde2f89cfec78c2095466da8ca61c888245;p=gosa.git diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc index 6cf1d32e2..8f882a58e 100644 --- a/gosa-core/include/class_configRegistry.inc +++ b/gosa-core/include/class_configRegistry.inc @@ -10,12 +10,130 @@ class configRegistry{ public $status = 'none'; + // Excludes property values defined in ldap + public $ignoreLdapProperties = FALSE; + + // Contains all classes with plInfo + public $classesWithInfo = array(); + public $pluginRequirements = array(); + public $categoryToClass = array(); + + public $objectClasses = array(); + + public $schemaCheckFinished = FALSE; + function __construct($config) { $this->config = &$config; + + // Detect classes that have a plInfo method + global $class_mapping; + foreach ($class_mapping as $cname => $path){ + $cmethods = get_class_methods($cname); + if (is_array($cmethods) && in_array_ics('plInfo',$cmethods)){ + + // Get plugin definitions + $def = call_user_func(array($cname, 'plInfo'));; + + // Register Post Events (postmodfiy,postcreate,postremove,checkhook) + if(count($def)){ + $this->classesWithInfo[$cname] = $def; + } + } + } + + // (Re)Load properties $this->reload(); } + + function validateSchemata($force = FALSE, $disableIncompatiblePlugins = FALSE,$displayMessage = FALSE) + { + // We can check the schemata only with a valid LDAP connection + if(empty($this->config->current['CONFIG'])){ + return(TRUE); + } + + // Don't do things twice unless forced + if($this->schemaCheckFinished && !$force) return; + + // Read objectClasses from ldap + if(!count($this->objectClasses)){ + $ldap = $this->config->get_ldap_link(); + $ldap->cd($this->config->current['BASE']); + $this->objectClasses = $ldap->get_objectclasses(); + } + + // Collect required schema infos + $this->pluginRequirements = array('ldapSchema' => array()); + $this->categoryToClass = array(); + foreach($this->classesWithInfo as $cname => $defs){ + if(isset($defs['plRequirements']['ldapSchema'])){ + $this->pluginRequirements['ldapSchema'][$cname] = $defs['plRequirements']['ldapSchema']; + } + } + + // Check schema requirements now + $missing = $invalid = array(); + foreach($this->pluginRequirements['ldapSchema'] as $cname => $requirements){ + foreach($requirements as $oc => $version){ + if(!$this->ocAvailable($oc)){ + $missing[] = $oc; + }elseif(!empty($version)){ + $currentVersion = $this->getObjectClassVersion($oc); + if(!empty($currentVersion) && !$this->ocVersionMatch($version, $currentVersion)){ + if($currentVersion == -1){ + $currentVersion = _("unknown"); + } + $invalid[] = sprintf(_("%s has version %s but %s required!"), bold($oc),bold($currentVersion),bold($version)); + } + } + } + } + + if($displayMessage && count($missing)){ + msg_dialog::display(_("Schema validation error"), + sprintf(_("The following objectClasses are missing! %s"), msgPool::buildList($missing)), + ERROR_DIALOG); + } + if($displayMessage && count($invalid)){ + msg_dialog::display(_("Schema validation error"), + sprintf(_("The following objectClasses do not match the version requirements! %s"), msgPool::buildList($invalid)), + ERROR_DIALOG); + } + + $this->schemaCheckFinished =TRUE; + } + + function ocVersionMatch($required, $installed) + { + $operator = preg_replace('/^([=<>]*).*$/',"\\1",$required); + $required = preg_replace('/^[=<>]*(.*)$/',"\\1",$required); + return(version_compare($installed,$required, $operator)); + } + + + function getObjectClassVersion($oc) + { + if(!isset($this->objectClasses[$oc])){ + return(NULL); + }else{ + $version = -1; // unknown + if(preg_match("/(v[^)]*)/", $this->objectClasses[$oc]['DESC'])){ + $version = preg_replace('/^.*\(v([^)]*)\).*$/',"\\1", $this->objectClasses[$oc]['DESC']); + } + } + return($version); + } + + + // check wheter an objectClass is installed or not. + function ocAvailable($name) + { + return(isset($this->objectClasses[$name])); + } + + function reload($force = FALSE) { // Do not reload the properties everytime, once we have @@ -50,6 +168,20 @@ class configRegistry{ } } + // 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; @@ -62,6 +194,14 @@ class configRegistry{ } } + // Skip searching for LDAP defined properties if 'ignoreLdapProperties' is set to 'true' + // in the config. + $this->ignoreLdapProperties = FALSE; + if(isset($this->fileStoredProperties['core'][strtolower('ignoreLdapProperties')]) && + preg_match("/(true|on)/i", $this->fileStoredProperties['core'][strtolower('ignoreLdapProperties')])){ + $this->ignoreLdapProperties = TRUE; + } + // 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(); @@ -77,36 +217,29 @@ class configRegistry{ $this->status = 'finished'; } - global $class_mapping; - foreach ($class_mapping as $cname => $path){ - $cmethods = get_class_methods($cname); - if (is_array($cmethods) && in_array_ics('plInfo',$cmethods)){ - - // Get plugin definitions - $def = call_user_func(array($cname, 'plInfo'));; - - // Register Post Events (postmodfiy,postcreate,postremove,checkhook) - if(count($def)){ - - $name = $cname; - $name = (isset($def['plShortName'])) ? $def['plShortName'] : $cname; - $name = (isset($def['plDescription'])) ? $def['plDescription'] : $cname; - - $this->classToName[$cname] = $name; - $data = array('name' => 'postcreate','type' => 'command'); - $this->register($cname, $data); - $data = array('name' => 'postremove','type' => 'command'); - $this->register($cname, $data); - $data = array('name' => 'postmodify','type' => 'command'); - $this->register($cname, $data); - $data = array('name' => 'check', 'type' => 'command'); - $this->register($cname, $data); - } - - if(isset($def['plProperties'])){ - foreach($def['plProperties'] as $property){ - $this->register($cname, $property); - } + // Register plugin properties. + foreach ($this->classesWithInfo as $cname => $def){ + + // Detect class name + $name = $cname; + $name = (isset($def['plShortName'])) ? $def['plShortName'] : $cname; + $name = (isset($def['plDescription'])) ? $def['plDescription'] : $cname; + + // Register post events + $this->classToName[$cname] = $name; + $data = array('name' => 'postcreate','type' => 'command'); + $this->register($cname, $data); + $data = array('name' => 'postremove','type' => 'command'); + $this->register($cname, $data); + $data = array('name' => 'postmodify','type' => 'command'); + $this->register($cname, $data); + $data = array('name' => 'check', 'type' => 'command'); + $this->register($cname, $data); + + // Register properties + if(isset($def['plProperties'])){ + foreach($def['plProperties'] as $property){ + $this->register($cname, $property); } } } @@ -237,8 +370,12 @@ class gosaProperty // Initialize with the current value $this->_restoreCurrentValue(); + } + + function migrationRequired() + { // Instantiate migration class - if(!empty($this->migrate)){ + 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{ @@ -246,14 +383,11 @@ class gosaProperty $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; } - $this->migrationClass = $tmp; } } - } - - function migrationRequired() - { if(empty($this->migrate) || $this->migrationClass == NULL){ return(FALSE); } @@ -289,7 +423,10 @@ class gosaProperty // 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); + msg_dialog::display(_("Warning"), + sprintf(_("The value '%s' specified for '%s:%s' is invalid. A bool value is required here!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); } return($match); @@ -301,7 +438,10 @@ class gosaProperty // Display the reason for failing this check. if($message && ! $match){ - msg_dialog::display(_("Warning"), msgPool::invalid($name), WARNING_DIALOG); + msg_dialog::display(_("Warning"), + sprintf(_("The value '%s' specified for '%s:%s' is invalid. A string value is required here!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); } return($match); @@ -313,7 +453,10 @@ class gosaProperty // Display the reason for failing this check. if($message && ! $match){ - msg_dialog::display(_("Warning"), msgPool::invalid($name, $value,'/[0-9]/'), WARNING_DIALOG); + msg_dialog::display(_("Warning"), + sprintf(_("The value '%s' specified for '%s:%s' is invalid. A numeric value is required here!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); } return($match); @@ -321,27 +464,57 @@ class gosaProperty static function isPath($message,$class,$name,$value, $type) { - $match = TRUE; + $match = preg_match("#^(/[^/]*/){1}#", $value); // Display the reason for failing this check. if($message && ! $match){ - msg_dialog::display(_("Warning"), msgPool::invalid($name), WARNING_DIALOG); + msg_dialog::display(_("Warning"), + sprintf(_("The path '%s' specified for '%s:%s' is invalid!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); } return($match); } - static function isWriteablePath($message,$class,$name,$value, $type) + static function isReadablePath($message,$class,$name,$value, $type) { $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 folder '%s' specified for '%s:%s' does not exists!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); + }elseif(!is_readable($value)){ + msg_dialog::display(_("Warning"), + sprintf(_("The folder '%s' specified for '%s:%s' cannot be used for reading!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); + } + } + + return($match); + } + static function isWriteablePath($message,$class,$name,$value, $type) + { + $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); + msg_dialog::display(_("Warning"), + sprintf(_("The folder '%s' specified for '%s:%s' does not exists!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); }elseif(!is_writeable($value)){ - msg_dialog::display(_("Warning"), sprintf(_("The specified folder cannot be used for writing '%s'."), $value), WARNING_DIALOG); + msg_dialog::display(_("Warning"), + sprintf(_("The folder '%s' specified for '%s:%s' cannot be used for writing!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); } } @@ -356,9 +529,15 @@ class gosaProperty if($message && ! $match){ if(!is_file($value)){ - msg_dialog::display(_("Warning"), sprintf(_("The specified file does not exists '%s'."), $value), WARNING_DIALOG); + msg_dialog::display(_("Warning"), + sprintf(_("The file '%s' specified for '%s:%s' does not exists!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); }elseif(!is_readable($value)){ - msg_dialog::display(_("Warning"), sprintf(_("The specified file cannot be used for reading '%s'."), $value), WARNING_DIALOG); + msg_dialog::display(_("Warning"), + sprintf(_("The file '%s' specified for '%s:%s' cannot be read!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); } } @@ -371,7 +550,10 @@ class gosaProperty // Display the reason for failing this check. if($message && ! $match){ - msg_dialog::display(_("Warning"), msgPool::cmdinvalid($name,$value), WARNING_DIALOG); + msg_dialog::display(_("Warning"), + sprintf(_("The command '%s' specified for '%s:%s' is invalid!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); } return($match); @@ -383,7 +565,10 @@ class gosaProperty // Display the reason for failing this check. if($message && ! $match){ - msg_dialog::display(_("Warning"), msgPool::invalid($name,$value), WARNING_DIALOG); + msg_dialog::display(_("Warning"), + sprintf(_("The dn '%s' specified for '%s:%s' is invalid!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); } return($match); @@ -391,11 +576,14 @@ class gosaProperty static function isRdn($message,$class,$name,$value, $type) { - $match = 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), WARNING_DIALOG); + msg_dialog::display(_("Warning"), + sprintf(_("The rdn '%s' specified for '%s:%s' is invalid!"), + bold($value),bold($class),bold($name)), + WARNING_DIALOG); } return($match); @@ -403,7 +591,6 @@ class gosaProperty private function _restoreCurrentValue() { - // First check for values in the LDAP Database. if(isset($this->parent->ldapStoredProperties[$this->class][$this->name])){ $this->setStatus('ldap'); @@ -412,9 +599,9 @@ class gosaProperty } // 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; } @@ -448,10 +635,24 @@ class gosaProperty function getValue($temporary = FALSE) { - if($temporary && in_array($this->getStatus(), array('modified'))){ - return($this->tmp_value); + if($temporary){ + if(in_array($this->getStatus(), array('modified','removed'))){ + return($this->tmp_value); + }else{ + return($this->value); + } }else{ - return($this->value); + + // Do not return ldap values if we've to ignore them. + if($this->parent->ignoreLdapProperties){ + if(isset($this->parent->fileStoredProperties[strtolower($this->class)][strtolower($this->name)])){ + return($this->parent->fileStoredProperties[strtolower($this->class)][strtolower($this->name)]); + }else{ + return($this->getDefault()); + } + }else{ + return($this->value); + } } } @@ -459,8 +660,13 @@ class gosaProperty { if(in_array($this->getStatus(),array('ldap'))){ $this->setStatus('removed'); - }elseif(in_array($this->getStatus(),array('modified'))){ - $this->_restoreCurrentValue(); + + // Second check for values in the config file. + if(isset($this->parent->fileStoredProperties[strtolower($this->class)][strtolower($this->name)])){ + $this->tmp_value = $this->parent->fileStoredProperties[strtolower($this->class)][strtolower($this->name)]; + }else{ + $this->tmp_value = $this->getDefault(); + } } } @@ -487,13 +693,15 @@ class gosaProperty $attrs = $ldap->fetch(); $data = array(); $found = false; - for($i = 0;$i<$attrs['gosaSetting']['count']; $i ++){ - $set = $attrs['gosaSetting'][$i]; - if(preg_match("/^{$this->name}:/", $set)){ - $set = "{$this->name}:{$this->tmp_value}"; - $found = true; + if(isset($attrs['gosaSetting']['count'])){ + for($i = 0;$i<$attrs['gosaSetting']['count']; $i ++){ + $set = $attrs['gosaSetting'][$i]; + if(preg_match("/^{$this->name}:/", $set)){ + $set = "{$this->name}:{$this->tmp_value}"; + $found = true; + } + $data['gosaSetting'][] = $set; } - $data['gosaSetting'][] = $set; } if(!$found) $data['gosaSetting'][] = "{$this->name}:{$this->tmp_value}"; $ldap->cd($dn);