diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-10 18:07:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-10 18:07:12 +0000 |
| commit | 557d09bb72f7e9848b6fc50ed4e2ba651b89e743 (patch) | |
| tree | 9db78285f2e35af8f70dfbb240712164b45bcfd2 /phpBB/includes/ucp | |
| parent | c9478353171267a3ebc5d87b43d759d22684b21e (diff) | |
| download | forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.tar forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.tar.gz forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.tar.bz2 forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.tar.xz forums-557d09bb72f7e9848b6fc50ed4e2ba651b89e743.zip | |
- added updated coding guidelines
- introduced is_registered and is_bot flags for correct determinition of guest/registered/bot users
- changed bot code to act on useragent || ip
git-svn-id: file:///svn/phpbb/trunk@5117 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 1c7752cda8..692d1a53ea 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -441,7 +441,7 @@ class ucp_main extends module if ($config['load_db_lastread']) { - $mark_time_topic = ($user->data['user_id'] != ANONYMOUS) ? $row['mark_time'] : 0; + $mark_time_topic = ($user->data['is_registered']) ? $row['mark_time'] : 0; $mark_time_forum = $row['forum_mark_time']; } else diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index 0ec90c3886..ee67746592 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -45,7 +45,7 @@ class ucp_pm extends module { global $user, $template, $phpbb_root_path, $auth, $phpEx, $db, $SID, $config; - if ($user->data['user_id'] == ANONYMOUS) + if (!$user->data['is_registered']) { trigger_error('NO_MESSAGE'); } @@ -89,7 +89,7 @@ class ucp_pm extends module case 'popup': $l_new_message = ''; - if ($user->data['user_id'] != ANONYMOUS) + if ($user->data['is_registered']) { if ($user->data['user_new_privmsg']) { |