Vergleich admin/modules/style/templates.php - 1.4.4 - 1.4.12

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 388Zeile 388
		
if(!$errors)
{

		
if(!$errors)
{

 
			$query = $db->simple_select("templates", "*", "tid='{$mybb->input['tid']}'");
$template = $db->fetch_array($query);


			$template_array = array(
'title' => $db->escape_string($mybb->input['title']),
'sid' => $sid,

			$template_array = array(
'title' => $db->escape_string($mybb->input['title']),
'sid' => $sid,

Zeile 397Zeile 400
				'dateline' => TIME_NOW
);


				'dateline' => TIME_NOW
);


			$tid = intval($mybb->input['tid']);
if($mybb->input['sid'] > 0)




			// Make sure we have the correct tid associated with this template. If the user double submits then the tid could originally be the master template tid, but because the form is sumbitted again, the tid doesn't get updated to the new modified template one. This then causes the master template to be overwritten
$query = $db->simple_select("templates", "tid", "title='".$db->escape_string($template['title'])."' AND (sid = '-2' OR sid = '{$template['sid']}')", array('order_by' => 'sid', 'order_dir' => 'desc', 'limit' => 1));
$template['tid'] = $db->fetch_field($query, "tid");

if($sid > 0)

			{

			{

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





				// Check to see if it's never been edited before (i.e. master) of if this a new template (i.e. we've renamed it)  or if it's a custom template
$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)

				{
$tid = $db->insert_query("templates", $template_array);
}
else
{

				{
$tid = $db->insert_query("templates", $template_array);
}
else
{

					$db->update_query("templates", $template_array, "tid='{$tid}'");

					$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='{$tid}'");

				$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 433Zeile 443
			}		

// Log admin action

			}		

// Log admin action

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

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

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


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


Zeile 441Zeile 451
			{
if($mybb->input['from'] == "diff_report")
{

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

					admin_redirect("index.php?module=style/templates&action=edit_template&title=".urlencode($mybb->input['title'])."&sid=".$sid.$expand_str2."&from=diff_report");

					admin_redirect("index.php?module=style/templates&action=edit_template&title=".urlencode($mybb->input['title'])."&sid=".intval($mybb->input['sid']).$expand_str2."&from=diff_report");

				}
else
{

				}
else
{

					admin_redirect("index.php?module=style/templates&action=edit_template&title=".urlencode($mybb->input['title'])."&sid=".$sid.$expand_str2);

					admin_redirect("index.php?module=style/templates&action=edit_template&title=".urlencode($mybb->input['title'])."&sid=".intval($mybb->input['sid']).$expand_str2);

				}
}
else

				}
}
else

Zeile 456Zeile 466
				}
else
{

				}
else
{

					admin_redirect("index.php?module=style/templates&sid=".$sid.$expand_str2."#group_{$group}");

					admin_redirect("index.php?module=style/templates&sid=".intval($mybb->input['sid']).$expand_str2."#group_{$group}");

				}
}
}

				}
}
}

Zeile 527Zeile 537
		
$form_container = new FormContainer($lang->edit_template_breadcrumb.$template['title']);
$form_container->output_row($lang->template_name, $lang->template_name_desc, $form->generate_text_box('title', $template['title'], array('id' => 'title')), 'title');

		
$form_container = new FormContainer($lang->edit_template_breadcrumb.$template['title']);
$form_container->output_row($lang->template_name, $lang->template_name_desc, $form->generate_text_box('title', $template['title'], array('id' => 'title')), 'title');

 

// Force users to save the default template to a specific set, rather than the "global" templates - where they can delete it
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($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' => 'codepress mybb', 'style' => 'width: 100%; height: 500px;')));
$form_container->end();


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


Zeile 668Zeile 686
										$label = $lang->sprintf($lang->search_found, $template['title']);
$url = "index.php?module=style/templates&action=edit_template&title=".urlencode($template['title'])."&sid={$template['sid']}";
}

										$label = $lang->sprintf($lang->search_found, $template['title']);
$url = "index.php?module=style/templates&action=edit_template&title=".urlencode($template['title'])."&sid={$template['sid']}";
}

 
								}
}
else
{
// Just show that the term was found
if($template['sid'] == -2)
{
$label = $lang->sprintf($lang->search_found, $template['title']);
}
else
{
$label = $lang->sprintf($lang->search_found, $template['title']);
$url = "index.php?module=style/templates&action=edit_template&title=".urlencode($template['title'])."&sid={$template['sid']}";

								}
}


								}
}


Zeile 689Zeile 720
							}
else
{

							}
else
{

								$table->construct_cell("<a href=\"{$url}\">Edit</a>", array("class" => "align_center"));

								$table->construct_cell("<a href=\"{$url}\">{$lang->edit}</a>", array("class" => "align_center"));

							}

$table->construct_row();

							}

$table->construct_row();

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


							$template['pretty_title'] = "<span style=\"color: blue;\">{$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}\">{$template['pretty_title']}</a></span>", array("width" => "85%"));

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

						$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 876Zeile 907
		
$form_container = new FormContainer($lang->search_replace);
$form_container->output_row($lang->search_for, "", $form->generate_text_area('find', $mybb->input['find'], array('id' => 'find', 'class' => 'codepress mybb', 'style' => 'width: 100%; height: 200px;')));

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

	

	

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


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


Zeile 891Zeile 922
	
$form = new Form("index.php?module=style/templates&amp;action=search_replace", "post", "do_title");
echo $form->generate_hidden_field('type', "titles");

	
$form = new Form("index.php?module=style/templates&amp;action=search_replace", "post", "do_title");
echo $form->generate_hidden_field('type', "titles");

		

		

	$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 = 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');

Zeile 949Zeile 980
	{
flash_message($lang->no_updated_templates, 'success');
admin_redirect("index.php?module=style/templates");

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

	}

$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->output_header($lang->find_updated);


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


Zeile 996Zeile 1027
	foreach($templates as $sid => $templates)
{
if(!$done_set[$sid])

	foreach($templates as $sid => $templates)
{
if(!$done_set[$sid])

		{

		{

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

$done_set[$sid] = 1;

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

$done_set[$sid] = 1;

Zeile 1183Zeile 1214
	require_once MYBB_ROOT."inc/3rdparty/diff/Diff.php";	
require_once MYBB_ROOT."inc/3rdparty/diff/Diff/Renderer/inline.php";


	require_once MYBB_ROOT."inc/3rdparty/diff/Diff.php";	
require_once MYBB_ROOT."inc/3rdparty/diff/Diff/Renderer/inline.php";


	$diff = &new Text_Diff('auto', array($template1['template'], $template2['template']));
$renderer = &new Text_Diff_Renderer_inline();

	$diff = new Text_Diff('auto', array($template1['template'], $template2['template']));
$renderer = new Text_Diff_Renderer_inline();

	
if($sid)
{

	
if($sid)
{

Zeile 1355Zeile 1386
		{
$template_sql = " AND (1=0{$template_sql})";
}

		{
$template_sql = " AND (1=0{$template_sql})";
}

					

		

		// Load the list of templates

		// Load the list of templates

		$query = $db->simple_select("templates", "*", "(sid='".intval($mybb->input['sid'])."' OR sid='-2') {$template_sql}", array('order_by' => 'sid DESC, title', 'order_dir' => 'ASC'));

		$query = $db->simple_select("templates", "*", "(sid='".intval($mybb->input['sid'])."' {$template_sql}) OR sid='-2'", array('order_by' => 'sid DESC, title', 'order_dir' => 'ASC'));

		while($template = $db->fetch_array($query))
{
$exploded = explode("_", $template['title'], 2);

		while($template = $db->fetch_array($query))
{
$exploded = explode("_", $template['title'], 2);