From 6f8094c63f914fce9fcfd02780c452d712a2dba3 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 15 Mar 2010 13:22:25 +0000 Subject: [PATCH] Small cleanups --- CHANGELOG.txt | 5 +++++ includes/current_user.inc | 2 +- includes/session.inc | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7bb7a3ad..f1b78fec 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,11 @@ Legend: ! -> Note $ -> Affected files +15-Mar-2010 Janusz Dobrowolski +# Smaller clenaups. +$ /includes/current_user.inc + /includes/session.inc + 10-Mar-2010 Joe Hunt ! Print full Location name on reports $ /reporting/rep105.php diff --git a/includes/current_user.inc b/includes/current_user.inc index bca45f08..ea106e15 100644 --- a/includes/current_user.inc +++ b/includes/current_user.inc @@ -193,7 +193,7 @@ class current_user $date_format, $date_sep, $tho_sep, $dec_sep, $theme, $pagesize, $show_hints, $profile, $rep_popup, $query_size, $graphic_links, $lang, $stickydate, $startup_tab); } - $this->prefs = new user_prefs($user); + $this->prefs = new user_prefs(get_user($this->user)); } } diff --git a/includes/session.inc b/includes/session.inc index ee6d2ff8..e083f932 100644 --- a/includes/session.inc +++ b/includes/session.inc @@ -231,7 +231,9 @@ if (strstr($_SERVER['PHP_SELF'], 'logout.php') == false){ $Ajax->activate('_page_body'); exit; } else { - $succeed = $_SESSION["wa_current_user"]->login($_POST["company_login_name"], + + $succeed = isset($db_connections[$_POST["company_login_name"]]) && + $_SESSION["wa_current_user"]->login($_POST["company_login_name"], $_POST["user_name_entry_field"], md5($_POST["password"])); // select full vs fallback ui mode on login $_SESSION["wa_current_user"]->ui_mode = $_POST['ui_mode']; -- 2.30.2