Vergleich admin/modules/style/templates.php - 1.8.16 - 1.8.38

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 242Zeile 242
			$sid = -1;
}


			$sid = -1;
}


 
		$template['title'] = "";

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

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

Zeile 264Zeile 265
<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>

<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/search/search.js?ver=1821"></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>

<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>

Zeile 389Zeile 390
		}
}


		}
}


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

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

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


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


Zeile 398Zeile 399
	$page->output_header($lang->add_template_group);
$page->output_nav_tabs($sub_tabs, 'add_template_group');


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


 
	$template_group = array();

	if($errors)
{
$template_group = array(
'prefix' => $prefix,
'title' => $title
);

	if($errors)
{
$template_group = array(
'prefix' => $prefix,
'title' => $title
);


$page->output_inline_error($errors);









$page->output_inline_error($errors);
}
else
{
$template_group = array(
'prefix' => null,
'title' => null,
);

	}

$form = new Form("index.php?module=style-templates&amp;action=add_template_group{$expand_str}", "post", "add_template_group");

	}

$form = new Form("index.php?module=style-templates&amp;action=add_template_group{$expand_str}", "post", "add_template_group");

Zeile 495Zeile 504
	$form_container = new FormContainer($lang->edit_set);
$form_container->output_row($lang->title, "", $form->generate_text_box('title', $mybb->input['title'], array('id' => 'title')), 'title');
$form_container->end();

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





	$buttons = array();
$buttons[] = $form->generate_submit_button($lang->save);


	$buttons = array();
$buttons[] = $form->generate_submit_button($lang->save);


Zeile 505Zeile 514

$page->output_footer();
}


$page->output_footer();
}





if($mybb->input['action'] == "edit_template")
{
if(!$mybb->input['title'] || !$sid || !isset($template_sets[$sid]))
{
flash_message($lang->error_missing_input, 'error');

if($mybb->input['action'] == "edit_template")
{
if(!$mybb->input['title'] || !$sid || !isset($template_sets[$sid]))
{
flash_message($lang->error_missing_input, 'error');

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

$plugins->run_hooks("admin_style_templates_edit_template");


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

$plugins->run_hooks("admin_style_templates_edit_template");


	if($mybb->request_method == "post")
{
if(empty($mybb->input['title']))

	if($mybb->request_method == "post")
{
if(empty($mybb->input['title']))

		{

		{

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

// Are we trying to do malicious things in our template?
if(check_template($mybb->input['template']))

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

// Are we trying to do malicious things in our template?
if(check_template($mybb->input['template']))

		{

		{

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


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


Zeile 555Zeile 564
				$query = $db->simple_select("templates", "sid", "title='".$db->escape_string($mybb->input['title'])."' AND (sid = '-2' OR sid = '{$sid}' OR sid='{$template['sid']}')", array('order_by' => 'sid', 'order_dir' => 'desc'));
$existing_sid = $db->fetch_field($query, "sid");
$existing_rows = $db->num_rows($query);

				$query = $db->simple_select("templates", "sid", "title='".$db->escape_string($mybb->input['title'])."' AND (sid = '-2' OR sid = '{$sid}' OR sid='{$template['sid']}')", array('order_by' => 'sid', 'order_dir' => 'desc'));
$existing_sid = $db->fetch_field($query, "sid");
$existing_rows = $db->num_rows($query);





				if(($existing_sid == -2 && $existing_rows == 1) || $existing_rows == 0)
{
$template['tid'] = $db->insert_query("templates", $template_array);

				if(($existing_sid == -2 && $existing_rows == 1) || $existing_rows == 0)
{
$template['tid'] = $db->insert_query("templates", $template_array);

				}

				}

				else
{
$db->update_query("templates", $template_array, "tid='{$template['tid']}' AND sid != '-2'");
}

				else
{
$db->update_query("templates", $template_array, "tid='{$template['tid']}' AND sid != '-2'");
}

			}

			}

			else
{
// Global template set

			else
{
// Global template set

				$db->update_query("templates", $template_array, "tid='{$template['tid']}' AND sid != '-2'");
}

				$db->update_query("templates", $template_array, "tid='{$template['tid']}' AND sid != '-2'");
}


$plugins->run_hooks("admin_style_templates_edit_template_commit");



$plugins->run_hooks("admin_style_templates_edit_template_commit");


Zeile 588Zeile 597
			}

// Log admin action

			}

// Log admin action

			log_admin_action($template['tid'], $mybb->input['title'], $mybb->input['sid'], $set['title']);










			if(!empty($set['title']))
{
$title = $set['title'];
}
else
{
$title = null;
}

log_admin_action($template['tid'], $mybb->get_input('title'), $mybb->get_input('sid'), $title);


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



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


			if($mybb->input['continue'])

			if($mybb->get_input('continue'))

			{

			{

				if($mybb->input['from'] == "diff_report")

				if($mybb->get_input('from') == "diff_report")

				{
admin_redirect("index.php?module=style-templates&action=edit_template&title=".urlencode($mybb->input['title'])."&sid=".$mybb->get_input('sid', MyBB::INPUT_INT).$expand_str2."&amp;from=diff_report");
}

				{
admin_redirect("index.php?module=style-templates&action=edit_template&title=".urlencode($mybb->input['title'])."&sid=".$mybb->get_input('sid', MyBB::INPUT_INT).$expand_str2."&amp;from=diff_report");
}

Zeile 605Zeile 623
			}
else
{

			}
else
{

				if($mybb->input['from'] == "diff_report")

				if($mybb->get_input('from') == "diff_report")

				{
admin_redirect("index.php?module=style-templates&amp;action=find_updated");
}

				{
admin_redirect("index.php?module=style-templates&amp;action=find_updated");
}

Zeile 627Zeile 645
		$template = $db->fetch_array($query);
}
$template['title'] = htmlspecialchars_uni($template['title']);

		$template = $db->fetch_array($query);
}
$template['title'] = htmlspecialchars_uni($template['title']);


if($admin_options['codepress'] != 0)
{
$page->extra_header .= '
<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">
';
}



if($admin_options['codepress'] != 0)
{
$page->extra_header .= '
<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=1821"></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">
';
}


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

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

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

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

	{

	{

		$mybb->input['from'] = '';
}

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

		$mybb->input['from'] = '';
}

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

	}

$page->add_breadcrumb_item($lang->edit_template_breadcrumb.$template['title'], "index.php?module=style-templates&amp;sid={$sid}");

$page->output_header($lang->sprintf($lang->editing_template, $template['title']));

	}

$page->add_breadcrumb_item($lang->edit_template_breadcrumb.$template['title'], "index.php?module=style-templates&amp;sid={$sid}");

$page->output_header($lang->sprintf($lang->editing_template, $template['title']));



$sub_tabs = array();



$sub_tabs = array();

Zeile 677Zeile 695

$sub_tabs['diff_report'] = array(
'title' => $lang->diff_report,


$sub_tabs['diff_report'] = array(
'title' => $lang->diff_report,

			'link' => "index.php?module=style-templates&amp;action=diff_report&amp;title=".$db->escape_string($template['title'])."&amp;sid1=".(int)$template['sid']."&amp;sid2=-2",

			'link' => "index.php?module=style-templates&amp;action=diff_report&amp;title=".urlencode($template['title'])."&amp;sid1=".(int)$template['sid']."&amp;sid2=-2",

		);

		);

	}

	}


$sub_tabs['edit_template'] = array(
'title' => $lang->edit_template,


$sub_tabs['edit_template'] = array(
'title' => $lang->edit_template,

Zeile 709Zeile 727
	if($template['sid'] == "-2")
{
unset($template_sets[-1]);

	if($template['sid'] == "-2")
{
unset($template_sets[-1]);

	}


	}


	$form_container->output_row($lang->template_set, $lang->template_set_desc, $form->generate_select_box('sid', $template_sets, $sid));

$form_container->output_row("", "", $form->generate_text_area('template', $template['template'], array('id' => 'template', 'class' => '', 'style' => 'width: 100%; height: 500px;')));

	$form_container->output_row($lang->template_set, $lang->template_set_desc, $form->generate_select_box('sid', $template_sets, $sid));

$form_container->output_row("", "", $form->generate_text_area('template', $template['template'], array('id' => 'template', 'class' => '', 'style' => 'width: 100%; height: 500px;')));

Zeile 742Zeile 760

$page->output_footer();
}


$page->output_footer();
}





if($mybb->input['action'] == "edit_template_group")
{
$query = $db->simple_select("templategroups", "*", "gid = '".$mybb->get_input('gid', MyBB::INPUT_INT)."'");

if($mybb->input['action'] == "edit_template_group")
{
$query = $db->simple_select("templategroups", "*", "gid = '".$mybb->get_input('gid', MyBB::INPUT_INT)."'");

Zeile 771Zeile 789
			$errors[] = $lang->error_missing_group_prefix;
}


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


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


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


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

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

Zeile 899Zeile 917
					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 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)

					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 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

					ORDER BY t.title ASC

				");
if($db->num_rows($query) == 0)
{

				");
if($db->num_rows($query) == 0)
{

Zeile 915Zeile 933
					while($template = $db->fetch_array($query))
{
$template_list[$template['sid']][$template['title']] = $template;

					while($template = $db->fetch_array($query))
{
$template_list[$template['sid']][$template['title']] = $template;

					}

					}


$count = 0;



$count = 0;


Zeile 931Zeile 949
							// Do replacement
$newtemplate = str_ireplace($mybb->input['find'], $mybb->input['replace'], $template['template']);
if($newtemplate != $template['template'] && check_template($newtemplate) === false)

							// Do replacement
$newtemplate = str_ireplace($mybb->input['find'], $mybb->input['replace'], $template['template']);
if($newtemplate != $template['template'] && check_template($newtemplate) === false)

							{

							{

								// If the template is different, that means the search term has been found.
if(trim($mybb->input['replace']) != "")
{

								// If the template is different, that means the search term has been found.
if(trim($mybb->input['replace']) != "")
{

Zeile 959Zeile 977
										);
$db->update_query("templates", $updatedtemplate, "tid='".$template['tid']."'");
$label = $lang->sprintf($lang->search_updated, $template['title']);

										);
$db->update_query("templates", $updatedtemplate, "tid='".$template['tid']."'");
$label = $lang->sprintf($lang->search_updated, $template['title']);

										$url = "index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid={$template['sid']}";
}
}
else

										$url = "index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid={$template['sid']}";
}
}
else

								{
// Just show that the term was found
if($template['sid'] == -2)

								{
// Just show that the term was found
if($template['sid'] == -2)

Zeile 990Zeile 1008
								}
}


								}
}


							$table->construct_cell($label, array("width" => "85%"));

							$table->construct_cell(htmlspecialchars_uni($label), array("width" => "85%"));


if($sid == -2)
{
$popup = new PopupMenu("template_{$template['tid']}", $lang->options);


if($sid == -2)
{
$popup = new PopupMenu("template_{$template['tid']}", $lang->options);





								foreach($template_sets as $set_sid => $title)
{
if($set_sid > 0)

								foreach($template_sets as $set_sid => $title)
{
if($set_sid > 0)

Zeile 1026Zeile 1044
				}

if(trim($mybb->input['replace']) != "")

				}

if(trim($mybb->input['replace']) != "")

				{

				{

					// Log admin action - only if replace
log_admin_action($mybb->input['find'], $mybb->input['replace']);
}

					// Log admin action - only if replace
log_admin_action($mybb->input['find'], $mybb->input['replace']);
}

Zeile 1117Zeile 1135

foreach($templates as $template)
{


foreach($templates as $template)
{

						$template['pretty_title'] = $template['title'];

						$template['pretty_title'] = htmlspecialchars_uni($template['title']);


$popup = new PopupMenu("template_{$template['tid']}", $lang->options);



$popup = new PopupMenu("template_{$template['tid']}", $lang->options);


Zeile 1144Zeile 1162
								$popup->add_item($lang->revert_to_orig, "index.php?module=style-templates&amp;action=revert&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_revertion}')");
}


								$popup->add_item($lang->revert_to_orig, "index.php?module=style-templates&amp;action=revert&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_revertion}')");
}


							$template['pretty_title'] = "<span style=\"color: green;\">{$template['title']}</span>";

							$template['pretty_title'] = "<span style=\"color: green;\">".htmlspecialchars_uni($template['title'])."</span>";

						}
// This template does not exist in the master list
else if(!isset($template['original']) || $template['original'] == false)
{
$popup->add_item($lang->delete_template, "index.php?module=style-templates&amp;action=delete_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_deletion}')");


						}
// This template does not exist in the master list
else if(!isset($template['original']) || $template['original'] == false)
{
$popup->add_item($lang->delete_template, "index.php?module=style-templates&amp;action=delete_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_deletion}')");


							$template['pretty_title'] = "<span style=\"color: blue;\">{$template['title']}</span>";

							$template['pretty_title'] = "<span style=\"color: blue;\">".htmlspecialchars_uni($template['title'])."</span>";

						}

$table->construct_cell("<span style=\"padding: 20px;\">{$template['pretty_title']}</span>", array("width" => "85%"));

						}

$table->construct_cell("<span style=\"padding: 20px;\">{$template['pretty_title']}</span>", array("width" => "85%"));

Zeile 1189Zeile 1207
<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>

<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/search/search.js?ver=1821"></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>

<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>

Zeile 1207Zeile 1225
	echo $form->generate_hidden_field('type', "templates");

$form_container = new FormContainer($lang->search_replace, 'tfixed');

	echo $form->generate_hidden_field('type', "templates");

$form_container = new FormContainer($lang->search_replace, 'tfixed');

	$form_container->output_row($lang->search_for, "", $form->generate_text_area('find', $mybb->input['find'], array('id' => 'find', 'class' => '', 'style' => 'width: 100%; height: 200px;')));

	$form_container->output_row($lang->search_for, "", $form->generate_text_area('find', $mybb->get_input('find'), array('id' => 'find', 'class' => '', 'style' => 'width: 100%; height: 200px;')));





	$form_container->output_row($lang->replace_with, "", $form->generate_text_area('replace', $mybb->input['replace'], array('id' => 'replace', 'class' => '', 'style' => 'width: 100%; height: 200px;')));

	$form_container->output_row($lang->replace_with, "", $form->generate_text_area('replace', $mybb->get_input('replace'), array('id' => 'replace', 'class' => '', 'style' => 'width: 100%; height: 200px;')));

	$form_container->end();

$buttons[] = $form->generate_submit_button($lang->find_and_replace);

	$form_container->end();

$buttons[] = $form->generate_submit_button($lang->find_and_replace);

Zeile 1226Zeile 1244

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



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


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

	$form_container->output_row($lang->search_for, "", $form->generate_text_box('title', $mybb->get_input('title'), array('id' => 'title')), 'title');


$form_container->end();



$form_container->end();


Zeile 1324Zeile 1342
		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 1333Zeile 1351

foreach($templates as $sid => $templates)
{


foreach($templates as $sid => $templates)
{

		if(!$done_set[$sid])

		if(empty($done_set[$sid]))

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


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


Zeile 1348Zeile 1366
			$popup->add_item($lang->diff_report, "index.php?module=style-templates&amp;action=diff_report&amp;title=".urlencode($template['title'])."&amp;sid1=".$template['sid']."&amp;sid2=-2&amp;from=diff_report");
$popup->add_item($lang->revert_to_orig, "index.php?module=style-templates&amp;action=revert&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;from=diff_report&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_revertion}')");


			$popup->add_item($lang->diff_report, "index.php?module=style-templates&amp;action=diff_report&amp;title=".urlencode($template['title'])."&amp;sid1=".$template['sid']."&amp;sid2=-2&amp;from=diff_report");
$popup->add_item($lang->revert_to_orig, "index.php?module=style-templates&amp;action=revert&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;from=diff_report&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_revertion}')");


			$table->construct_cell("<a href=\"index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;from=diff_report\">{$template['title']}</a>", array('width' => '80%'));

			$table->construct_cell("<a href=\"index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;from=diff_report\">".htmlspecialchars_uni($template['title'])."</a>", array('width' => '80%'));

			$table->construct_cell($popup->fetch(), array("class" => "align_center"));

$table->construct_row();
}


			$table->construct_cell($popup->fetch(), array("class" => "align_center"));

$table->construct_row();
}


		if($done_set[$sid] && !$done_output[$sid])

		if(!empty($done_set[$sid]) && empty($done_output[$sid]))

		{
$done_output[$sid] = 1;
if($count == 1)

		{
$done_output[$sid] = 1;
if($count == 1)

Zeile 1383Zeile 1401
	}

// User clicked no

	}

// User clicked no

	if($mybb->input['no'])

	if($mybb->get_input('no'))

	{
admin_redirect("index.php?module=style-templates&amp;sid={$sid}");
}

	{
admin_redirect("index.php?module=style-templates&amp;sid={$sid}");
}

Zeile 1417Zeile 1435
	$set = $db->fetch_array($query);

// Does the template not exist?

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

// Does the template not exist?

	if(!$set['sid'])

	if(!$set)

	{
flash_message($lang->error_invalid_template_set, 'error');
admin_redirect("index.php?module=style-templates");

	{
flash_message($lang->error_invalid_template_set, 'error');
admin_redirect("index.php?module=style-templates");

Zeile 1439Zeile 1457
	}

// User clicked no

	}

// User clicked no

	if($mybb->input['no'])

	if($mybb->get_input('no'))

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

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

Zeile 1484Zeile 1502
	}

// User clicked no

	}

// User clicked no

	if($mybb->input['no'])

	if($mybb->get_input('no'))

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

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

Zeile 1513Zeile 1531
if($mybb->input['action'] == "diff_report")
{
// Compares a template of sid1 with that of sid2, if no sid1, it is assumed -2

if($mybb->input['action'] == "diff_report")
{
// Compares a template of sid1 with that of sid2, if no sid1, it is assumed -2

	if(!$mybb->input['sid1'] || !isset($template_sets[$mybb->input['sid1']]))

	if(empty($mybb->input['sid1']) || !isset($template_sets[$mybb->input['sid1']]))

	{
$mybb->input['sid1'] = -2;
}

	{
$mybb->input['sid1'] = -2;
}

Zeile 1532Zeile 1550
		admin_redirect("index.php?module=style-templates");
}


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


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

	if(empty($mybb->input['from']))

	{
$mybb->input['from'] = 0;
}

$sub_tabs['diff_report'] = array(
'title' => $lang->diff_report,

	{
$mybb->input['from'] = 0;
}

$sub_tabs['diff_report'] = array(
'title' => $lang->diff_report,

		'link' => "index.php?module=style-templates&amp;action=diff_report&amp;title=".$db->escape_string($mybb->input['title'])."&amp;from=".htmlspecialchars_uni($mybb->input['from'])."sid1=".$mybb->get_input('sid1', MyBB::INPUT_INT)."&amp;sid2=".$mybb->get_input('sid2', MyBB::INPUT_INT),

		'link' => "index.php?module=style-templates&amp;action=diff_report&amp;title=".urlencode($mybb->input['title'])."&amp;from=".htmlspecialchars_uni($mybb->input['from'])."sid1=".$mybb->get_input('sid1', MyBB::INPUT_INT)."&amp;sid2=".$mybb->get_input('sid2', MyBB::INPUT_INT),

		'description' => $lang->diff_report_desc
);


		'description' => $lang->diff_report_desc
);


Zeile 1587Zeile 1605
		$page->add_breadcrumb_item($lang->find_updated, "index.php?module=style-templates&amp;action=find_updated");
}


		$page->add_breadcrumb_item($lang->find_updated, "index.php?module=style-templates&amp;action=find_updated");
}


	$page->add_breadcrumb_item($lang->diff_report.": ".htmlspecialchars_uni($template1['title']), "index.php?module=style-templates&amp;action=diff_report&amp;title=".$db->escape_string($mybb->input['title'])."&amp;from=".htmlspecialchars_uni($mybb->input['from'])."&amp;sid1=".$mybb->get_input('sid1', MyBB::INPUT_INT)."&amp;sid2=".$mybb->get_input('sid2', MyBB::INPUT_INT));

	$page->add_breadcrumb_item($lang->diff_report.": ".htmlspecialchars_uni($template1['title']), "index.php?module=style-templates&amp;action=diff_report&amp;title=".urlencode($mybb->input['title'])."&amp;from=".htmlspecialchars_uni($mybb->input['from'])."&amp;sid1=".$mybb->get_input('sid1', MyBB::INPUT_INT)."&amp;sid2=".$mybb->get_input('sid2', MyBB::INPUT_INT));


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



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


Zeile 1607Zeile 1625
	$table->construct_cell("<pre class=\"differential\">".$renderer->render($diff)."</pre>");
$table->construct_row();


	$table->construct_cell("<pre class=\"differential\">".$renderer->render($diff)."</pre>");
$table->construct_row();


	$table->output($lang->template_diff_analysis.": ".$template1['title']);

	$table->output($lang->template_diff_analysis.": ".htmlspecialchars_uni($template1['title']));


$page->output_footer();
}


$page->output_footer();
}

Zeile 1630Zeile 1648
	}

// User clicked no

	}

// User clicked no

	if($mybb->input['no'])

	if($mybb->get_input('no'))

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

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

Zeile 1664Zeile 1682
	}
}


	}
}


if($mybb->input['sid'] && !$mybb->input['action'])

if(!empty($mybb->input['sid']) && !$mybb->input['action'])

{
if(!isset($template_sets[$mybb->input['sid']]))
{

{
if(!isset($template_sets[$mybb->input['sid']]))
{

Zeile 1695Zeile 1713
			$popup->add_item($lang->full_edit, "index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid=-1");
$popup->add_item($lang->delete_template, "index.php?module=style-templates&amp;action=delete_template&amp;title=".urlencode($template['title'])."&amp;sid=-1&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_deletion}')");


			$popup->add_item($lang->full_edit, "index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid=-1");
$popup->add_item($lang->delete_template, "index.php?module=style-templates&amp;action=delete_template&amp;title=".urlencode($template['title'])."&amp;sid=-1&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_deletion}')");


			$table->construct_cell("<a href=\"index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid=-1\">{$template['title']}</a>");

			$table->construct_cell("<a href=\"index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid=-1\">".htmlspecialchars_uni($template['title'])."</a>");

			$table->construct_cell($popup->fetch(), array("class" => "align_center"));

$table->construct_row();

			$table->construct_cell($popup->fetch(), array("class" => "align_center"));

$table->construct_row();

Zeile 1869Zeile 1887
			$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);

foreach($templates as $template)
{

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

foreach($templates as $template)
{

					$template['pretty_title'] = $template['title'];

					$template['pretty_title'] = htmlspecialchars_uni($template['title']);


$popup = new PopupMenu("template_{$template['tid']}", $lang->options);
$popup->add_item($lang->full_edit, "index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}{$expand_str}");


$popup = new PopupMenu("template_{$template['tid']}", $lang->options);
$popup->add_item($lang->full_edit, "index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}{$expand_str}");

Zeile 1890Zeile 1908
							$popup->add_item($lang->revert_to_orig, "index.php?module=style-templates&amp;action=revert&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;my_post_key={$mybb->post_code}{$expand_str}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_revertion}')");
}


							$popup->add_item($lang->revert_to_orig, "index.php?module=style-templates&amp;action=revert&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;my_post_key={$mybb->post_code}{$expand_str}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_revertion}')");
}


						$template['pretty_title'] = "<span style=\"color: green;\">{$template['title']}</span>";

						$template['pretty_title'] = "<span style=\"color: green;\">".htmlspecialchars_uni($template['title'])."</span>";

					}
// This template does not exist in the master list
else if(isset($template['original']) && $template['original'] == false)
{
$popup->add_item($lang->delete_template, "index.php?module=style-templates&amp;action=delete_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;my_post_key={$mybb->post_code}{$expand_str}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_deletion}')");


					}
// This template does not exist in the master list
else if(isset($template['original']) && $template['original'] == false)
{
$popup->add_item($lang->delete_template, "index.php?module=style-templates&amp;action=delete_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}&amp;my_post_key={$mybb->post_code}{$expand_str}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_deletion}')");


						$template['pretty_title'] = "<span style=\"color: blue;\">{$template['title']}</span>";

						$template['pretty_title'] = "<span style=\"color: blue;\">".htmlspecialchars_uni($template['title'])."</span>";

					}


					}


					$table->construct_cell("<span style=\"padding: 20px;\"><a href=\"index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}{$expand_str}\" >{$template['pretty_title']}</a></span>");

					$table->construct_cell("<span style=\"padding-left: 20px;\"><a href=\"index.php?module=style-templates&amp;action=edit_template&amp;title=".urlencode($template['title'])."&amp;sid={$sid}{$expand_str}\" >{$template['pretty_title']}</a></span>");

					$table->construct_cell($popup->fetch(), array("class" => "align_center"));

$table->construct_row();

					$table->construct_cell($popup->fetch(), array("class" => "align_center"));

$table->construct_row();

Zeile 1967Zeile 1985
			continue;
}


			continue;
}


		if($themes[$set['sid']])

		if(!empty($themes[$set['sid']]))

		{
$used_by_note = $lang->used_by;
$comma = "";

		{
$used_by_note = $lang->used_by;
$comma = "";

Zeile 1995Zeile 2013
			{
$popup->add_item($lang->edit_template_set, "index.php?module=style-templates&amp;action=edit_set&amp;sid={$set['sid']}");


			{
$popup->add_item($lang->edit_template_set, "index.php?module=style-templates&amp;action=edit_set&amp;sid={$set['sid']}");


				if(!$themes[$set['sid']])

				if(empty($themes[$set['sid']]))

				{
$popup->add_item($lang->delete_template_set, "index.php?module=style-templates&amp;action=delete_set&amp;sid={$set['sid']}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_set_deletion}')");
}

				{
$popup->add_item($lang->delete_template_set, "index.php?module=style-templates&amp;action=delete_set&amp;sid={$set['sid']}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_template_set_deletion}')");
}