Updated a couple of values

[gosa.git] / gosa-core / include / class_config.inc

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 8d839877c5eec731614953a4f46417164195eea7..481da05236d2f7d39cdca2c3e8db040025fd97ab 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -137,8 +137,8 @@ class config  {
     /* Trigger on CONF section */
     if ($tag == 'CONF'){
       $this->config_found= TRUE;
-      if(isset($attrs['CONFIG_VERSION'])){
-        $this->config_version = $attrs['CONFIG_VERSION'];
+      if(isset($attrs['CONFIGVERSION'])){
+        $this->config_version = $attrs['CONFIGVERSION'];
       }
     }
 
@@ -287,8 +287,11 @@ class config  {
   {
     $this->current= $this->data['LOCATIONS'][$name];
 
-    if (!isset($this->current['PEOPLE'])){
-      $this->current['PEOPLE']= "ou=people";
+    if (!isset($this->current['SAMBAVERSION'])){
+      $this->current['SAMBAVERSION']= 3;
+    }
+    if (!isset($this->current['USERRDN'])){
+      $this->current['USERRDN']= "ou=people";
     }
     if (!isset($this->current['GROUPS'])){
       $this->current['GROUPS']= "ou=groups";
@@ -300,7 +303,7 @@ class config  {
   
     /* Remove possibly added ',' from end of group and people ou */
     $this->current['GROUPS'] = preg_replace("/,*$/","",$this->current['GROUPS']);
-    $this->current['PEOPLE'] = preg_replace("/,*$/","",$this->current['PEOPLE']);
+    $this->current['USERRDN'] = preg_replace("/,*$/","",$this->current['USERRDN']);
 
     if (!isset($this->current['WINSTATIONS'])){
       $this->current['WINSTATIONS']= "ou=winstations,ou=systems";
@@ -308,8 +311,8 @@ class config  {
     if (!isset($this->current['HASH'])){
       $this->current['HASH']= "crypt";
     }
-    if (!isset($this->current['DNMODE'])){
-      $this->current['DNMODE']= "cn";
+    if (!isset($this->current['ACCOUNTPRIMARYATTRIBUTE'])){
+      $this->current['ACCOUNTPRIMARYATTRIBUTE']= "cn";
     }
     if (!isset($this->current['MINID'])){
       $this->current['MINID']= 100;
@@ -382,12 +385,18 @@ class config  {
     if ($this->current['MAILMETHOD'] == ""){
       $ldap->search ("(objectClass=goMailServer)", array('cn'));
       $this->data['SERVERS']['IMAP']= array();
-      error_reporting(0);
       while ($attrs= $ldap->fetch()){
         $name= $attrs['cn'][0];
-        $this->data['SERVERS']['IMAP'][$name]= $name;
+        $this->data['SERVERS']['IMAP'][$name]= 
+          array( 
+              "server_dn"   => $attrs['dn'],
+              "connect"     => "",
+              "admin"       => "",
+              "password"    => "",
+              "sieve_server"=> "",
+              "sieve_option"=> "",
+              "sieve_port"  => "");
       }
-      error_reporting(E_ALL);
     } else {
       $ldap->search ("(&(objectClass=goImapServer)(goImapSieveServer=*))", 
                     array('goImapName', 'goImapConnect', 'goImapAdmin', 'goImapPassword',
@@ -514,8 +523,12 @@ class config  {
     $ldap->search ("(objectClass=goLogDBServer)");
     if ($ldap->count()){
       $attrs= $ldap->fetch();
+      if(!isset($attrs['goLogDB'][0])){
+        $attrs['goLogDB'][0] = "gomon";
+      }
       $this->data['SERVERS']['LOG']= array( 'SERVER' => $attrs['cn'][0],
           'LOGIN' => $attrs['goLogAdmin'][0],
+          'DB' => $attrs['goLogDB'][0],
           'PASSWORD' => $attrs['goLogPassword'][0]);
     }
 
@@ -850,7 +863,7 @@ class config  {
 
     foreach($res as $entry){
         
-        $acl = $ui->get_permissions($entry['dn'],"server/goShareServer","");
+        $acl = $ui->get_permissions($entry['dn'],"server","");
         if(isset($entry['goExportEntry']['count'])){
           unset($entry['goExportEntry']['count']);
         }
@@ -928,6 +941,23 @@ class config  {
   }
 
 
+  function get_cfg_value($name, $default= "") {
+    $name= strtoupper($name);
+
+    /* Check if we have a current value for $name */
+    if (isset($this->current[$name])){
+      return ($this->current[$name]);
+    }
+
+    /* Check if we have a global value for $name */
+    if (isset($this->data["MAIN"][$name])){
+      return ($this->data["MAIN"][$name]);
+    }
+
+    return ($default);
+  }
+
+
   function check_config_version()
   {
     /* Skip check, if we've already mentioned the mismatch 
@@ -956,7 +986,7 @@ class config  {
    */
   function check_session_lifetime()
   {
-    $cfg_lifetime = $this->data['MAIN']['SESSION_LIFETIME'];
+    $cfg_lifetime = $this->data['MAIN']['SESSIONLIFETIME'];
     $ini_lifetime = ini_get('session.gc_maxlifetime');
     $deb_system   = file_exists('/etc/debian_version');
     return(!($deb_system && ($ini_lifetime < $cfg_lifetime)));