Vergleich admin/modules/config/settings.php - 1.8.8 - 1.8.21

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 438	Zeile 438
$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 656	Zeile 656
$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 927	Zeile 927
} $lang->success_settings_updated .= $lang->sprintf($lang->success_settings_updated_hiddencaptchaimage, htmlspecialchars_uni($mybb->input['upsetting']['hiddencaptchaimagefield']), htmlspecialchars_uni($wrong_value));	} $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 and not set a public/private key?	} // 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(2, 4)) && (!$mybb->input['upsetting']['captchaprivatekey'] \|\| !$mybb->input['upsetting']['captchapublickey'])) \|\| (in_array($mybb->settings['captchaimage'], array(2, 4)) && (!$mybb->settings['captchaprivatekey'] \|\| !$mybb->settings['captchapublickey'])))	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;	{ $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'];
Zeile 952	Zeile 981
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($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 {	} else {
$forum_group_select[] = $multisetting['name']; } }	$forum_group_select[] = $multisetting['name']; } }
Zeile 970	Zeile 1026
// 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) {	// 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, COUNT(email) AS duplicates', "email!=''", array('group_by' => 'email HAVING duplicates>1'));	$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;	if($db->num_rows($query)) { $mybb->input['upsetting']['username_method'] = 0;
Zeile 980	Zeile 1036
{ $mybb->input['upsetting']['allowmultipleemails'] = 0; $lang->success_settings_updated .= $lang->success_settings_updated_allowmultipleemails;	{ $mybb->input['upsetting']['allowmultipleemails'] = 0; $lang->success_settings_updated .= $lang->success_settings_updated_allowmultipleemails;
	} } $fields = array( 'uploadspath', 'cdnpath', 'avataruploadpath', ); 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]);
} }	} }
Zeile 1053	Zeile 1126