Merged changes from mai trunk up to 2.3.1

[fa-stable.git] / includes / session.inc

diff --git a/includes/session.inc b/includes/session.inc
index 4a50596f14a2f8e2dadea608408990d40c9852bc..261f8914684262a22c3d842646dcd032c369770e 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -182,6 +182,15 @@ include_once($path_to_root . "/includes/ui/ui_msgs.inc");
 include_once($path_to_root . "/includes/prefs/sysprefs.inc");
 
 include_once($path_to_root . "/includes/hooks.inc");
+//
+// include all extensions hook files.
+//
+foreach ($installed_extensions as $ext)
+{
+       if (file_exists($path_to_root.'/'.$ext['path'].'/hooks.php'))
+               include_once($path_to_root.'/'.$ext['path'].'/hooks.php');
+}
+
 
 /*
        Uncomment the setting below when using FA on shared hosting
@@ -192,9 +201,12 @@ include_once($path_to_root . "/includes/hooks.inc");
 
 ini_set('session.gc_maxlifetime', 36000); // 10hrs
 
+hook_session_start(@$_POST["company_login_name"]);
+
 session_name('FA'.md5(dirname(__FILE__)));
-//include_once($path_to_root.'/modules/www_statistics/includes/db_sessions.inc');
+
 session_start();
+session_regenerate_id();
 
 // this is to fix the "back-do-you-want-to-refresh" issue - thanx PHPFreaks
 header("Cache-control: private");
@@ -239,6 +251,7 @@ if (!isset($_SESSION["wa_current_user"]))
 html_cleanup($_GET);
 html_cleanup($_POST);
 html_cleanup($_REQUEST);
+html_cleanup($_SERVER);
 
 // logout.php is the only page we should have always 
 // accessable regardless of access level and current login status.