diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-31 18:00:10 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-05-31 18:00:10 +0000 |
| commit | 2c470e4b27f4e5df4c996d6755ebbb1f7306d86a (patch) | |
| tree | 3a8748f72fcba6da3ba2bc9e0fbc047c71deadd7 /phpBB/viewtopic.php | |
| parent | 6aa42b69abe798388aad4f7e6bf943dfb608e896 (diff) | |
| download | forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.tar forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.tar.gz forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.tar.bz2 forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.tar.xz forums-2c470e4b27f4e5df4c996d6755ebbb1f7306d86a.zip | |
- added delete cookies link
- fixed global announcement links in viewforum
- do not display redirects in link forums as posts in forum overview
git-svn-id: file:///svn/phpbb/trunk@4904 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 5224eda215..8a59d5e6b4 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -65,9 +65,17 @@ if ($view && !$post_id) } else { - $tracking_topics = unserialize(request_var($config['cookie_name'] . '_track', array())); - $sql_unread_time = base_convert(max($tracking_topics[$forum_id]), 36, 10); - $sql_unread_time = max($sql_unread_time, $user->data['session_last_visit']); + $sql_lastread = ''; + $sql_unread_time = 0; + if (isset($_COOKIE[$config['cookie_name'] . '_track'])) + { + $tracking_topics = unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_track'])); + if (isset($tracking_topics[$forum_id])) + { + $sql_unread_time = base_convert(max($tracking_topics[$forum_id]), 36, 10); + $sql_unread_time = max($sql_unread_time, $user->data['session_last_visit']); + } + } } $sql = 'SELECT p.post_id @@ -198,10 +206,18 @@ if ($user->data['user_id'] != ANONYMOUS) } else { - $tracking_topics = unserialize(request_var($config['cookie_name'] . '_track', array())); - $topic_last_read = base_convert(max($tracking_topics[$forum_id]), 36, 10); - $topic_last_read = max($sql_unread_time, $user->data['session_last_visit']); - unset($tracking_topics); + $topic_last_read = 0; + if (isset($_COOKIE[$config['cookie_name'] . '_track'])) + { + $tracking_topics = unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_track'])); + + if (isset($tracking_topics[$forum_id])) + { + $topic_last_read = base_convert(max($tracking_topics[$forum_id]), 36, 10); + $topic_last_read = max($topic_last_read, $user->data['session_last_visit']); + } + unset($tracking_topics); + } } } else @@ -535,7 +551,7 @@ if (!empty($poll_start)) if ($user->data['user_id'] == ANONYMOUS) { - setcookie($config['cookie_name'] . '_poll_' . $topic_id, implode(',', $voted_id), time() + 31536000, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $user->set_cookie('poll_' . $topic_id, implode(',', $voted_id), time() + 31536000); } //, topic_last_post_time = ' . time() . " @@ -950,7 +966,7 @@ if (count($attach_list)) // Instantiate BBCode if need be if ($bbcode_bitfield) { - include($phpbb_root_path . 'includes/bbcode.'.$phpEx); + include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); $bbcode = new bbcode($bbcode_bitfield); } |