"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Upload/admin/modules/config/settings.php" between
mybb_1819.zip and mybb_1820.zip

About: MyBB is a multilingual, standards-compliant and free forum (discussion board) software.

settings.php  (mybb_1819):settings.php  (mybb_1820)
skipping to change at line 443 skipping to change at line 443
$form_container->output_row($lang->extra, $lang->extra_desc, $form->gener ate_text_area('extra', $mybb->input['extra'], array('id' => 'extra')), 'extra', array(), array('id' => 'row_extra')); $form_container->output_row($lang->extra, $lang->extra_desc, $form->gener ate_text_area('extra', $mybb->input['extra'], array('id' => 'extra')), 'extra', array(), array('id' => 'row_extra'));
$form_container->output_row($lang->value, "", $form->generate_text_area(' value', $mybb->input['value'], array('id' => 'value')), 'value'); $form_container->output_row($lang->value, "", $form->generate_text_area(' value', $mybb->input['value'], array('id' => 'value')), 'value');
$form_container->end(); $form_container->end();
$buttons[] = $form->generate_submit_button($lang->insert_new_setting); $buttons[] = $form->generate_submit_button($lang->insert_new_setting);
$form->output_submit_wrapper($buttons); $form->output_submit_wrapper($buttons);
$form->end(); $form->end();
echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"> </script> echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"> </script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(function() {
new Peeker($("#type"), $("#row_extra"), /^(select|radio|c heckbox|php)$/, false); new Peeker($("#type"), $("#row_extra"), /^(select|radio|c heckbox|php)$/, false);
}); });
// Add a star to the extra row since the "extra" is required if t he box is shown // Add a star to the extra row since the "extra" is required if t he box is shown
add_star("row_extra"); add_star("row_extra");
</script>'; </script>';
$page->output_footer(); $page->output_footer();
} }
// Editing a particular setting // Editing a particular setting
skipping to change at line 661 skipping to change at line 661
$form_container->output_row($lang->extra, $lang->extra_desc, $form->gener ate_text_area('extra', $setting_data['extra'], array('id' => 'extra')), 'extra', array(), array('id' => 'row_extra')); $form_container->output_row($lang->extra, $lang->extra_desc, $form->gener ate_text_area('extra', $setting_data['extra'], array('id' => 'extra')), 'extra', array(), array('id' => 'row_extra'));
$form_container->output_row($lang->value, '', $form->generate_text_area(' value', $setting_data['value'], array('id' => 'value')), 'value'); $form_container->output_row($lang->value, '', $form->generate_text_area(' value', $setting_data['value'], array('id' => 'value')), 'value');
$form_container->end(); $form_container->end();
$buttons[] = $form->generate_submit_button($lang->update_setting); $buttons[] = $form->generate_submit_button($lang->update_setting);
$form->output_submit_wrapper($buttons); $form->output_submit_wrapper($buttons);
$form->end(); $form->end();
echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"> </script> echo '<script type="text/javascript" src="./jscripts/peeker.js?ver=1804"> </script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(function() {
new Peeker($("#type"), $("#row_extra"), /^(select|radio|c heckbox|php)$/, false); new Peeker($("#type"), $("#row_extra"), /^(select|radio|c heckbox|php)$/, false);
}); });
// Add a star to the extra row since the "extra" is required if t he box is shown // Add a star to the extra row since the "extra" is required if t he box is shown
add_star("row_extra"); add_star("row_extra");
</script>'; </script>';
$page->output_footer(); $page->output_footer();
} }
// Delete Setting // Delete Setting
skipping to change at line 1148 skipping to change at line 1148
// What type of page // What type of page
$cache_groups = $cache_settings = array(); $cache_groups = $cache_settings = array();
if(isset($mybb->input['search'])) if(isset($mybb->input['search']))
{ {
// Search // Search
// Search for settings // Search for settings
$search = $db->escape_string_like($mybb->input['search']); $search = $db->escape_string_like($mybb->input['search']);
$query = $db->query(" $query = $db->query("
SELECT s.* SELECT s.* , g.name as gname, g.title as gtitle, g.descri ption as gdescription
FROM ".TABLE_PREFIX."settings s FROM ".TABLE_PREFIX."settings s
LEFT JOIN ".TABLE_PREFIX."settinggroups g ON(s.gid=g.gid) LEFT JOIN ".TABLE_PREFIX."settinggroups g ON(s.gid=g.gid)
WHERE s.name LIKE '%{$search}%' OR s.title LIKE '%{$searc h}%' OR s.description LIKE '%{$search}%' OR g.name LIKE '%{$search}%' OR g.title LIKE '%{$search}%' OR g.description LIKE '%{$search}%'
ORDER BY s.disporder ORDER BY s.disporder
"); ");
while($setting = $db->fetch_array($query)) while($setting = $db->fetch_array($query))
{ {
$cache_settings[$setting['gid']][$setting['sid']] = $sett $lang_var = "setting_{$setting['name']}";
ing; 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["descripti
on"] . " " . $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(!count($cache_settings))
if(!$db->num_rows($query))
{ {
if(isset($mybb->input['ajax_search'])) if(isset($mybb->input['ajax_search']))
{ {
echo json_encode(array("errors" => array($lang->e rror_no_settings_found))); echo json_encode(array("errors" => array($lang->e rror_no_settings_found)));
exit; exit;
} }
else else
{ {
flash_message($lang->error_no_settings_found, 'er ror'); flash_message($lang->error_no_settings_found, 'er ror');
admin_redirect("index.php?module=config-settings" ); admin_redirect("index.php?module=config-settings" );
skipping to change at line 1727 skipping to change at line 1750
$table->output($lang->plugin_settings); $table->output($lang->plugin_settings);
} }
echo '</div>'; echo '</div>';
echo ' echo '
<script type="text/javascript" src="./jscripts/search.js?ver=1808"></script> <script type="text/javascript" src="./jscripts/search.js?ver=1808"></script>
<script type="text/javascript"> <script type="text/javascript">
//<!-- //<!--
$(document).ready(function(){ $(function(){
SettingSearch.init("'.$lang->settings_search.'","'.$lang->error_ajax_unkn own.'"); SettingSearch.init("'.$lang->settings_search.'","'.$lang->error_ajax_unkn own.'");
}); });
//--> //-->
</script>'; </script>';
print_setting_peekers(); print_setting_peekers();
$page->output_footer(); $page->output_footer();
} }
/** /**
skipping to change at line 1784 skipping to change at line 1807
'new Peeker($(".setting_portal_showdiscussions"), $("#row_setting _portal_showdiscussionsnum, #row_setting_portal_excludediscussion"), 1, true)', 'new Peeker($(".setting_portal_showdiscussions"), $("#row_setting _portal_showdiscussionsnum, #row_setting_portal_excludediscussion"), 1, true)',
'new Peeker($(".setting_enableattachments"), $("#row_setting_maxa ttachments, #row_setting_attachthumbnails"), 1, true)', 'new Peeker($(".setting_enableattachments"), $("#row_setting_maxa ttachments, #row_setting_attachthumbnails"), 1, true)',
'new Peeker($(".setting_attachthumbnails"), $("#row_setting_attac hthumbh, #row_setting_attachthumbw"), "yes", true)', 'new Peeker($(".setting_attachthumbnails"), $("#row_setting_attac hthumbh, #row_setting_attachthumbw"), "yes", true)',
'new Peeker($(".setting_showbirthdays"), $("#row_setting_showbirt hdayspostlimit"), 1, true)', 'new Peeker($(".setting_showbirthdays"), $("#row_setting_showbirt hdayspostlimit"), 1, true)',
'new Peeker($("#setting_betweenregstime"), $("#row_setting_maxreg sbetweentime"), /[^0+|]/, false)', 'new Peeker($("#setting_betweenregstime"), $("#row_setting_maxreg sbetweentime"), /[^0+|]/, false)',
'new Peeker($(".setting_usecdn"), $("#row_setting_cdnurl, #row_se tting_cdnpath"), 1, true)', 'new Peeker($(".setting_usecdn"), $("#row_setting_cdnurl, #row_se tting_cdnpath"), 1, true)',
'new Peeker($("#setting_errorlogmedium"), $("#row_setting_errorty pemedium"), /^(log|email|both)/, false)', 'new Peeker($("#setting_errorlogmedium"), $("#row_setting_errorty pemedium"), /^(log|email|both)/, false)',
'new Peeker($("#setting_errorlogmedium"), $("#row_setting_errorlo glocation"), /^(log|both)/, false)', 'new Peeker($("#setting_errorlogmedium"), $("#row_setting_errorlo glocation"), /^(log|both)/, false)',
'new Peeker($(".setting_sigmycode"), $("#row_setting_sigcountmyco de, #row_setting_sigimgcode"), 1, true)', 'new Peeker($(".setting_sigmycode"), $("#row_setting_sigcountmyco de, #row_setting_sigimgcode"), 1, true)',
'new Peeker($(".setting_pmsallowmycode"), $("#row_setting_pmsallo wimgcode, #row_setting_pmsallowvideocode"), 1, true)', 'new Peeker($(".setting_pmsallowmycode"), $("#row_setting_pmsallo wimgcode, #row_setting_pmsallowvideocode"), 1, true)',
'new Peeker($(".setting_enableshowteam"), $("#row_setting_showadd 'new Peeker($(".setting_enableshowteam"), $("#row_setting_showadd
lgroups, #row_setting_showgroupleaders"), 1, true)' lgroups, #row_setting_showgroupleaders"), 1, true)',
'new Peeker($(".setting_usereferrals"), $("#row_setting_referrals
perpage"), 1, true)',
); );
$peekers = $plugins->run_hooks("admin_settings_print_peekers", $peekers); $peekers = $plugins->run_hooks("admin_settings_print_peekers", $peekers);
$setting_peekers = implode("\n ", $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=1804"> </script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(function() {
' . $setting_peekers . ' ' . $setting_peekers . '
}); });
</script>'; </script>';
} }
 End of changes. 9 change blocks. 
12 lines changed or deleted 39 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)