projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Certain new releases of MySql don't accept empty numeric values.
[fa-stable.git]
/
includes
/
session.inc
diff --git
a/includes/session.inc
b/includes/session.inc
index ed5f5c0312e1da7773c34f1676a4407c233898bd..37591d3489e8bdbceffdb78b28eece26c6053966 100644
(file)
--- a/
includes/session.inc
+++ b/
includes/session.inc
@@
-76,8
+76,7
@@
class SessionManager
$_SESSION['EXPIRES'] = time() + 10;
// Create new session without destroying the old one
$_SESSION['EXPIRES'] = time() + 10;
// Create new session without destroying the old one
- session_regenerate_id(version_compare(PHP_VERSION, '5.1.0') >= 0 && (substr(strtoupper(PHP_OS),0,3) == "WIN"));
-
+ session_regenerate_id();
// Grab current session ID and close both sessions to allow other scripts to use them
$newSession = session_id();
session_write_close();
// Grab current session ID and close both sessions to allow other scripts to use them
$newSession = session_id();
session_write_close();
@@
-355,7
+354,6
@@
foreach ($installed_extensions as $ext)
// ini_set('session.save_path', dirname(__FILE__).'/../tmp/');
ini_set('session.gc_maxlifetime', 36000); // 10hrs
// 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__)));
$Session_manager = new SessionManager();
$Session_manager->sessionStart('FA'.md5(dirname(__FILE__)));
@@
-453,6
+451,14
@@
if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){
// Incorrect password
login_fail();
}
// Incorrect password
login_fail();
}
+ elseif(!$_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);
}
$lang = &$_SESSION['language'];
$lang->set_language($_SESSION['language']->code);
}