Updated index and logout

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11999 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 9b289caab1b99308b967bdb8d9fabe678f5ac241..2c17abef8e17804ea28e201e91dfe46e9888505d 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -286,11 +286,11 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
   }
 
   /* Check for locking area */
-  $ldap->cat($config->current['CONFIG'], array("dn"));
+  $ldap->cat($config->get_cfg_value("config"), array("dn"));
   $attrs= $ldap->fetch();
   if (!count ($attrs)){
     $ldap->cd($config->current['BASE']);
-    $ldap->create_missing_trees($config->current['CONFIG']);
+    $ldap->create_missing_trees($config->get_cfg_value("config"));
   }
 
   /* Check for valid input */

diff --git a/gosa-core/html/logout.php b/gosa-core/html/logout.php
index 3dc371e2e147e8f82c1ed2a97b73cddf46fd0679..b54fea5f0f7a709ea16b37a8cac32c84aebdba20 100644 (file)
--- a/gosa-core/html/logout.php
+++ b/gosa-core/html/logout.php
@@ -45,10 +45,10 @@ if(session::is_set('ui')){
 }
 
 /* Language setup */
-if ((!isset($config))||(empty($config->data['MAIN']['LANG']))){
+if ((!isset($config)) || $config->get_cfg_value("lang") == ""){
   $lang= get_browser_language();
 } else {
-  $lang= $config->data['MAIN']['LANG'];
+  $lang= $config->get_cfg_value("lang");
 }
 
 $lang.=".UTF-8";
@@ -65,12 +65,7 @@ textdomain($domain);
 
 /* Create smarty & Set template compile directory */
 $smarty= new smarty();
-if (isset ($config->data['MAIN']['COMPILE'])){
-  $smarty->compile_dir= $config->data['MAIN']['COMPILE'];
-} else {
-  $smarty->compile_dir= '/var/spool/gosa/';
-}
-
+$smarty->compile_dir= $config->get_cfg_value("compile", '/var/spool/gosa/');
     
 /* If GET request is posted, the logout was forced by pressing the link */
 if (isset($_GET['request'])){
@@ -79,7 +74,7 @@ if (isset($_GET['request'])){
   session::destroy ();
   
   /* If we're not using htaccess authentication, just redirect... */
-  if (isset($config->data['MAIN']['HTACCESS_AUTH']) && preg_match('/^(true|yes)$/i', $config->data['MAIN']['HTACCESS_AUTH'])){
+  if ($config->get_cfg_value("htaccess_auth") == "true"){
 
     /* Else notice that the user has to close the browser... */
     $smarty->display (get_template_path('headers.tpl'));