1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
diff -ur phpBB2.orig/admin/pagestart.php phpBB2/admin/pagestart.php
--- phpBB2.orig/admin/pagestart.php 2006-06-09 16:29:41.000000000 +0200
+++ phpBB2/admin/pagestart.php 2006-07-03 13:21:52.000000000 +0200
@@ -52,11 +52,6 @@
redirect("index.$phpEx?sid=" . $userdata['session_id']);
}
-if (!$userdata['session_admin'])
-{
- redirect(append_sid("login.$phpEx?redirect=admin/index.$phpEx&admin=1", true));
-}
-
if (empty($no_page_header))
{
// Not including the pageheader can be neccesarry if META tags are
diff -ur phpBB2.orig/includes/sessions.php phpBB2/includes/sessions.php
--- phpBB2.orig/includes/sessions.php 2006-06-09 16:29:41.000000000 +0200
+++ phpBB2/includes/sessions.php 2006-07-03 13:21:52.000000000 +0200
@@ -172,7 +172,7 @@
// Create or update the session
//
$sql = "UPDATE " . SESSIONS_TABLE . "
- SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login, session_admin = $admin
+ SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login
WHERE session_id = '" . $session_id . "'
AND session_ip = '$user_ip'";
if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
@@ -180,8 +180,8 @@
$session_id = md5(dss_rand());
$sql = "INSERT INTO " . SESSIONS_TABLE . "
- (session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in, session_admin)
- VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login, $admin)";
+ (session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in)
+ VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login)";
if ( !$db->sql_query($sql) )
{
message_die(CRITICAL_ERROR, 'Error creating new session', '', __LINE__, __FILE__, $sql);
@@ -248,7 +248,6 @@
$userdata['session_page'] = $page_id;
$userdata['session_start'] = $current_time;
$userdata['session_time'] = $current_time;
- $userdata['session_admin'] = $admin;
$userdata['session_key'] = $sessiondata['autologinid'];
setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
@@ -339,11 +338,8 @@
//
if ( $current_time - $userdata['session_time'] > 60 )
{
- // A little trick to reset session_admin on session re-usage
- $update_admin = (!defined('IN_ADMIN') && $current_time - $userdata['session_time'] > ($board_config['session_length']+60)) ? ', session_admin = 0' : '';
-
$sql = "UPDATE " . SESSIONS_TABLE . "
- SET session_time = $current_time, session_page = $thispage_id$update_admin
+ SET session_time = $current_time, session_page = $thispage_id
WHERE session_id = '" . $userdata['session_id'] . "'";
if ( !$db->sql_query($sql) )
{
diff -ur phpBB2.orig/install/schemas/mssql_schema.sql phpBB2/install/schemas/mssql_schema.sql
--- phpBB2.orig/install/schemas/mssql_schema.sql 2006-06-09 16:29:41.000000000 +0200
+++ phpBB2/install/schemas/mssql_schema.sql 2006-07-03 13:21:52.000000000 +0200
@@ -191,8 +191,7 @@
[session_time] [int] NULL ,
[session_ip] [char] (8) NOT NULL ,
[session_page] [int] NULL ,
- [session_logged_in] [smallint] NULL,
- [session_admin] [smallint] NULL
+ [session_logged_in] [smallint] NULL
) ON [PRIMARY]
GO
diff -ur phpBB2.orig/install/schemas/mysql_schema.sql phpBB2/install/schemas/mysql_schema.sql
--- phpBB2.orig/install/schemas/mysql_schema.sql 2006-06-09 16:29:41.000000000 +0200
+++ phpBB2/install/schemas/mysql_schema.sql 2006-07-03 13:21:52.000000000 +0200
@@ -306,7 +306,6 @@
session_ip char(8) DEFAULT '0' NOT NULL,
session_page int(11) DEFAULT '0' NOT NULL,
session_logged_in tinyint(1) DEFAULT '0' NOT NULL,
- session_admin tinyint(2) DEFAULT '0' NOT NULL,
PRIMARY KEY (session_id),
KEY session_user_id (session_user_id),
KEY session_id_ip_user_id (session_id, session_ip, session_user_id)
diff -ur phpBB2.orig/install/schemas/postgres_schema.sql phpBB2/install/schemas/postgres_schema.sql
--- phpBB2.orig/install/schemas/postgres_schema.sql 2006-06-09 16:29:41.000000000 +0200
+++ phpBB2/install/schemas/postgres_schema.sql 2006-07-03 13:21:52.000000000 +0200
@@ -290,7 +290,6 @@
session_ip char(8) DEFAULT '0' NOT NULL,
session_page int4 DEFAULT '0' NOT NULL,
session_logged_in int2 DEFAULT '0' NOT NULL,
- session_admin int2 DEFAULT '0' NOT NULL,
CONSTRAINT phpbb_session_pkey PRIMARY KEY (session_id)
);
CREATE INDEX session_user_id_phpbb_sessions_index ON phpbb_sessions (session_user_id);
|
