Vergleich polls.php - 1.8.1 - 1.8.6

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 46Zeile 46
if($mybb->input['action'] == "newpoll")
{
// Form for new poll

if($mybb->input['action'] == "newpoll")
{
// Form for new poll

	$tid = $mybb->get_input('tid', 1);

	$tid = $mybb->get_input('tid', MyBB::INPUT_INT);


$plugins->run_hooks("polls_newpoll_start");



$plugins->run_hooks("polls_newpoll_start");


	$thread = get_thread($mybb->get_input('tid', 1));

	$thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT));

	if(!$thread)
{
error($lang->error_invalidthread);

	if(!$thread)
{
error($lang->error_invalidthread);

Zeile 114Zeile 114
	}

// Sanitize number of poll options

	}

// Sanitize number of poll options

	if($mybb->get_input('numpolloptions', 1) > 0)

	if($mybb->get_input('numpolloptions', MyBB::INPUT_INT) > 0)

	{

	{

		$mybb->input['polloptions'] = $mybb->get_input('numpolloptions', 1);

		$mybb->input['polloptions'] = $mybb->get_input('numpolloptions', MyBB::INPUT_INT);

	}

	}

	if($mybb->settings['maxpolloptions'] && $mybb->get_input('polloptions', 1) > $mybb->settings['maxpolloptions'])

	if($mybb->settings['maxpolloptions'] && $mybb->get_input('polloptions', MyBB::INPUT_INT) > $mybb->settings['maxpolloptions'])

	{	// Too big
$polloptions = $mybb->settings['maxpolloptions'];
}

	{	// Too big
$polloptions = $mybb->settings['maxpolloptions'];
}

	elseif($mybb->get_input('polloptions', 1) < 2)

	elseif($mybb->get_input('polloptions', MyBB::INPUT_INT) < 2)

	{	// Too small
$polloptions = 2;
}
else
{ // Just right

	{	// Too small
$polloptions = 2;
}
else
{ // Just right

		$polloptions = $mybb->get_input('polloptions', 1);

		$polloptions = $mybb->get_input('polloptions', MyBB::INPUT_INT);

	}

$question = htmlspecialchars_uni($mybb->get_input('question'));

$postoptionschecked = array('public' => '', 'multiple' => '');

	}

$question = htmlspecialchars_uni($mybb->get_input('question'));

$postoptionschecked = array('public' => '', 'multiple' => '');

	$postoptions = $mybb->get_input('postoptions', 1);

	$postoptions = $mybb->get_input('postoptions', MyBB::INPUT_INT);

	if(isset($postoptions['multiple']) && $postoptions['multiple'] == 1)
{
$postoptionschecked['multiple'] = 'checked="checked"';

	if(isset($postoptions['multiple']) && $postoptions['multiple'] == 1)
{
$postoptionschecked['multiple'] = 'checked="checked"';

Zeile 144Zeile 144
		$postoptionschecked['public'] = 'checked="checked"';
}


		$postoptionschecked['public'] = 'checked="checked"';
}


	$options = $mybb->get_input('options', 2);

	$options = $mybb->get_input('options', MyBB::INPUT_ARRAY);

	$optionbits = '';
for($i = 1; $i <= $polloptions; ++$i)
{

	$optionbits = '';
for($i = 1; $i <= $polloptions; ++$i)
{

Zeile 158Zeile 158
		$option = "";
}


		$option = "";
}


	if($mybb->get_input('timeout', 1) > 0)

	if($mybb->get_input('timeout', MyBB::INPUT_INT) > 0)

	{

	{

		$timeout = $mybb->get_input('timeout', 1);

		$timeout = $mybb->get_input('timeout', MyBB::INPUT_INT);

	}
else
{
$timeout = 0;
}


	}
else
{
$timeout = 0;
}


	if($mybb->get_input('maxoptions', 1) > 0 && $mybb->get_input('maxoptions', 1) < $polloptions)

	if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $polloptions)

	{

	{

		$maxoptions = $mybb->get_input('maxoptions', 1);

		$maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT);

	}
else
{

	}
else
{

Zeile 188Zeile 188

$plugins->run_hooks("polls_do_newpoll_start");



$plugins->run_hooks("polls_do_newpoll_start");


	$thread = get_thread($mybb->get_input('tid', 1));

	$thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT));

	if(!$thread)
{
error($lang->error_invalidthread);

	if(!$thread)
{
error($lang->error_invalidthread);

Zeile 224Zeile 224
		error($lang->error_pollalready);
}


		error($lang->error_pollalready);
}


	$polloptions = $mybb->get_input('polloptions', 1);

	$polloptions = $mybb->get_input('polloptions', MyBB::INPUT_INT);

	if($mybb->settings['maxpolloptions'] && $polloptions > $mybb->settings['maxpolloptions'])
{
$polloptions = $mybb->settings['maxpolloptions'];
}


	if($mybb->settings['maxpolloptions'] && $polloptions > $mybb->settings['maxpolloptions'])
{
$polloptions = $mybb->settings['maxpolloptions'];
}


	$postoptions = $mybb->get_input('postoptions', 2);

	$postoptions = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY);

	if(!isset($postoptions['multiple']) || $postoptions['multiple'] != '1')
{
$postoptions['multiple'] = 0;

	if(!isset($postoptions['multiple']) || $postoptions['multiple'] != '1')
{
$postoptions['multiple'] = 0;

Zeile 246Zeile 246
		$polloptions = "2";
}
$optioncount = "0";

		$polloptions = "2";
}
$optioncount = "0";

	$options = $mybb->get_input('options', 2);

	$options = $mybb->get_input('options', MyBB::INPUT_ARRAY);


for($i = 1; $i <= $polloptions; ++$i)
{


for($i = 1; $i <= $polloptions; ++$i)
{

Zeile 255Zeile 255
			$options[$i] = '';
}


			$options[$i] = '';
}


		if(trim($options[$i]) != "")
{
$optioncount++;


		if($mybb->settings['polloptionlimit'] != 0 && my_strlen($options[$i]) > $mybb->settings['polloptionlimit'])
{
$lengtherror = 1;
break;

		}


		}


		if(my_strlen($options[$i]) > $mybb->settings['polloptionlimit'] && $mybb->settings['polloptionlimit'] != 0)

		if(strpos($options[$i], '||~|~||') !== false)

		{

		{

			$lengtherror = 1;
break;






			$sequenceerror = 1;
break;
}

if(trim($options[$i]) != "")
{
$optioncount++;

		}
}

if(isset($lengtherror))

		}
}

if(isset($lengtherror))

	{

	{

		error($lang->error_polloptiontoolong);

		error($lang->error_polloptiontoolong);

	}






	}

if(isset($sequenceerror))
{
error($lang->error_polloptionsequence);
}

	
$mybb->input['question'] = $mybb->get_input('question');

if(trim($mybb->input['question']) == '' || $optioncount < 2)

	
$mybb->input['question'] = $mybb->get_input('question');

if(trim($mybb->input['question']) == '' || $optioncount < 2)

	{

	{

		error($lang->error_noquestionoptions);
}


		error($lang->error_noquestionoptions);
}


Zeile 292Zeile 303
			}
$optionslist .= trim($options[$i]);
$voteslist .= '0';

			}
$optionslist .= trim($options[$i]);
$voteslist .= '0';

		}
}

if($mybb->get_input('timeout', 1) > 0)
{
$timeout = $mybb->get_input('timeout', 1);
}
else
{
$timeout = 0;
}

if($mybb->get_input('maxoptions', 1) > 0 && $mybb->get_input('maxoptions', 1) < $polloptions)
{
$maxoptions = $mybb->get_input('maxoptions', 1);

		}
}

if($mybb->get_input('timeout', MyBB::INPUT_INT) > 0)
{
$timeout = $mybb->get_input('timeout', MyBB::INPUT_INT);
}
else
{
$timeout = 0;
}

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);

	}
else
{

	}
else
{

Zeile 329Zeile 340
	);

$plugins->run_hooks("polls_do_newpoll_process");

	);

$plugins->run_hooks("polls_do_newpoll_process");





	$pid = $db->insert_query("polls", $newpoll);

	$pid = $db->insert_query("polls", $newpoll);





	$db->update_query("threads", array('poll' => $pid), "tid='".$thread['tid']."'");

$plugins->run_hooks("polls_do_newpoll_end");

	$db->update_query("threads", array('poll' => $pid), "tid='".$thread['tid']."'");

$plugins->run_hooks("polls_do_newpoll_end");





	if($thread['visible'] == 1)
{
redirect(get_thread_link($thread['tid']), $lang->redirect_pollposted);

	if($thread['visible'] == 1)
{
redirect(get_thread_link($thread['tid']), $lang->redirect_pollposted);

Zeile 348Zeile 359

if($mybb->input['action'] == "editpoll")
{


if($mybb->input['action'] == "editpoll")
{

	$pid = $mybb->get_input('pid', 1);

	$pid = $mybb->get_input('pid', MyBB::INPUT_INT);


$plugins->run_hooks("polls_editpoll_start");

$query = $db->simple_select("polls", "*", "pid='$pid'");


$plugins->run_hooks("polls_editpoll_start");

$query = $db->simple_select("polls", "*", "pid='$pid'");

	$poll = $db->fetch_array($query);


	$poll = $db->fetch_array($query);


	if(!$poll)
{
error($lang->error_invalidpoll);

	if(!$poll)
{
error($lang->error_invalidpoll);

	}


	}


	$query = $db->simple_select("threads", "*", "poll='$pid'");
$thread = $db->fetch_array($query);
if(!$thread)
{
error($lang->error_invalidthread);

	$query = $db->simple_select("threads", "*", "poll='$pid'");
$thread = $db->fetch_array($query);
if(!$thread)
{
error($lang->error_invalidthread);

	}

	}


$tid = $thread['tid'];
$fid = $thread['fid'];


$tid = $thread['tid'];
$fid = $thread['fid'];

Zeile 376Zeile 387
	add_breadcrumb($lang->nav_editpoll);

$forumpermissions = forum_permissions($fid);

	add_breadcrumb($lang->nav_editpoll);

$forumpermissions = forum_permissions($fid);





	// Get forum info
$forum = get_forum($fid);
if(!$forum)
{
error($lang->error_invalidforum);

	// Get forum info
$forum = get_forum($fid);
if(!$forum)
{
error($lang->error_invalidforum);

	}

	}

	else
{
// Is our forum closed?

	else
{
// Is our forum closed?

Zeile 399Zeile 410
	}

$postoptionschecked = array('closed' => '', 'multiple' => '', 'public' => '');

	}

$postoptionschecked = array('closed' => '', 'multiple' => '', 'public' => '');





	$polldate = my_date($mybb->settings['dateformat'], $poll['dateline']);
if(empty($mybb->input['updateoptions']))
{

	$polldate = my_date($mybb->settings['dateformat'], $poll['dateline']);
if(empty($mybb->input['updateoptions']))
{

Zeile 411Zeile 422
		if($poll['multiple'] == 1)
{
$postoptionschecked['multiple'] = 'checked="checked"';

		if($poll['multiple'] == 1)
{
$postoptionschecked['multiple'] = 'checked="checked"';

		}


		}


		if($poll['public'] == 1)
{
$postoptionschecked['public'] = 'checked="checked"';

		if($poll['public'] == 1)
{
$postoptionschecked['public'] = 'checked="checked"';

		}


		}


		$optionsarray = explode("||~|~||", $poll['options']);
$votesarray = explode("||~|~||", $poll['votes']);


		$optionsarray = explode("||~|~||", $poll['options']);
$votesarray = explode("||~|~||", $poll['votes']);


Zeile 445Zeile 456
			eval("\$optionbits .= \"".$templates->get("polls_editpoll_option")."\";");
$option = "";
$optionvotes = "";

			eval("\$optionbits .= \"".$templates->get("polls_editpoll_option")."\";");
$option = "";
$optionvotes = "";

		}

		}


if(!$poll['timeout'])
{
$timeout = 0;


if(!$poll['timeout'])
{
$timeout = 0;

		}

		}

		else
{
$timeout = $poll['timeout'];

		else
{
$timeout = $poll['timeout'];

Zeile 459Zeile 470
		if(!$poll['maxoptions'])
{
$maxoptions = 0;

		if(!$poll['maxoptions'])
{
$maxoptions = 0;

		}
else

		}
else

		{
$maxoptions = $poll['maxoptions'];
}
}
else
{

		{
$maxoptions = $poll['maxoptions'];
}
}
else
{

		if($mybb->settings['maxpolloptions'] && $mybb->get_input('numoptions', 1) > $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', 1) < 2)
{

		}
elseif($mybb->get_input('numoptions', MyBB::INPUT_INT) < 2)
{

			$numoptions = 2;

			$numoptions = 2;

		}

		}

		else

		else

		{
$numoptions = $mybb->get_input('numoptions', 1);
}

		{
$numoptions = $mybb->get_input('numoptions', MyBB::INPUT_INT);
}

		$question = htmlspecialchars_uni($mybb->input['question']);


		$question = htmlspecialchars_uni($mybb->input['question']);


		$postoptions = $mybb->get_input('postoptions', 2);

		$postoptions = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY);

		if(isset($postoptions['multiple']) && $postoptions['multiple'] == 1)
{
$postoptionschecked['multiple'] = 'checked="checked"';

		if(isset($postoptions['multiple']) && $postoptions['multiple'] == 1)
{
$postoptionschecked['multiple'] = 'checked="checked"';

Zeile 490Zeile 501
		if(isset($postoptions['public']) && $postoptions['public'] == 1)
{
$postoptionschecked['public'] = 'checked="checked"';

		if(isset($postoptions['public']) && $postoptions['public'] == 1)
{
$postoptionschecked['public'] = 'checked="checked"';

		}

if(isset($postoptions['closed']) && $postoptions['closed'] == 1)
{
$postoptionschecked['closed'] = 'checked="checked"';
}

		}

if(isset($postoptions['closed']) && $postoptions['closed'] == 1)
{
$postoptionschecked['closed'] = 'checked="checked"';
}





		$options = $mybb->get_input('options', 2);
$votes = $mybb->get_input('votes', 2);

		$options = $mybb->get_input('options', MyBB::INPUT_ARRAY);
$votes = $mybb->get_input('votes', MyBB::INPUT_ARRAY);

		$optionbits = '';
for($i = 1; $i <= $numoptions; ++$i)
{

		$optionbits = '';
for($i = 1; $i <= $numoptions; ++$i)
{

Zeile 523Zeile 534
			$option = "";
}


			$option = "";
}


		if($mybb->get_input('timeout', 1) > 0)

		if($mybb->get_input('timeout', MyBB::INPUT_INT) > 0)

		{

		{

			$timeout = $mybb->get_input('timeout', 1);

			$timeout = $mybb->get_input('timeout', MyBB::INPUT_INT);

		}
else
{

		}
else
{

Zeile 555Zeile 566

$plugins->run_hooks("polls_do_editpoll_start");



$plugins->run_hooks("polls_do_editpoll_start");


	$query = $db->simple_select("polls", "*", "pid='".$mybb->get_input('pid', 1)."'");

	$query = $db->simple_select("polls", "*", "pid='".$mybb->get_input('pid', MyBB::INPUT_INT)."'");

	$poll = $db->fetch_array($query);

if(!$poll)

	$poll = $db->fetch_array($query);

if(!$poll)

Zeile 563Zeile 574
		error($lang->error_invalidpoll);
}


		error($lang->error_invalidpoll);
}


	$query = $db->simple_select("threads", "*", "poll='".$mybb->get_input('pid', 1)."'");

	$query = $db->simple_select("threads", "*", "poll='".$mybb->get_input('pid', MyBB::INPUT_INT)."'");

	$thread = $db->fetch_array($query);
if(!$thread)
{

	$thread = $db->fetch_array($query);
if(!$thread)
{

Zeile 574Zeile 585

// Get forum info
$forum = get_forum($thread['fid']);


// Get forum info
$forum = get_forum($thread['fid']);

 
	$fid = $thread['fid'];

	if(!$forum)

	if(!$forum)

	{

	{

		error($lang->error_invalidforum);

		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 588Zeile 600
		}
}


		}
}


	if(!is_moderator($thread['fid'], "canmanagepolls"))
{
error_no_permission();
}

if($mybb->settings['maxpolloptions'] && $mybb->get_input('numoptions', 1) > $mybb->settings['maxpolloptions'])

	if(!is_moderator($thread['fid'], "canmanagepolls"))
{
error_no_permission();
}

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', 1) < 2)

	elseif($mybb->get_input('numoptions', MyBB::INPUT_INT) < 2)

	{
$numoptions = 2;
}
else
{

	{
$numoptions = 2;
}
else
{

		$numoptions = $mybb->get_input('numoptions', 1);

		$numoptions = $mybb->get_input('numoptions', MyBB::INPUT_INT);

	}


	}


	$postoptions = $mybb->get_input('postoptions', 2);

	$postoptions = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY);

	if(!isset($postoptions['multiple']) || $postoptions['multiple'] != '1')
{
$postoptions['multiple'] = 0;

	if(!isset($postoptions['multiple']) || $postoptions['multiple'] != '1')
{
$postoptions['multiple'] = 0;

Zeile 615Zeile 627
	if(!isset($postoptions['public']) || $postoptions['public'] != '1')
{
$postoptions['public'] = 0;

	if(!isset($postoptions['public']) || $postoptions['public'] != '1')
{
$postoptions['public'] = 0;

	}

	}


if(!isset($postoptions['closed']) || $postoptions['closed'] != '1')
{
$postoptions['closed'] = 0;


if(!isset($postoptions['closed']) || $postoptions['closed'] != '1')
{
$postoptions['closed'] = 0;

	}

	}

	$optioncount = "0";
$options = $mybb->input['options'];


	$optioncount = "0";
$options = $mybb->input['options'];


Zeile 630Zeile 642
		{
$options[$i] = '';
}

		{
$options[$i] = '';
}

		if(trim($options[$i]) != '')















if($mybb->settings['polloptionlimit'] != 0 && my_strlen($options[$i]) > $mybb->settings['polloptionlimit'])
{
$lengtherror = 1;
break;
}

if(strpos($options[$i], '||~|~||') !== false)
{
$sequenceerror = 1;
break;
}

if(trim($options[$i]) != "")

		{
$optioncount++;
}

		{
$optioncount++;
}


if(my_strlen($options[$i]) > $mybb->settings['polloptionlimit'] && $mybb->settings['polloptionlimit'] != 0)
{
$lengtherror = 1;
break;
}
}

	}








if(isset($lengtherror))


if(isset($lengtherror))

	{

	{

		error($lang->error_polloptiontoolong);

		error($lang->error_polloptiontoolong);

 
	}

if(isset($sequenceerror))
{
error($lang->error_polloptionsequence);

	}

$mybb->input['question'] = $mybb->get_input('question');

	}

$mybb->input['question'] = $mybb->get_input('question');

Zeile 677Zeile 701
		}
}


		}
}


	if($mybb->get_input('timeout', 1) > 0)

	if($mybb->get_input('timeout', MyBB::INPUT_INT) > 0)

	{

	{

		$timeout = $mybb->get_input('timeout', 1);

		$timeout = $mybb->get_input('timeout', MyBB::INPUT_INT);

	}
else
{
$timeout = 0;
}


	}
else
{
$timeout = 0;
}


	if($mybb->get_input('maxoptions', 1) > 0 && $mybb->get_input('maxoptions', 1) < $numoptions)

	if($mybb->get_input('maxoptions', MyBB::INPUT_INT) > 0 && $mybb->get_input('maxoptions', MyBB::INPUT_INT) < $numoptions)

	{

	{

		$maxoptions = $mybb->get_input('maxoptions', 1);

		$maxoptions = $mybb->get_input('maxoptions', MyBB::INPUT_INT);

	}
else
{

	}
else
{

Zeile 710Zeile 734

$plugins->run_hooks("polls_do_editpoll_process");



$plugins->run_hooks("polls_do_editpoll_process");


	$db->update_query("polls", $updatedpoll, "pid='".$mybb->get_input('pid', 1)."'");

	$db->update_query("polls", $updatedpoll, "pid='".$mybb->get_input('pid', MyBB::INPUT_INT)."'");


$plugins->run_hooks("polls_do_editpoll_end");



$plugins->run_hooks("polls_do_editpoll_end");


Zeile 723Zeile 747

if($mybb->input['action'] == "showresults")
{


if($mybb->input['action'] == "showresults")
{

	$query = $db->simple_select("polls", "*", "pid='".$mybb->get_input('pid', 1)."'");

	$query = $db->simple_select("polls", "*", "pid='".$mybb->get_input('pid', MyBB::INPUT_INT)."'");

	$poll = $db->fetch_array($query);

if(!$poll)

	$poll = $db->fetch_array($query);

if(!$poll)

Zeile 1053Zeile 1077
		error_no_permission();
}


		error_no_permission();
}


	$query = $db->simple_select("polls", "*", "pid='".$mybb->get_input('pid', 1)."'");

	$query = $db->simple_select("polls", "*", "pid='".$mybb->get_input('pid', MyBB::INPUT_INT)."'");

	$poll = $db->fetch_array($query);

if(!$poll['pid'])

	$poll = $db->fetch_array($query);

if(!$poll['pid'])