X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_config.inc;h=e50de7e22e022610ba36d91feb7e65cc632abcb2;hb=c9bd6c4d92532063a9dd8df3cfd20740d43e5841;hp=c01a2ec0e519fe9e696298030f2692cccbe49b79;hpb=226580d683c1bebd09e732b0ce8af02935fd7e31;p=gosa.git

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index c01a2ec0e..e50de7e22 100644
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -160,11 +160,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)
@@ -339,8 +334,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 +356,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 +419,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()){
@@ -973,38 +932,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 +974,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 +986,7 @@ class config  {
    *  \code
    *  $postcmd = $this->config->search(get_class($this), "POSTCOMMAND", array("menu", "tabs"));
    *  \endcode
+   *  ) 
    *
    * */
   function search($class, $value, $categories= "")
@@ -1059,6 +1009,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,11 +1033,11 @@ class config  {
    *
    *
    */
-  function get_cfg_value($name, $default= "") 
+  function get_cfg_value($class,$name, $default= "") 
   {
 
-    if($this->configRegistry->propertyExists('core',$name)){
-        return($this->configRegistry->getPropertyValue('core',$name));
+    if($this->configRegistry->propertyExists($class,$name)){
+        return($this->configRegistry->getPropertyValue($class,$name));
     }
 
     syslog(1, $name);    
@@ -1155,10 +1113,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")){
@@ -1183,12 +1141,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 */