From 356897aedf8d2dee40316857f40813072dc33ea5 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 13 Nov 2007 18:41:10 +0000
Subject: [PATCH] Updated to load index.php from html directory

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-playground@7793 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 index.php => html/index.php          | 6 ++----
 include/class_ViewportController.inc | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename index.php => html/index.php (90%)

diff --git a/index.php b/html/index.php
similarity index 90%
rename from index.php
rename to html/index.php
index 5d71f7c21..857f1cd20 100755
--- a/index.php
+++ b/html/index.php
@@ -1,7 +1,5 @@
-#!/usr/bin/php
 <?php
 
-
 /* This is good for testing... */
 error_reporting (E_ALL | E_STRICT);
 
@@ -14,13 +12,13 @@ function normalizePreg($input)
 
 
 /* Initiate autoloader... */
-require_once("include/autoload.inc");
+require_once("../include/autoload.inc");
 restore_error_handler();
 try {
 
 	/* Get new test instance of the Configuration */
 	$cr= Registry::getInstance("ConfigManager");
-	$cr->load("gosa.conf");
+	$cr->load("../gosa.conf");
 
 	/* Get a new instance of the main Viewport */
 	$vc= new ViewportController();
diff --git a/include/class_ViewportController.inc b/include/class_ViewportController.inc
index 692de5018..9eeda233a 100644
--- a/include/class_ViewportController.inc
+++ b/include/class_ViewportController.inc
@@ -55,7 +55,7 @@ class ViewportController {
 
     /* Do Smarty setup */
     $this->Smarty= new Smarty;
-    $this->Smarty->template_dir= $BASE_DIR.'/templates/';
+    $this->Smarty->template_dir= BASE_DIR.'/templates/';
     $this->Smarty->caching= $config->getValue('cache-templates', FALSE);
     $this->Smarty->php_handling= SMARTY_PHP_REMOVE;
 
@@ -64,7 +64,7 @@ class ViewportController {
 
     /* Check if our template directory is accessible */
     if (!(is_dir($this->Smarty->compile_dir) && is_writable($this->Smarty->compile_dir))){
-      throw new ViewportControllerException(sprintf(_("Directory '%s' specified as compile-directory is not accessible!"), $smarty->compile_dir));
+      throw new ViewportControllerException(sprintf(_("Directory '%s' specified as compile-directory is not accessible!"), $this->Smarty->compile_dir));
     }
 
     /* Check for old files in compile directory */
@@ -74,7 +74,6 @@ class ViewportController {
 
   private function cleanSmartyCompileDir() {
     #TODO: Clean compile dir
-    echo "TODO: clean compile dir\n";
   }
 
 
@@ -83,7 +82,7 @@ class ViewportController {
     /* Get the browser language if */
     $lang= Utils::getBrowserLanguage();
     if ($this->language != $lang){
-      echo "Emit EventObject for changed language\n";
+      #TODO: Emit EventObject for changed language
       $this->language= $lang;
     }
 
-- 
2.30.2