Vergleich admin/modules/config/settings.php - 1.8.18 - 1.8.22

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 425Zeile 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 438Zeile 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 643Zeile 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 656Zeile 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 966Zeile 968

// 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 1038Zeile 1040
				$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;
}
}
}



if(is_array($mybb->input['upsetting']))
{


if(is_array($mybb->input['upsetting']))
{

Zeile 1052Zeile 1098
					elseif($value == 'custom')
{
if(isset($mybb->input['select'][$name]) && is_array($mybb->input['select'][$name]))

					elseif($value == 'custom')
{
if(isset($mybb->input['select'][$name]) && is_array($mybb->input['select'][$name]))

						{

						{

							foreach($mybb->input['select'][$name] as &$val)
{
$val = (int)$val;
}
unset($val);

							foreach($mybb->input['select'][$name] as &$val)
{
$val = (int)$val;
}
unset($val);





							$value = implode(',', $mybb->input['select'][$name]);

							$value = implode(',', $mybb->input['select'][$name]);

						}

						}

						else
{
$value = '';
}

						else
{
$value = '';
}

					}

					}

					else
{
$value = '';

					else
{
$value = '';

Zeile 1091Zeile 1137
			if(!$db->is_fulltext("posts") && $db->supports_fulltext_boolean("posts"))
{
$db->create_fulltext_index("posts", "message");

			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("threads", "subject");

			if(!$db->is_fulltext("posts") && $db->supports_fulltext("threads"))
{
$db->create_fulltext_index("threads", "subject");

Zeile 1145Zeile 1191
		// Search for settings
$search = $db->escape_string_like($mybb->input['search']);
$query = $db->query("

		// Search for settings
$search = $db->escape_string_like($mybb->input['search']);
$query = $db->query("

			SELECT s.*

			SELECT s.* , g.name as gname, g.title as gtitle, g.description as gdescription

			FROM ".TABLE_PREFIX."settings s
LEFT JOIN ".TABLE_PREFIX."settinggroups g ON(s.gid=g.gid)

			FROM ".TABLE_PREFIX."settings s
LEFT JOIN ".TABLE_PREFIX."settinggroups g ON(s.gid=g.gid)

			WHERE s.name LIKE '%{$search}%' OR s.title LIKE '%{$search}%' OR s.description LIKE '%{$search}%' OR g.name LIKE '%{$search}%' OR g.title LIKE '%{$search}%' OR g.description LIKE '%{$search}%'

 
			ORDER BY s.disporder
");
while($setting = $db->fetch_array($query))
{

			ORDER BY s.disporder
");
while($setting = $db->fetch_array($query))
{

			$cache_settings[$setting['gid']][$setting['sid']] = $setting;


























			$lang_var = "setting_{$setting['name']}";
if(isset($lang->$lang_var))
{
$setting["title"] = $lang->$lang_var;
}
$lang_var = "setting_{$setting['name']}_desc";
if(isset($lang->$lang_var))
{
$setting["description"] = $lang->$lang_var;
}
$lang_var = "setting_group_{$setting['gname']}";
if(isset($lang->$lang_var))
{
$setting["gtitle"] = $lang->$lang_var;
}
$lang_var = "setting_group_{$setting['gname']}_desc";
if(isset($lang->$lang_var))
{
$setting["gdescription"] = $lang->$lang_var;
}
$lang_var = $setting["title"] . " " . $setting["description"] . " " . $setting["gtitle"] . " " . $setting["gdescription"];
$search = mb_convert_encoding($search, mb_detect_encoding($setting["title"], "auto"));
if (mb_stripos($lang_var, $search))
{
$cache_settings[$setting['gid']][$setting['sid']] = $setting;
}

		}

		}


if(!$db->num_rows($query))

		if(!count($cache_settings))


		{
if(isset($mybb->input['ajax_search']))
{

		{
if(isset($mybb->input['ajax_search']))
{

Zeile 1168Zeile 1237
				flash_message($lang->error_no_settings_found, 'error');
admin_redirect("index.php?module=config-settings");
}

				flash_message($lang->error_no_settings_found, 'error');
admin_redirect("index.php?module=config-settings");
}

		}


		}


		// Cache groups
$groups = array_keys($cache_settings);
$groups = implode(',', $groups);
$query = $db->simple_select("settinggroups", "*", "gid IN ({$groups})", array('order_by' => 'disporder'));
while($group = $db->fetch_array($query))

		// Cache groups
$groups = array_keys($cache_settings);
$groups = implode(',', $groups);
$query = $db->simple_select("settinggroups", "*", "gid IN ({$groups})", array('order_by' => 'disporder'));
while($group = $db->fetch_array($query))

		{

		{

			$cache_groups[$group['gid']] = $group;
}


			$cache_groups[$group['gid']] = $group;
}


Zeile 1194Zeile 1263
		$groupinfo = $db->fetch_array($query);
$cache_groups[$groupinfo['gid']] = $groupinfo;


		$groupinfo = $db->fetch_array($query);
$cache_groups[$groupinfo['gid']] = $groupinfo;


		if(!$db->num_rows($query))
{
$page->output_error($lang->error_invalid_gid2);
}


		if(!$db->num_rows($query))
{
$page->output_error($lang->error_invalid_gid2);
}


		// Cache settings
$query = $db->simple_select("settings", "*", "gid='".$mybb->get_input('gid', MyBB::INPUT_INT)."'", array('order_by' => 'disporder'));
while($setting = $db->fetch_array($query))

		// Cache settings
$query = $db->simple_select("settings", "*", "gid='".$mybb->get_input('gid', MyBB::INPUT_INT)."'", array('order_by' => 'disporder'));
while($setting = $db->fetch_array($query))

Zeile 1405Zeile 1474
			{
$selected_value = (int)$setting['value']; // No need to check if empty, int will give 0
$setting_code = $form->generate_forum_select($element_name, $selected_value, array('id' => $element_id, 'main_option' => $lang->none));

			{
$selected_value = (int)$setting['value']; // No need to check if empty, int will give 0
$setting_code = $form->generate_forum_select($element_name, $selected_value, array('id' => $element_id, 'main_option' => $lang->none));

			}

			}

			else if($type[0] == "groupselect")
{
$selected_values = '';
if($setting['value'] != '' && $setting['value'] != -1)
{
$selected_values = explode(',', (string)$setting['value']);

			else if($type[0] == "groupselect")
{
$selected_values = '';
if($setting['value'] != '' && $setting['value'] != -1)
{
$selected_values = explode(',', (string)$setting['value']);
























































foreach($selected_values as &$value)
{
$value = (int)$value;
}
unset($value);
}

$group_checked = array('all' => '', 'custom' => '', 'none' => '');
if($setting['value'] == -1)
{
$group_checked['all'] = 'checked="checked"';
}
elseif($setting['value'] != '')
{
$group_checked['custom'] = 'checked="checked"';
}
else
{
$group_checked['none'] = 'checked="checked"';
}

print_selection_javascript();

$setting_code = "
<dl style=\"margin-top: 0; margin-bottom: 0; width: 100%\">
<dt><label style=\"display: block;\"><input type=\"radio\" name=\"{$element_name}\" value=\"all\" {$group_checked['all']} class=\"{$element_id}_forums_groups_check\" onclick=\"checkAction('{$element_id}');\" style=\"vertical-align: middle;\" /> <strong>{$lang->all_groups}</strong></label></dt>
<dt><label style=\"display: block;\"><input type=\"radio\" name=\"{$element_name}\" value=\"custom\" {$group_checked['custom']} class=\"{$element_id}_forums_groups_check\" onclick=\"checkAction('{$element_id}');\" style=\"vertical-align: middle;\" /> <strong>{$lang->select_groups}</strong></label></dt>
<dd style=\"margin-top: 4px;\" id=\"{$element_id}_forums_groups_custom\" class=\"{$element_id}_forums_groups\">
<table cellpadding=\"4\">
<tr>
<td valign=\"top\"><small>{$lang->groups_colon}</small></td>
<td>".$form->generate_group_select('select['.$setting['name'].'][]', $selected_values, array('id' => $element_id, 'multiple' => true, 'size' => 5))."</td>
</tr>
</table>
</dd>
<dt><label style=\"display: block;\"><input type=\"radio\" name=\"{$element_name}\" value=\"none\" {$group_checked['none']} class=\"{$element_id}_forums_groups_check\" onclick=\"checkAction('{$element_id}');\" style=\"vertical-align: middle;\" /> <strong>{$lang->none}</strong></label></dt>
</dl>
<script type=\"text/javascript\">
checkAction('{$element_id}');
</script>";
}
else if($type[0] == "groupselectsingle")
{
$selected_value = (int)$setting['value']; // No need to check if empty, int will give 0
$setting_code = $form->generate_group_select($element_name, $selected_value, array('id' => $element_id, 'main_option' => $lang->none));
}
else if($type[0] == "prefixselect")
{
$selected_values = '';
if($setting['value'] != '' && $setting['value'] != -1)
{
$selected_values = explode(',', (string)$setting['value']);

					foreach($selected_values as &$value)
{
$value = (int)$value;
}
unset($value);

					foreach($selected_values as &$value)
{
$value = (int)$value;
}
unset($value);

				}

$group_checked = array('all' => '', 'custom' => '', 'none' => '');

				}
$prefix_checked = array('all' => '', 'custom' => '', 'none' => '');


				if($setting['value'] == -1)
{

				if($setting['value'] == -1)
{

					$group_checked['all'] = 'checked="checked"';

					$prefix_checked['all'] = 'checked="checked"';

				}
elseif($setting['value'] != '')
{

				}
elseif($setting['value'] != '')
{

					$group_checked['custom'] = 'checked="checked"';

					$prefix_checked['custom'] = 'checked="checked"';

				}
else
{

				}
else
{

					$group_checked['none'] = 'checked="checked"';

					$prefix_checked['none'] = 'checked="checked"';

				}

				}



 
				print_selection_javascript();

				print_selection_javascript();



 
				$setting_code = "
<dl style=\"margin-top: 0; margin-bottom: 0; width: 100%\">

				$setting_code = "
<dl style=\"margin-top: 0; margin-bottom: 0; width: 100%\">

					<dt><label style=\"display: block;\"><input type=\"radio\" name=\"{$element_name}\" value=\"all\" {$group_checked['all']} class=\"{$element_id}_forums_groups_check\" onclick=\"checkAction('{$element_id}');\" style=\"vertical-align: middle;\" /> <strong>{$lang->all_groups}</strong></label></dt>
<dt><label style=\"display: block;\"><input type=\"radio\" name=\"{$element_name}\" value=\"custom\" {$group_checked['custom']} class=\"{$element_id}_forums_groups_check\" onclick=\"checkAction('{$element_id}');\" style=\"vertical-align: middle;\" /> <strong>{$lang->select_groups}</strong></label></dt>

					<dt><label style=\"display: block;\"><input type=\"radio\" name=\"{$element_name}\" value=\"all\" {$prefix_checked['all']} class=\"{$element_id}_forums_groups_check\" onclick=\"checkAction('{$element_id}');\" style=\"vertical-align: middle;\" /> <strong>{$lang->all_prefix}</strong></label></dt>
<dt><label style=\"display: block;\"><input type=\"radio\" name=\"{$element_name}\" value=\"custom\" {$prefix_checked['custom']} class=\"{$element_id}_forums_groups_check\" onclick=\"checkAction('{$element_id}');\" style=\"vertical-align: middle;\" /> <strong>{$lang->select_prefix}</strong></label></dt>

					<dd style=\"margin-top: 4px;\" id=\"{$element_id}_forums_groups_custom\" class=\"{$element_id}_forums_groups\">
<table cellpadding=\"4\">
<tr>

					<dd style=\"margin-top: 4px;\" id=\"{$element_id}_forums_groups_custom\" class=\"{$element_id}_forums_groups\">
<table cellpadding=\"4\">
<tr>

								<td valign=\"top\"><small>{$lang->groups_colon}</small></td>
<td>".$form->generate_group_select('select['.$setting['name'].'][]', $selected_values, array('id' => $element_id, 'multiple' => true, 'size' => 5))."</td>

								<td valign=\"top\"><small>{$lang->prefix_colon}</small></td>
<td>".$form->generate_prefix_select('select['.$setting['name'].'][]', $selected_values, array('id' => $element_id, 'multiple' => true, 'size' => 5))."</td>

							</tr>
</table>
</dd>

							</tr>
</table>
</dd>

					<dt><label style=\"display: block;\"><input type=\"radio\" name=\"{$element_name}\" value=\"none\" {$group_checked['none']} class=\"{$element_id}_forums_groups_check\" onclick=\"checkAction('{$element_id}');\" style=\"vertical-align: middle;\" /> <strong>{$lang->none}</strong></label></dt>

					<dt><label style=\"display: block;\"><input type=\"radio\" name=\"{$element_name}\" value=\"none\" {$prefix_checked['none']} class=\"{$element_id}_forums_groups_check\" onclick=\"checkAction('{$element_id}');\" style=\"vertical-align: middle;\" /> <strong>{$lang->none}</strong></label></dt>

				</dl>
<script type=\"text/javascript\">
checkAction('{$element_id}');
</script>";

				</dl>
<script type=\"text/javascript\">
checkAction('{$element_id}');
</script>";

			}
else if($type[0] == "groupselectsingle")
{
$selected_value = (int)$setting['value']; // No need to check if empty, int will give 0
$setting_code = $form->generate_group_select($element_name, $selected_value, array('id' => $element_id, 'main_option' => $lang->none));

 
			}
else
{

			}
else
{

Zeile 1721Zeile 1834
	echo '</div>';

echo '

	echo '</div>';

echo '

<script type="text/javascript" src="./jscripts/search.js?ver=1808"></script>

<script type="text/javascript" src="./jscripts/search.js?ver=1821"></script>

<script type="text/javascript">
//<!--

<script type="text/javascript">
//<!--

$(document).ready(function(){

$(function(){

	SettingSearch.init("'.$lang->settings_search.'","'.$lang->error_ajax_unknown.'");
});
//-->

	SettingSearch.init("'.$lang->settings_search.'","'.$lang->error_ajax_unknown.'");
});
//-->

Zeile 1781Zeile 1894
		'new Peeker($("#setting_errorlogmedium"), $("#row_setting_errorloglocation"), /^(log|both)/, false)',
'new Peeker($(".setting_sigmycode"), $("#row_setting_sigcountmycode, #row_setting_sigimgcode"), 1, true)',
'new Peeker($(".setting_pmsallowmycode"), $("#row_setting_pmsallowimgcode, #row_setting_pmsallowvideocode"), 1, true)',

		'new Peeker($("#setting_errorlogmedium"), $("#row_setting_errorloglocation"), /^(log|both)/, false)',
'new Peeker($(".setting_sigmycode"), $("#row_setting_sigcountmycode, #row_setting_sigimgcode"), 1, true)',
'new Peeker($(".setting_pmsallowmycode"), $("#row_setting_pmsallowimgcode, #row_setting_pmsallowvideocode"), 1, true)',

		'new Peeker($(".setting_enableshowteam"), $("#row_setting_showaddlgroups, #row_setting_showgroupleaders"), 1, true)'


		'new Peeker($(".setting_enableshowteam"), $("#row_setting_showaddlgroups, #row_setting_showgroupleaders"), 1, true)',
'new Peeker($(".setting_usereferrals"), $("#row_setting_referralsperpage"), 1, true)',

	);

$peekers = $plugins->run_hooks("admin_settings_print_peekers", $peekers);

$setting_peekers = implode("\n ", $peekers);


	);

$peekers = $plugins->run_hooks("admin_settings_print_peekers", $peekers);

$setting_peekers = implode("\n ", $peekers);


	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() {

			' . $setting_peekers . '
});
</script>';

			' . $setting_peekers . '
});
</script>';