Vergleich admin/inc/functions_themes.php - 1.8.17 - 1.8.27

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 19Zeile 19
{
global $mybb, $db;


{
global $mybb, $db;


	require_once MYBB_ROOT."inc/class_xml.php";

$parser = new XMLParser($xml);

	$parser = create_xml_parser($xml);



	$tree = $parser->get_tree();

if(!is_array($tree) || !is_array($tree['theme']))

	$tree = $parser->get_tree();

if(!is_array($tree) || !is_array($tree['theme']))

Zeile 65Zeile 63
	if(isset($theme['themebits']) && is_array($theme['themebits']))
{
$themebits = kill_tags($theme['themebits']);

	if(isset($theme['themebits']) && is_array($theme['themebits']))
{
$themebits = kill_tags($theme['themebits']);





		$theme['properties']['tag'] = 'properties';

foreach($themebits as $name => $value)

		$theme['properties']['tag'] = 'properties';

foreach($themebits as $name => $value)

Zeile 87Zeile 85
		$theme['stylesheets']['stylesheet'][0]['tag'] = 'stylesheet';
$theme['stylesheets']['stylesheet'][0]['attributes'] = array('name' => 'global.css', 'version' => $mybb->version_code);
$theme['stylesheets']['stylesheet'][0]['value'] = $css_120;

		$theme['stylesheets']['stylesheet'][0]['tag'] = 'stylesheet';
$theme['stylesheets']['stylesheet'][0]['attributes'] = array('name' => 'global.css', 'version' => $mybb->version_code);
$theme['stylesheets']['stylesheet'][0]['value'] = $css_120;





		unset($theme['cssbits']);
unset($theme['themebits']);
}

		unset($theme['cssbits']);
unset($theme['themebits']);
}

Zeile 130Zeile 128

$query = $db->simple_select("themes", "tid", "name='".$db->escape_string($name)."'", array("limit" => 1));
$existingtheme = $db->fetch_array($query);


$query = $db->simple_select("themes", "tid", "name='".$db->escape_string($name)."'", array("limit" => 1));
$existingtheme = $db->fetch_array($query);

	if(!empty($options['force_name_check']) && $existingtheme['tid'])

	if(!empty($options['force_name_check']) && !empty($existingtheme['tid']))

	{
return -3;
}

	{
return -3;
}

	else if($existingtheme['tid'])

	else if(!empty($existingtheme['tid']))

	{
$options['tid'] = $existingtheme['tid'];
}

	{
$options['tid'] = $existingtheme['tid'];
}

Zeile 146Zeile 144

// Do we have any templates to insert?
if(!empty($theme['templates']['template']) && empty($options['no_templates']))


// Do we have any templates to insert?
if(!empty($theme['templates']['template']) && empty($options['no_templates']))

	{
if($options['templateset'])
{
$sid = $options['templateset'];
}
else
{
$sid = $db->insert_query("templatesets", array('title' => $db->escape_string($name)." Templates"));
}


	{	










		$templates = $theme['templates']['template'];
if(is_array($templates))
{

		$templates = $theme['templates']['template'];
if(is_array($templates))
{

Zeile 166Zeile 155
			}
}


			}
}


 
		// Security check

		$security_check = false;

		$security_check = false;

		$templatecache = array();
foreach($templates as $template)
{

		foreach($templates as $template)
{


			if(check_template($template['value']))
{
$security_check = true;
break;
}

			if(check_template($template['value']))
{
$security_check = true;
break;
}

 
		}

if($security_check == true)
{
return -4;
}

if(!empty($options['templateset']))
{
$sid = (int)$options['templateset'];
}
else
{
$sid = $db->insert_query("templatesets", array('title' => $db->escape_string($name)." Templates"));
}





 
		$templatecache = array();
foreach($templates as $template)
{

			$templatecache[] = array(
"title" => $db->escape_string($template['attributes']['name']),
"template" => $db->escape_string($template['value']),

			$templatecache[] = array(
"title" => $db->escape_string($template['attributes']['name']),
"template" => $db->escape_string($template['value']),

Zeile 183Zeile 190
				"version" => $db->escape_string($template['attributes']['version']),
"dateline" => TIME_NOW
);

				"version" => $db->escape_string($template['attributes']['version']),
"dateline" => TIME_NOW
);

		}

if($security_check == true)
{
return -4;

 
		}

foreach($templatecache as $template)

		}

foreach($templatecache as $template)

Zeile 201Zeile 203
			}

$db->insert_query("templates", $template);

			}

$db->insert_query("templates", $template);

		}

		}


$properties['templateset'] = $sid;
}

// Not overriding an existing theme
if(empty($options['tid']))


$properties['templateset'] = $sid;
}

// Not overriding an existing theme
if(empty($options['tid']))

	{

	{

		// Insert the theme
if(!isset($options['parent']))
{

		// Insert the theme
if(!isset($options['parent']))
{

Zeile 222Zeile 224
		$db->delete_query("themestylesheets", "tid='{$options['tid']}'");
$db->update_query("themes", array("properties" => $db->escape_string(my_serialize($properties))), "tid='{$options['tid']}'");
$theme_id = $options['tid'];

		$db->delete_query("themestylesheets", "tid='{$options['tid']}'");
$db->update_query("themes", array("properties" => $db->escape_string(my_serialize($properties))), "tid='{$options['tid']}'");
$theme_id = $options['tid'];

	}


	}


	// If we have any stylesheets, process them
if(!empty($theme['stylesheets']['stylesheet']) && empty($options['no_stylesheets']))
{

	// If we have any stylesheets, process them
if(!empty($theme['stylesheets']['stylesheet']) && empty($options['no_stylesheets']))
{

Zeile 240Zeile 242
		{
$inherited_stylesheets = my_unserialize($db->fetch_field($query, "stylesheets"));


		{
$inherited_stylesheets = my_unserialize($db->fetch_field($query, "stylesheets"));


			if(is_array($inherited_stylesheets['inherited']))

			if(isset($inherited_stylesheets['inherited']) && is_array($inherited_stylesheets['inherited']))

			{
$loop = 1;
foreach($inherited_stylesheets['inherited'] as $action => $stylesheets)

			{
$loop = 1;
foreach($inherited_stylesheets['inherited'] as $action => $stylesheets)

Zeile 262Zeile 264
		$loop = 1;
foreach($theme['stylesheets']['stylesheet'] as $stylesheet)
{

		$loop = 1;
foreach($theme['stylesheets']['stylesheet'] as $stylesheet)
{

 
			$stylesheet['attributes']['name'] = my_substr($stylesheet['attributes']['name'], 0, 30);


			if(substr($stylesheet['attributes']['name'], -4) != ".css")
{
continue;

			if(substr($stylesheet['attributes']['name'], -4) != ".css")
{
continue;

Zeile 331Zeile 335
		);

$db->update_query("themes", $updated_theme, "tid='{$theme_id}'");

		);

$db->update_query("themes", $updated_theme, "tid='{$theme_id}'");

	}

	}


update_theme_stylesheet_list($theme_id);



update_theme_stylesheet_list($theme_id);


Zeile 374Zeile 378
	$filename = basename($filename);
$tid = (int) $tid;
$theme_directory = "cache/themes/theme{$tid}";

	$filename = basename($filename);
$tid = (int) $tid;
$theme_directory = "cache/themes/theme{$tid}";

 

if(substr($filename, -4) != ".css")
{
return false;
}


// If we're in safe mode save to the main theme folder by default
if($mybb->safemode)


// If we're in safe mode save to the main theme folder by default
if($mybb->safemode)

Zeile 623Zeile 632
		);
$properties['logo'] = parse_theme_variables($properties['logo'], $theme_vars);
}

		);
$properties['logo'] = parse_theme_variables($properties['logo'], $theme_vars);
}

 

$updated_theme = array();

	if(!empty($stylesheets))

	if(!empty($stylesheets))

	{

	{

		$updated_theme['stylesheets'] = $db->escape_string(my_serialize($stylesheets));
}
$updated_theme['properties'] = $db->escape_string(my_serialize($properties));

		$updated_theme['stylesheets'] = $db->escape_string(my_serialize($stylesheets));
}
$updated_theme['properties'] = $db->escape_string(my_serialize($properties));





	if(count($updated_theme) > 0)
{
$db->update_query("themes", $updated_theme, "tid='{$tid}'");
}

return $tid;

	if(count($updated_theme) > 0)
{
$db->update_query("themes", $updated_theme, "tid='{$tid}'");
}

return $tid;

}

}


/**
* Generates an array from an incoming CSS file.


/**
* Generates an array from an incoming CSS file.

Zeile 663Zeile 674
	$parsed_css = array();

for($i=0; $i < $total; $i++)

	$parsed_css = array();

for($i=0; $i < $total; $i++)

	{

	{

		$name = $description = '';
$class_name = $matches[3][$i];
$class_name = trim($class_name);

		$name = $description = '';
$class_name = $matches[3][$i];
$class_name = trim($class_name);

Zeile 732Zeile 743
			else
{
$select .= "<option value=\"{$id}\">{$css_array['name']}</option>\n";

			else
{
$select .= "<option value=\"{$id}\">{$css_array['name']}</option>\n";

			}
}

			}
}

	}
return $select;
}

	}
return $select;
}

Zeile 756Zeile 767
		$b['name'] = $b['class_name'];
}
return strcmp($a['name'], $b['name']);

		$b['name'] = $b['class_name'];
}
return strcmp($a['name'], $b['name']);

}

/**

}

/**

 * @param array|string $css
* @param string $id
*

 * @param array|string $css
* @param string $id
*

Zeile 769Zeile 780
	if(!is_array($css))
{
$css = css_to_array($css);

	if(!is_array($css))
{
$css = css_to_array($css);

	}


	}


	if(!isset($css[$id]))
{
return false;
}
return parse_css_properties($css[$id]['values']);

	if(!isset($css[$id]))
{
return false;
}
return parse_css_properties($css[$id]['values']);

}

/**

}

/**

 * Parses CSS supported properties and returns them as an array.
*
* @param string $values Value of CSS properties from within class or selector

 * Parses CSS supported properties and returns them as an array.
*
* @param string $values Value of CSS properties from within class or selector

Zeile 786Zeile 797
 */
function parse_css_properties($values)
{

 */
function parse_css_properties($values)
{

	$css_bits = array();



	$css_bits = array(
'extra' => null,
);


if(!$values)
{


if(!$values)
{

Zeile 801Zeile 814
		list($property, $css_value) = explode(":", $value, 2);
$property = trim($property);
switch(strtolower($property))

		list($property, $css_value) = explode(":", $value, 2);
$property = trim($property);
switch(strtolower($property))

		{

		{

			case "background":
case "color":
case "width":

			case "background":
case "color":
case "width":

Zeile 888Zeile 901
		{
$pos = strpos($css, "\n".$existing_block['class_name']." {", $pos);
if($pos === false)

		{
$pos = strpos($css, "\n".$existing_block['class_name']." {", $pos);
if($pos === false)

			{
break;

			{
break;

			}
if($occurance == $actual_occurance)
{

			}
if($occurance == $actual_occurance)
{

Zeile 910Zeile 923

/**
* @param array $stylesheet


/**
* @param array $stylesheet

 * @param int $tid
*

 * @param int $tid
*

 * @return bool|int
*/
function copy_stylesheet_to_theme($stylesheet, $tid)

 * @return bool|int
*/
function copy_stylesheet_to_theme($stylesheet, $tid)

Zeile 952Zeile 965
	$parent_list = make_parent_theme_list($tid);

if(!is_array($parent_list))

	$parent_list = make_parent_theme_list($tid);

if(!is_array($parent_list))

	{

	{

		return false;

		return false;

	}

$tid_list = implode(',', $parent_list);

	}

$tid_list = implode(',', $parent_list);


// Get our list of stylesheets
$query = $db->simple_select("themestylesheets", "*", "tid IN ({$tid_list})", array('order_by' => 'tid', 'order_dir' => 'desc'));


// Get our list of stylesheets
$query = $db->simple_select("themestylesheets", "*", "tid IN ({$tid_list})", array('order_by' => 'tid', 'order_dir' => 'desc'));

Zeile 970Zeile 983
			}

$stylesheets[$stylesheet['name']] = $stylesheet;

			}

$stylesheets[$stylesheet['name']] = $stylesheet;

		}
}


		}
}


	$theme_stylesheets = array();

foreach($stylesheets as $name => $stylesheet)

	$theme_stylesheets = array();

foreach($stylesheets as $name => $stylesheet)

Zeile 982Zeile 995

foreach($parent_list as $theme_id)
{


foreach($parent_list as $theme_id)
{

			if($mybb->settings['usecdn'] && !empty($mybb->settings['cdnpath']))

			if(!empty($mybb->settings['usecdn']) && !empty($mybb->settings['cdnpath']))

			{
$cdnpath = rtrim($mybb->settings['cdnpath'], '/\\').'/';
if(file_exists($cdnpath."cache/themes/theme{$theme_id}/{$stylesheet['name']}") && filemtime(
$cdnpath."cache/themes/theme{$theme_id}/{$stylesheet['name']}"

			{
$cdnpath = rtrim($mybb->settings['cdnpath'], '/\\').'/';
if(file_exists($cdnpath."cache/themes/theme{$theme_id}/{$stylesheet['name']}") && filemtime(
$cdnpath."cache/themes/theme{$theme_id}/{$stylesheet['name']}"

					) >= $stylesheet['lastmodified']
)
{
$css_url = "cache/themes/theme{$theme_id}/{$stylesheet['name']}";
break;
}
}

					) >= $stylesheet['lastmodified']
)
{
$css_url = "cache/themes/theme{$theme_id}/{$stylesheet['name']}";
break;
}
}

			else
{
if(file_exists(MYBB_ROOT."cache/themes/theme{$theme_id}/{$stylesheet['name']}") && filemtime(

			else
{
if(file_exists(MYBB_ROOT."cache/themes/theme{$theme_id}/{$stylesheet['name']}") && filemtime(

Zeile 1006Zeile 1019
				}
}
}

				}
}
}

		



		if(is_object($plugins))
{
$plugins->run_hooks('update_theme_stylesheet_list_set_css_url', $css_url);

		if(is_object($plugins))
{
$plugins->run_hooks('update_theme_stylesheet_list_set_css_url', $css_url);

Zeile 1035Zeile 1048
			}

foreach($attached_actions as $action)

			}

foreach($attached_actions as $action)

			{

			{

				$theme_stylesheets[$attached_file][$action][] = $css_url;

if(!empty($stylesheet['inherited']))

				$theme_stylesheets[$attached_file][$action][] = $css_url;

if(!empty($stylesheet['inherited']))

Zeile 1045Zeile 1058
			}
}
}

			}
}
}





	// Now we have our list of built stylesheets, save them
$updated_theme = array(
"stylesheets" => $db->escape_string(my_serialize($theme_stylesheets))

	// Now we have our list of built stylesheets, save them
$updated_theme = array(
"stylesheets" => $db->escape_string(my_serialize($theme_stylesheets))

Zeile 1055Zeile 1068
	if($update_disporders)
{
if(!is_array($theme) || !$theme)

	if($update_disporders)
{
if(!is_array($theme) || !$theme)

		{

		{

			$theme_cache = cache_themes();
$theme = $theme_cache[$tid];

			$theme_cache = cache_themes();
$theme = $theme_cache[$tid];

		}

		}


$orders = $orphaned_stylesheets = array();
$properties = $theme['properties'];


$orders = $orphaned_stylesheets = array();
$properties = $theme['properties'];

Zeile 1067Zeile 1080
		{
$properties = my_unserialize($theme['properties']);
}

		{
$properties = my_unserialize($theme['properties']);
}

		
$max_disporder = 0;


$max_disporder = 0;


foreach($stylesheets as $stylesheet)
{


foreach($stylesheets as $stylesheet)
{

Zeile 1077Zeile 1090
				$orphaned_stylesheets[] = $stylesheet['name'];
continue;
}

				$orphaned_stylesheets[] = $stylesheet['name'];
continue;
}

			



			if($properties['disporder'][$stylesheet['name']] > $max_disporder)
{
$max_disporder = $properties['disporder'][$stylesheet['name']];

			if($properties['disporder'][$stylesheet['name']] > $max_disporder)
{
$max_disporder = $properties['disporder'][$stylesheet['name']];

Zeile 1223Zeile 1236
		$query = $db->simple_select("themes", "*", "", array('order_by' => "pid, name"));
while($theme = $db->fetch_array($query))
{

		$query = $db->simple_select("themes", "*", "", array('order_by' => "pid, name"));
while($theme = $db->fetch_array($query))
{

 
			$theme['users'] = 0;

			$theme['properties'] = my_unserialize($theme['properties']);
$theme['stylesheets'] = my_unserialize($theme['stylesheets']);
$theme_cache[$theme['tid']] = $theme;

			$theme['properties'] = my_unserialize($theme['properties']);
$theme['stylesheets'] = my_unserialize($theme['stylesheets']);
$theme_cache[$theme['tid']] = $theme;

Zeile 1265Zeile 1279
				$user_themes['style'] = $themes['default'];
}


				$user_themes['style'] = $themes['default'];
}


			if($themes[$user_themes['style']]['users'] > 0)

			if(isset($themes[$user_themes['style']]['users']) && $themes[$user_themes['style']]['users'] > 0)

			{
$themes[$user_themes['style']]['users'] += (int)$user_themes['users'];

			{
$themes[$user_themes['style']]['users'] += (int)$user_themes['users'];

			}
else
{

			}
else
{

				$themes[$user_themes['style']]['users'] = (int)$user_themes['users'];

				$themes[$user_themes['style']]['users'] = (int)$user_themes['users'];

			}

			}

		}

// Restrucure the theme array to something we can "loop-de-loop" with

		}

// Restrucure the theme array to something we can "loop-de-loop" with

Zeile 1282Zeile 1296
			{
continue;
}

			{
continue;
}





			$theme_cache[$theme['pid']][$theme['tid']] = $theme;
}
$theme_cache['num_themes'] = count($themes);
unset($themes);

			$theme_cache[$theme['pid']][$theme['tid']] = $theme;
}
$theme_cache['num_themes'] = count($themes);
unset($themes);

	}

if(!is_array($theme_cache[$parent]))
{
return;
}


	}

if(!isset($theme_cache[$parent]) || !is_array($theme_cache[$parent]))
{
return;
}


	foreach($theme_cache[$parent] as $theme)
{
$popup = new PopupMenu("theme_{$theme['tid']}", $lang->options);

	foreach($theme_cache[$parent] as $theme)
{
$popup = new PopupMenu("theme_{$theme['tid']}", $lang->options);

 
		$set_default = '';

		if($theme['tid'] > 1)
{
$popup->add_item($lang->edit_theme, "index.php?module=style-themes&amp;action=edit&amp;tid={$theme['tid']}");

		if($theme['tid'] > 1)
{
$popup->add_item($lang->edit_theme, "index.php?module=style-themes&amp;action=edit&amp;tid={$theme['tid']}");

Zeile 1318Zeile 1333
				$set_default = "<img src=\"styles/{$page->style}/images/icons/default.png\" alt=\"{$lang->default_theme}\" style=\"vertical-align: middle;\" title=\"{$lang->default_theme}\" />";
}
$popup->add_item($lang->force_on_users, "index.php?module=style-themes&amp;action=force&amp;tid={$theme['tid']}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_theme_forced}')");

				$set_default = "<img src=\"styles/{$page->style}/images/icons/default.png\" alt=\"{$lang->default_theme}\" style=\"vertical-align: middle;\" title=\"{$lang->default_theme}\" />";
}
$popup->add_item($lang->force_on_users, "index.php?module=style-themes&amp;action=force&amp;tid={$theme['tid']}&amp;my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_theme_forced}')");

 
			$set_default = "<div class=\"float_right\">{$set_default}</div>";

		}
$popup->add_item($lang->export_theme, "index.php?module=style-themes&amp;action=export&amp;tid={$theme['tid']}");
$popup->add_item($lang->duplicate_theme, "index.php?module=style-themes&amp;action=duplicate&amp;tid={$theme['tid']}");

		}
$popup->add_item($lang->export_theme, "index.php?module=style-themes&amp;action=export&amp;tid={$theme['tid']}");
$popup->add_item($lang->duplicate_theme, "index.php?module=style-themes&amp;action=duplicate&amp;tid={$theme['tid']}");

		$table->construct_cell("<div class=\"float_right\">{$set_default}</div><div style=\"margin-left: {$padding}px;\"><strong>{$theme['name']}</strong></div>");

		$table->construct_cell("{$set_default}<div style=\"margin-left: {$padding}px;\"><strong>{$theme['name']}</strong></div>");

		$table->construct_cell(my_number_format($theme['users']), array("class" => "align_center"));
$table->construct_cell($popup->fetch(), array("class" => "align_center"));
$table->construct_row();

		$table->construct_cell(my_number_format($theme['users']), array("class" => "align_center"));
$table->construct_cell($popup->fetch(), array("class" => "align_center"));
$table->construct_row();

Zeile 1359Zeile 1375
			$theme_cache[$theme['pid']][$theme['tid']] = $theme;
}
unset($theme);

			$theme_cache[$theme['pid']][$theme['tid']] = $theme;
}
unset($theme);

	}

if(!is_array($theme_cache[$parent]) || $ignoretid === $parent)
{

	}

if(!isset($theme_cache[$parent]) || !is_array($theme_cache[$parent]) || $ignoretid === $parent)
{

		return null;

		return null;

	}


	}


	foreach($theme_cache[$parent] as $theme)

	foreach($theme_cache[$parent] as $theme)

	{

	{

		if($ignoretid === $theme['tid'])
{
continue;

		if($ignoretid === $theme['tid'])
{
continue;

Zeile 1381Zeile 1397
	if(!$parent)
{
return $list;

	if(!$parent)
{
return $list;

	}
}


	}
}


/**
* @param array $theme
*

/**
* @param array $theme
*

Zeile 1415Zeile 1431
			foreach($style as $stylesheet2)
{
$stylesheets[$stylesheet2]['applied_to'][$file][] = $action;

			foreach($style as $stylesheet2)
{
$stylesheets[$stylesheet2]['applied_to'][$file][] = $action;

				if(is_array($file_stylesheets['inherited'][$file."_".$action]) && in_array($stylesheet2, array_keys($file_stylesheets['inherited'][$file."_".$action])))

				if(isset($file_stylesheets['inherited'][$file."_".$action]) && is_array($file_stylesheets['inherited'][$file."_".$action]) && in_array($stylesheet2, array_keys($file_stylesheets['inherited'][$file."_".$action])))

				{
$stylesheets[$stylesheet2]['inherited'] = $file_stylesheets['inherited'][$file."_".$action];
foreach($file_stylesheets['inherited'][$file."_".$action] as $value)

				{
$stylesheets[$stylesheet2]['inherited'] = $file_stylesheets['inherited'][$file."_".$action];
foreach($file_stylesheets['inherited'][$file."_".$action] as $value)

Zeile 1429Zeile 1445

foreach($stylesheets as $file => $stylesheet2)
{


foreach($stylesheets as $file => $stylesheet2)
{

		if(is_array($stylesheet2['inherited']))

		if(isset($stylesheet2['inherited']) && is_array($stylesheet2['inherited']))

		{
foreach($stylesheet2['inherited'] as $inherited_file => $tid)
{

		{
foreach($stylesheet2['inherited'] as $inherited_file => $tid)
{

Zeile 1452Zeile 1468
 */
function upgrade_css_120_to_140($css)
{

 */
function upgrade_css_120_to_140($css)
{

 
	global $mybb;

	// Update our CSS to the new stuff in 1.4
$parsed_css = css_to_array($css);


	// Update our CSS to the new stuff in 1.4
$parsed_css = css_to_array($css);