diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-05-11 16:21:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-05-11 16:21:35 +0000 |
| commit | 4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff (patch) | |
| tree | 477b69dc84a7ec7efc9c8de15b7b28b952320ec7 /phpBB/includes/message_parser.php | |
| parent | 30fd2486d82d50fecd4ba5ec6b81eebc4fcfdf49 (diff) | |
| download | forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.gz forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.bz2 forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.xz forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.zip | |
a few updates, added #539865 and #694413.
git-svn-id: file:///svn/phpbb/trunk@4005 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 9e7b2bc714..bac3348b40 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -576,8 +576,7 @@ echo "<pre><hr>processing <b>$username</b><hr></pre>"; { global $config, $_FILE, $_POST, $auth, $user; - $error = false; - $error_msg = ''; + $error = array(); $num_attachments = count($this->attachment_data); $this->filename_data['filecomment'] = ( isset($_POST['filecomment']) ) ? trim( strip_tags($_POST['filecomment'])) : ''; @@ -593,13 +592,9 @@ echo "<pre><hr>processing <b>$username</b><hr></pre>"; { $filedata = upload_attachment($this->filename_data['filename']); - if ($filedata['error']) - { - $error = true; - $error_msg .= (!empty($error_msg)) ? '<br />' . $filedata['err_msg'] : $filedata['err_msg']; - } + $error = $filedata['error']; - if (($filedata['post_attach']) && (!$error)) + if (($filedata['post_attach']) && (!count($error))) { $new_entry = array( 'physical_filename' => $filedata['destination_filename'], @@ -629,12 +624,11 @@ echo "<pre><hr>processing <b>$username</b><hr></pre>"; } else { - $error = true; - $error_msg .= (!empty($error_msg)) ? '<br />' : '' . sprintf($user->lang['TOO_MANY_ATTACHMENTS'], $config['max_attachments']); + $error[] = sprintf($user->lang['TOO_MANY_ATTACHMENTS'], $config['max_attachments']); } } - if ($preview || $refresh || $error) + if ($preview || $refresh || count($error)) { // Perform actions on temporary attachments if ($delete_file) @@ -675,17 +669,13 @@ echo "<pre><hr>processing <b>$username</b><hr></pre>"; if ((($add_file) || ($preview) ) && ($this->filename_data['filename'] != '') ) { - if ( $num_attachments < $config['max_attachments'] ) //|| $auth->acl_gets('m_', 'a_', $forum_id) ) + if ($num_attachments < $config['max_attachments'] || $auth->acl_gets('m_', 'a_')) { $filedata = upload_attachment($this->filename_data['filename']); - if ($filedata['error']) - { - $error = true; - $error_msg .= (!empty($error_msg)) ? '<br />' . $filedata['err_msg'] : $filedata['err_msg']; - } + $error = array_merge($error, $filedata['error']); - if (!$error) + if (!count($error)) { $new_entry = array( 'physical_filename' => $filedata['destination_filename'], @@ -705,14 +695,13 @@ echo "<pre><hr>processing <b>$username</b><hr></pre>"; } else { - $error = true; - $error_msg .= (!empty($error_msg)) ? '<br />' : '' . sprintf($user->lang['TOO_MANY_ATTACHMENTS'], $config['max_attachments']); + $error[] = sprintf($user->lang['TOO_MANY_ATTACHMENTS'], $config['max_attachments']); } } } } - return ($error_msg); + return ($error); } // Parse Poll |