X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=3f4d7cd4e219138101f1d1ca2f2c64a2563eac4e;hb=818719f38b8327cdca616d58b13913dbd174d96a;hp=c5d417f710d2b0d0dac559939b9573935c3bd27a;hpb=8a3cbfb85641b8949c5b4ce504f2a74e2c03eaf3;p=fa-stable.git diff --git a/includes/session.inc b/includes/session.inc index c5d417f7..3f4d7cd4 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -1,28 +1,62 @@ . +***********************************************************************/ + function output_html($text) + { + global $before_box, $Ajax, $messages; + // Fatal errors are not send to error_handler, + // so we must check the output + if ($text && preg_match('/\bFatal error(<.*?>)?:(.*)/i', $text, $m)) { + $Ajax->aCommands = array(); // Don't update page via ajax on errors + $text = preg_replace('/\bFatal error(<.*?>)?:(.*)/i','', $text); + $messages[] = array(E_ERROR, $m[2], null, null); + } + $Ajax->run(); + return in_ajax() ? fmt_errors() : ($before_box.fmt_errors().$text); + } + + if (!isset($path_to_root)) { $path_to_root = "."; } include_once($path_to_root . "/includes/current_user.inc"); - include_once($path_to_root . "/config.php"); +/* + // Make sure this directory exists and is writable! + $session_save_path = dirname(__FILE__).'/tmp/'; +*/ - include_once($path_to_root . "/includes/main.inc"); + $session_save_path = session_save_path(); + if (strpos($session_save_path, ";") !== false) + $session_save_path = substr($session_save_path, strpos($session_save_path, ";") + 1); + + if (isset($session_save_path)) + { + session_save_path($session_save_path); + unset($session_save_path); + } + if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_to_root'])) + die("Restricted access"); + include_once($path_to_root . "/includes/lang/language.php"); + include_once($path_to_root . "/config_db.php"); + include_once($path_to_root . "/config.php"); + include_once($path_to_root . "/includes/ajax.inc"); + $Ajax =& new Ajax(); + + include_once($path_to_root . "/includes/main.inc"); //---------------------------------------------------------------------------------------- - function kill_login() + function kill_login() { session_unset(); session_destroy(); @@ -30,7 +64,7 @@ //---------------------------------------------------------------------------------------- - function login_fail() + function login_fail() { echo "


" . _("Incorrect Password") . "

"; echo "" . _("The user and password combination is not valid for the system.") . "

"; @@ -45,9 +79,9 @@ //---------------------------------------------------------------------------------------- - function check_page_security($page_security) + function check_page_security($page_security) { - if (!$_SESSION["wa_current_user"]->check_user_access()) + if (!$_SESSION["wa_current_user"]->check_user_access()) { echo "


"; echo "" . _("Security settings have not been defined for your user account."); @@ -57,14 +91,13 @@ exit; } - if (!$_SESSION["wa_current_user"]->can_access_page($page_security)) + if (!$_SESSION["wa_current_user"]->can_access_page($page_security)) { page(_("Access denied")); echo "



"; echo _("The security settings on your account do not permit you to access this function"); echo ""; - echo "

" . _("Back") . ""; - echo "



"; + echo "



"; //echo '