From be51930cd79f80d0bd75c1156c66c1c396a7b1d5 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 18 May 2005 19:13:56 +0000 Subject: [PATCH] Added error handling for login and themes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@251 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/index.php | 5 +++++ ihtml/themes/altlinux/framework.tpl | 1 + ihtml/themes/altlinux/login.tpl | 1 + ihtml/themes/classic/framework.tpl | 1 + ihtml/themes/classic/login.tpl | 2 ++ ihtml/themes/default/login.tpl | 1 + include/functions.inc | 6 +++--- 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/html/index.php b/html/index.php index 9ced14d67..d218040f2 100644 --- a/html/index.php +++ b/html/index.php @@ -23,6 +23,10 @@ require_once ("../include/php_setup.inc"); 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 (); @@ -232,6 +236,7 @@ $smarty->assign ("PHPSESSID", session_id()); if (isset($_SESSION['errors'])){ $smarty->assign("errors", $_SESSION['errors']); } +$smarty->assign("php_error", $error_collector); $smarty->display (get_template_path('login.tpl')); // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/ihtml/themes/altlinux/framework.tpl b/ihtml/themes/altlinux/framework.tpl index c40913bf8..fea2a6785 100644 --- a/ihtml/themes/altlinux/framework.tpl +++ b/ihtml/themes/altlinux/framework.tpl @@ -1,5 +1,6 @@ +{$php_errors}