aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-10-15 17:43:07 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-10-15 17:43:07 +0000
commita47fa4d6cab862a9635f3e30d01ad2740c45a888 (patch)
tree10d3ad33badde24948065613ff884cc37ee87781 /phpBB/adm
parent8661a45de596e06e89e8fa8f12efb91293780419 (diff)
downloadforums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar
forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar.gz
forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar.bz2
forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.tar.xz
forums-a47fa4d6cab862a9635f3e30d01ad2740c45a888.zip
Remove need for session_ids for "allowed" bots, dump user_founder/user_active in favour of user_type, new user_type, USER_IGNORE
git-svn-id: file:///svn/phpbb/trunk@4603 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
-rw-r--r--phpBB/adm/admin_jabber.php2
-rw-r--r--phpBB/adm/index.php9
2 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/adm/admin_jabber.php b/phpBB/adm/admin_jabber.php
index f998578b94..5661a01f35 100644
--- a/phpBB/adm/admin_jabber.php
+++ b/phpBB/adm/admin_jabber.php
@@ -3,7 +3,7 @@
//
// $Id$
//
-// FILENAME : viewtopic.php
+// FILENAME : admin_jabber.php
// STARTED : Sat Feb 13, 2001
// COPYRIGHT : © 2001, 2003 phpBB Group
// WWW : http://www.phpbb.com/
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index d5f4c05203..8dfa55743a 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -145,7 +145,7 @@ elseif ($pane == 'right')
trigger_error($user->lang['NO_ADMIN']);
}
- $sql = ($activate) ? 'UPDATE ' . USERS_TABLE . " SET user_active = 1 WHERE user_id IN ($mark)" : 'DELETE FROM ' . USERS_TABLE . " WHERE user_id IN ($mark)";
+ $sql = ($activate) ? 'UPDATE ' . USERS_TABLE . ' SET user_type = ' . USER_NORMAL . " WHERE user_id IN ($mark)" : 'DELETE FROM ' . USERS_TABLE . " WHERE user_id IN ($mark)";
$db->sql_query($sql);
if (!$delete)
@@ -253,7 +253,7 @@ elseif ($pane == 'right')
$sql = 'SELECT COUNT(user_id) AS stat
FROM ' . USERS_TABLE . '
- WHERE user_active = 1';
+ WHERE user_type IN (' . USER_NORMAL . ',' . USER_FOUNDER . ')';
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
@@ -516,9 +516,8 @@ elseif ($pane == 'right')
<?php
$sql = 'SELECT user_id, username, user_regdate
- FROM ' . USERS_TABLE . '
- WHERE user_active = 0
- AND user_id <> ' . ANONYMOUS . '
+ FROM ' . USERS_TABLE . '
+ WHERE user_type = ' . USER_INACTIVE . '
ORDER BY user_regdate ASC';
$result = $db->sql_query($sql);