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

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 441	Zeile 441
echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"></script> <script type="text/javascript"> $(document).ready(function() {	echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"></script> <script type="text/javascript"> $(document).ready(function() {
var peeker = new Peeker($("#type"), $("#row_extra"), /select\|radio\|checkbox\|php/, false);	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 add_star("row_extra");	}); // Add a star to the extra row since the "extra" is required if the box is shown add_star("row_extra");
Zeile 550	Zeile 550
$plugins->run_hooks("admin_config_settings_edit_commit");	$plugins->run_hooks("admin_config_settings_edit_commit");
$db->update_query("settings", $updated_setting, "sid='{$mybb->input['sid']}'");	$db->update_query("settings", $updated_setting, "sid='{$setting['sid']}'");
rebuild_settings(); // Log admin action	rebuild_settings(); // Log admin action
Zeile 659	Zeile 659
echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"></script> <script type="text/javascript"> $(document).ready(function() {	echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"></script> <script type="text/javascript"> $(document).ready(function() {
var peeker = new Peeker($("#type"), $("#row_extra"), /select\|radio\|checkbox\|php/, false);	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 add_star("row_extra");	}); // Add a star to the extra row since the "extra" is required if the box is shown add_star("row_extra");
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', 'allownotices', 'hideemail', 'receivepms', 'pmnotice', 'emailpmnotify', 'invisible', 'subscriptionmethod', 'timezoneoffset', 'dstcorrection', 'language', 'step', 'action', '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"); } } // Get settings which optionscode is a forum/group select	// 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)); } // 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']))) { $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	// We cannot rely on user input to decide this
$forum_group_select = array(); $query = $db->simple_select('settings', 'name', 'optionscode IN (\'forumselect\', \'groupselect\')'); while($name = $db->fetch_field($query, 'name'))	$checkbox_settings = $forum_group_select = array(); $query = $db->simple_select('settings', 'name, optionscode', "optionscode IN('forumselect', 'groupselect', 'numeric') OR optionscode LIKE 'checkbox%'"); while($multisetting = $db->fetch_array($query)) { 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(); } } elseif($multisetting['optionscode'] == 'numeric') { if(isset($mybb->input['upsetting'][$multisetting['name']])) { $mybb->input['upsetting'][$multisetting['name']] = (int)$mybb->input['upsetting'][$multisetting['name']]; } } 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)
{	{
$forum_group_select[] = $name;	$query = $db->simple_select('users', 'email, COUNT(email) AS duplicates', "email!=''", array('group_by' => 'email HAVING duplicates>1')); if($db->num_rows($query)) { $mybb->input['upsetting']['username_method'] = 0; $lang->success_settings_updated .= $lang->success_settings_updated_username_method; } else { $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) {
if(!empty($forum_group_select) && in_array($name, $forum_group_select))	if($forum_group_select && in_array($name, $forum_group_select))
{ if($value == 'all') {	{ if($value == 'all') {
Zeile 947	Zeile 1003
} unset($val);	} unset($val);
$value = implode(',', (array)$mybb->input['select'][$name]);	$value = implode(',', $mybb->input['select'][$name]);
} else { $value = ''; }	} else { $value = ''; }
}	}
else	else
{	{
$value = ''; } }	$value = ''; } }
$value = $db->escape_string($value); $db->update_query("settings", array('value' => $value), "name='".$db->escape_string($name)."'"); }	elseif($checkbox_settings && in_array($name, $checkbox_settings)) { $value = ''; 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") { if(!$db->is_fulltext("posts") && $db->supports_fulltext_boolean("posts"))	} // 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"))
{	{
$db->create_fulltext_index("posts", "message");	$db->create_fulltext_index("posts", "message");
}	}
if(!$db->is_fulltext("posts") && $db->supports_fulltext("threads")) { $db->create_fulltext_index("threads", "subject");	if(!$db->is_fulltext("posts") && $db->supports_fulltext("threads")) { $db->create_fulltext_index("threads", "subject");
} }	} }
// If the delayedthreadviews setting was changed, enable or disable the tasks for it. if(isset($mybb->input['upsetting']['delayedthreadviews']) && $mybb->settings['delayedthreadviews'] != $mybb->input['upsetting']['delayedthreadviews'])	// If the delayedthreadviews setting was changed, enable or disable the tasks for it. if(isset($mybb->input['upsetting']['delayedthreadviews']) && $mybb->settings['delayedthreadviews'] != $mybb->input['upsetting']['delayedthreadviews'])
{ if($mybb->input['upsetting']['delayedthreadviews'] == 0) { $updated_task = array( "enabled" => 0 ); } else { $updated_task = array( "enabled" => 1 ); } $db->update_query("tasks", $updated_task, "file='threadviews'");	{ $db->update_query("tasks", array('enabled' => (int)$mybb->input['upsetting']['delayedthreadviews']), "file='threadviews'");
} // Have we changed our cookie prefix? If so, update our adminsid so we're not logged out	} // Have we changed our cookie prefix? If so, update our adminsid so we're not logged out
if($mybb->input['upsetting']['cookieprefix'] && $mybb->input['upsetting']['cookieprefix'] != $mybb->settings['cookieprefix'])	if(isset($mybb->input['upsetting']['cookieprefix']) && $mybb->input['upsetting']['cookieprefix'] != $mybb->settings['cookieprefix'])