aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2003-07-04 17:19:00 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2003-07-04 17:19:00 +0000
commit055fe9e82dc15c84dbdad866e8a486397d32cfe9 (patch)
tree80ae44e1b48ee1fd7440655574ff1b2641e96078 /phpBB/includes/functions.php
parentc220126bbd1bac33ca4bf1e13bf2d95a5b980124 (diff)
downloadforums-055fe9e82dc15c84dbdad866e8a486397d32cfe9.tar
forums-055fe9e82dc15c84dbdad866e8a486397d32cfe9.tar.gz
forums-055fe9e82dc15c84dbdad866e8a486397d32cfe9.tar.bz2
forums-055fe9e82dc15c84dbdad866e8a486397d32cfe9.tar.xz
forums-055fe9e82dc15c84dbdad866e8a486397d32cfe9.zip
sqlite support UNION ALL SELECT method
git-svn-id: file:///svn/phpbb/trunk@4203 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 9a0dbd94b0..092b5b592a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -557,9 +557,11 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $marktime = false)
case 'mysql':
case 'mysql4':
$sql .= (($sql != '') ? ', ' : '') . '(' . $user->data['user_id'] . ', ' . $row['forum_id'] . ", $current_time)";
+ $sql = 'VALUES ' . $sql;
break;
case 'mssql':
+ case 'sqlite':
$sql = (($sql != '') ? ' UNION ALL ' : '') . ' SELECT ' . $user->data['user_id'] . ', ' . $row['forum_id'] . ", $current_time";
break;
@@ -572,8 +574,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $marktime = false)
if ($sql != '')
{
- $sql = 'INSERT INTO ' . FORUMS_TRACK_TABLE . ' (user_id, forum_id, mark_time)
- VALUES ' . $sql;
+ $sql = 'INSERT INTO ' . FORUMS_TRACK_TABLE . " (user_id, forum_id, mark_time) $sql";
$db->sql_query($sql);
}
}
@@ -941,6 +942,10 @@ function login_box($s_action, $s_hidden_fields = '', $login_explain = '')
$err = ($result === 0) ? $user->lang['ACTIVE_ERROR'] : $user->lang['LOGIN_ERROR'];
}
+ $sql = 'DELETE FROM ' . CONFIRM_TABLE . '
+ WHERE confirm_time < ' . (time() - $config['session_length']);
+// $db->sql_query($sql);
+
$template->assign_vars(array(
'LOGIN_ERROR' => $err,
'LOGIN_EXPLAIN' => $login_explain,