diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-28 17:35:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-28 17:35:20 +0000 |
| commit | 0334d424779dac4f0adf89caa0362a03f93163c3 (patch) | |
| tree | 91f9771d64488df6366eac5e76f783a1979576e1 /phpBB/includes/session.php | |
| parent | 761598e1b78d704b7f9aed82f8ac35673b4174bd (diff) | |
| download | forums-0334d424779dac4f0adf89caa0362a03f93163c3.tar forums-0334d424779dac4f0adf89caa0362a03f93163c3.tar.gz forums-0334d424779dac4f0adf89caa0362a03f93163c3.tar.bz2 forums-0334d424779dac4f0adf89caa0362a03f93163c3.tar.xz forums-0334d424779dac4f0adf89caa0362a03f93163c3.zip | |
- some changes to browser checking (was the reason for not working logins)
- partly working style acp
- other tiny changes here and there
git-svn-id: file:///svn/phpbb/trunk@5388 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 19569be832..0094b4e107 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -105,8 +105,8 @@ class session $s_ip = implode('.', array_slice(explode('.', $this->data['session_ip']), 0, $config['ip_check'])); $u_ip = implode('.', array_slice(explode('.', $this->ip), 0, $config['ip_check'])); - $s_browser = ($config['browser_check']) ? $this->data['session_browser'] : ''; - $u_browser = ($config['browser_check']) ? $this->browser : ''; + $s_browser = ($config['browser_check']) ? substr($this->data['session_browser'], 0, 149) : ''; + $u_browser = ($config['browser_check']) ? substr($this->browser, 0, 149) : ''; if ($u_ip == $s_ip && $s_browser == $u_browser) { @@ -312,6 +312,7 @@ class session $sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE session_id = '" . $db->sql_escape($this->session_id) . "'"; + if (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows()) { // Limit new sessions in 1 minute period (if required) @@ -666,7 +667,7 @@ class session ); } - $sql = ($key) ? 'UPDATE ' . SESSIONS_KEYS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . (int) $user_id . ' AND key_id = "' . $db->sql_escape($key) . '"' : 'INSERT INTO ' . SESSIONS_KEYS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); + $sql = ($key) ? 'UPDATE ' . SESSIONS_KEYS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . (int) $user_id . ' AND key_id = "' . $db->sql_escape(md5($key)) . '"' : 'INSERT INTO ' . SESSIONS_KEYS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $db->sql_query($sql); $this->cookie_data['k'] = $key_id; |