diff --git a/html/index.php b/html/index.php
index d218040f29717a76b9d85435271827151242ed65..1adcf42ff6d6ed1f65fde5541d1da1bcce127f30 100644 (file)
--- a/html/index.php
+++ b/html/index.php
require_once ("functions.inc");
header("Content-type: text/html; charset=UTF-8");
-/* Reset error handler */
-$error_collector= "";
-set_error_handler('gosaRaiseError');
-
/* Set error handler to own one, initialize time calculation
and start session. */
session_start ();
exit();
}
+/* Check for old files in compile directory */
+clean_smarty_compile_dir($smarty->compile_dir);
/* Language setup */
if ($config->data['MAIN']['LANG'] == ""){
}
/* If SSL is forced, just forward to the SSL enabled site */
-if ($config->data['MAIN']['FORCESSL'] == 'true'){
+if ($config->data['MAIN']['FORCESSL'] == 'true' && $ssl != ''){
header ("Location: $ssl");
exit;
}
exit();
}
+ /* Check for schema file presence */
+ require_once("functions_setup.inc");
+ if(!is_schema_readable($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'])){
+ print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible."));
+ echo $_SESSION['errors'];
+ exit();
+ }else{
+ $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'],0,TRUE));
+ $checkarr = array();
+ foreach($str as $tr){
+ if(isset($tr['needonstartup'])){
+ print_red($tr['msg']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
+ print $_SESSION['errors'];
+ exit();
+ }
+ }
+ }
+
/* Check for locking area */
$ldap->cat($config->current['CONFIG']);
$attrs= $ldap->fetch();
if (isset($_SESSION['errors'])){
$smarty->assign("errors", $_SESSION['errors']);
}
-$smarty->assign("php_error", $error_collector);
+if ($error_collector != ""){
+ $smarty->assign("php_errors", $error_collector."</div>");
+} else {
+ $smarty->assign("php_errors", "");
+}
$smarty->display (get_template_path('login.tpl'));
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: