From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 21 Sep 2007 11:02:00 +0000 (+0000)
Subject: Added search method for class "config". Prepare to replace the search_config() occure... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b89eb7443ac7ceb1381fb303c8ee128e26e00a0e;p=gosa.git

Added search method for class "config". Prepare to replace the search_config() occurencies


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

diff --git a/html/getFAIscript.php b/html/getFAIscript.php
index 8be8f02fb..45277a6fd 100644
--- a/html/getFAIscript.php
+++ b/html/getFAIscript.php
@@ -82,7 +82,7 @@ if(!preg_match("/r/",$acl)){
   header ("Location: index.php");
   exit;
 }
-$dir = search_config($config->data,"environment", "KIOSKPATH");
+$dir= $config->search('environment', 'kioskpath', array('main','tabs'));
 getFAIScript(base64_decode($_GET['id']));
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
diff --git a/html/getkiosk.php b/html/getkiosk.php
index ba0ea77ee..ef0c64aa8 100644
--- a/html/getkiosk.php
+++ b/html/getkiosk.php
@@ -69,7 +69,7 @@ if(!preg_match("/r/",$acl)){
   header ("Location: index.php");
   exit;
 }
-$dir = search_config($config->data,"environment", "KIOSKPATH");
+$dir= $config->search('environment', 'kioskpath', array('main','tabs'));
 getkiosk($dir."/".$_GET['id']);
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
diff --git a/html/main.php b/html/main.php
index f9c2cc6e7..3620bce81 100644
--- a/html/main.php
+++ b/html/main.php
@@ -420,8 +420,5 @@ echo $display;
 $_SESSION['plist']= $plist;
 $_SESSION['config']= $config;
 
-/* Echo compilation time */
-#echo "<p align='right'>".get_MicroTimeDiff($start,microtime())."</p>";
-
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>