Vergleich admin/modules/config/smilies.php - 1.8.0 - 1.8.10

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 45Zeile 45
		}
else
{

		}
else
{

			$mybb->input['disporder'] = $mybb->get_input('disporder', 1);

			$mybb->input['disporder'] = $mybb->get_input('disporder', MyBB::INPUT_INT);

			$query = $db->simple_select('smilies', 'sid', 'disporder=\''.$mybb->input['disporder'].'\'');
$duplicate_disporder = $db->fetch_field($query, 'sid');


			$query = $db->simple_select('smilies', 'sid', 'disporder=\''.$mybb->input['disporder'].'\'');
$duplicate_disporder = $db->fetch_field($query, 'sid');


Zeile 70Zeile 70
				"name" => $db->escape_string($mybb->input['name']),
"find" => $db->escape_string($mybb->input['find']),
"image" => $db->escape_string($mybb->input['image']),

				"name" => $db->escape_string($mybb->input['name']),
"find" => $db->escape_string($mybb->input['find']),
"image" => $db->escape_string($mybb->input['image']),

				"disporder" => (int)$mybb->input['disporder'],
"showclickable" => $db->escape_string($mybb->input['showclickable'])

				"disporder" => $mybb->get_input('disporder', MyBB::INPUT_INT),
"showclickable" => $mybb->get_input('showclickable', MyBB::INPUT_INT)

			);

$sid = $db->insert_query("smilies", $new_smilie);

			);

$sid = $db->insert_query("smilies", $new_smilie);


$cache->update_smilies();

 

$plugins->run_hooks("admin_config_smilies_add_commit");


$plugins->run_hooks("admin_config_smilies_add_commit");

 

$cache->update_smilies();


// Log admin action


// Log admin action

			log_admin_action($sid, $mybb->input['name']);

			log_admin_action($sid, htmlspecialchars_uni($mybb->input['name']));


flash_message($lang->success_smilie_added, 'success');
admin_redirect("index.php?module=config-smilies");


flash_message($lang->success_smilie_added, 'success');
admin_redirect("index.php?module=config-smilies");

Zeile 126Zeile 126
	{
$query = $db->simple_select("smilies", "max(disporder) as dispordermax");
$mybb->input['disporder'] = $db->fetch_field($query, "dispordermax")+1;

	{
$query = $db->simple_select("smilies", "max(disporder) as dispordermax");
$mybb->input['disporder'] = $db->fetch_field($query, "dispordermax")+1;

	}


	}


	$form_container = new FormContainer($lang->add_smilie);
$form_container->output_row($lang->name." <em>*</em>", "", $form->generate_text_box('name', $mybb->input['name'], array('id' => 'name')), 'name');
$form_container->output_row($lang->text_replace." <em>*</em>", $lang->text_replace_desc, $form->generate_text_area('find', $mybb->input['find'], array('id' => 'find')), 'find');
$form_container->output_row($lang->image_path." <em>*</em>", $lang->image_path_desc, $form->generate_text_box('image', $mybb->input['image'], array('id' => 'image')), 'image');

	$form_container = new FormContainer($lang->add_smilie);
$form_container->output_row($lang->name." <em>*</em>", "", $form->generate_text_box('name', $mybb->input['name'], array('id' => 'name')), 'name');
$form_container->output_row($lang->text_replace." <em>*</em>", $lang->text_replace_desc, $form->generate_text_area('find', $mybb->input['find'], array('id' => 'find')), 'find');
$form_container->output_row($lang->image_path." <em>*</em>", $lang->image_path_desc, $form->generate_text_box('image', $mybb->input['image'], array('id' => 'image')), 'image');

	$form_container->output_row($lang->display_order." <em>*</em>", $lang->display_order_desc, $form->generate_text_box('disporder', $mybb->input['disporder'], array('id' => 'disporder')), 'disporder');

	$form_container->output_row($lang->display_order." <em>*</em>", $lang->display_order_desc, $form->generate_numeric_field('disporder', $mybb->input['disporder'], array('id' => 'disporder', 'min' => 0)), 'disporder');

	$form_container->output_row($lang->show_clickable." <em>*</em>", $lang->show_clickable_desc, $form->generate_yes_no_radio('showclickable', $mybb->input['showclickable']));
$form_container->end();


	$form_container->output_row($lang->show_clickable." <em>*</em>", $lang->show_clickable_desc, $form->generate_yes_no_radio('showclickable', $mybb->input['showclickable']));
$form_container->end();


Zeile 145Zeile 145
}

if($mybb->input['action'] == "edit")

}

if($mybb->input['action'] == "edit")

{
$query = $db->simple_select("smilies", "*", "sid='".$mybb->get_input('sid', 1)."'");
$smilie = $db->fetch_array($query);

// Does the smilie not exist?
if(!$smilie['sid'])
{
flash_message($lang->error_invalid_smilie, 'error');
admin_redirect("index.php?module=config-smilies");
}

$plugins->run_hooks("admin_config_smilies_edit");

if($mybb->request_method == "post")

{
$query = $db->simple_select("smilies", "*", "sid='".$mybb->get_input('sid', MyBB::INPUT_INT)."'");
$smilie = $db->fetch_array($query);

// Does the smilie not exist?
if(!$smilie['sid'])
{
flash_message($lang->error_invalid_smilie, 'error');
admin_redirect("index.php?module=config-smilies");
}

$plugins->run_hooks("admin_config_smilies_edit");

if($mybb->request_method == "post")

	{
if(!trim($mybb->input['name']))

	{
if(!trim($mybb->input['name']))

		{

		{

			$errors[] = $lang->error_missing_name;
}

if(!trim($mybb->input['find']))
{
$errors[] = $lang->error_missing_text_replacement;

			$errors[] = $lang->error_missing_name;
}

if(!trim($mybb->input['find']))
{
$errors[] = $lang->error_missing_text_replacement;

		}

		}


if(!trim($mybb->input['image']))


if(!trim($mybb->input['image']))

		{

		{

			$errors[] = $lang->error_missing_path;
}

if(!trim($mybb->input['disporder']))
{
$errors[] = $lang->error_missing_order;

			$errors[] = $lang->error_missing_path;
}

if(!trim($mybb->input['disporder']))
{
$errors[] = $lang->error_missing_order;

		}

		}

		else
{

		else
{

			$mybb->input['disporder'] = $mybb->get_input('disporder', 1);
$query = $db->simple_select("smilies", "sid", "disporder= '".$mybb->input['disporder']."' AND sid != '".$mybb->input['sid']."'");

			$mybb->input['disporder'] = $mybb->get_input('disporder', MyBB::INPUT_INT);
$query = $db->simple_select("smilies", "sid", "disporder= '".$mybb->input['disporder']."' AND sid != '".$smilie['sid']."'");

			$duplicate_disporder = $db->fetch_field($query, 'sid');

			$duplicate_disporder = $db->fetch_field($query, 'sid');





			if($duplicate_disporder)
{
$errors[] = $lang->error_duplicate_order;

			if($duplicate_disporder)
{
$errors[] = $lang->error_duplicate_order;

			}
}


			}
}


		if(!$errors)
{
$mybb->input['find'] = str_replace("\r\n", "\n", $mybb->input['find']);

		if(!$errors)
{
$mybb->input['find'] = str_replace("\r\n", "\n", $mybb->input['find']);

Zeile 206Zeile 206
				"name" => $db->escape_string($mybb->input['name']),
"find" => $db->escape_string($mybb->input['find']),
"image" => $db->escape_string($mybb->input['image']),

				"name" => $db->escape_string($mybb->input['name']),
"find" => $db->escape_string($mybb->input['find']),
"image" => $db->escape_string($mybb->input['image']),

				"disporder" => (int)$mybb->input['disporder'],
"showclickable" => $db->escape_string($mybb->input['showclickable'])

				"disporder" => $mybb->get_input('disporder', MyBB::INPUT_INT),
"showclickable" => $mybb->get_input('showclickable', MyBB::INPUT_INT)

			);

			);


$db->update_query("smilies", $updated_smilie, "sid = '".$mybb->get_input('sid', 1)."'");

$cache->update_smilies();








			$plugins->run_hooks("admin_config_smilies_edit_commit");

			$plugins->run_hooks("admin_config_smilies_edit_commit");

 

$db->update_query("smilies", $updated_smilie, "sid = '{$smilie['sid']}'");

$cache->update_smilies();


// Log admin action


// Log admin action

			log_admin_action($smilie['sid'], $mybb->input['name']);

			log_admin_action($smilie['sid'], htmlspecialchars_uni($mybb->input['name']));


flash_message($lang->success_smilie_updated, 'success');
admin_redirect("index.php?module=config-smilies");


flash_message($lang->success_smilie_updated, 'success');
admin_redirect("index.php?module=config-smilies");

Zeile 241Zeile 241
	$form = new Form("index.php?module=config-smilies&amp;action=edit", "post", "edit");

echo $form->generate_hidden_field("sid", $smilie['sid']);

	$form = new Form("index.php?module=config-smilies&amp;action=edit", "post", "edit");

echo $form->generate_hidden_field("sid", $smilie['sid']);


if($errors)
{


if($errors)
{

		$page->output_inline_error($errors);
}
else
{
$mybb->input = array_merge($mybb->input, $smilie);

		$page->output_inline_error($errors);
}
else
{
$mybb->input = array_merge($mybb->input, $smilie);

	}


	}


	$form_container = new FormContainer($lang->edit_smilie);
$form_container->output_row($lang->name." <em>*</em>", "", $form->generate_text_box('name', $mybb->input['name'], array('id' => 'name')), 'name');
$form_container->output_row($lang->text_replace." <em>*</em>", $lang->text_replace_desc, $form->generate_text_area('find', $mybb->input['find'], array('id' => 'find')), 'find');
$form_container->output_row($lang->image_path." <em>*</em>", $lang->image_path_desc, $form->generate_text_box('image', $mybb->input['image'], array('id' => 'image')), 'image');

	$form_container = new FormContainer($lang->edit_smilie);
$form_container->output_row($lang->name." <em>*</em>", "", $form->generate_text_box('name', $mybb->input['name'], array('id' => 'name')), 'name');
$form_container->output_row($lang->text_replace." <em>*</em>", $lang->text_replace_desc, $form->generate_text_area('find', $mybb->input['find'], array('id' => 'find')), 'find');
$form_container->output_row($lang->image_path." <em>*</em>", $lang->image_path_desc, $form->generate_text_box('image', $mybb->input['image'], array('id' => 'image')), 'image');

	$form_container->output_row($lang->display_order." <em>*</em>", $lang->display_order_desc, $form->generate_text_box('disporder', $mybb->input['disporder'], array('id' => 'disporder')), 'disporder');

	$form_container->output_row($lang->display_order." <em>*</em>", $lang->display_order_desc, $form->generate_numeric_field('disporder', $mybb->input['disporder'], array('id' => 'disporder', 'min' => 0)), 'disporder');

	$form_container->output_row($lang->show_clickable." <em>*</em>", $lang->show_clickable_desc, $form->generate_yes_no_radio('showclickable', $mybb->input['showclickable']));
$form_container->end();


	$form_container->output_row($lang->show_clickable." <em>*</em>", $lang->show_clickable_desc, $form->generate_yes_no_radio('showclickable', $mybb->input['showclickable']));
$form_container->end();


Zeile 270Zeile 270

if($mybb->input['action'] == "delete")
{


if($mybb->input['action'] == "delete")
{

	$query = $db->simple_select("smilies", "*", "sid='".$mybb->get_input('sid', 1)."'");

	$query = $db->simple_select("smilies", "*", "sid='".$mybb->get_input('sid', MyBB::INPUT_INT)."'");

	$smilie = $db->fetch_array($query);

// Does the smilie not exist?
if(!$smilie['sid'])
{
flash_message($lang->error_invalid_smilie, 'error');

	$smilie = $db->fetch_array($query);

// Does the smilie not exist?
if(!$smilie['sid'])
{
flash_message($lang->error_invalid_smilie, 'error');

		admin_redirect("index.php?module=config-smilies");

		admin_redirect("index.php?module=config-smilies");

	}

// User clicked no

	}

// User clicked no

Zeile 292Zeile 292
	{
// Delete the smilie
$db->delete_query("smilies", "sid='{$smilie['sid']}'");

	{
// Delete the smilie
$db->delete_query("smilies", "sid='{$smilie['sid']}'");


$cache->update_smilies();

 

$plugins->run_hooks("admin_config_smilies_delete_commit");


$plugins->run_hooks("admin_config_smilies_delete_commit");

 

$cache->update_smilies();


// Log admin action


// Log admin action

		log_admin_action($smilie['sid'], $smilie['name']);

		log_admin_action($smilie['sid'], htmlspecialchars_uni($smilie['name']));


flash_message($lang->success_smilie_updated, 'success');
admin_redirect("index.php?module=config-smilies");


flash_message($lang->success_smilie_updated, 'success');
admin_redirect("index.php?module=config-smilies");

Zeile 475Zeile 475
					$db->insert_query("smilies", $new_smilie);
}
}

					$db->insert_query("smilies", $new_smilie);
}
}


$cache->update_smilies();

 

$plugins->run_hooks("admin_config_smilies_add_multiple_commit");


$plugins->run_hooks("admin_config_smilies_add_multiple_commit");

 

$cache->update_smilies();


// Log admin action
log_admin_action();


// Log admin action
log_admin_action();

Zeile 550Zeile 550
			}
else
{

			}
else
{

 
				$mybb->input['find'][$sid] = str_replace("\r\n", "\n", $mybb->input['find'][$sid]);
$mybb->input['find'][$sid] = str_replace("\r", "\n", $mybb->input['find'][$sid]);
$mybb->input['find'][$sid] = explode("\n", $mybb->input['find'][$sid]);
foreach(array_merge(array_keys($mybb->input['find'][$sid], ""), array_keys($mybb->input['find'][$sid], " ")) as $key)
{
unset($mybb->input['find'][$sid][$key]);
}
$mybb->input['find'][$sid] = implode("\n", $mybb->input['find'][$sid]);


				$smilie = array(
"name" => $db->escape_string($mybb->input['name'][$sid]),
"find" => $db->escape_string($mybb->input['find'][$sid]),

				$smilie = array(
"name" => $db->escape_string($mybb->input['name'][$sid]),
"find" => $db->escape_string($mybb->input['find'][$sid]),

Zeile 569Zeile 578

$disporder_list[$disporder] = $disporder;
}


$disporder_list[$disporder] = $disporder;
}


$cache->update_smilies();

 

$plugins->run_hooks("admin_config_smilies_mass_edit_commit");


$plugins->run_hooks("admin_config_smilies_mass_edit_commit");

 

$cache->update_smilies();


// Log admin action
log_admin_action();


// Log admin action
log_admin_action();

Zeile 587Zeile 596
	$sub_tabs['manage_smilies'] = array(
'title' => $lang->manage_smilies,
'link' => "index.php?module=config-smilies",

	$sub_tabs['manage_smilies'] = array(
'title' => $lang->manage_smilies,
'link' => "index.php?module=config-smilies",

	);

	);

	$sub_tabs['add_smilie'] = array(
'title' => $lang->add_smilie,
'link' => "index.php?module=config-smilies&amp;action=add",

	$sub_tabs['add_smilie'] = array(
'title' => $lang->add_smilie,
'link' => "index.php?module=config-smilies&amp;action=add",

Zeile 605Zeile 614
	$page->output_nav_tabs($sub_tabs, 'mass_edit');

$form = new Form("index.php?module=config-smilies&amp;action=mass_edit", "post", "mass_edit");

	$page->output_nav_tabs($sub_tabs, 'mass_edit');

$form = new Form("index.php?module=config-smilies&amp;action=mass_edit", "post", "mass_edit");





	if($errors)

	if($errors)

	{

	{

		$page->output_inline_error($errors);

		$page->output_inline_error($errors);

	}

	}

	else
{
$mybb->input['path'] = 'images/smilies/';
$mybb->input['showclickable'] = 1;

	else
{
$mybb->input['path'] = 'images/smilies/';
$mybb->input['showclickable'] = 1;

	}

	}


if(!$mybb->input['disporder'])
{


if(!$mybb->input['disporder'])
{

Zeile 634Zeile 643
	while($smilie = $db->fetch_array($query))
{
$smilie['image'] = str_replace("{theme}", "images", $smilie['image']);

	while($smilie = $db->fetch_array($query))
{
$smilie['image'] = str_replace("{theme}", "images", $smilie['image']);

		if(my_strpos($smilie['image'], "p://") || substr($smilie['image'], 0, 1) == "/")

		if(my_validate_url($smilie['image'], true))

		{
$image = $smilie['image'];
}

		{
$image = $smilie['image'];
}

Zeile 642Zeile 651
		{
$image = "../".$smilie['image'];
}

		{
$image = "../".$smilie['image'];
}


$smilie['find'] = implode(', ', explode("\n", $smilie['find']));

 

$form_container->output_cell("<img src=\"{$image}\" alt=\"\" />", array("class" => "align_center", "width" => 1));
$form_container->output_cell($form->generate_text_box("name[{$smilie['sid']}]", $smilie['name'], array('id' => 'name', 'style' => 'width: 98%')));
$form_container->output_cell($form->generate_text_area("find[{$smilie['sid']}]", $smilie['find'], array('id' => 'find', 'style' => 'width: 95%')));


$form_container->output_cell("<img src=\"{$image}\" alt=\"\" />", array("class" => "align_center", "width" => 1));
$form_container->output_cell($form->generate_text_box("name[{$smilie['sid']}]", $smilie['name'], array('id' => 'name', 'style' => 'width: 98%')));
$form_container->output_cell($form->generate_text_area("find[{$smilie['sid']}]", $smilie['find'], array('id' => 'find', 'style' => 'width: 95%')));

		$form_container->output_cell($form->generate_text_box("disporder[{$smilie['sid']}]", $smilie['disporder'], array('id' => 'disporder', 'style' => 'width: 80%')));

		$form_container->output_cell($form->generate_numeric_field("disporder[{$smilie['sid']}]", $smilie['disporder'], array('id' => 'disporder', 'style' => 'width: 80%', 'min' => 0)));

		$form_container->output_cell($form->generate_yes_no_radio("showclickable[{$smilie['sid']}]", $smilie['showclickable']), array("class" => "align_center"));
$form_container->output_cell($form->generate_check_box("delete[{$smilie['sid']}]", 1, $mybb->input['delete']), array("class" => "align_center"));
$form_container->construct_row();

		$form_container->output_cell($form->generate_yes_no_radio("showclickable[{$smilie['sid']}]", $smilie['showclickable']), array("class" => "align_center"));
$form_container->output_cell($form->generate_check_box("delete[{$smilie['sid']}]", 1, $mybb->input['delete']), array("class" => "align_center"));
$form_container->construct_row();

Zeile 697Zeile 704

$page->output_nav_tabs($sub_tabs, 'manage_smilies');



$page->output_nav_tabs($sub_tabs, 'manage_smilies');


	$pagenum = $mybb->get_input('page', 1);

	$pagenum = $mybb->get_input('page', MyBB::INPUT_INT);

	if($pagenum)
{
$start = ($pagenum-1) * 20;

	if($pagenum)
{
$start = ($pagenum-1) * 20;

Zeile 719Zeile 726
	while($smilie = $db->fetch_array($query))
{
$smilie['image'] = str_replace("{theme}", "images", $smilie['image']);

	while($smilie = $db->fetch_array($query))
{
$smilie['image'] = str_replace("{theme}", "images", $smilie['image']);

		if(my_strpos($smilie['image'], "p://") || substr($smilie['image'], 0, 1) == "/")

		if(my_validate_url($smilie['image'], true))

		{
$image = $smilie['image'];

		{
$image = $smilie['image'];

			$smilie['image'] = str_replace("{theme}", "images", $smilie['image']);

 
		}
else
{
$image = "../".$smilie['image'];
}

		}
else
{
$image = "../".$smilie['image'];
}


$smilie['find'] = str_replace("\n", ", ", $smilie['find']);

 

$table->construct_cell("<img src=\"{$image}\" alt=\"\" class=\"smilie smilie_{$smilie['sid']}\" />", array("class" => "align_center"));
$table->construct_cell(htmlspecialchars_uni($smilie['name']));


$table->construct_cell("<img src=\"{$image}\" alt=\"\" class=\"smilie smilie_{$smilie['sid']}\" />", array("class" => "align_center"));
$table->construct_cell(htmlspecialchars_uni($smilie['name']));

		$table->construct_cell(htmlspecialchars_uni($smilie['find']));

		$table->construct_cell(nl2br(htmlspecialchars_uni($smilie['find'])));


$table->construct_cell("<a href=\"index.php?module=config-smilies&amp;action=edit&amp;sid={$smilie['sid']}\">{$lang->edit}</a>", array("class" => "align_center"));
$table->construct_cell("<a href=\"index.php?module=config-smilies&amp;action=delete&amp;sid={$smilie['sid']}&amp;my_post_key={$mybb->post_code}\" onclick=\"return AdminCP.deleteConfirmation(this, '{$lang->confirm_smilie_deletion}')\">{$lang->delete}</a>", array("class" => "align_center"));


$table->construct_cell("<a href=\"index.php?module=config-smilies&amp;action=edit&amp;sid={$smilie['sid']}\">{$lang->edit}</a>", array("class" => "align_center"));
$table->construct_cell("<a href=\"index.php?module=config-smilies&amp;action=delete&amp;sid={$smilie['sid']}&amp;my_post_key={$mybb->post_code}\" onclick=\"return AdminCP.deleteConfirmation(this, '{$lang->confirm_smilie_deletion}')\">{$lang->delete}</a>", array("class" => "align_center"));