Vergleich admin/modules/style/templates.php - 1.8.4 - 1.8.18

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 102Zeile 102
$query = $db->simple_select("templatesets", "*", "", array('order_by' => 'title', 'order_dir' => 'ASC'));
while($template_set = $db->fetch_array($query))
{

 
$query = $db->simple_select("templatesets", "*", "", array('order_by' => 'title', 'order_dir' => 'ASC'));
while($template_set = $db->fetch_array($query))
{

	$template_sets[$template_set['sid']] = $template_set['title'];

	$template_sets[$template_set['sid']] = htmlspecialchars_uni($template_set['title']);

}

$plugins->run_hooks("admin_style_templates");

}

$plugins->run_hooks("admin_style_templates");

Zeile 157Zeile 157
	$form = new Form("index.php?module=style-templates&action=add_set", "post", "add_set");

	$form_container = new FormContainer($lang->add_set);

 
	$form = new Form("index.php?module=style-templates&action=add_set", "post", "add_set");

	$form_container = new FormContainer($lang->add_set);

	$form_container->output_row($lang->title, "", $form->generate_text_box('title', $mybb->input['title'], array('id' => 'title')), 'title');

	$form_container->output_row($lang->title, "", $form->generate_text_box('title', htmlspecialchars_uni($mybb->input['title']), array('id' => 'title')), 'title');

	$form_container->end();

	$buttons = array();

	$form_container->end();

	$buttons = array();

Zeile 240Zeile 240
		if(!$sid)
		{
			$sid = -1;

 
		if(!$sid)
		{
			$sid = -1;

		}

		}


		$template['template'] = "";
		$template['sid'] = $sid;


		$template['template'] = "";
		$template['sid'] = $sid;

Zeile 254Zeile 254
	if($admin_options['codepress'] != 0)
	{
		$page->extra_header .= '

 
	if($admin_options['codepress'] != 0)
	{
		$page->extra_header .= '

<link href="./jscripts/codemirror/lib/codemirror.css" rel="stylesheet">
<link href="./jscripts/codemirror/theme/mybb.css?ver=1804" rel="stylesheet">
<script src="./jscripts/codemirror/lib/codemirror.js"></script>
<script src="./jscripts/codemirror/mode/xml/xml.js"></script>
<script src="./jscripts/codemirror/mode/javascript/javascript.js"></script>
<script src="./jscripts/codemirror/mode/css/css.js"></script>
<script src="./jscripts/codemirror/mode/htmlmixed/htmlmixed.js"></script>
<link href="./jscripts/codemirror/addon/dialog/dialog-mybb.css" rel="stylesheet">
<script src="./jscripts/codemirror/addon/dialog/dialog.js"></script>
<script src="./jscripts/codemirror/addon/search/searchcursor.js"></script>
<script src="./jscripts/codemirror/addon/search/search.js"></script>
<script src="./jscripts/codemirror/addon/fold/foldcode.js"></script>
<script src="./jscripts/codemirror/addon/fold/xml-fold.js"></script>
<script src="./jscripts/codemirror/addon/fold/foldgutter.js"></script>
<link href="./jscripts/codemirror/addon/fold/foldgutter.css" rel="stylesheet">

<link href="./jscripts/codemirror/lib/codemirror.css?ver=1813" rel="stylesheet">
<link href="./jscripts/codemirror/theme/mybb.css?ver=1813" rel="stylesheet">
<script src="./jscripts/codemirror/lib/codemirror.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/xml/xml.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/javascript/javascript.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/css/css.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/htmlmixed/htmlmixed.js?ver=1813"></script>
<link href="./jscripts/codemirror/addon/dialog/dialog-mybb.css?ver=1813" rel="stylesheet">
<script src="./jscripts/codemirror/addon/dialog/dialog.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/search/searchcursor.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/search/search.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/fold/foldcode.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/fold/xml-fold.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/fold/foldgutter.js?ver=1813"></script>
<link href="./jscripts/codemirror/addon/fold/foldgutter.css?ver=1813" rel="stylesheet">

';
	}


';
	}


Zeile 341Zeile 341
		if(!$prefix)
		{
			$errors[] = $lang->error_missing_group_prefix;

 
		if(!$prefix)
		{
			$errors[] = $lang->error_missing_group_prefix;

 
		}

		if(strpos($prefix, "_") !== false)
		{
			$errors[] = $lang->error_invalid_group_title;

		}

		$title = trim($mybb->input['title']);

		}

		$title = trim($mybb->input['title']);

Zeile 391Zeile 396

	$page->add_breadcrumb_item($lang->add_template_group);
	$page->output_header($lang->add_template_group);

 

	$page->add_breadcrumb_item($lang->add_template_group);
	$page->output_header($lang->add_template_group);

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

	if($errors)

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

	if($errors)

	{
		$template_group = array(
			'prefix' => $prefix,

	{
		$template_group = array(
			'prefix' => $prefix,

Zeile 626Zeile 631
	if($admin_options['codepress'] != 0)
	{
		$page->extra_header .= '

 
	if($admin_options['codepress'] != 0)
	{
		$page->extra_header .= '

<link href="./jscripts/codemirror/lib/codemirror.css" rel="stylesheet">
<link href="./jscripts/codemirror/theme/mybb.css?ver=1804" rel="stylesheet">
<script src="./jscripts/codemirror/lib/codemirror.js"></script>
<script src="./jscripts/codemirror/mode/xml/xml.js"></script>
<script src="./jscripts/codemirror/mode/javascript/javascript.js"></script>
<script src="./jscripts/codemirror/mode/css/css.js"></script>
<script src="./jscripts/codemirror/mode/htmlmixed/htmlmixed.js"></script>
<link href="./jscripts/codemirror/addon/dialog/dialog-mybb.css" rel="stylesheet">
<script src="./jscripts/codemirror/addon/dialog/dialog.js"></script>
<script src="./jscripts/codemirror/addon/search/searchcursor.js"></script>
<script src="./jscripts/codemirror/addon/search/search.js"></script>
<script src="./jscripts/codemirror/addon/fold/foldcode.js"></script>
<script src="./jscripts/codemirror/addon/fold/xml-fold.js"></script>
<script src="./jscripts/codemirror/addon/fold/foldgutter.js"></script>
<link href="./jscripts/codemirror/addon/fold/foldgutter.css" rel="stylesheet">

<link href="./jscripts/codemirror/lib/codemirror.css?ver=1813" rel="stylesheet">
<link href="./jscripts/codemirror/theme/mybb.css?ver=1813" rel="stylesheet">
<script src="./jscripts/codemirror/lib/codemirror.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/xml/xml.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/javascript/javascript.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/css/css.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/htmlmixed/htmlmixed.js?ver=1813"></script>
<link href="./jscripts/codemirror/addon/dialog/dialog-mybb.css?ver=1813" rel="stylesheet">
<script src="./jscripts/codemirror/addon/dialog/dialog.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/search/searchcursor.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/search/search.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/fold/foldcode.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/fold/xml-fold.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/fold/foldgutter.js?ver=1813"></script>
<link href="./jscripts/codemirror/addon/fold/foldgutter.css?ver=1813" rel="stylesheet">

';
	}


';
	}


Zeile 764Zeile 769
		if(!$prefix)
		{
			$errors[] = $lang->error_missing_group_prefix;

 
		if(!$prefix)
		{
			$errors[] = $lang->error_missing_group_prefix;

 
		}

		if(strpos($prefix, "_") !== false)
		{
			$errors[] = $lang->error_invalid_group_title;

		}

		$title = trim($mybb->input['title']);

		}

		$title = trim($mybb->input['title']);

Zeile 797Zeile 807
				$plugins->run_hooks('admin_style_templates_edit_template_group_commit');

				$db->update_query('templategroups', $update_array, "gid = '{$template_group['gid']}'");

 
				$plugins->run_hooks('admin_style_templates_edit_template_group_commit');

				$db->update_query('templategroups', $update_array, "gid = '{$template_group['gid']}'");


				log_admin_action($template_group['gid'], htmlspecialchars_uni($title));


				log_admin_action($template_group['gid'], $title);

				flash_message($lang->success_template_group_saved, 'success');
				admin_redirect("index.php?module=style-templates&amp;sid={$sid}");
			}
		}
	}

 
				flash_message($lang->success_template_group_saved, 'success');
				admin_redirect("index.php?module=style-templates&amp;sid={$sid}");
			}
		}
	}





	$lang->editing_template_group = $lang->sprintf($lang->editing_template_group, htmlspecialchars_uni($template_group['title']));

	$page->add_breadcrumb_item($template_sets[$sid], "index.php?module=style-templates&amp;sid={$sid}{$expand_str}");
	$page->add_breadcrumb_item($lang->editing_template_group, "index.php?module=style-templates&amp;sid={$sid}");

 
	$lang->editing_template_group = $lang->sprintf($lang->editing_template_group, htmlspecialchars_uni($template_group['title']));

	$page->add_breadcrumb_item($template_sets[$sid], "index.php?module=style-templates&amp;sid={$sid}{$expand_str}");
	$page->add_breadcrumb_item($lang->editing_template_group, "index.php?module=style-templates&amp;sid={$sid}");





	$page->output_header($lang->editing_template_group);

	if($errors)

	$page->output_header($lang->editing_template_group);

	if($errors)

Zeile 850Zeile 860
			// Search and replace in templates

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

 
			// Search and replace in templates

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

			{
				flash_message($lang->search_noneset, "error");

			{
				flash_message($lang->search_noneset, "error");

				admin_redirect("index.php?module=style-templates&action=search_replace");
			}
			else

				admin_redirect("index.php?module=style-templates&action=search_replace");
			}
			else

Zeile 861Zeile 871
				$page->output_header($lang->search_replace);

				$plugins->run_hooks("admin_style_templates_search_replace_find");

 
				$page->output_header($lang->search_replace);

				$plugins->run_hooks("admin_style_templates_search_replace_find");





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

				$templates_list = array();
				$table = new Table;

				$template_sets = array();

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

				$templates_list = array();
				$table = new Table;

				$template_sets = array();





				// Get the names of all template sets
				$template_sets[-2] = $lang->master_templates;
				$template_sets[-1] = $lang->global_templates;

				// Get the names of all template sets
				$template_sets[-2] = $lang->master_templates;
				$template_sets[-1] = $lang->global_templates;

Zeile 878Zeile 888
				{
					$template_sets[$set['sid']] = $set['title'];
				}

 
				{
					$template_sets[$set['sid']] = $set['title'];
				}

 

				$search_string = str_replace(array("\r\n", "\r"), "\n", $mybb->input['find']);
				$search_string = str_replace(array("  ", "\t"), "", $search_string);


				// Select all templates with that search term
				$query = $db->query("


				// Select all templates with that search term
				$query = $db->query("

Zeile 885Zeile 898
					FROM ".TABLE_PREFIX."templates t
					LEFT JOIN ".TABLE_PREFIX."templatesets s ON (t.sid=s.sid)
					LEFT JOIN ".TABLE_PREFIX."templates t2 ON (t.title=t2.title AND t2.sid='1')

 
					FROM ".TABLE_PREFIX."templates t
					LEFT JOIN ".TABLE_PREFIX."templatesets s ON (t.sid=s.sid)
					LEFT JOIN ".TABLE_PREFIX."templates t2 ON (t.title=t2.title AND t2.sid='1')

					WHERE t.template LIKE '%".$db->escape_string_like($mybb->input['find'])."%' AND NOT (t.sid = -2 AND (t2.tid) IS NOT NULL)

					WHERE REPLACE(REPLACE(REPLACE(REPLACE(t.template, '\r\n', '\n'), '\r', '\n'), '  ', ''), '\t', '') LIKE '%".$db->escape_string_like($search_string)."%' AND NOT (t.sid = -2 AND (t2.tid) IS NOT NULL)

					ORDER BY t.title ASC
				");
				if($db->num_rows($query) == 0)

					ORDER BY t.title ASC
				");
				if($db->num_rows($query) == 0)

Zeile 1166Zeile 1179
	if($admin_options['codepress'] != 0)
	{
		$page->extra_header .= '

 
	if($admin_options['codepress'] != 0)
	{
		$page->extra_header .= '

<link href="./jscripts/codemirror/lib/codemirror.css" rel="stylesheet">
<link href="./jscripts/codemirror/theme/mybb.css?ver=1804" rel="stylesheet">
<script src="./jscripts/codemirror/lib/codemirror.js"></script>
<script src="./jscripts/codemirror/mode/xml/xml.js"></script>
<script src="./jscripts/codemirror/mode/javascript/javascript.js"></script>
<script src="./jscripts/codemirror/mode/css/css.js"></script>
<script src="./jscripts/codemirror/mode/htmlmixed/htmlmixed.js"></script>
<link href="./jscripts/codemirror/addon/dialog/dialog-mybb.css" rel="stylesheet">
<script src="./jscripts/codemirror/addon/dialog/dialog.js"></script>
<script src="./jscripts/codemirror/addon/search/searchcursor.js"></script>
<script src="./jscripts/codemirror/addon/search/search.js"></script>
<script src="./jscripts/codemirror/addon/fold/foldcode.js"></script>
<script src="./jscripts/codemirror/addon/fold/xml-fold.js"></script>
<script src="./jscripts/codemirror/addon/fold/foldgutter.js"></script>
<link href="./jscripts/codemirror/addon/fold/foldgutter.css" rel="stylesheet">

<link href="./jscripts/codemirror/lib/codemirror.css?ver=1813" rel="stylesheet">
<link href="./jscripts/codemirror/theme/mybb.css?ver=1813" rel="stylesheet">
<script src="./jscripts/codemirror/lib/codemirror.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/xml/xml.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/javascript/javascript.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/css/css.js?ver=1813"></script>
<script src="./jscripts/codemirror/mode/htmlmixed/htmlmixed.js?ver=1813"></script>
<link href="./jscripts/codemirror/addon/dialog/dialog-mybb.css?ver=1813" rel="stylesheet">
<script src="./jscripts/codemirror/addon/dialog/dialog.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/search/searchcursor.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/search/search.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/fold/foldcode.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/fold/xml-fold.js?ver=1813"></script>
<script src="./jscripts/codemirror/addon/fold/foldgutter.js?ver=1813"></script>
<link href="./jscripts/codemirror/addon/fold/foldgutter.css?ver=1813" rel="stylesheet">

';
	}


';
	}


Zeile 1311Zeile 1324
		FROM ".TABLE_PREFIX."templates t
		LEFT JOIN ".TABLE_PREFIX."templates m ON (m.title=t.title AND m.sid=-2 AND m.version > t.version)
		WHERE t.sid > 0 AND m.template != t.template

 
		FROM ".TABLE_PREFIX."templates t
		LEFT JOIN ".TABLE_PREFIX."templates m ON (m.title=t.title AND m.sid=-2 AND m.version > t.version)
		WHERE t.sid > 0 AND m.template != t.template

		ORDER BY t.sid ASC, title ASC

		ORDER BY t.sid ASC, t.title ASC

	");
	while($template = $db->fetch_array($query))
	{

	");
	while($template = $db->fetch_array($query))
	{

Zeile 1322Zeile 1335
	{
		if(!$done_set[$sid])
		{

 
	{
		if(!$done_set[$sid])
		{

			$table->construct_header($templatesets[$sid]['title'], array("colspan" => 2));

			$table->construct_header(htmlspecialchars_uni($templatesets[$sid]['title']), array("colspan" => 2));


			$done_set[$sid] = 1;
			++$count;


			$done_set[$sid] = 1;
			++$count;

Zeile 1387Zeile 1400
		$plugins->run_hooks("admin_style_template_group_delete_commit");

		// Log admin action

 
		$plugins->run_hooks("admin_style_template_group_delete_commit");

		// Log admin action

		log_admin_action($template_group['gid'], htmlspecialchars_uni($template_group['title']));

		log_admin_action($template_group['gid'], $template_group['title']);


		flash_message($lang->success_template_group_deleted, 'success');
		admin_redirect("index.php?module=style-templates&amp;sid={$sid}");


		flash_message($lang->success_template_group_deleted, 'success');
		admin_redirect("index.php?module=style-templates&amp;sid={$sid}");

Zeile 1534Zeile 1547

	$query = $db->simple_select("templates", "*", "title='".$db->escape_string($mybb->input['title'])."' AND sid='".$mybb->get_input('sid1', MyBB::INPUT_INT)."'");
	$template1 = $db->fetch_array($query);

 

	$query = $db->simple_select("templates", "*", "title='".$db->escape_string($mybb->input['title'])."' AND sid='".$mybb->get_input('sid1', MyBB::INPUT_INT)."'");
	$template1 = $db->fetch_array($query);





	$query = $db->simple_select("templates", "*", "title='".$db->escape_string($mybb->input['title'])."' AND sid='".$mybb->get_input('sid2', MyBB::INPUT_INT)."'");
	$template2 = $db->fetch_array($query);


	$query = $db->simple_select("templates", "*", "title='".$db->escape_string($mybb->input['title'])."' AND sid='".$mybb->get_input('sid2', MyBB::INPUT_INT)."'");
	$template2 = $db->fetch_array($query);


Zeile 1585Zeile 1598
	if($mybb->input['from'])
	{
		$table->construct_header("<ins>".$lang->master_updated_ins."</ins><br /><del>".$lang->master_updated_del."</del>");

 
	if($mybb->input['from'])
	{
		$table->construct_header("<ins>".$lang->master_updated_ins."</ins><br /><del>".$lang->master_updated_del."</del>");

	}
	else
	{

	}
	else
	{

		$table->construct_header("<ins>".$lang->master_updated_del."</ins><br /><del>".$lang->master_updated_ins."</del>");
	}


		$table->construct_header("<ins>".$lang->master_updated_del."</ins><br /><del>".$lang->master_updated_ins."</del>");
	}


Zeile 1613Zeile 1626
	if(!$template)
	{
		flash_message($lang->error_invalid_template, 'error');

 
	if(!$template)
	{
		flash_message($lang->error_invalid_template, 'error');

		admin_redirect("index.php?module=style-templates");

		admin_redirect("index.php?module=style-templates");

	}

	// User clicked no

	}

	// User clicked no

Zeile 1623Zeile 1636
	}

	$plugins->run_hooks("admin_style_templates_revert");

 
	}

	$plugins->run_hooks("admin_style_templates_revert");





	if($mybb->request_method == "post")
	{
		// Revert the template
		$db->delete_query("templates", "tid='{$template['tid']}'");

		$plugins->run_hooks("admin_style_templates_revert_commit");

 
	if($mybb->request_method == "post")
	{
		// Revert the template
		$db->delete_query("templates", "tid='{$template['tid']}'");

		$plugins->run_hooks("admin_style_templates_revert_commit");





		// Log admin action
		log_admin_action($template['tid'], $template['title'], $template['sid'], $template['set_title']);

 
		// Log admin action
		log_admin_action($template['tid'], $template['title'], $template['sid'], $template['set_title']);





		flash_message($lang->success_template_reverted, 'success');

		if($mybb->input['from'] == "diff_report")
		{
			admin_redirect("index.php?module=style-templates&action=find_updated");

 
		flash_message($lang->success_template_reverted, 'success');

		if($mybb->input['from'] == "diff_report")
		{
			admin_redirect("index.php?module=style-templates&action=find_updated");

		}

		}

		else
		{
			admin_redirect("index.php?module=style-templates&sid={$template['sid']}{$expand_str2}");

		else
		{
			admin_redirect("index.php?module=style-templates&sid={$template['sid']}{$expand_str2}");

Zeile 1726Zeile 1739
		$template_groups[$templategroup['prefix']] = $templategroup;
	}


 
		$template_groups[$templategroup['prefix']] = $templategroup;
	}


 
	/**
	 * @param array $a
	 * @param array $b
	 *
	 * @return int
	 */

	function sort_template_groups($a, $b)
	{
		return strcasecmp($a['title'], $b['title']);

	function sort_template_groups($a, $b)
	{
		return strcasecmp($a['title'], $b['title']);

Zeile 1738Zeile 1757
		"title" => $lang->ungrouped_templates,
		"gid" => -1
	);

 
		"title" => $lang->ungrouped_templates,
		"gid" => -1
	);

 

	// Set the template group keys to lowercase for case insensitive comparison.
	$template_groups = array_change_key_case($template_groups, CASE_LOWER);


	// Load the list of templates
	$query = $db->simple_select("templates", "*", "sid='".$mybb->get_input('sid', MyBB::INPUT_INT)."' OR sid='-2'", array('order_by' => 'sid DESC, title', 'order_dir' => 'ASC'));
	while($template = $db->fetch_array($query))
	{
		$exploded = explode("_", $template['title'], 2);

 

	// Load the list of templates
	$query = $db->simple_select("templates", "*", "sid='".$mybb->get_input('sid', MyBB::INPUT_INT)."' OR sid='-2'", array('order_by' => 'sid DESC, title', 'order_dir' => 'ASC'));
	while($template = $db->fetch_array($query))
	{
		$exploded = explode("_", $template['title'], 2);

 

		// Set the prefix to lowercase for case insensitive comparison.
		$exploded[0] = strtolower($exploded[0]);


		if(isset($template_groups[$exploded[0]]))
		{


		if(isset($template_groups[$exploded[0]]))
		{

Zeile 1844Zeile 1869
			$table->construct_cell("<a href=\"index.php?module=style-templates&amp;sid={$sid}{$group['expand_str']}#group_{$group['gid']}\">{$expand}</a>", array("class" => "align_center"));
			$table->construct_row(array("class" => "alt_row", "id" => "group_".$group['gid'], "name" => "group_".$group['gid']));


 
			$table->construct_cell("<a href=\"index.php?module=style-templates&amp;sid={$sid}{$group['expand_str']}#group_{$group['gid']}\">{$expand}</a>", array("class" => "align_center"));
			$table->construct_row(array("class" => "alt_row", "id" => "group_".$group['gid'], "name" => "group_".$group['gid']));


			if(isset($group['templates']) && count($group['templates']) > 0)

			if(isset($group['templates']) && is_array($group['templates']) && count($group['templates']) > 0)

			{
				$templates = $group['templates'];
				ksort($templates);

			{
				$templates = $group['templates'];
				ksort($templates);

Zeile 1978Zeile 2003

			$actions = $popup->fetch();
		}

 

			$actions = $popup->fetch();
		}

 

		$set['title'] = htmlspecialchars_uni($set['title']);


		$table->construct_cell("<strong><a href=\"index.php?module=style-templates&amp;sid={$set['sid']}\">{$set['title']}</a></strong><br /><small>{$used_by_note}</small>");
		$table->construct_cell($actions, array("class" => "align_center"));


		$table->construct_cell("<strong><a href=\"index.php?module=style-templates&amp;sid={$set['sid']}\">{$set['title']}</a></strong><br /><small>{$used_by_note}</small>");
		$table->construct_cell($actions, array("class" => "align_center"));