![[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 ac9ba95628680c3f04419f6fcd80ba6c475c83cc..ee68d2ed46836ec343471604dde32eb23770a94c 100644 (file)
public $schemaCheckFinished = FALSE;
public $pluginsDeactivated = array();
+ // Name of enabled plugins found in gosa.conf.
+ private $activePlugins = array();
+
+
+ /*! \brief Constructs the config registry
+ * @param config The configuration object
+ * @return
+ */
function __construct($config)
{
$this->config = &$config;
}
+ /*! \brief Returns a list of plugins used by GOsa.
+ @return Array An array containing all plugins with theis plInfo data.
+ */
+ function getListOfPlugins()
+ {
+ return($this->classesWithInfo);
+ }
+
+
+ /*! \brief Checks whether the schema check was called in the current session or not.
+ * @return Boolean True if check was already called
+ */
function schemaCheckFinished()
{
return($this->schemaCheckFinished);
}
- function validateSchemata($force = FALSE, $disableIncompatiblePlugins = FALSE)
+ /*! \brief Starts the schema validation
+ * @param Boolean 'force' Force a re-check.
+ * @param Boolean 'disableIncompatiblePlugins' Disables of incompatible GOsa-plugins.
+ * @return Boolean True on success else FALSE
+ */
+ function validateSchemata($force = FALSE, $disableIncompatiblePlugins = FALSE, $objectClassesToUse = array())
{
- // We can check the schemata only with a valid LDAP connection
- if(empty($this->config->current['CONFIG'])){
+ // Read objectClasses from ldap
+ if(count($objectClassesToUse)){
+ $this->setObjectClasses($objectClassesToUse);
+ }elseif(!count($this->objectClasses)){
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->config->current['BASE']);
+ $this->setObjectClasses($ldap->get_objectclasses());
+ }
+
+ return($this->_validateSchemata($force, $disableIncompatiblePlugins));
+ }
+
+
+ /*! \brief Sets the list object classes to use while validation the schema. (See 'validateSchemata')
+ * This is called from the GOsa-Setup
+ * @param Array The list of object classes (usually LDAP::get_objectlclasses()).
+ * @return void
+ */
+ function setObjectClasses($ocs)
+ {
+ $this->objectClasses = $ocs;
+ }
+
+
+ /*! \brief Returns an array which contains all unresolved schemata requirements.
+ * @return Array An array containing all errors/issues
+ */
+ function getSchemaResults()
+ {
+ return($this->detectedSchemaIssues);
+ }
+
+
+ /*! \brief This method checks if the installed ldap-schemata matches the plugin requirements.
+ * @param Boolean 'force' Force a re-check.
+ * @param Boolean 'disableIncompatiblePlugins' Disables of incompatible GOsa-plugins.
+ * @return String
+ */
+ private function _validateSchemata($force = FALSE, $disableIncompatiblePlugins = FALSE)
+ {
+ // We cannot check without readable schema info
+ if(!count($this->objectClasses)){
return(TRUE);
}
// Clear last results
$this->pluginsDeactivated = array();
- // 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();
+
+ // Walk through plugins with requirements, but only check for active plugins.
foreach($this->classesWithInfo as $cname => $defs){
if(isset($defs['plRequirements'])){
- $this->pluginRequirements[$cname] = $defs['plRequirements'];
+
+ // Check only if required plugin is enabled in gosa.conf
+ // Normally this is the class name itself, but may be overridden
+ // in plInfo using the plRequirements::activePlugin statement.
+ $requiresActivePlugin = $cname;
+ if(isset($defs['plRequirements']['activePlugin'])){
+ $requiresActivePlugin = $defs['plRequirements']['activePlugin'];
+ }
+
+ // Only queue checks for active plugins.
+ if(isset($this->activePlugins[strtolower($requiresActivePlugin)])){
+ $this->pluginRequirements[$cname] = $defs['plRequirements'];
+ }else{
+ if($cname == $requiresActivePlugin){
+ new log("debug","","Skipped schema check for '{$cname}' plugin is inactive!",
+ array(),'');
+ }else{
+ new log("debug","","Skipped schema check for class '{$cname}' skipped,".
+ " required plugin '{$requiresActivePlugin}' is inactive!",
+ array(),'');
+ }
+ }
}
}
if(isset($requirements['ldapSchema'])){
foreach($requirements['ldapSchema'] as $oc => $version){
if(!$this->ocAvailable($oc)){
- $this->detectedSchemaIssues['missing'][] = $oc;
+ $this->detectedSchemaIssues['missing'][$oc] = $oc;
+
$this->schemaCheckFailed = TRUE;
$failure = TRUE;
+
+ new log("debug","","LDAP objectClass missing '{$oc}'!",
+ array(),'');
+
}elseif(!empty($version)){
$currentVersion = $this->getObjectClassVersion($oc);
if(!empty($currentVersion) && !$this->ocVersionMatch($version, $currentVersion)){
if($currentVersion == -1){
$currentVersion = _("unknown");
}
- $this->detectedSchemaIssues['versionMismatch'][] =
+ $this->detectedSchemaIssues['versionMismatch'][$oc] =
sprintf(_("%s has version %s but %s is required!"), bold($oc),bold($currentVersion),bold($version));
$this->schemaCheckFailed = TRUE;
$failure = TRUE;
+
+ new log("debug","","LDAP objectClass version mismatch '{$oc}' ".
+ "has '{$currentVersion}' but {$version} required!",
+ array(),'');
}
}
}
}
+ /*! \brief The function 'validateSchemata' may has disabled some GOsa-Plugins,
+ * the list of disabled plugins will be returned here.
+ * @return Array The list of plugins disabled by 'validateSchemata'
+ */
function getDisabledPlugins()
{
return($this->pluginsDeactivated);
}
- function displayErrors()
+ /*! \brief Displays an error message with all issues detect during the schema validation.
+ */
+ function displayRequirementErrors()
{
-
$message = "";
if(count($this->detectedSchemaIssues['missing'])){
$message.= "<br>".
_("The following object classes are missing:").
"<div class='scrollContainer' style='height:100px'>".
- msgPool::buildList($this->detectedSchemaIssues['missing']).
+ msgPool::buildList(array_values($this->detectedSchemaIssues['missing'])).
"</div>";
}
if(count($this->detectedSchemaIssues['versionMismatch'])){
$message.= "<br>".
_("The following object classes are outdated:").
"<div class='scrollContainer' style='height:100px'>".
- msgPool::buildList($this->detectedSchemaIssues['versionMismatch']).
+ msgPool::buildList(array_values($this->detectedSchemaIssues['versionMismatch'])).
"</div>";
}
if($message != ""){
}
- function ocVersionMatch($required, $installed)
+ /*! \brief Checks to version strings (e.g. '>=v2.8' and '2.9')
+ * @param String The required version with operators (e.g. '>=2.8')
+ * @param String The version to match for withOUT operators (e.g. '2.9')
+ * @return Boolean True if version matches else false.
+ */
+ private function ocVersionMatch($required, $installed)
{
$operator = preg_replace('/^([=<>]*).*$/',"\\1",$required);
$required = preg_replace('/^[=<>]*(.*)$/',"\\1",$required);
}
+ /*! \brief Returns the currently installed version of a given object class.
+ * @param String The name of the objectClass to check for.
+ * @return String The version string of the objectClass (e.g. v2.7)
+ */
function getObjectClassVersion($oc)
{
if(!isset($this->objectClasses[$oc])){
}
- // check wheter an objectClass is installed or not.
+ /*! \brief Check whether the given object class is available or not.
+ * @param String The name of the objectClass to check for (e.g. 'mailAccount')
+ * @return Boolean Returns TRUE if the class exists else FALSE.
+ */
function ocAvailable($name)
{
return(isset($this->objectClasses[$name]));
}
+ /*! \brief Re-loads the list of installed GOsa-Properties.
+ * @param Boolean $force If force is TRUE, the complete properties list is rebuild..
+ */
function reload($force = FALSE)
{
// Do not reload the properties everytime, once we have
$this->fileStoredProperties = array();
$this->properties = array();
$this->mapByName = array();
+ $this->activePlugins = array('core'=>'core');
+
+ if(!$this->config) return;
// Search for config flags defined in the config file (TAB section)
foreach($this->config->data['TABS'] as $tabname => $tabdefs){
foreach($tabdefs as $info){
+ // Put plugin in list of active plugins
+ if(isset($info['CLASS'])){
+ $class = strtolower($info['CLASS']);
+ $this->activePlugins[$class] = $class;
+ }
+
// Check if the info is valid
if(isset($info['NAME']) && isset($info['CLASS'])){
+
// Check if there is nore than just the plugin definition
if(count($info) > 2){
// 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;
+
+ if(isset($entry['CLASS'])){
+
+ // Put plugin to active plugins list.
+ $class = strtolower($entry['CLASS']);
+ $this->activePlugins[$class] = $class;
+
+ if(count($entry) > 2 ){
+ foreach($entry as $name => $value){
+ if(!in_array($name, array('CLASS','ACL'))){
+ $this->fileStoredProperties[strtolower($class)][strtolower($name)] = $value;
+ }
}
}
}
$this->ldapStoredProperties[$class][$name] = $value;
}
}
- $this->status = 'finished';
}
// Register plugin properties.
$this->register($cname, $data);
$data = array('name' => 'postmodify','type' => 'command');
$this->register($cname, $data);
+ $data = array('name' => 'precreate','type' => 'command');
+ $this->register($cname, $data);
+ $data = array('name' => 'preremove','type' => 'command');
+ $this->register($cname, $data);
+ $data = array('name' => 'premodify','type' => 'command');
+ $this->register($cname, $data);
$data = array('name' => 'check', 'type' => 'command');
$this->register($cname, $data);
}
}
}
+
+ // We are only finsihed once we are logged in.
+ if(!empty($this->config->current['CONFIG'])){
+ $this->status = 'finished';
+ }
+ }
+
+
+ /*! \brief Returns TRUE if the property registration has finished without any error.
+ */
+ function propertyInitializationComplete()
+ {
+ return($this->status == 'finished');
}
+
+ /*! \brief Registers a GOsa-Property and thus makes it useable by GOsa and its plugins.
+ * @param String $class The name of the class/plugin that wants to register this property.
+ * @return Array $data An array containing all data set in plInfo['plProperty]
+ */
function register($class,$data)
{
$id = count($this->properties);
$this->mapByName[$p] = $id;
}
+
+ /*! \brief Returns all registered properties.
+ * @return Array A list of all properties.
+ */
public function getAllProperties()
{
return($this->properties);
}
+
+ /*! \brief Checks whether a property exists or not.
+ * @param String $class The class name (e.g. 'core' or 'mailAccount')
+ * @param String $name The property name (e.g. 'sessionTimeout' or 'mailMethod')
+ * @return Boolean TRUE if it exists else FALSE.
+ */
function propertyExists($class,$name)
{
$p = strtolower("{$class}::{$name}");
return(isset($this->mapByName[$p]));
}
+
+ /*! \brief Returns the id of a registered property.
+ * @param String $class The class name (e.g. 'core' or 'mailAccount')
+ * @param String $name The property name (e.g. 'sessionTimeout' or 'mailMethod')
+ * @return Integer The id for the given property.
+ */
private function getId($class,$name)
{
$p = strtolower("{$class}::{$name}");
return($this->mapByName[$p]);
}
+
+ /*! \brief Returns a given property, if it exists.
+ * @param String $class The class name (e.g. 'core' or 'mailAccount')
+ * @param String $name The property name (e.g. 'sessionTimeout' or 'mailMethod')
+ * @return GOsaPropery The property or 'NULL' if it doesn't exists.
+ */
function getProperty($class,$name)
{
if($this->propertyExists($class,$name)){
return(NULL);
}
+
+ /*! \brief Returns the value for a given property, if it exists.
+ * @param String $class The class name (e.g. 'core' or 'mailAccount')
+ * @param String $name The property name (e.g. 'sessionTimeout' or 'mailMethod')
+ * @return GOsaPropery The property value or an empty string if it doesn't exists.
+ */
function getPropertyValue($class,$name)
{
if($this->propertyExists($class,$name)){
return("");
}
+
+ /*! \brief Set a new value for a given property, if it exists.
+ * @param String $class The class name (e.g. 'core' or 'mailAccount')
+ * @param String $name The property name (e.g. 'sessionTimeout' or 'mailMethod')
+ * @return
+ */
function setPropertyValue($class,$name, $value)
{
if($this->propertyExists($class,$name)){
return("");
}
+
+ /*! \brief Save all temporary made property changes and thus make them useable/effective.
+ * @return Array Returns a list of plugins that have to be migrated before they can be saved.
+ */
function saveChanges()
{
$migrate = array();