X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Fsetup.php;h=e37452c06c6883aa017ad18a56a64e5eea1054bd;hb=7dc416a3b6561a8b6b4d8098a31e2acea5481422;hp=177b38216d6c6c21ea12a724c0c58e5ff9b9c497;hpb=d9ba4914c8207283c4fda60aea3bc6dd79c73ad6;p=gosa.git

diff --git a/html/setup.php b/html/setup.php
index 177b38216..e37452c06 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -24,7 +24,6 @@
 /* Get standard functions */
 require_once ("../include/php_setup.inc");
 require_once ("functions.inc");
-require_once ("class_timezones.inc");
 
 require_once("../setup/class_setup.inc");
 require_once("../setup/class_setupStep.inc");
@@ -73,6 +72,13 @@ $_SESSION['LastError']          = "";
 /* Set template compile directory */
 $smarty->compile_dir= '/var/spool/gosa/';
 
+/* Check for compile directory */
+if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
+  echo sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
+        $smarty->compile_dir);
+  exit();
+}
+
 /* Get posted language */
 if(!isset($_SESSION['lang'])){
   $_SESSION['lang'] = get_browser_language();
@@ -86,7 +92,10 @@ if(isset($_POST['lang_selected'])){
 }
 
 $lang = $_SESSION['lang'];
-$lang.=".UTF-8";
+/* Append .UTF-8 to language string if necessary */
+if(!preg_match("/utf(-)8$/i",$lang)){
+  $lang .= ".UTF-8";
+}
 putenv("LANGUAGE=");
 putenv("LANG=$lang");
 setlocale(LC_ALL, $lang);