Updated gosa si DAK remove key ring entry.

[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 e182c94fddbfc973a94412b19e9b72f06bc63d10..db862c0f887929ba03f86b9105f767b07d44d86f 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -83,15 +83,15 @@ class config  {
       xml_set_object($this->parser, $this);
       xml_set_element_handler($this->parser, "tag_open", "tag_close");
       $this->parse($this->filename);
-      if(session::is_set('plist')){
-        session::un_set('plist');
-      }
-      if(session::is_set('plug')){
-        session::un_set('plug');
-      }
-      if(isset($_GET['plug'])){
-        unset($_GET['plug']);
-      }
+#     if(session::is_set('plist')){
+#       session::un_set('plist');
+#     }
+#     if(session::is_set('plug')){
+#       session::un_set('plug');
+#     }
+#     if(isset($_GET['plug'])){
+#       unset($_GET['plug']);
+#     }
     }
   }  
 
@@ -160,11 +160,13 @@ class config  {
       case 'LOCATION':
                   if ($this->tags[$this->level-2] == 'MAIN'){
                     $name= $attrs['NAME'];
+                    $name = preg_replace("/[<>\"']/","",$name);
+                    $attrs['NAME'] = $name;
                     $this->currentLocation= $name;
 
                     /* Add location elements */
-                      $this->data['LOCATIONS'][$name]= $attrs;
-                    }
+                    $this->data['LOCATIONS'][$name]= $attrs;
+                  }
                   break;
 
                   /* Handle referral tags */
@@ -268,6 +270,7 @@ class config  {
   function set_current($name)
   {
     $this->current= $this->data['LOCATIONS'][$name];
+
     if (!isset($this->current['PEOPLE'])){
       $this->current['PEOPLE']= "ou=people";
     }
@@ -370,20 +373,40 @@ class config  {
       }
       error_reporting(E_ALL);
     } else {
-      $ldap->search ("(objectClass=goImapServer)", array('goImapName', 'goImapConnect', 'goImapAdmin', 'goImapPassword',
+      $ldap->search ("(&(objectClass=goImapServer)(goImapSieveServer=*))", 
+                    array('goImapName', 'goImapConnect', 'goImapAdmin', 'goImapPassword',
             'goImapSieveServer', 'goImapSievePort'));
 
       $this->data['SERVERS']['IMAP']= array();
-      error_reporting(0);
+
       while ($attrs= $ldap->fetch()){
-        $name= $attrs['goImapName'][0];
-        $this->data['SERVERS']['IMAP'][$name]= array( "connect" => $attrs['goImapConnect'][0],
-            "admin" => $attrs['goImapAdmin'][0],
-            "password" => $attrs['goImapPassword'][0],
-            "sieve_server" => $attrs['goImapSieveServer'][0],
-            "sieve_port" => $attrs['goImapSievePort'][0]);
+
+        /* Check if the given goImapSieveServer is in the new style "{cn:port/option}"
+           or the old style just "cn".
+         */
+        if(preg_match("/\{/",$attrs['goImapSieveServer'][0])){
+          $sieve_server = preg_replace("/^\{([^:]*).*$/","\\1",$attrs['goImapSieveServer'][0]);
+          $sieve_option = preg_replace("/^[^:]*[^\/]*+\/(.*)\}$/","\\1",$attrs['goImapSieveServer'][0]);
+        }else{
+          $sieve_server = $attrs['goImapSieveServer'][0];
+          $sieve_option = "";
+        }
+
+        $pwd            = $attrs['goImapPassword'][0];
+        $imap_admin     = $attrs['goImapAdmin'][0];
+        $imap_connect   = $attrs['goImapConnect'][0];
+        $imap_server    = $attrs['goImapName'][0];
+        $sieve_port     = $attrs['goImapSievePort'][0];
+        
+        $this->data['SERVERS']['IMAP'][$imap_server]= 
+            array( 
+            "connect"     => $imap_connect,
+            "admin"       => $imap_admin,
+            "password"    => $pwd,
+            "sieve_server"=> $sieve_server,
+            "sieve_option"=> $sieve_option,
+            "sieve_port"  => $sieve_port);
       }
-      error_reporting(E_ALL);
     }
 
     /* Get kerberos server. FIXME: only one is supported currently */
@@ -850,9 +873,6 @@ class config  {
 
   function check_config_version()
   {
-
-    $current = get_gosa_version();
-
     /* Skip check, if we've already mentioned the mismatch 
      */
     if(session::is_set("LastChecked") && session::get("LastChecked") == $this->config_version) return;
@@ -861,22 +881,12 @@ class config  {
      */
     session::set("LastChecked",$this->config_version);
 
-    if(preg_match("/\(Rev[^\)]*\)/",$current)){
+    $current = md5(file_get_contents(CONFIG_TEMPLATE_DIR."/gosa.conf"));
 
-      /* Development Version 
-       */
-      $c_v = preg_replace("/^.*\(Rev ([0-9]*)\).*$/","\\1",$current);
-      $g_v = preg_replace("/^.*\(Rev ([0-9]*)\).*$/","\\1",$this->config_version);
-      if($c_v != $g_v){
-#        msg_dialog::display(_("Configuration"),_("The configuration file you are using seems to be outdated. Please move the GOsa configuration file away to run the GOsa setup again."));
-      }
-    }else{
-
-      /* Tagged version 
-       */
-      if($this->config_version != $current){
-        msg_dialog::display(_("Configuration"),_("The configuration file you are using seems to be outdated. Please move the GOsa configuration file away to run the GOsa setup again."));
-      }
+    /* Check contributed config version and current config version.
+     */
+    if($this->config_version != $current && !empty($this->config_version)){
+      msg_dialog::display(_("Configuration"),_("The configuration file you are using seems to be outdated. Please move the GOsa configuration file away to run the GOsa setup again."));
     }
   }