X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_config.inc;h=17b860c58386189fc00acba33f58227ca1acbe9d;hb=652bb3908381dd238ce5bc023203ec8d67ae7bff;hp=741207e2eb06e24e31c6cfbf5db527cd0360921e;hpb=fccaf95b90012b6946d1c60dc7de21270921ddfc;p=gosa.git diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 741207e2e..17b860c58 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -64,6 +64,8 @@ class config { var $filename = ""; var $last_modified = 0; + private $jsonRPChandle = NULL; + public $configRegistry = NULL; /*! \brief Class constructor of the config class @@ -86,7 +88,7 @@ class config { } // Load configuration registry - $this->configRegistry = new configRegistry(); + $this->configRegistry = new configRegistry($this); } @@ -160,11 +162,6 @@ class config { msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG); exit; } - - // Default schemacheck to "true" - if(!isset($this->data['MAIN']['SCHEMACHECK'])){ - $this->data['MAIN']['SCHEMACHECK'] = "true"; - } } function tag_open($parser, $tag, $attrs) @@ -256,6 +253,10 @@ class config { $this->data['PATHMENU']= array(); ; break; + case 'SHORTCUTMENU': + $this->data['SHORTCUTMENU']= array(); ; + break; + /* Inser plugins */ case 'PLUGIN': if ($this->tags[$this->level-3] == 'MENU' && @@ -266,6 +267,9 @@ class config { if ($this->tags[$this->level-2] == 'PATHMENU'){ $this->data['PATHMENU'][$this->gpc++]= $attrs; } + if ($this->tags[$this->level-2] == 'SHORTCUTMENU'){ + $this->data['SHORTCUTMENU'][$this->gpc++]= $attrs; + } if ($this->tags[$this->level-2] == 'SERVICEMENU'){ $this->data['SERVICE'][$attrs['CLASS']]= $attrs; } @@ -300,6 +304,16 @@ class config { } + function getRpcHandle() + { + // Create jsonRPC handle on demand. + if(!$this->jsonRPChandle){ + $this->jsonRPChandle = new jsonRPC($this); + } + return($this->jsonRPChandle); + } + + /*! \brief Get a LDAP link object * * This function can be used to get an ldap object, which in turn can @@ -339,8 +353,8 @@ class config { } if (!session::global_is_set('size_limit')){ - session::global_set('size_limit',$this->current['LDAPSIZELIMIT']); - session::global_set('size_ignore',$this->current['LDAPSIZEIGNORE']); + session::global_set('size_limit', $this->get_cfg_value('core', 'ldapSizelimit')); + session::global_set('size_ignore', $this->boolValueIsTrue('core', 'ldapSizeIgnore')); } } @@ -361,43 +375,10 @@ class config { { $this->current= $this->data['LOCATIONS'][$name]; - if (!isset($this->current['USERRDN'])){ - $this->current['USERRDN']= "ou=people"; - } - if (!isset($this->current['GROUPRDN'])){ - $this->current['GROUPS']= "ou=groups"; - } - if (isset($this->current['INITIAL_BASE'])){ session::global_set('CurrentMainBase',$this->current['INITIAL_BASE']); } - /* Remove possibly added ',' from end of group and people ou */ - $this->current['GROUPS'] = preg_replace("/,*$/","",$this->current['GROUPRDN']); - $this->current['USERRDN'] = preg_replace("/,*$/","",$this->current['USERRDN']); - - if (!isset($this->current['SAMBAMACHINEACCOUNTRDN'])){ - $this->current['SAMBAMACHINEACCOUNTRDN']= "ou=winstations,ou=systems"; - } - if (!isset($this->current['ACCOUNTPRIMARYATTRIBUTE'])){ - $this->current['ACCOUNTPRIMARYATTRIBUTE']= "cn"; - } - if (!isset($this->current['MINID'])){ - $this->current['MINID']= 100; - } - if (!isset($this->current['LDAPSIZELIMIT'])){ - $this->current['LDAPSIZELIMIT']= 200; - } - if (!isset($this->current['SIZEINGORE'])){ - $this->current['LDAPSIZEIGNORE']= TRUE; - } else { - if (preg_match("/true/i", $this->current['LDAPSIZEIGNORE'])){ - $this->current['LDAPSIZEIGNORE']= TRUE; - } else { - $this->current['LDAPSIZEIGNORE']= FALSE; - } - } - /* Sort referrals, if present */ if (isset ($this->current['REFERRAL'])){ $bases= array(); @@ -457,11 +438,8 @@ class config { /* Search mailMethod konfiguration in main section too */ - $this->current['MAILMETHOD'] = $this->get_cfg_value("mailMethod",""); - if (!isset($this->current['MAILMETHOD'])){ - $this->current['MAILMETHOD']= ""; - } - if ($this->current['MAILMETHOD'] == ""){ + $tmp = $this->get_cfg_value("core","mailMethod"); + if ($tmp){ $ldap->search ("(objectClass=goMailServer)", array('cn')); $this->data['SERVERS']['IMAP']= array(); while ($attrs= $ldap->fetch()){ @@ -907,7 +885,7 @@ class config { */ function getShareList($listboxEntry = false) { - $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","server",get_ou("serverRDN"), + $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","server",get_ou("servgeneric", "serverRDN"), $this->current['BASE'],array("goExportEntry","cn"), GL_NONE); $return =array(); foreach($tmp as $entry){ @@ -949,7 +927,7 @@ class config { $ui = get_userinfo(); $base = $config->current['BASE']; $res= get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))", "server", - get_ou("serverRDN"), $base,array("goExportEntry","cn"),GL_NONE | GL_NO_ACL_CHECK); + get_ou("servgeneric", "serverRDN"), $base,array("goExportEntry","cn"),GL_NONE | GL_NO_ACL_CHECK); foreach($res as $entry){ @@ -973,38 +951,26 @@ class config { } - /*! \brief Check if there's the specified bool value set in the configuration + /*! \brief Checks if there's a bool property set in the configuration. * * The function checks, weither the specified bool value is set to a true - * value in the configuration file. Considered true are either true or yes, - * case-insensitive. + * value in the configuration file. * * Example usage: * \code - * if ($this->config->boolValueIsTrue("main", "copyPaste")) { + * if ($this->config->boolValueIsTrue("core", "copyPaste")) { * echo "Copy Paste Handling is enabled"; * } * \endcode * - * \param string 'section' Section in the configuration file. + * \param string 'class' The properties class. e.g. 'core','user','sudo',... * \param string 'value' Key in the given section, which is subject to check * * * */ - function boolValueIsTrue($section, $value) + function boolValueIsTrue($class, $name) { - $section= strtoupper($section); - $value= strtoupper($value); - if (isset($this->data[$section][$value])){ - - $data= $this->data[$section][$value]; - if (preg_match("/^true$/i", $data) || preg_match("/yes/i", $data)){ - return TRUE; - } - - } - - return FALSE; + return(preg_match("/true/i", $this->get_cfg_value($class,$name))); } @@ -1027,7 +993,9 @@ class config { } - /*! Search for a configuration setting in different categories + /*! Outdated - try to use pluginEnabled, boolValueIsTrue or get_cfg_value instead. + * + * (Search for a configuration setting in different categories * * Searches for the value of a given key in the configuration data. * Optionally the list of categories to search (tabs, main, locations) can @@ -1037,6 +1005,7 @@ class config { * \code * $postcmd = $this->config->search(get_class($this), "POSTCOMMAND", array("menu", "tabs")); * \endcode + * ) * * */ function search($class, $value, $categories= "") @@ -1059,6 +1028,14 @@ class config { return (""); } + + /*! \brief Check whether a plugin is activated or not + */ + function pluginEnabled($class){ + $tmp = $this->search($class, "CLASS",array('menu','tabs')); + return(!empty($tmp)); + } + /*! \brief Get a configuration value from the config * @@ -1075,26 +1052,30 @@ class config { * * */ - function get_cfg_value($name, $default= "") + function get_cfg_value($class,$name, $default= NULL) { - if($this->configRegistry->propertyExists($name)){ - return($this->configRegistry->getPropertyValue($name)); - } - - - $name= strtoupper($name); + // The default parameter is deprecated + if($default != NULL){ +# trigger_error("Third parameter 'default' is deprecated for function 'get_cfg_value'!"); + } - /* Check if we have a current value for $name */ - if (isset($this->current[$name])){ - return ($this->current[$name]); + // Return the matching property value if it exists. + if($this->configRegistry->propertyExists($class,$name)){ + return($this->configRegistry->getPropertyValue($class,$name)); } - /* Check if we have a global value for $name */ - if (isset($this->data["MAIN"][$name])){ - return ($this->data["MAIN"][$name]); + // Show a warning in the syslog if there is an undefined property requested. + if($this->configRegistry->propertyInitializationComplete() && + "{$class}::{$name}" != 'core::config' && // <--- This on is never set, only in gosa.conf. + "{$class}::{$name}" != 'core::logging'){ // <--- This one may cause endless recursions in class_log.inc + new log("debug","","Unconfigured property: '{$class}::{$name}'",array(),''); } - return ($default); + // Try to find the property in the config file directly. + $name= strtoupper($name); + if (isset($this->current[$name])) return ($this->current[$name]); + if (isset($this->data["MAIN"][$name])) return ($this->data["MAIN"][$name]); + return (""); } @@ -1153,10 +1134,10 @@ class config { There will also be some errors psoted, if the configuration failed */ function snapshotEnabled() { - if($this->get_cfg_value("enableSnapshots") == "true"){ + if($this->get_cfg_value("core","enableSnapshots") == "true"){ /* Check if the snapshot_base is defined */ - if ($this->get_cfg_value("snapshotBase") == ""){ + if ($this->get_cfg_value("core","snapshotBase") == ""){ /* Send message if not done already */ if(!session::is_set("snapshotFailMessageSend")){ @@ -1181,12 +1162,12 @@ class config { } /* check if there are special server configurations for snapshots */ - if ($this->get_cfg_value("snapshotURI") != ""){ + if ($this->get_cfg_value("core","snapshotURI") != ""){ /* check if all required vars are available to create a new ldap connection */ $missing = ""; foreach(array("snapshotURI","snapshotAdminDn","snapshotAdminPassword","snapshotBase") as $var){ - if($this->get_cfg_value($var) == ""){ + if($this->get_cfg_value("core",$var) == ""){ $missing .= $var." "; /* Send message if not done already */