aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-06-14 15:03:52 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-06-14 15:03:52 +0000
commit6813967ae1024d386c6f829256a66f9391791dda (patch)
tree388382dc11f437491eb43a4707b029759691903f /phpBB/includes/functions.php
parent9693f31404037cce3067f249d1cbbb93ef705cab (diff)
downloadforums-6813967ae1024d386c6f829256a66f9391791dda.tar
forums-6813967ae1024d386c6f829256a66f9391791dda.tar.gz
forums-6813967ae1024d386c6f829256a66f9391791dda.tar.bz2
forums-6813967ae1024d386c6f829256a66f9391791dda.tar.xz
forums-6813967ae1024d386c6f829256a66f9391791dda.zip
Changing the behaviour of the hideonline permission.
Test the current setting before altering the memory limit during install(Bug #12195) And another language var. git-svn-id: file:///svn/phpbb/trunk@7755 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php22
1 files changed, 2 insertions, 20 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b096c7319e..9059352bb7 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2130,24 +2130,6 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
// append/replace SID (may change during the session for AOL users)
$redirect = reapply_sid($redirect);
- // Make sure the user is able to hide his session
- if (!$viewonline)
- {
- $check_auth = new auth();
- $check_auth->acl($user->data);
-
- // Reset online status if not allowed to hide the session...
- if (!$check_auth->acl_get('u_hideonline'))
- {
- $sql = 'UPDATE ' . SESSIONS_TABLE . '
- SET session_viewonline = 1
- WHERE session_user_id = ' . $user->data['user_id'];
- $db->sql_query($sql);
- }
-
- unset($check_auth);
- }
-
// Special case... the user is effectively banned, but we allow founders to login
if (defined('IN_CHECK_BAN') && $result['user_row']['user_type'] != USER_FOUNDER)
{
@@ -3959,7 +3941,7 @@ function page_header($page_title = '', $display_online_list = true)
$user_colour = '';
}
- if ($row['user_allow_viewonline'] && $row['session_viewonline'])
+ if ($row['session_viewonline'])
{
$user_online_link = $row['username'];
$logged_visible_online++;
@@ -3970,7 +3952,7 @@ function page_header($page_title = '', $display_online_list = true)
$logged_hidden_online++;
}
- if (($row['user_allow_viewonline'] && $row['session_viewonline']) || $auth->acl_get('u_viewonline'))
+ if (($row['session_viewonline']) || $auth->acl_get('u_viewonline'))
{
if ($row['user_type'] <> USER_IGNORE)
{