diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-12 16:14:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-12 16:14:07 +0000 |
| commit | 002dd8155708415b3c1c828789feccbfc087a387 (patch) | |
| tree | 9c7ec297cc23082f2b5894cd28657f5e7b2492fb /phpBB/includes | |
| parent | 2ba03a411e561cb943f8ec8f11afc51eaa720275 (diff) | |
| download | forums-002dd8155708415b3c1c828789feccbfc087a387.tar forums-002dd8155708415b3c1c828789feccbfc087a387.tar.gz forums-002dd8155708415b3c1c828789feccbfc087a387.tar.bz2 forums-002dd8155708415b3c1c828789feccbfc087a387.tar.xz forums-002dd8155708415b3c1c828789feccbfc087a387.zip | |
some more fixes
git-svn-id: file:///svn/phpbb/trunk@7875 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/message_parser.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 20 |
3 files changed, 33 insertions, 4 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 3579467bff..e7b7edc169 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1228,6 +1228,11 @@ class parse_message extends bbcode_firstpass while ($row = $db->sql_fetchrow($result)) { + if (empty($row['code'])) + { + continue; + } + // (assertion) $match[] = '(?<=^|[\n .])' . preg_quote($row['code'], '#') . '(?![^<>]*>)'; $replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->'; diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 8a9021b573..9a98f442d4 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1506,10 +1506,16 @@ class user extends session // Is load exceeded? if ($config['limit_load'] && $this->load !== false) { - if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) + if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN')) { - header('HTTP/1.1 503 Service Unavailable'); - trigger_error('BOARD_UNAVAILABLE'); + // Set board disabled to true to let the admins/mods get the proper notification + $config['board_disable'] = '1'; + + if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) + { + header('HTTP/1.1 503 Service Unavailable'); + trigger_error('BOARD_UNAVAILABLE'); + } } } diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index e296ad12b1..56a11afe33 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -208,12 +208,30 @@ function compose_pm($id, $mode, $action) if ($sql) { - $result = $db->sql_query_limit($sql, 1); + $result = $db->sql_query($sql); $post = $db->sql_fetchrow($result); $db->sql_freeresult($result); if (!$post) { + // If editing it could be the recipient already read the message... + if ($action == 'edit') + { + $sql = 'SELECT p.*, t.folder_id + FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p + WHERE t.user_id = ' . $user->data['user_id'] . " + AND t.msg_id = $msg_id + AND t.msg_id = p.msg_id"; + $result = $db->sql_query($sql); + $post = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if ($post) + { + trigger_error('NO_EDIT_READ_MESSAGE'); + } + } + trigger_error('NO_MESSAGE'); } |