Added additional <br> tags to msgPool::deleteInfo

[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 274142b83de9735d769a8a36ddc3e016d56ae793..e182c94fddbfc973a94412b19e9b72f06bc63d10 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -43,6 +43,7 @@ class config  {
       'MAIN' => array(),
       'MENU' => array(), 'SERVICE' => array());
   var $basedir= "";
+  var $config_version ="";
 
   /* Keep a copy of the current deparment list */
   var $departments= array();
@@ -106,13 +107,13 @@ class config  {
       $msg = sprintf(_("XML error in gosa.conf: %s at line %d"),
             xml_error_string(xml_get_error_code($this->parser)),
             xml_get_current_line_number($this->parser));
-      msg_dialog::display(_("Config file parsing"), $msg, FATAL_ERROR_DIALOG);
+      msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG);
       exit;
     }
   }
 
   function tag_open($parser, $tag, $attrs)
-  { 
+  {
     /* Save last and current tag for reference */
     $this->tags[$this->level]= $tag;
     $this->level++;
@@ -120,6 +121,9 @@ class config  {
     /* Trigger on CONF section */
     if ($tag == 'CONF'){
       $this->config_found= TRUE;
+      if(isset($attrs['CONFIG_VERSION'])){
+        $this->config_version = $attrs['CONFIG_VERSION'];
+      }
     }
 
     /* Return if we're not in config section */
@@ -214,38 +218,51 @@ class config  {
     $this->level--;
   }
 
+
+  function get_credentials($creds)
+  {
+    if (isset($_SERVER['HTTP_GOSA_KEY'])){
+      return (cred_decrypt($creds, $_SERVER['HTTP_GOSA_KEY']));
+    }
+    return ($creds);
+  }
+
+
   function get_ldap_link($sizelimit= FALSE)
   {
-    /* Build new connection */
-    $this->ldap= ldap_init ($this->current['SERVER'], $this->current['BASE'],
-        $this->current['ADMIN'], $this->current['PASSWORD']);
+    if($this->ldap === NULL || !is_resource($this->ldap->cid)){
 
-    /* Check for connection */
-    if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
-      $smarty= get_smarty();
-      msg_dialog::display(_("LDAP error"), _("Cannot bind to LDAP. Please contact the system administrator."), FATAL_ERROR_DIALOG);
-      exit();
-    }
+      /* Build new connection */
+      $this->ldap= ldap_init ($this->current['SERVER'], $this->current['BASE'],
+          $this->current['ADMIN'], $this->get_credentials($this->current['PASSWORD']));
 
-    if (!session::is_set('size_limit')){
-      session::set('size_limit',$this->current['SIZELIMIT']);
-      session::set('size_ignore',$this->current['SIZEIGNORE']);
-    }
+      /* Check for connection */
+      if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
+        $smarty= get_smarty();
+        msg_dialog::display(_("LDAP error"), _("Cannot bind to LDAP. Please contact the system administrator."), FATAL_ERROR_DIALOG);
+        exit();
+      }
 
-    if ($sizelimit){
-      $this->ldap->set_size_limit(session::get('size_limit'));
-    } else {
-      $this->ldap->set_size_limit(0);
-    }
+      if (!session::is_set('size_limit')){
+        session::set('size_limit',$this->current['SIZELIMIT']);
+        session::set('size_ignore',$this->current['SIZEIGNORE']);
+      }
 
-    /* Move referrals */
-    if (!isset($this->current['REFERRAL'])){
-      $this->ldap->referrals= array();
-    } else {
-      $this->ldap->referrals= $this->current['REFERRAL'];
+      if ($sizelimit){
+        $this->ldap->set_size_limit(session::get('size_limit'));
+      } else {
+        $this->ldap->set_size_limit(0);
+      }
+
+      /* Move referrals */
+      if (!isset($this->current['REFERRAL'])){
+        $this->ldap->referrals= array();
+      } else {
+        $this->ldap->referrals= $this->current['REFERRAL'];
+      }
     }
 
-    return ($this->ldap);
+    return new ldapMultiplexer($this->ldap);
   }
 
   function set_current($name)
@@ -371,13 +388,12 @@ class config  {
 
     /* Get kerberos server. FIXME: only one is supported currently */
     $ldap->cd ($this->current['BASE']);
-    $ldap->search ("(objectClass=goKrbServer)");
+    $ldap->search ("(&(goKrbRealm=*)(goKrbAdmin=*)(objectClass=goKrbServer))");
     if ($ldap->count()){
       $attrs= $ldap->fetch();
       $this->data['SERVERS']['KERBEROS']= array( 'SERVER' => $attrs['cn'][0],
           'REALM' => $attrs['goKrbRealm'][0],
-          'ADMIN' => $attrs['goKrbAdmin'][0],
-          'PASSWORD' => $attrs['goKrbPassword'][0]);
+          'ADMIN' => $attrs['goKrbAdmin'][0]);
     }
 
     /* Get cups server. FIXME: only one is supported currently */
@@ -722,7 +738,7 @@ class config  {
    */
   function getShareList($listboxEntry = false)
   {
-    $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","",get_ou("serverou"),
+    $tmp = get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))","server",get_ou("serverou"),
         $this->current['BASE'],array("goExportEntry","cn"), GL_NONE);
     $return =array();
     foreach($tmp as $entry){
@@ -832,6 +848,39 @@ 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;
+  
+    /* Remember last checked version 
+     */
+    session::set("LastChecked",$this->config_version);
+
+    if(preg_match("/\(Rev[^\)]*\)/",$current)){
+
+      /* 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."));
+      }
+    }
+  }
+
+
   /* On debian systems the session files are deleted with
    *  a cronjob, which detects all files older than specified 
    *  in php.ini:'session.gc_maxlifetime' and removes them.