Vergleich polls.php - 1.8.6 - 1.8.23

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 24	Zeile 24
if($mybb->user['uid'] != 0) {	if($mybb->user['uid'] != 0) {
	$mybb->user['username'] = htmlspecialchars_uni($mybb->user['username']);
eval("\$loginbox = \"".$templates->get("changeuserbox")."\";"); } else	eval("\$loginbox = \"".$templates->get("changeuserbox")."\";"); } else
Zeile 51	Zeile 52
$plugins->run_hooks("polls_newpoll_start"); $thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT));	$plugins->run_hooks("polls_newpoll_start"); $thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT));
if(!$thread) {	if(!$thread \|\| $thread['visible'] == -1) {
error($lang->error_invalidthread);	error($lang->error_invalidthread);
}	}
// Is the currently logged in user a moderator of this forum?	// Is the currently logged in user a moderator of this forum?
if(is_moderator($thread['fid'])) { $ismod = true; } else { $ismod = false; }	$ismod = is_moderator($thread['fid']);
// Make sure we are looking at a real thread here. if(($thread['visible'] != 1 && $ismod == false) \|\| ($thread['visible'] > 1 && $ismod == true))	// Make sure we are looking at a real thread here. if(($thread['visible'] != 1 && $ismod == false) \|\| ($thread['visible'] > 1 && $ismod == true))
Zeile 104	Zeile 98
if($thread['poll']) { error($lang->error_pollalready);	if($thread['poll']) { error($lang->error_pollalready);
}	}
$time = TIME_NOW; if($thread['dateline'] < ($time-($mybb->settings['polltimelimit']6060)) && $mybb->settings['polltimelimit'] != 0 && $ismod == false) {	$time = TIME_NOW; if($thread['dateline'] < ($time-($mybb->settings['polltimelimit']6060)) && $mybb->settings['polltimelimit'] != 0 && $ismod == false) {
Zeile 136	Zeile 130
$postoptionschecked = array('public' => '', 'multiple' => ''); $postoptions = $mybb->get_input('postoptions', MyBB::INPUT_INT); if(isset($postoptions['multiple']) && $postoptions['multiple'] == 1)	$postoptionschecked = array('public' => '', 'multiple' => ''); $postoptions = $mybb->get_input('postoptions', MyBB::INPUT_INT); if(isset($postoptions['multiple']) && $postoptions['multiple'] == 1)
{	{
$postoptionschecked['multiple'] = 'checked="checked"'; } if(isset($postoptions['public']) && $postoptions['public'] == 1)	$postoptionschecked['multiple'] = 'checked="checked"'; } if(isset($postoptions['public']) && $postoptions['public'] == 1)
Zeile 165	Zeile 159
else { $timeout = 0;	else { $timeout = 0;
}	}
if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $polloptions)	if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $polloptions)
{	{
$maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT);	$maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT);
}	}
else { $maxoptions = 0;	else { $maxoptions = 0;
Zeile 182	Zeile 176
output_page($newpoll); } if($mybb->input['action'] == "do_newpoll" && $mybb->request_method == "post")	output_page($newpoll); } if($mybb->input['action'] == "do_newpoll" && $mybb->request_method == "post")
{ // Verify incoming POST request verify_post_check($mybb->get_input('my_post_key')); $plugins->run_hooks("polls_do_newpoll_start");	{ // Verify incoming POST request verify_post_check($mybb->get_input('my_post_key')); $plugins->run_hooks("polls_do_newpoll_start");
$thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT)); if(!$thread) { error($lang->error_invalidthread); }	$thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT)); if(!$thread) { error($lang->error_invalidthread); }

$fid = $thread['fid']; $forumpermissions = forum_permissions($fid);	$fid = $thread['fid']; $forumpermissions = forum_permissions($fid);
Zeile 202	Zeile 196
if(!$forum) { error($lang->error_invalidforum);	if(!$forum) { error($lang->error_invalidforum);
} else	} else
{ // Is our forum closed? if($forum['open'] == 0 && !is_moderator($fid, "canmanagepolls"))	{ // Is our forum closed? if($forum['open'] == 0 && !is_moderator($fid, "canmanagepolls"))
Zeile 277	Zeile 271
{ error($lang->error_polloptiontoolong); }	{ error($lang->error_polloptiontoolong); }

if(isset($sequenceerror)) { error($lang->error_polloptionsequence);	if(isset($sequenceerror)) { error($lang->error_polloptionsequence);
Zeile 316	Zeile 310
} if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $polloptions)	} if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $polloptions)
{ $maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT); }	{ $maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT); }
else { $maxoptions = 0; }	else { $maxoptions = 0; }

$newpoll = array( "tid" => $thread['tid'], "question" => $db->escape_string($mybb->input['question']),	$newpoll = array( "tid" => $thread['tid'], "question" => $db->escape_string($mybb->input['question']),
Zeile 348	Zeile 342
$plugins->run_hooks("polls_do_newpoll_end"); if($thread['visible'] == 1)	$plugins->run_hooks("polls_do_newpoll_end"); if($thread['visible'] == 1)
{	{
redirect(get_thread_link($thread['tid']), $lang->redirect_pollposted); } else	redirect(get_thread_link($thread['tid']), $lang->redirect_pollposted); } else
Zeile 380	Zeile 374
$tid = $thread['tid']; $fid = $thread['fid'];	$tid = $thread['tid']; $fid = $thread['fid'];

// Make navigation build_forum_breadcrumb($fid); add_breadcrumb(htmlspecialchars_uni($thread['subject']), get_thread_link($thread['tid']));	// Make navigation build_forum_breadcrumb($fid); add_breadcrumb(htmlspecialchars_uni($thread['subject']), get_thread_link($thread['tid']));
Zeile 446	Zeile 440
$counter = $i + 1; $option = $optionsarray[$i]; $option = htmlspecialchars_uni($option);	$counter = $i + 1; $option = $optionsarray[$i]; $option = htmlspecialchars_uni($option);
$optionvotes = (int)$votesarray[$i]; if(!$optionvotes) { $optionvotes = 0;	$optionvotes = (int)$votesarray[$i]; if(!$optionvotes) { $optionvotes = 0;
}	}

eval("\$optionbits .= \"".$templates->get("polls_editpoll_option")."\";"); $option = ""; $optionvotes = "";	eval("\$optionbits .= \"".$templates->get("polls_editpoll_option")."\";"); $option = ""; $optionvotes = "";
}	}
if(!$poll['timeout']) {	if(!$poll['timeout']) {
$timeout = 0;	$timeout = 0; } else { $timeout = $poll['timeout'];
}	}
else { $timeout = $poll['timeout']; }
if(!$poll['maxoptions']) { $maxoptions = 0;	if(!$poll['maxoptions']) { $maxoptions = 0;
Zeile 477	Zeile 471
} } else	} } else
{ if($mybb->settings['maxpolloptions'] && $mybb->get_input('numoptions', MyBB::INPUT_INT) > $mybb->settings['maxpolloptions'])	{ if($mybb->settings['maxpolloptions'] && $mybb->get_input('numoptions', MyBB::INPUT_INT) > $mybb->settings['maxpolloptions'])
{ $numoptions = $mybb->settings['maxpolloptions']; }	{ $numoptions = $mybb->settings['maxpolloptions']; }
Zeile 542	Zeile 536
{ $timeout = 0; }	{ $timeout = 0; }

if(!$poll['maxoptions'])	if(!$poll['maxoptions'])
{	{
$maxoptions = 0; } else	$maxoptions = 0; } else
Zeile 577	Zeile 571
$query = $db->simple_select("threads", "*", "poll='".$mybb->get_input('pid', MyBB::INPUT_INT)."'"); $thread = $db->fetch_array($query); if(!$thread)	$query = $db->simple_select("threads", "*", "poll='".$mybb->get_input('pid', MyBB::INPUT_INT)."'"); $thread = $db->fetch_array($query); if(!$thread)
{ error($lang->error_invalidthread); } $forumpermissions = forum_permissions($thread['fid']);	{ error($lang->error_invalidthread); } $forumpermissions = forum_permissions($thread['fid']);
// Get forum info $forum = get_forum($thread['fid']); $fid = $thread['fid'];	// Get forum info $forum = get_forum($thread['fid']); $fid = $thread['fid'];
Zeile 597	Zeile 591
{ // Doesn't look like it is error($lang->error_closedinvalidforum);	{ // Doesn't look like it is error($lang->error_closedinvalidforum);
} }	} }
if(!is_moderator($thread['fid'], "canmanagepolls")) {	if(!is_moderator($thread['fid'], "canmanagepolls")) {
Zeile 606	Zeile 600
} if($mybb->settings['maxpolloptions'] && $mybb->get_input('numoptions', MyBB::INPUT_INT) > $mybb->settings['maxpolloptions'])	} if($mybb->settings['maxpolloptions'] && $mybb->get_input('numoptions', MyBB::INPUT_INT) > $mybb->settings['maxpolloptions'])
{	{
$numoptions = $mybb->settings['maxpolloptions'];	$numoptions = $mybb->settings['maxpolloptions'];
}	}
elseif($mybb->get_input('numoptions', MyBB::INPUT_INT) < 2)	elseif($mybb->get_input('numoptions', MyBB::INPUT_INT) < 2)
{	{
$numoptions = 2; }	$numoptions = 2; }
else { $numoptions = $mybb->get_input('numoptions', MyBB::INPUT_INT); }	else { $numoptions = $mybb->get_input('numoptions', MyBB::INPUT_INT); }
$postoptions = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY); if(!isset($postoptions['multiple']) \|\| $postoptions['multiple'] != '1')	$postoptions = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY); if(!isset($postoptions['multiple']) \|\| $postoptions['multiple'] != '1')
{	{
$postoptions['multiple'] = 0;	$postoptions['multiple'] = 0;
}	}
if(!isset($postoptions['public']) \|\| $postoptions['public'] != '1') {	if(!isset($postoptions['public']) \|\| $postoptions['public'] != '1') {
Zeile 630	Zeile 624
} if(!isset($postoptions['closed']) \|\| $postoptions['closed'] != '1')	} if(!isset($postoptions['closed']) \|\| $postoptions['closed'] != '1')
{	{
$postoptions['closed'] = 0; } $optioncount = "0";	$postoptions['closed'] = 0; } $optioncount = "0";
Zeile 697	Zeile 691
$votes[$i] = "0"; } $voteslist .= $votes[$i];	$votes[$i] = "0"; } $voteslist .= $votes[$i];
$numvotes = $numvotes + $votes[$i];	$numvotes = (int)$numvotes + (int)$votes[$i];
} }	} }
Zeile 709	Zeile 703
{ $timeout = 0; }	{ $timeout = 0; }

if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $numoptions) { $maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT);	if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $numoptions) { $maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT);
Zeile 757	Zeile 751
$tid = $poll['tid']; $thread = get_thread($tid);	$tid = $poll['tid']; $thread = get_thread($tid);
if(!$thread) {	if(!$thread \|\| ($thread['visible'] != 1 && ($thread['visible'] == 0 && !is_moderator($thread['fid'], "canviewunapprove")) \|\| ($thread['visible'] == -1 && !is_moderator($thread['fid'], "canviewdeleted")))) {
error($lang->error_invalidthread);	error($lang->error_invalidthread);
}	}
$fid = $thread['fid']; // Get forum info	$fid = $thread['fid']; // Get forum info
Zeile 769	Zeile 763
if(!$forum) { error($lang->error_invalidforum);	if(!$forum) { error($lang->error_invalidforum);
}	}
$forumpermissions = forum_permissions($forum['fid']);	$forumpermissions = forum_permissions($forum['fid']);
Zeile 801	Zeile 795
if($mybb->user['uid'] == $voter['uid'] && $mybb->user['uid']) { $votedfor[$voter['voteoption']] = 1;	if($mybb->user['uid'] == $voter['uid'] && $mybb->user['uid']) { $votedfor[$voter['voteoption']] = 1;
}	}
// Count number of guests and users without a username (assumes they've been deleted) if($voter['uid'] == 0 \|\| $voter['username'] == '')	// Count number of guests and users without a username (assumes they've been deleted) if($voter['uid'] == 0 \|\| $voter['username'] == '')
{	{
// Add one to the number of voters for guests ++$guest_voters[$voter['voteoption']];	// Add one to the number of voters for guests ++$guest_voters[$voter['voteoption']];
} else { $voters[$voter['voteoption']][$voter['uid']] = $voter['username']; } }	} else { $voters[$voter['voteoption']][$voter['uid']] = htmlspecialchars_uni($voter['username']); } }
$optionsarray = explode("\|\|~\|~\|\|", $poll['options']); $votesarray = explode("\|\|~\|~\|\|", $poll['votes']); $poll['totvotes'] = 0;	$optionsarray = explode("\|\|~\|~\|\|", $poll['options']); $votesarray = explode("\|\|~\|~\|\|", $poll['votes']); $poll['totvotes'] = 0;
Zeile 848	Zeile 842
{ $optionbg = 'trow1'; $votestar = '';	{ $optionbg = 'trow1'; $votestar = '';
}	}
if($votes == 0) { $percent = 0;	if($votes == 0) { $percent = 0;
Zeile 880	Zeile 874
if($guest_voters[$number] == 1) { $userlist .= $guest_comma.$lang->guest_count;	if($guest_voters[$number] == 1) { $userlist .= $guest_comma.$lang->guest_count;
}	}
else { $userlist .= $guest_comma.$lang->sprintf($lang->guest_count_multiple, $guest_voters[$number]);	else { $userlist .= $guest_comma.$lang->sprintf($lang->guest_count_multiple, $guest_voters[$number]);
Zeile 905	Zeile 899
eval("\$showresults = \"".$templates->get("polls_showresults")."\";"); output_page($showresults); }	eval("\$showresults = \"".$templates->get("polls_showresults")."\";"); output_page($showresults); }

if($mybb->input['action'] == "vote" && $mybb->request_method == "post") { // Verify incoming POST request	if($mybb->input['action'] == "vote" && $mybb->request_method == "post") { // Verify incoming POST request
Zeile 922	Zeile 917
$poll['timeout'] = $poll['timeout']6060*24;	$poll['timeout'] = $poll['timeout']6060*24;
$query = $db->simple_select("threads", "*", "poll='".(int)$poll['pid']."'"); $thread = $db->fetch_array($query); if(!$thread \|\| $thread['visible'] == 0)	$thread = get_thread($poll['tid']); if(!$thread \|\| ($thread['visible'] != 1 && ($thread['visible'] == 0 && !is_moderator($thread['fid'], "canviewunapprove")) \|\| ($thread['visible'] == -1 && !is_moderator($thread['fid'], "canviewdeleted"))))
{ error($lang->error_invalidthread);	{ error($lang->error_invalidthread);
}	}
$fid = $thread['fid']; $forumpermissions = forum_permissions($fid); if($forumpermissions['canvotepolls'] == 0)	$fid = $thread['fid']; $forumpermissions = forum_permissions($fid); if($forumpermissions['canvotepolls'] == 0)
Zeile 961	Zeile 955
} if(!isset($mybb->input['option']))	} if(!isset($mybb->input['option']))
{	{
error($lang->error_nopolloptions);	error($lang->error_nopolloptions);
}	}
// Check if the user has voted before... if($mybb->user['uid']) {	// Check if the user has voted before... if($mybb->user['uid']) {
$query = $db->simple_select("pollvotes", "*", "uid='".$mybb->user['uid']."' AND pid='".$poll['pid']."'"); $votecheck = $db->fetch_array($query);	$user_check = "uid='{$mybb->user['uid']}'"; } else { $user_check = "ipaddress=".$db->escape_binary($session->packedip);
}	}
if($votecheck['vid'] \|\| (isset($mybb->cookies['pollvotes'][$poll['pid']]) && $mybb->cookies['pollvotes'][$poll['pid']] !== "")) { error($lang->error_alreadyvoted); } elseif(!$mybb->user['uid'])	$query = $db->simple_select("pollvotes", "*", "{$user_check} AND pid='".$poll['pid']."'"); $votecheck = $db->fetch_array($query); if($votecheck['vid'])
{	{
// Give a cookie to guests to inhibit revotes if(is_array($mybb->input['option'])) { // We have multiple options here... $votes_cookie = implode(',', array_keys($mybb->input['option'])); } else { $votes_cookie = $mybb->input['option']; } my_setcookie("pollvotes[{$poll['pid']}]", $votes_cookie);	error($lang->error_alreadyvoted);
}	}
$votesql = ''; $now = TIME_NOW;	$votesql = array();
$votesarray = explode("\|\|~\|~\|\|", $poll['votes']); $option = $mybb->input['option']; $numvotes = (int)$poll['numvotes'];	$votesarray = explode("\|\|~\|~\|\|", $poll['votes']); $option = $mybb->input['option']; $numvotes = (int)$poll['numvotes'];
Zeile 1002	Zeile 986
if(is_array($option)) { $total_options = 0;	if(is_array($option)) { $total_options = 0;

foreach($option as $voteoption => $vote) { if($vote == 1 && isset($votesarray[$voteoption-1])) {	foreach($option as $voteoption => $vote) { if($vote == 1 && isset($votesarray[$voteoption-1])) {
if($votesql) { $votesql .= ","; } $votesql .= "('".$poll['pid']."','".$mybb->user['uid']."','".$db->escape_string($voteoption)."','$now')";	$votesql[] = array( "pid" => $poll['pid'], "uid" => (int)$mybb->user['uid'], "voteoption" => $db->escape_string($voteoption), "dateline" => TIME_NOW, "ipaddress" => $db->escape_binary($session->packedip) );
$votesarray[$voteoption-1]++; $numvotes = $numvotes+1; $total_options++; }	$votesarray[$voteoption-1]++; $numvotes = $numvotes+1; $total_options++; }
}	}
if($total_options > $poll['maxoptions'] && $poll['maxoptions'] != 0) { error($lang->sprintf($lang->error_maxpolloptions, $poll['maxoptions'])); }	if($total_options > $poll['maxoptions'] && $poll['maxoptions'] != 0) { error($lang->sprintf($lang->error_maxpolloptions, $poll['maxoptions'])); }
} }	} }
else	else
{	{
if(is_array($option) \|\| !isset($votesarray[$option-1])) { error($lang->error_nopolloptions); }	if(is_array($option) \|\| !isset($votesarray[$option-1])) { error($lang->error_nopolloptions); }
$votesql = "('".$poll['pid']."','".$mybb->user['uid']."','".$db->escape_string($option)."','$now')";	$votesql = array( "pid" => $poll['pid'], "uid" => (int)$mybb->user['uid'], "voteoption" => $db->escape_string($option), "dateline" => TIME_NOW, "ipaddress" => $db->escape_binary($session->packedip) );
$votesarray[$option-1]++; $numvotes = $numvotes+1; }	$votesarray[$option-1]++; $numvotes = $numvotes+1; }
Zeile 1038	Zeile 1033
if(!$votesql) { error($lang->error_nopolloptions);	if(!$votesql) { error($lang->error_nopolloptions);
} $db->write_query(" INSERT INTO ".TABLE_PREFIX."pollvotes (pid,uid,voteoption,dateline) VALUES $votesql ");	} if($poll['multiple'] == 1) { $db->insert_query_multiple("pollvotes", $votesql); } else { $db->insert_query("pollvotes", $votesql); }
$voteslist = ''; for($i = 1; $i <= $poll['numoptions']; ++$i) {	$voteslist = ''; for($i = 1; $i <= $poll['numoptions']; ++$i) {
Zeile 1075	Zeile 1074
if($mybb->usergroup['canundovotes'] != 1) { error_no_permission();	if($mybb->usergroup['canundovotes'] != 1) { error_no_permission();
}	}
$query = $db->simple_select("polls", "*", "pid='".$mybb->get_input('pid', MyBB::INPUT_INT)."'"); $poll = $db->fetch_array($query);	$query = $db->simple_select("polls", "*", "pid='".$mybb->get_input('pid', MyBB::INPUT_INT)."'"); $poll = $db->fetch_array($query);
Zeile 1092	Zeile 1091
// We do not have $forum_cache available here since no forums permissions are checked in undo vote // Get thread ID and then get forum info $thread = get_thread($poll['tid']);	// We do not have $forum_cache available here since no forums permissions are checked in undo vote // Get thread ID and then get forum info $thread = get_thread($poll['tid']);
if(!$thread \|\| $thread['visible'] == 0)	if(!$thread \|\| ($thread['visible'] != 1 && ($thread['visible'] == 0 && !is_moderator($thread['fid'], "canviewunapprove")) \|\| ($thread['visible'] == -1 && !is_moderator($thread['fid'], "canviewdeleted"))))
{ error($lang->error_invalidthread); }	{ error($lang->error_invalidthread); }
Zeile 1122	Zeile 1121
if($poll['closed'] == 1 \|\| $thread['closed'] == 1 \|\| ($expiretime < TIME_NOW && $poll['timeout'])) { error($lang->error_pollclosed);	if($poll['closed'] == 1 \|\| $thread['closed'] == 1 \|\| ($expiretime < TIME_NOW && $poll['timeout'])) { error($lang->error_pollclosed);
}	}
// Check if the user has voted before... $vote_options = array();	// Check if the user has voted before... $vote_options = array();

if($mybb->user['uid'])	if($mybb->user['uid'])
{ $query = $db->simple_select("pollvotes", "vid,voteoption", "uid='".$mybb->user['uid']."' AND pid='".$poll['pid']."'"); while($voteoption = $db->fetch_array($query)) { $vote_options[$voteoption['vid']] = $voteoption['voteoption']; } } elseif(isset($mybb->cookies['pollvotes'][$poll['pid']])) { // for Guests, we simply see if they've got the cookie $vote_options = explode(',', $mybb->cookies['pollvotes'][$poll['pid']]);	{ $user_check = "uid='{$mybb->user['uid']}'"; } else { $user_check = "uid='0' AND ipaddress=".$db->escape_binary($session->packedip); } $query = $db->simple_select("pollvotes", "vid,voteoption", "{$user_check} AND pid='".$poll['pid']."'"); while($voteoption = $db->fetch_array($query)) { $vote_options[$voteoption['vid']] = $voteoption['voteoption'];
} if(empty($vote_options)) { error($lang->error_notvoted);	} if(empty($vote_options)) { error($lang->error_notvoted);
} else if(!$mybb->user['uid']) { // clear cookie for Guests my_setcookie("pollvotes[{$poll['pid']}]", "");
} // Note, this is not thread safe!	} // Note, this is not thread safe!
Zeile 1200	Zeile 1196
$plugins->run_hooks("polls_do_undovote_process");	$plugins->run_hooks("polls_do_undovote_process");
$db->delete_query("pollvotes", "uid='".$mybb->user['uid']."' AND pid='".$poll['pid']."'");	$db->delete_query("pollvotes", "{$user_check} AND pid='".$poll['pid']."'");
$db->update_query("polls", $updatedpoll, "pid='".$poll['pid']."'"); $plugins->run_hooks("polls_do_undovote_end");	$db->update_query("polls", $updatedpoll, "pid='".$poll['pid']."'"); $plugins->run_hooks("polls_do_undovote_end");