mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00
Code Issues Releases Wiki Activity

'1' might not have been a good choice

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8216 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-10-29 13:39:34 +00:00
parent 2adef2c457
commit 04ebbeca3f
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/constants.php
View File

@ -169,7 +169,7 @@ define('FIELD_DATE', 6);
// Additional constants
define('VOTE_CONVERTED', 9999);
// Table names
define('ACL_GROUPS_TABLE', $table_prefix . 'acl_groups');

2
phpBB/install/convertors/convert_phpbb20.php
View File

@ -571,7 +571,7 @@ if (!$get_info)
'primary' => 'vote_desc.topic_id',
'query_first' => array('target', $convert->truncate_statement . POLL_VOTES_TABLE),
array('poll_option_id', 1, ''),
array('poll_option_id', VOTE_CONVERTED, ''),
array('topic_id', 'vote_desc.topic_id', ''),
array('vote_user_id', 'vote_voters.vote_user_id', 'phpbb_user_id'),
array('vote_user_ip', 'vote_voters.vote_user_ip', 'decode_ip'),

1
phpBB/language/en/viewtopic.php
View File

@ -105,6 +105,7 @@ $lang = array_merge($lang, array(
'VIEW_UNREAD_POST' => 'First unread post',
'VISIT_WEBSITE' => 'WWW',
'VOTE_SUBMITTED' => 'Your vote has been cast.',
'VOTE_CONVERTED' => 'Changing votes is not supported for converted polls.',
));

18
phpBB/viewtopic.php
View File

@ -654,13 +654,25 @@ if (!empty($topic_data['poll_start']))
if ($update && $s_can_vote)
{
if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'])
if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id))
{
$redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start");
meta_refresh(5, $redirect_url);
$message = (!sizeof($voted_id)) ? 'NO_VOTE_OPTION' : 'TOO_MANY_VOTE_OPTIONS';
if (!sizeof($voted_id))
{
$message = 'NO_VOTE_OPTION';
}
else if (sizeof($voted_id) > $topic_data['poll_max_options'])
{
$message = 'TOO_MANY_VOTE_OPTIONS';
}
else
{
$message = 'VOTE_CONVERTED';
}
$message = $user->lang[$message] . '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $redirect_url . '">', '</a>');
trigger_error($message);
}