Vergleich admin/modules/config/settings.php - 1.8.20 - 1.8.23

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"> $(function() { new Peeker($("#type"), $("#row_extra"), /^(select\|radio\|checkbox\|php)$/, false);	<script type="text/javascript"> $(function() { new Peeker($("#type"), $("#row_extra"), /^(select\|radio\|checkbox\|php)$/, false);
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"> $(function() { new Peeker($("#type"), $("#row_extra"), /^(select\|radio\|checkbox\|php)$/, false);	<script type="text/javascript"> $(function() { new Peeker($("#type"), $("#row_extra"), /^(select\|radio\|checkbox\|php)$/, false);
Zeile 956	Zeile 958
} }	} }
// 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'])))	// 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;	{ $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') OR optionscode LIKE 'checkbox%' OR optionscode LIKE 'numeric%'");	$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)) {
Zeile 981	Zeile 1000
if(empty($mybb->input['upsetting'][$multisetting['name']]) && isset($mybb->input["isvisible_{$multisetting['name']}"])) { $mybb->input['upsetting'][$multisetting['name']] = array();	if(empty($mybb->input['upsetting'][$multisetting['name']]) && isset($mybb->input["isvisible_{$multisetting['name']}"])) { $mybb->input['upsetting'][$multisetting['name']] = array();
}	}
} elseif(substr($multisetting['optionscode'], 0, 7) == 'numeric') {	} elseif(substr($multisetting['optionscode'], 0, 7) == 'numeric') {
Zeile 989	Zeile 1008
{ $type = explode("\n", $multisetting['optionscode']); for($i=1; $i < count($type); $i++)	{ $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')))	$optionsexp = explode("=", $type[$i]); $opt = array_map('trim', $optionsexp); if(in_array($opt[0], array('min', 'max', 'step')))
Zeile 1021	Zeile 1040
{ $forum_group_select[] = $multisetting['name']; }	{ $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'));	} // 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))	if($db->num_rows($query))
{ $mybb->input['upsetting']['username_method'] = 0; $lang->success_settings_updated .= $lang->success_settings_updated_username_method;	{ $mybb->input['upsetting']['username_method'] = 0; $lang->success_settings_updated .= $lang->success_settings_updated_username_method;
Zeile 1038	Zeile 1064
$lang->success_settings_updated .= $lang->success_settings_updated_allowmultipleemails; } }	$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; } } }