X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fsession.inc;h=1b9c5ce2daa48631079f207014ee2882f22f8cb3;hb=aa7eb75a2b21809008113779e9b6c5fa7a869c9b;hp=9eb70019807a98852d6cb28a5aa76cc687d331fc;hpb=abe7fb7c2dc7f845e5577bc40c7361150ac83c94;p=fa-stable.git

diff --git a/includes/session.inc b/includes/session.inc
index 9eb70019..1b9c5ce2 100644
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -21,7 +21,11 @@ class SessionManager
 		$https = isset($secure) ? $secure : (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
 
 		// Set session cookie options
-		session_set_cookie_params($limit, $path, $domain, $https, true);
+		if (version_compare(PHP_VERSION, '5.2', '<')) // avoid failure on older php versions
+			session_set_cookie_params($limit, $path, $domain, $https);
+		else
+			session_set_cookie_params($limit, $path, $domain, $https, true);
+
 		session_start();
 
 		// Make sure the session hasn't expired, and destroy it if it has
@@ -140,6 +144,35 @@ function login_fail()
 	die();
 }
 
+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 _("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>";
+
+	kill_login();
+	die();
+}
+
+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 "<br><a href='$path_to_root/index.php'>" . _("Login here") . "</a>";
+  echo "</center>";
+	
+	kill_login();
+	die();
+}
+
 function check_faillog()
 {
 	global $login_delay, $login_faillog, $login_max_attempts;
@@ -184,7 +217,7 @@ function write_login_filelog($login, $result)
 	$msg .= "*/\n";
 	$msg .= "\$login_faillog = " .var_export($login_faillog, true). ";\n";
 
-	$filename = $path_to_root."/faillog.php";
+	$filename = $path_to_root."/tmp/faillog.php";
 
 	if ((!file_exists($filename) && is_writable($path_to_root)) || is_writable($filename))
 	{
@@ -354,7 +387,6 @@ foreach ($installed_extensions as $ext)
 // ini_set('session.save_path', dirname(__FILE__).'/../tmp/');
 
 ini_set('session.gc_maxlifetime', 36000); // 10hrs
-ini_set('session.cache_limiter', 'private'); // prevent 'page expired' errors
 
 $Session_manager = new SessionManager();
 $Session_manager->sessionStart('FA'.md5(dirname(__FILE__)));
@@ -366,7 +398,7 @@ include_once($path_to_root . "/config.php");
 get_text_init();
 
 if ($login_delay > 0)
-	@include_once($path_to_root . "/faillog.php");
+	@include_once($path_to_root . "/tmp/faillog.php");
 
 // Page Initialisation
 if (!isset($_SESSION['language']) || !method_exists($_SESSION['language'], 'set_language')) 
@@ -409,7 +441,7 @@ html_cleanup($_SERVER);
 
 // logout.php is the only page we should have always 
 // accessable regardless of access level and current login status.
-if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
+if (!defined('FA_LOGOUT_PHP_FILE')){
 
 	login_timeout();
 
@@ -420,6 +452,33 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 
 	if (!$_SESSION["wa_current_user"]->logged_in())
 	{
+      if (@$allow_password_reset && !$allow_demo_mode
+        && (isset($_GET['reset']) || isset($_POST['email_entry_field']))) {
+		  if (!isset($_POST["email_entry_field"])) {
+        include($path_to_root . "/access/password_reset.php");
+        exit();
+      }
+      else {
+        if (isset($_POST["company_login_nickname"]) && !isset($_POST["company_login_name"])) {
+          for ($i = 0; $i < count($db_connections); $i++) {
+            if ($db_connections[$i]["name"] == $_POST["company_login_nickname"]) {
+              $_POST["company_login_name"] = $i;
+              unset($_POST["company_login_nickname"]);
+              break 1; // cannot pass variables to break from PHP v5.4 onwards
+            }
+          }
+        }
+        $_succeed = isset($db_connections[$_POST["company_login_name"]]) &&
+          $_SESSION["wa_current_user"]->reset_password($_POST["company_login_name"],
+          $_POST["email_entry_field"]);
+        if ($_succeed)
+        {
+          password_reset_success();
+        }
+
+        password_reset_fail();
+      }
+    }
 		// Show login screen
 		if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "")
 		{
@@ -452,6 +511,14 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
 			// Incorrect password
 				login_fail();
 			}
+			elseif(isset($_SESSION['timeout']) && !$_SESSION['timeout']['post'])
+			{
+				// in case of GET request redirect to avoid confirmation dialog 
+				// after return from menu option
+				header("HTTP/1.1 303 See Other");
+				header("Location: ".$_SESSION['timeout']['uri']);
+				exit();
+			}
 			$lang = &$_SESSION['language'];
 			$lang->set_language($_SESSION['language']->code);
 		}
@@ -470,4 +537,4 @@ $SysPrefs = &$_SESSION['SysPrefs'];
 // We quote all values later with db_escape() before db update.
 $_POST = strip_quotes($_POST);
 
-?>
\ No newline at end of file
+?>