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

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 425	Zeile 425
"checkbox" => $lang->checkbox, "language" => $lang->language_selection_box, "adminlanguage" => $lang->adminlanguage,	"checkbox" => $lang->checkbox, "language" => $lang->language_selection_box, "adminlanguage" => $lang->adminlanguage,
"cpstyle" => $lang->cpstyle	"cpstyle" => $lang->cpstyle, "prefixselect" => $lang->prefix_selection_box
//"php" => $lang->php // Internal Use Only );	//"php" => $lang->php // Internal Use Only );
Zeile 438	Zeile 439
$form->output_submit_wrapper($buttons); $form->end();	$form->output_submit_wrapper($buttons); $form->end();
echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"></script>	echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1821"></script>
<script type="text/javascript">	<script type="text/javascript">
$(document).ready(function() {	$(function() {
new Peeker($("#type"), $("#row_extra"), /^(select\|radio\|checkbox\|php)$/, false); }); // Add a star to the extra row since the "extra" is required if the box is shown	new Peeker($("#type"), $("#row_extra"), /^(select\|radio\|checkbox\|php)$/, false); }); // Add a star to the extra row since the "extra" is required if the box is shown
Zeile 643	Zeile 644
"checkbox" => $lang->checkbox, "language" => $lang->language_selection_box, "adminlanguage" => $lang->adminlanguage,	"checkbox" => $lang->checkbox, "language" => $lang->language_selection_box, "adminlanguage" => $lang->adminlanguage,
"cpstyle" => $lang->cpstyle	"cpstyle" => $lang->cpstyle, "prefixselect" => $lang->prefix_selection_box
//"php" => $lang->php // Internal Use Only );	//"php" => $lang->php // Internal Use Only );
Zeile 656	Zeile 658
$form->output_submit_wrapper($buttons); $form->end();	$form->output_submit_wrapper($buttons); $form->end();
echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"></script>	echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1821"></script>
<script type="text/javascript">	<script type="text/javascript">
$(document).ready(function() {	$(function() {
new Peeker($("#type"), $("#row_extra"), /^(select\|radio\|checkbox\|php)$/, false); }); // Add a star to the extra row since the "extra" is required if the box is shown	new Peeker($("#type"), $("#row_extra"), /^(select\|radio\|checkbox\|php)$/, false); }); // Add a star to the extra row since the "extra" is required if the box is shown
Zeile 882	Zeile 884
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)) { // 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"); } }	// 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 { $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)); } // Validate avatar dimension inputs $gid = (int)$mybb->input['gid']; $dimfields = array( 8 => array('postmaxavatarsize'), 10 => array('useravatardims', 'maxavatardims'), 13 => array('memberlistmaxavatarsize') ); if(in_array($gid, array_keys($dimfields))) { foreach($dimfields[$gid] as $field) { if(isset($mybb->input['upsetting'][$field])) { if(preg_match("/\b\d+[\|x]{1}\d+\b/i", $mybb->input['upsetting'][$field]) \|\| ($field == 'maxavatardims' && trim($mybb->input['upsetting'][$field]) == "")) { // If pipe (\|) is used normalize to 'x' $mybb->input['upsetting'][$field] = str_replace('\|', 'x', my_strtolower($mybb->input['upsetting'][$field])); } else { flash_message($lang->sprintf($lang->error_format_dimension, $lang->{'error_field_'.$field}), 'error'); admin_redirect("index.php?module=config-settings&action=change&gid=".$gid); } } } } // Have we opted for a reCAPTCHA or hCaptcha 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']['recaptchaprivatekey'] \|\| !$mybb->input['upsetting']['recaptchapublickey'])) \|\| (in_array($mybb->settings['captchaimage'], array(4, 5)) && (!$mybb->settings['recaptchaprivatekey'] \|\| !$mybb->settings['recaptchapublickey'])) \|\| (isset($mybb->input['upsetting']['captchaimage']) && in_array($mybb->input['upsetting']['captchaimage'], array(8)) && (!$mybb->input['upsetting']['recaptchaprivatekey'] \|\| !$mybb->input['upsetting']['recaptchapublickey'] \|\| !$mybb->input['upsetting']['recaptchascore'])) \|\| (in_array($mybb->settings['captchaimage'], array(8)) && (!$mybb->settings['recaptchaprivatekey'] \|\| !$mybb->settings['recaptchapublickey'] \|\| !$mybb->settings['recaptchascore'])) \|\| (isset($mybb->input['upsetting']['captchaimage']) && in_array($mybb->input['upsetting']['captchaimage'], array(6, 7)) && (!$mybb->input['upsetting']['hcaptchaprivatekey'] \|\| !$mybb->input['upsetting']['hcaptchapublickey'])) \|\| (in_array($mybb->settings['captchaimage'], array(6, 7)) && (!$mybb->settings['hcaptchaprivatekey'] \|\| !$mybb->settings['hcaptchapublickey']))) { $mybb->input['upsetting']['captchaimage'] = 1; $lang->success_settings_updated .= $lang->success_settings_updated_captchaimage; } // If using fulltext then enforce minimum word length given by database if(isset($mybb->input['upsetting']['minsearchword']) && $mybb->input['upsetting']['minsearchword'] > 0 && $mybb->input['upsetting']['searchtype'] == "fulltext" && $db->supports_fulltext_boolean("posts") && $db->supports_fulltext("threads")) { // Attempt to determine minimum word length from MySQL for fulltext searches $query = $db->query("SHOW VARIABLES LIKE 'ft_min_word_len';"); $min_length = $db->fetch_field($query, 'Value'); if(is_numeric($min_length) && $mybb->input['upsetting']['minsearchword'] < $min_length) { $mybb->input['upsetting']['minsearchword'] = $min_length; $lang->success_settings_updated .= $lang->success_settings_updated_minsearchword; } }
// Get settings which optionscode is a forum/group select, checkbox or numeric // We cannot rely on user input to decide this	// 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%'");	$checkbox_settings = $forum_group_select = $prefix_select = array(); $query = $db->simple_select('settings', 'name, optionscode', "optionscode IN('forumselect', 'groupselect', 'prefixselect') 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']; } } // Verify for admin email that can't be empty if(isset($mybb->input['upsetting']['adminemail']) && !validate_email_format($mybb->input['upsetting']['adminemail'])) { unset($mybb->input['upsetting']['adminemail']); $lang->success_settings_updated .= $lang->error_admin_email_settings_empty; } // 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; } } // reject dangerous/unsupported upload paths $fields = array( 'uploadspath', 'cdnpath', 'avataruploadpath', ); $dynamic_include_directories = array( MYBB_ROOT.'cache/', MYBB_ROOT.'inc/plugins/', MYBB_ROOT.'inc/languages/', MYBB_ROOT.'inc/tasks/', ); $dynamic_include_directories_realpath = array_map('realpath', $dynamic_include_directories); foreach($fields as $field) { if( isset($mybb->input['upsetting'][$field]) && is_string($mybb->input['upsetting'][$field]) && strpos($mybb->input['upsetting'][$field], '://') !== false) { unset($mybb->input['upsetting'][$field]); continue; } $realpath = realpath(MYBB_ROOT.$mybb->input['upsetting'][$field]); if ($realpath === false) { unset($mybb->input['upsetting'][$field]); continue; } foreach ($dynamic_include_directories_realpath as $forbidden_realpath) { if ($realpath === $forbidden_realpath \|\| strpos($realpath, $forbidden_realpath.DIRECTORY_SEPARATOR) === 0) { unset($mybb->input['upsetting'][$field]); continue 2; }
} }	} }

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 1116
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')
{	{