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

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 8be8f02fbfe137541c1c11c86a6062e6bf4a9408..45277a6fdcf544184923056b6fb79af62dddd2e0 100644 (file)
--- 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 ba0ea77ee2f283ad87e16a06b62ea4e96f06a0c6..ef0c64aa81e59061b436c56f355c012a2b0ce224 100644 (file)
--- 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 f9c2cc6e7d93e4517ce3ad36fb592389b0ad034e..3620bce819b2a9a5fcbd3bd2209d74aeeb167199 100644 (file)
--- 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:
 ?>