Vergleich admin/modules/config/warning.php - 1.8.0 - 1.8.16

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 53	Zeile 53
if(!is_numeric($mybb->input['percentage']) \|\| $mybb->input['percentage'] > 100 \|\| $mybb->input['percentage'] < 0) { $errors[] = $lang->error_invalid_warning_percentage;	if(!is_numeric($mybb->input['percentage']) \|\| $mybb->input['percentage'] > 100 \|\| $mybb->input['percentage'] < 0) { $errors[] = $lang->error_invalid_warning_percentage;
	} if(!$mybb->input['action_type']) { $errors[] = $lang->error_missing_action_type;
} if(!$errors)	} if(!$errors)
Zeile 62	Zeile 67
{ $action = array( "type" => 1,	{ $action = array( "type" => 1,
"usergroup" => (int)$mybb->input['action_1_usergroup'],	"usergroup" => $mybb->get_input('action_1_usergroup', MyBB::INPUT_INT),
"length" => fetch_time_length($mybb->input['action_1_time'], $mybb->input['action_1_period']) ); }	"length" => fetch_time_length($mybb->input['action_1_time'], $mybb->input['action_1_period']) ); }
Zeile 72	Zeile 77
$action = array( "type" => 2, "length" => fetch_time_length($mybb->input['action_2_time'], $mybb->input['action_2_period'])	$action = array( "type" => 2, "length" => fetch_time_length($mybb->input['action_2_time'], $mybb->input['action_2_period'])
); }	); }
// Moderate posts else if($mybb->input['action_type'] == 3) {	// Moderate posts else if($mybb->input['action_type'] == 3) {
Zeile 83	Zeile 88
); } $new_level = array(	); } $new_level = array(
"percentage" => (int)$mybb->input['percentage'], "action" => serialize($action)	"percentage" => $mybb->get_input('percentage', MyBB::INPUT_INT), "action" => my_serialize($action)
); $lid = $db->insert_query("warninglevels", $new_level);	); $lid = $db->insert_query("warninglevels", $new_level);
Zeile 110	Zeile 115
{ $page->output_inline_error($errors); $action_checked[$mybb->input['action_type']] = "checked=\"checked\"";	{ $page->output_inline_error($errors); $action_checked[$mybb->input['action_type']] = "checked=\"checked\"";
} $form_container = new FormContainer($lang->add_warning_level); $form_container->output_row($lang->warning_points_percentage, $lang->warning_points_percentage_desc, $form->generate_text_box('percentage', $mybb->input['percentage'], array('id' => 'percentage')), 'percentage'); $query = $db->simple_select("usergroups", "*", "isbannedgroup=1"); while($group = $db->fetch_array($query)) { $banned_groups[$group['gid']] = $group['title']; } $periods = array( "hours" => $lang->expiration_hours, "days" => $lang->expiration_days, "weeks" => $lang->expiration_weeks, "months" => $lang->expiration_months, "never" => $lang->expiration_permanent ); $actions = "<script type=\"text/javascript\"> function checkAction(id) { var checked = ''; $('.'+id+'s_check').each(function(e, val) { if($(this).prop('checked') == true) { checked = $(this).val(); } }); $('.'+id+'s').each(function(e) { $(this).hide(); }); if($('#'+id+'_'+checked)) { $('#'+id+'_'+checked).show(); } } </script> <dl style=\"margin-top: 0; margin-bottom: 0; width: 100%;\"> <dt><label style=\"display: block;\"><input type=\"radio\" name=\"action_type\" value=\"1\" {$action_checked[1]} class=\"actions_check\" onclick=\"checkAction('action');\" style=\"vertical-align: middle;\" /> <strong>{$lang->ban_user}</strong></label></dt> <dd style=\"margin-top: 4px;\" id=\"action_1\" class=\"actions\"> <table cellpadding=\"4\"> <tr> <td><small>{$lang->banned_group}</small></td> <td>".$form->generate_select_box('action_1_usergroup', $banned_groups, $mybb->input['action_1_usergroup'])."</td> </tr> <tr> <td><small>{$lang->ban_length}</small></td> <td>".$form->generate_text_box('action_1_time', $mybb->input['action_1_time'], array('style' => 'width: 2em;'))." ".$form->generate_select_box('action_1_period', $periods, $mybb->input['action_1_period'])."</td> </tr> </table> </dd> <dt><label style=\"display: block;\"><input type=\"radio\" name=\"action_type\" value=\"2\" {$action_checked[2]} class=\"actions_check\" onclick=\"checkAction('action');\" style=\"vertical-align: middle;\" /> <strong>{$lang->suspend_posting_privileges}</strong></label></dt> <dd style=\"margin-top: 4px;\" id=\"action_2\" class=\"actions\"> <table cellpadding=\"4\"> <tr> <td><small>{$lang->suspension_length}</small></td> <td>".$form->generate_text_box('action_2_time', $mybb->input['action_2_time'], array('style' => 'width: 2em;'))." ".$form->generate_select_box('action_2_period', $periods, $mybb->input['action_2_period'])."</td> </tr> </table> </dd> <dt><label style=\"display: block;\"><input type=\"radio\" name=\"action_type\" value=\"3\" {$action_checked[3]} class=\"actions_check\" onclick=\"checkAction('action');\" style=\"vertical-align: middle;\" /> <strong>{$lang->moderate_posts}</strong></label></dt> <dd style=\"margin-top: 4px;\" id=\"action_3\" class=\"actions\"> <table cellpadding=\"4\"> <tr> <td><small>{$lang->moderation_length}</small></td> <td>".$form->generate_text_box('action_3_time', $mybb->input['action_3_time'], array('style' => 'width: 2em;'))." ".$form->generate_select_box('action_3_period', $periods, $mybb->input['action_3_period'])."</td>	} $form_container = new FormContainer($lang->add_warning_level); $form_container->output_row($lang->warning_points_percentage, $lang->warning_points_percentage_desc, $form->generate_numeric_field('percentage', $mybb->input['percentage'], array('id' => 'percentage', 'min' => 0, 'max' => 100)), 'percentage'); $query = $db->simple_select("usergroups", "*", "isbannedgroup=1"); while($group = $db->fetch_array($query)) { $banned_groups[$group['gid']] = $group['title']; } $periods = array( "hours" => $lang->expiration_hours, "days" => $lang->expiration_days, "weeks" => $lang->expiration_weeks, "months" => $lang->expiration_months, "never" => $lang->expiration_permanent ); $actions = "<script type=\"text/javascript\"> function checkAction(id) { var checked = ''; $('.'+id+'s_check').each(function(e, val) { if($(this).prop('checked') == true) { checked = $(this).val(); } }); $('.'+id+'s').each(function(e) { $(this).hide(); }); if($('#'+id+'_'+checked)) { $('#'+id+'_'+checked).show(); } } </script> <dl style=\"margin-top: 0; margin-bottom: 0; width: 100%;\"> <dt><label style=\"display: block;\"><input type=\"radio\" name=\"action_type\" value=\"1\" {$action_checked[1]} class=\"actions_check\" onclick=\"checkAction('action');\" style=\"vertical-align: middle;\" /> <strong>{$lang->ban_user}</strong></label></dt> <dd style=\"margin-top: 4px;\" id=\"action_1\" class=\"actions\"> <table cellpadding=\"4\"> <tr> <td><small>{$lang->banned_group}</small></td> <td>".$form->generate_select_box('action_1_usergroup', $banned_groups, $mybb->input['action_1_usergroup'])."</td> </tr> <tr> <td><small>{$lang->ban_length}</small></td> <td>".$form->generate_numeric_field('action_1_time', $mybb->input['action_1_time'], array('style' => 'width: 3em;', 'min' => 0))." ".$form->generate_select_box('action_1_period', $periods, $mybb->input['action_1_period'])."</td> </tr> </table> </dd> <dt><label style=\"display: block;\"><input type=\"radio\" name=\"action_type\" value=\"2\" {$action_checked[2]} class=\"actions_check\" onclick=\"checkAction('action');\" style=\"vertical-align: middle;\" /> <strong>{$lang->suspend_posting_privileges}</strong></label></dt> <dd style=\"margin-top: 4px;\" id=\"action_2\" class=\"actions\"> <table cellpadding=\"4\"> <tr> <td><small>{$lang->suspension_length}</small></td> <td>".$form->generate_numeric_field('action_2_time', $mybb->input['action_2_time'], array('style' => 'width: 3em;', 'min' => 0))." ".$form->generate_select_box('action_2_period', $periods, $mybb->input['action_2_period'])."</td> </tr> </table> </dd> <dt><label style=\"display: block;\"><input type=\"radio\" name=\"action_type\" value=\"3\" {$action_checked[3]} class=\"actions_check\" onclick=\"checkAction('action');\" style=\"vertical-align: middle;\" /> <strong>{$lang->moderate_posts}</strong></label></dt> <dd style=\"margin-top: 4px;\" id=\"action_3\" class=\"actions\"> <table cellpadding=\"4\"> <tr> <td><small>{$lang->moderation_length}</small></td> <td>".$form->generate_numeric_field('action_3_time', $mybb->input['action_3_time'], array('style' => 'width: 3em;', 'min' => 0))." ".$form->generate_select_box('action_3_period', $periods, $mybb->input['action_3_period'])."</td>
</tr> </table> </dd>	</tr> </table> </dd>
Zeile 197	Zeile 202
$page->output_footer(); }	$page->output_footer(); }

if($mybb->input['action'] == "edit_level") {	if($mybb->input['action'] == "edit_level") {
$query = $db->simple_select("warninglevels", "*", "lid='".(int)$mybb->input['lid']."'");	$query = $db->simple_select("warninglevels", "*", "lid='".$mybb->get_input('lid', MyBB::INPUT_INT)."'");
$level = $db->fetch_array($query); // Does the warning level not exist?	$level = $db->fetch_array($query); // Does the warning level not exist?
Zeile 217	Zeile 222
if(!is_numeric($mybb->input['percentage']) \|\| $mybb->input['percentage'] > 100 \|\| $mybb->input['percentage'] < 0) { $errors[] = $lang->error_invalid_warning_percentage;	if(!is_numeric($mybb->input['percentage']) \|\| $mybb->input['percentage'] > 100 \|\| $mybb->input['percentage'] < 0) { $errors[] = $lang->error_invalid_warning_percentage;
	} if(!$mybb->input['action_type']) { $errors[] = $lang->error_missing_action_type;
} if(!$errors)	} if(!$errors)
Zeile 226	Zeile 236
{ $action = array( "type" => 1,	{ $action = array( "type" => 1,
"usergroup" => (int)$mybb->input['action_1_usergroup'],	"usergroup" => $mybb->get_input('action_1_usergroup', MyBB::INPUT_INT),
"length" => fetch_time_length($mybb->input['action_1_time'], $mybb->input['action_1_period']) ); }	"length" => fetch_time_length($mybb->input['action_1_time'], $mybb->input['action_1_period']) ); }
Zeile 247	Zeile 257
); } $updated_level = array(	); } $updated_level = array(
"percentage" => (int)$mybb->input['percentage'], "action" => serialize($action)	"percentage" => $mybb->get_input('percentage', MyBB::INPUT_INT), "action" => my_serialize($action)
);	);
$db->update_query("warninglevels", $updated_level, "lid='{$level['lid']}'");
$plugins->run_hooks("admin_config_warning_edit_level_commit");	$plugins->run_hooks("admin_config_warning_edit_level_commit");
	$db->update_query("warninglevels", $updated_level, "lid='{$level['lid']}'");
// Log admin action log_admin_action($level['lid'], $mybb->input['percentage']);	// Log admin action log_admin_action($level['lid'], $mybb->input['percentage']);
Zeile 309	Zeile 319
} $form_container = new FormContainer($lang->edit_warning_level);	} $form_container = new FormContainer($lang->edit_warning_level);
$form_container->output_row($lang->warning_points_percentage, $lang->warning_points_percentage_desc, $form->generate_text_box('percentage', $mybb->input['percentage'], array('id' => 'percentage')), 'percentage');	$form_container->output_row($lang->warning_points_percentage, $lang->warning_points_percentage_desc, $form->generate_numeric_field('percentage', $mybb->input['percentage'], array('id' => 'percentage', 'min' => 0, 'max' => 100)), 'percentage');
$query = $db->simple_select("usergroups", "*", "isbannedgroup=1"); while($group = $db->fetch_array($query))	$query = $db->simple_select("usergroups", "*", "isbannedgroup=1"); while($group = $db->fetch_array($query))
Zeile 357	Zeile 367
</tr> <tr> <td><small>{$lang->ban_length}</small></td>	</tr> <tr> <td><small>{$lang->ban_length}</small></td>
<td>".$form->generate_text_box('action_1_time', $mybb->input['action_1_time'], array('style' => 'width: 2em;'))." ".$form->generate_select_box('action_1_period', $periods, $mybb->input['action_1_period'])."</td>	<td>".$form->generate_numeric_field('action_1_time', $mybb->input['action_1_time'], array('style' => 'width: 3em;', 'min' => 0))." ".$form->generate_select_box('action_1_period', $periods, $mybb->input['action_1_period'])."</td>
</tr> </table> </dd>	</tr> </table> </dd>
Zeile 366	Zeile 376
<table cellpadding=\"4\"> <tr> <td><small>{$lang->suspension_length}</small></td>	<table cellpadding=\"4\"> <tr> <td><small>{$lang->suspension_length}</small></td>
<td>".$form->generate_text_box('action_2_time', $mybb->input['action_2_time'], array('style' => 'width: 2em;'))." ".$form->generate_select_box('action_2_period', $periods, $mybb->input['action_2_period'])."</td>	<td>".$form->generate_numeric_field('action_2_time', $mybb->input['action_2_time'], array('style' => 'width: 3em;', 'min' => 0))." ".$form->generate_select_box('action_2_period', $periods, $mybb->input['action_2_period'])."</td>
</tr> </table> </dd>	</tr> </table> </dd>
Zeile 375	Zeile 385
<table cellpadding=\"4\"> <tr> <td><small>{$lang->moderation_length}</small></td>	<table cellpadding=\"4\"> <tr> <td><small>{$lang->moderation_length}</small></td>
<td>".$form->generate_text_box('action_3_time', $mybb->input['action_3_time'], array('style' => 'width: 2em;'))." ".$form->generate_select_box('action_3_period', $periods, $mybb->input['action_3_period'])."</td>	<td>".$form->generate_numeric_field('action_3_time', $mybb->input['action_3_time'], array('style' => 'width: 3em;', 'min' => 0))." ".$form->generate_select_box('action_3_period', $periods, $mybb->input['action_3_period'])."</td>
</tr> </table> </dd>	</tr> </table> </dd>
Zeile 396	Zeile 406
if($mybb->input['action'] == "delete_level") {	if($mybb->input['action'] == "delete_level") {
$query = $db->simple_select("warninglevels", "*", "lid='".(int)$mybb->input['lid']."'");	$query = $db->simple_select("warninglevels", "*", "lid='".$mybb->get_input('lid', MyBB::INPUT_INT)."'");
$level = $db->fetch_array($query); // Does the warning level not exist?	$level = $db->fetch_array($query); // Does the warning level not exist?
Zeile 453	Zeile 463
{ $new_type = array( "title" => $db->escape_string($mybb->input['title']),	{ $new_type = array( "title" => $db->escape_string($mybb->input['title']),
"points" => (int)$mybb->input['points'],	"points" => $mybb->get_input('points', MyBB::INPUT_INT),
"expirationtime" => fetch_time_length($mybb->input['expire_time'], $mybb->input['expire_period']) );	"expirationtime" => fetch_time_length($mybb->input['expire_time'], $mybb->input['expire_period']) );
Zeile 483	Zeile 493
$page->output_nav_tabs($sub_tabs, 'add_type'); $form = new Form("index.php?module=config-warning&action=add_type", "post");	$page->output_nav_tabs($sub_tabs, 'add_type'); $form = new Form("index.php?module=config-warning&action=add_type", "post");

if($errors) { $page->output_inline_error($errors);	if($errors) { $page->output_inline_error($errors);
Zeile 492	Zeile 502
$form_container = new FormContainer($lang->add_warning_type); $form_container->output_row($lang->title." <em>*</em>", "", $form->generate_text_box('title', $mybb->input['title'], array('id' => 'title')), 'title');	$form_container = new FormContainer($lang->add_warning_type); $form_container->output_row($lang->title." <em>*</em>", "", $form->generate_text_box('title', $mybb->input['title'], array('id' => 'title')), 'title');
$form_container->output_row($lang->points_to_add." <em>*</em>", $lang->points_to_add_desc, $form->generate_text_box('points', $mybb->input['points'], array('id' => 'points')), 'points');	$form_container->output_row($lang->points_to_add." <em>*</em>", $lang->points_to_add_desc, $form->generate_numeric_field('points', $mybb->input['points'], array('id' => 'points', 'min' => 0, 'max' => $mybb->settings['maxwarningpoints'])), 'points');
$expiration_periods = array( "hours" => $lang->expiration_hours, "days" => $lang->expiration_days,	$expiration_periods = array( "hours" => $lang->expiration_hours, "days" => $lang->expiration_days,
Zeile 500	Zeile 510
"months" => $lang->expiration_months, "never" => $lang->expiration_never );	"months" => $lang->expiration_months, "never" => $lang->expiration_never );
$form_container->output_row($lang->warning_expiry, $lang->warning_expiry_desc, $form->generate_text_box('expire_time', $mybb->input['expire_time'], array('id' => 'expire_time'))." ".$form->generate_select_box('expire_period', $expiration_periods, $mybb->input['expire_period'], array('id' => 'expire_period')), 'expire_time');	$form_container->output_row($lang->warning_expiry, $lang->warning_expiry_desc, $form->generate_numeric_field('expire_time', $mybb->input['expire_time'], array('id' => 'expire_time', 'min' => 0))." ".$form->generate_select_box('expire_period', $expiration_periods, $mybb->input['expire_period'], array('id' => 'expire_period')), 'expire_time');
$form_container->end(); $buttons[] = $form->generate_submit_button($lang->save_warning_type);	$form_container->end(); $buttons[] = $form->generate_submit_button($lang->save_warning_type);
Zeile 513	Zeile 523
if($mybb->input['action'] == "edit_type") {	if($mybb->input['action'] == "edit_type") {
$query = $db->simple_select("warningtypes", "*", "tid='".$mybb->get_input('tid', 1)."'");	$query = $db->simple_select("warningtypes", "*", "tid='".$mybb->get_input('tid', MyBB::INPUT_INT)."'");
$type = $db->fetch_array($query); // Does the warning type not exist?	$type = $db->fetch_array($query); // Does the warning type not exist?
Zeile 524	Zeile 534
} $plugins->run_hooks("admin_config_warning_edit_type");	} $plugins->run_hooks("admin_config_warning_edit_type");

if($mybb->request_method == "post") { if(!trim($mybb->input['title']))	if($mybb->request_method == "post") { if(!trim($mybb->input['title']))
Zeile 541	Zeile 551
{ $updated_type = array( "title" => $db->escape_string($mybb->input['title']),	{ $updated_type = array( "title" => $db->escape_string($mybb->input['title']),
"points" => (int)$mybb->input['points'],	"points" => $mybb->get_input('points', MyBB::INPUT_INT),
"expirationtime" => fetch_time_length($mybb->input['expire_time'], $mybb->input['expire_period']) );	"expirationtime" => fetch_time_length($mybb->input['expire_time'], $mybb->input['expire_period']) );
$db->update_query("warningtypes", $updated_type, "tid='{$type['tid']}'");
$plugins->run_hooks("admin_config_warning_edit_type_commit");	$plugins->run_hooks("admin_config_warning_edit_type_commit");
	$db->update_query("warningtypes", $updated_type, "tid='{$type['tid']}'");
// Log admin action log_admin_action($type['tid'], $mybb->input['title']);	// Log admin action log_admin_action($type['tid'], $mybb->input['title']);
Zeile 588	Zeile 598
$form_container = new FormContainer($lang->edit_warning_type); $form_container->output_row($lang->title." <em>*</em>", "", $form->generate_text_box('title', $mybb->input['title'], array('id' => 'title')), 'title');	$form_container = new FormContainer($lang->edit_warning_type); $form_container->output_row($lang->title." <em>*</em>", "", $form->generate_text_box('title', $mybb->input['title'], array('id' => 'title')), 'title');
$form_container->output_row($lang->points_to_add." <em>*</em>", $lang->points_to_add_desc, $form->generate_text_box('points', $mybb->input['points'], array('id' => 'points')), 'points');	$form_container->output_row($lang->points_to_add." <em>*</em>", $lang->points_to_add_desc, $form->generate_numeric_field('points', $mybb->input['points'], array('id' => 'points', 'min' => 0, 'max' => $mybb->settings['maxwarningpoints'])), 'points');
$expiration_periods = array( "hours" => $lang->expiration_hours, "days" => $lang->expiration_days,	$expiration_periods = array( "hours" => $lang->expiration_hours, "days" => $lang->expiration_days,
Zeile 596	Zeile 606
"months" => $lang->expiration_months, "never" => $lang->expiration_never );	"months" => $lang->expiration_months, "never" => $lang->expiration_never );
$form_container->output_row($lang->warning_expiry, $lang->warning_expiry_desc, $form->generate_text_box('expire_time', $mybb->input['expire_time'], array('id' => 'expire_time'))." ".$form->generate_select_box('expire_period', $expiration_periods, $mybb->input['expire_period'], array('id' => 'expire_period')), 'expire_time');	$form_container->output_row($lang->warning_expiry, $lang->warning_expiry_desc, $form->generate_numeric_field('expire_time', $mybb->input['expire_time'], array('id' => 'expire_time', 'min' => 0))." ".$form->generate_select_box('expire_period', $expiration_periods, $mybb->input['expire_period'], array('id' => 'expire_period')), 'expire_time');
$form_container->end(); $buttons[] = $form->generate_submit_button($lang->save_warning_type);	$form_container->end(); $buttons[] = $form->generate_submit_button($lang->save_warning_type);
Zeile 609	Zeile 619
if($mybb->input['action'] == "delete_type") {	if($mybb->input['action'] == "delete_type") {
$query = $db->simple_select("warningtypes", "*", "tid='".$mybb->get_input('tid', 1)."'");	$query = $db->simple_select("warningtypes", "*", "tid='".$mybb->get_input('tid', MyBB::INPUT_INT)."'");
$type = $db->fetch_array($query); // Does the warning type not exist?	$type = $db->fetch_array($query); // Does the warning type not exist?
Zeile 734	Zeile 744
while($type = $db->fetch_array($query)) { $type['name'] = htmlspecialchars_uni($type['title']);	while($type = $db->fetch_array($query)) { $type['name'] = htmlspecialchars_uni($type['title']);
$table->construct_cell("<a href=\"index.php?module=config-warning&action=edit_type&tid={$type['tid']}\"><strong>{$type['title']}</strong></a>");	$table->construct_cell("<a href=\"index.php?module=config-warning&action=edit_type&tid={$type['tid']}\"><strong>{$type['name']}</strong></a>");
$table->construct_cell("{$type['points']}", array("class" => "align_center")); $expiration = fetch_friendly_expiration($type['expirationtime']); $lang_str = "expiration_".$expiration['period'];	$table->construct_cell("{$type['points']}", array("class" => "align_center")); $expiration = fetch_friendly_expiration($type['expirationtime']); $lang_str = "expiration_".$expiration['period'];