X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=bba6496fddd1dc6a861c9db4b149cf63aabe734b;hb=ca4b0e00f434d0180fe3e3ec9fa3d31a278a9fef;hp=65bc9929fa39c00b9d3695c0c48bdee400265170;hpb=33cabd27cc1bb3aaed559ba37691b7b27d45896e;p=fa-stable.git

diff --git a/includes/session.inc b/includes/session.inc
index 65bc9929..bba6496f 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -148,12 +148,12 @@ function password_reset_fail()
 {
 	global $path_to_root;
 	
-  echo "<center><br><br><font size='5' color='red'><b>" . _("Incorrect Email") . "<b></font><br><br>";
-  echo "<b>" . _("The email address does not exist in the system.") . "<b><br><br>";
+  	echo "<center><br><br><font size='5' color='red'><b>" . _("Incorrect Email") . "<b></font><br><br>";
+  	echo "<b>" . _("The email address does not exist in the system, or is used by more than one user.") . "<b><br><br>";
 
-  echo _("If you are not an authorized user, please contact your system administrator to obtain an account to enable you to use the system.");
-  echo "<br><a href='$path_to_root/index.php?reset=1'>" . _("Try again") . "</a>";
-  echo "</center>";
+  	echo _("Plase try again or contact your system administrator to obtain new password.");
+  	echo "<br><a href='$path_to_root/index.php?reset=1'>" . _("Try again") . "</a>";
+  	echo "</center>";
 
 	kill_login();
 	die();
@@ -163,11 +163,11 @@ function password_reset_success()
 {
 	global $path_to_root;
 
-  echo "<center><br><br><font size='5' color='green'><b>" . _("New password sent") . "<b></font><br><br>";
-  echo "<b>" . _("A new password has been sent to your mailbox.") . "<b><br><br>";
+  	echo "<center><br><br><font size='5' color='green'><b>" . _("New password sent") . "<b></font><br><br>";
+  	echo "<b>" . _("A new password has been sent to your mailbox.") . "<b><br><br>";
 
-  echo "<br><a href='$path_to_root/index.php'>" . _("Login here") . "</a>";
-  echo "</center>";
+  	echo "<br><a href='$path_to_root/index.php'>" . _("Login here") . "</a>";
+  	echo "</center>";
 	
 	kill_login();
 	die();
@@ -184,6 +184,16 @@ function check_faillog()
 
 	return false;
 }
+
+/*
+	Ensure file is re-read on next request if php caching is active
+*/
+function cache_invalidate($filename)
+{
+	if (function_exists('opcache_invalidate'))	// OpCode extension
+		opcache_invalidate($filename);
+}
+
 /*
 	Simple brute force attack detection is performed before connection to company database is open. Therefore access counters have to be stored in file.
 	Login attempts counter is created for every new user IP, which partialy prevent DOS attacks.
@@ -222,6 +232,7 @@ function write_login_filelog($login, $result)
 	if ((!file_exists($filename) && is_writable($path_to_root.'/tmp')) || is_writable($filename))
 	{
 		file_put_contents($filename, $msg);
+		cache_invalidate($filename);
 	}
 }
 
@@ -361,6 +372,7 @@ if (isset($_GET['path_to_root']) || isset($_POST['path_to_root']))
 include_once($path_to_root . "/includes/errors.inc");
 // colect all error msgs
 set_error_handler('error_handler' /*, errtypes */);
+set_exception_handler('exception_handler');
 
 include_once($path_to_root . "/includes/current_user.inc");
 include_once($path_to_root . "/frontaccounting.php");
@@ -408,7 +420,6 @@ if ($SysPrefs->error_logfile != '') {
 	ini_set("log_errors", "On");
 }
 
-
 /*
 	Uncomment the setting below when using FA on shared hosting
 	to avoid unexpeced session timeouts.
@@ -476,7 +487,7 @@ if (!defined('FA_LOGOUT_PHP_FILE')){
 	login_timeout();
 
 	if (!$_SESSION["wa_current_user"]->old_db)
-		include_once($path_to_root . '/company/'.user_company().'/installed_extensions.php');
+		include($path_to_root . '/company/'.user_company().'/installed_extensions.php');
 
 	install_hooks();
 
@@ -559,7 +570,7 @@ if (!defined('FA_LOGOUT_PHP_FILE')){
 		if (db_fixed())
 			db_set_encoding($_SESSION['language']->encoding);
 
-		$SysPrefs->refresh_company_prefs();
+		$SysPrefs->refresh();
 	}
 	if (!isset($_SESSION["App"])) {
 		$_SESSION["App"] = new front_accounting();