From c0c424a564d2f3d847bd910fd30f3a60128579d8 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 15 Jul 2007 12:09:54 +0000 Subject: #13435 git-svn-id: file:///svn/phpbb/trunk@7887 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/posting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 403eea5418..20a1c9c73b 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -994,7 +994,7 @@ if ($submit || $preview || $refresh) { meta_refresh(10, $redirect_url); $message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD']; - $message .= (($user->data['user_id'] == ANONYMOUS) ? '' : $user->lang['POST_APPROVAL_NOTIFY']); + $message .= (($user->data['user_id'] == ANONYMOUS) ? '' : ' '. $user->lang['POST_APPROVAL_NOTIFY']); } else { -- cgit v1.2.1 From 13aae518665d1f01aee075efe15aba68c1f3576b Mon Sep 17 00:00:00 2001 From: David M Date: Sat, 21 Jul 2007 16:11:09 +0000 Subject: #13657 - thanks Thatbitextra git-svn-id: file:///svn/phpbb/trunk@7917 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/posting.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 20a1c9c73b..282f651f43 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1070,10 +1070,11 @@ if (!sizeof($error) && $preview) $preview_poll_options = explode('
', $parse_poll->message); unset($parse_poll); - foreach ($preview_poll_options as $option) + foreach ($preview_poll_options as $key => $option) { $template->assign_block_vars('poll_option', array( - 'POLL_OPTION_CAPTION' => $option) + 'POLL_OPTION_CAPTION' => $option, + 'POLL_OPTION_ID' => $key + 1) ); } unset($preview_poll_options); -- cgit v1.2.1 From ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 22 Jul 2007 20:11:45 +0000 Subject: try to normalize everything... git-svn-id: file:///svn/phpbb/trunk@7920 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/posting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 282f651f43..11cce9a451 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -561,7 +561,7 @@ $solved_captcha = false; if ($submit || $preview || $refresh) { $post_data['topic_cur_post_id'] = request_var('topic_cur_post_id', 0); - $post_data['post_subject'] = trim(utf8_normalize_nfc(request_var('subject', '', true))); + $post_data['post_subject'] = utf8_normalize_nfc(request_var('subject', '', true)); $message_parser->message = utf8_normalize_nfc(request_var('message', '', true)); $post_data['username'] = utf8_normalize_nfc(request_var('username', $post_data['username'], true)); -- cgit v1.2.1 From a43ead8ee7db832871db9cd2c4f294108398f4b0 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 26 Jul 2007 15:51:11 +0000 Subject: do not get too excited git-svn-id: file:///svn/phpbb/trunk@7954 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/posting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 11cce9a451..7fa97be4c5 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); -- cgit v1.2.1 From 1a5413275978a307d200d0b52cc30c75da003669 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Fri, 27 Jul 2007 14:55:48 +0000 Subject: #13800 git-svn-id: file:///svn/phpbb/trunk@7958 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/posting.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 7fa97be4c5..c2712009a1 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -512,7 +512,7 @@ if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ( } else { - if (!$subject) + if (!$subject || !utf_clean_string($subject)) { $error[] = $user->lang['EMPTY_SUBJECT']; } @@ -756,7 +756,7 @@ if ($submit || $preview || $refresh) } // Parse subject - if (!$preview && !$refresh && !$post_data['post_subject'] && ($mode == 'post' || ($mode == 'edit' && $post_data['topic_first_post_id'] == $post_id))) + if (!$preview && !$refresh && !utf8_clean_string($post_data['post_subject']) && ($mode == 'post' || ($mode == 'edit' && $post_data['topic_first_post_id'] == $post_id))) { $error[] = $user->lang['EMPTY_SUBJECT']; } -- cgit v1.2.1 From acf0c0ddebf13b6075b6dac81c7675dd04d4a692 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 27 Jul 2007 17:33:27 +0000 Subject: err, forgot to commit git-svn-id: file:///svn/phpbb/trunk@7961 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/posting.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index c2712009a1..92b44b3f21 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -476,12 +476,12 @@ if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ( if (confirm_box(true)) { $sql = 'INSERT INTO ' . DRAFTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'user_id' => $user->data['user_id'], - 'topic_id' => $topic_id, - 'forum_id' => $forum_id, - 'save_time' => $current_time, - 'draft_subject' => $subject, - 'draft_message' => $message) + 'user_id' => (int) $user->data['user_id'], + 'topic_id' => (int) $topic_id, + 'forum_id' => (int) $forum_id, + 'save_time' => (int) $current_time, + 'draft_subject' => (string) $subject, + 'draft_message' => (string) $message) ); $db->sql_query($sql); -- cgit v1.2.1