Vergleich admin/modules/config/settings.php - 1.8.7 - 1.8.17

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 882	Zeile 882
admin_redirect("index.php?module=config-settings"); }	admin_redirect("index.php?module=config-settings"); }
// If we are changing the hidden captcha, make sure it doesn't conflict with another registration field if(isset($mybb->input['upsetting']['hiddencaptchaimagefield'])) { // Not allowed to be hidden captcha fields $disallowed_fields = array( 'username', 'password', 'password2', 'email', 'email2', 'imagestring', 'imagehash', 'answer', 'question_id', 'allownotices', 'hideemail', 'receivepms', 'pmnotice', 'emailpmnotify', 'invisible', 'subscriptionmethod', 'timezoneoffset', 'dstcorrection', 'language', 'step', 'action', 'agree', 'regtime', 'regcheck1', 'regcheck2', 'regsubmit' ); if(in_array($mybb->input['upsetting']['hiddencaptchaimagefield'], $disallowed_fields))	// Not allowed to be hidden captcha fields $disallowed_fields = array( 'username', 'password', 'password2', 'email', 'email2', 'imagestring', 'imagehash', 'answer', 'question_id', 'allownotices', 'hideemail', 'receivepms', 'pmnotice', 'emailpmnotify', 'invisible', 'subscriptionmethod', 'timezoneoffset', 'dstcorrection', 'language', 'step', 'action', 'agree', 'regtime', 'regcheck1', 'regcheck2', 'regsubmit' ); $is_current_hiddencaptcha_wrong = in_array($mybb->settings['hiddencaptchaimagefield'], $disallowed_fields); if(in_array($mybb->input['upsetting']['hiddencaptchaimagefield'], $disallowed_fields) \|\| $is_current_hiddencaptcha_wrong) { if(isset($mybb->input['upsetting']['hiddencaptchaimagefield']) && $mybb->input['upsetting']['hiddencaptchaimagefield'] != $mybb->settings['hiddencaptchaimagefield'] && !$is_current_hiddencaptcha_wrong) { $wrong_value = $mybb->input['upsetting']['hiddencaptchaimagefield']; $mybb->input['upsetting']['hiddencaptchaimagefield'] = $mybb->settings['hiddencaptchaimagefield']; } else
{	{
// Whoopsies, you can't do that! $error_message = $lang->sprintf($lang->error_hidden_captcha_conflict, htmlspecialchars_uni($mybb->input['upsetting']['hiddencaptchaimagefield'])); flash_message($error_message, 'error'); admin_redirect("index.php?module=config-settings&action=change&gid=9");	$wrong_value = $mybb->settings['hiddencaptchaimagefield']; $mybb->input['upsetting']['hiddencaptchaimagefield'] = 'email3';
}	}
	$lang->success_settings_updated .= $lang->sprintf($lang->success_settings_updated_hiddencaptchaimage, htmlspecialchars_uni($mybb->input['upsetting']['hiddencaptchaimagefield']), htmlspecialchars_uni($wrong_value)); } // Have we opted for a reCAPTCHA and not set a public/private key? if((isset($mybb->input['upsetting']['captchaimage']) && in_array($mybb->input['upsetting']['captchaimage'], array(4, 5)) && (!$mybb->input['upsetting']['captchaprivatekey'] \|\| !$mybb->input['upsetting']['captchapublickey'])) \|\| (in_array($mybb->settings['captchaimage'], array(4, 5)) && (!$mybb->settings['captchaprivatekey'] \|\| !$mybb->settings['captchapublickey']))) { $mybb->input['upsetting']['captchaimage'] = 1; $lang->success_settings_updated .= $lang->success_settings_updated_captchaimage;
} // Get settings which optionscode is a forum/group select, checkbox or numeric // We cannot rely on user input to decide this $checkbox_settings = $forum_group_select = array();	} // Get settings which optionscode is a forum/group select, checkbox or numeric // We cannot rely on user input to decide this $checkbox_settings = $forum_group_select = array();
$query = $db->simple_select('settings', 'name, optionscode', "optionscode IN('forumselect', 'groupselect', 'numeric') OR optionscode LIKE 'checkbox%'");	$query = $db->simple_select('settings', 'name, optionscode', "optionscode IN('forumselect', 'groupselect') OR optionscode LIKE 'checkbox%' OR optionscode LIKE 'numeric%'");
while($multisetting = $db->fetch_array($query)) {	while($multisetting = $db->fetch_array($query)) {
	$options = array();
if(substr($multisetting['optionscode'], 0, 8) == 'checkbox') { $checkbox_settings[] = $multisetting['name'];	if(substr($multisetting['optionscode'], 0, 8) == 'checkbox') { $checkbox_settings[] = $multisetting['name'];

// All checkboxes deselected = no $mybb->input['upsetting'] for them, we need to initialize it manually then, but only on pages where the setting is shown if(empty($mybb->input['upsetting'][$multisetting['name']]) && isset($mybb->input["isvisible_{$multisetting['name']}"])) { $mybb->input['upsetting'][$multisetting['name']] = array(); } }	// All checkboxes deselected = no $mybb->input['upsetting'] for them, we need to initialize it manually then, but only on pages where the setting is shown if(empty($mybb->input['upsetting'][$multisetting['name']]) && isset($mybb->input["isvisible_{$multisetting['name']}"])) { $mybb->input['upsetting'][$multisetting['name']] = array(); } }
elseif($multisetting['optionscode'] == 'numeric')	elseif(substr($multisetting['optionscode'], 0, 7) == 'numeric')
{ if(isset($mybb->input['upsetting'][$multisetting['name']]))	{ if(isset($mybb->input['upsetting'][$multisetting['name']]))
{ $mybb->input['upsetting'][$multisetting['name']] = (int)$mybb->input['upsetting'][$multisetting['name']];	{ $type = explode("\n", $multisetting['optionscode']); for($i=1; $i < count($type); $i++) { $optionsexp = explode("=", $type[$i]); $opt = array_map('trim', $optionsexp); if(in_array($opt[0], array('min', 'max', 'step'))) { if($opt[0] != 'step' \|\| $opt[1] != 'any') { $opt[1] = (float)$opt[1]; } $options[$opt[0]] = $opt[1]; } } $value = (float)$mybb->input['upsetting'][$multisetting['name']]; if(isset($options['min'])) { $value = max($value, $options['min']); } if(isset($options['max'])) { $value = min($value, $options['max']); } $mybb->input['upsetting'][$multisetting['name']] = $value;
}	}
}	} else { $forum_group_select[] = $multisetting['name']; } } // Administrator is changing the login method. if($mybb->settings['username_method'] == 1 \|\| $mybb->settings['username_method'] == 2 \|\| $mybb->input['upsetting']['username_method'] == 1 \|\| $mybb->input['upsetting']['username_method'] == 2) { $query = $db->simple_select('users', 'email', "email != ''", array('group_by' => 'email HAVING COUNT(email)>1')); if($db->num_rows($query)) { $mybb->input['upsetting']['username_method'] = 0; $lang->success_settings_updated .= $lang->success_settings_updated_username_method; }
else {	else {
$forum_group_select[] = $multisetting['name'];	$mybb->input['upsetting']['allowmultipleemails'] = 0; $lang->success_settings_updated .= $lang->success_settings_updated_allowmultipleemails;
} }	} }

if(is_array($mybb->input['upsetting'])) { foreach($mybb->input['upsetting'] as $name => $value)	if(is_array($mybb->input['upsetting'])) { foreach($mybb->input['upsetting'] as $name => $value)
Zeile 962	Zeile 1019
if($forum_group_select && in_array($name, $forum_group_select)) { if($value == 'all')	if($forum_group_select && in_array($name, $forum_group_select)) { if($value == 'all')
{	{
$value = -1; } elseif($value == 'custom')	$value = -1; } elseif($value == 'custom')
Zeile 985	Zeile 1042
else { $value = '';	else { $value = '';
}	}
} elseif($checkbox_settings && in_array($name, $checkbox_settings)) { $value = '';	} elseif($checkbox_settings && in_array($name, $checkbox_settings)) { $value = '';

if(is_array($mybb->input['upsetting'][$name])) { $value = implode(',', $mybb->input['upsetting'][$name]); } }	if(is_array($mybb->input['upsetting'][$name])) { $value = implode(',', $mybb->input['upsetting'][$name]); } }

$db->update_query("settings", array('value' => $db->escape_string($value)), "name='".$db->escape_string($name)."'"); } } // Check if we need to create our fulltext index after changing the search mode if($mybb->settings['searchtype'] != $mybb->input['upsetting']['searchtype'] && $mybb->input['upsetting']['searchtype'] == "fulltext")	$db->update_query("settings", array('value' => $db->escape_string($value)), "name='".$db->escape_string($name)."'"); } } // Check if we need to create our fulltext index after changing the search mode if($mybb->settings['searchtype'] != $mybb->input['upsetting']['searchtype'] && $mybb->input['upsetting']['searchtype'] == "fulltext")
{	{
if(!$db->is_fulltext("posts") && $db->supports_fulltext_boolean("posts"))	if(!$db->is_fulltext("posts") && $db->supports_fulltext_boolean("posts"))
{	{
$db->create_fulltext_index("posts", "message"); } if(!$db->is_fulltext("posts") && $db->supports_fulltext("threads"))	$db->create_fulltext_index("posts", "message"); } if(!$db->is_fulltext("posts") && $db->supports_fulltext("threads"))
{	{