Vergleich admin/inc/functions_themes.php - 1.8.14 - 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();

	$tree = $parser->get_tree();





	if(!is_array($tree) || !is_array($tree['theme']))
{
return -1;

	if(!is_array($tree) || !is_array($tree['theme']))
{
return -1;

Zeile 44Zeile 42
			foreach($values as $property => $value)
{
if(is_array($value))

			foreach($values as $property => $value)
{
if(is_array($value))

				{

				{

					$property = str_replace('_', ':', $property);

$css_120 .= "}\n{$name} {$property} {\n";

					$property = str_replace('_', ':', $property);

$css_120 .= "}\n{$name} {$property} {\n";

Zeile 110Zeile 108
					// Bad data?
continue;
}

					// Bad data?
continue;
}





				$value['value'] = $data;
}


				$value['value'] = $data;
}


Zeile 123Zeile 121
		$name = $theme['attributes']['name'];
}
else

		$name = $theme['attributes']['name'];
}
else

	{

	{

		$name = $mybb->input['name'];
}
$version = $theme['attributes']['version'];

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

		$name = $mybb->input['name'];
}
$version = $theme['attributes']['version'];

$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'];

	}

	}


if($mybb->version_code != $version && $options['version_compat'] != 1)


if($mybb->version_code != $version && $options['version_compat'] != 1)

	{

	{

		return -2;
}

		return -2;
}





	// 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)
{
// PostgreSQL causes apache to stop sending content sometimes and

		foreach($templatecache as $template)
{
// PostgreSQL causes apache to stop sending content sometimes and

Zeile 201Zeile 203
			}

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

			}

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

		}


		}


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


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


Zeile 232Zeile 234
		{
// Trick the system into thinking we have a good array =P
$theme['stylesheets']['stylesheet'] = array($theme['stylesheets']['stylesheet']);

		{
// Trick the system into thinking we have a good array =P
$theme['stylesheets']['stylesheet'] = array($theme['stylesheets']['stylesheet']);

		}

		}


// Retrieve a list of inherited stylesheets
$query = $db->simple_select("themes", "stylesheets", "tid = '{$theme_id}'");


// Retrieve a list of inherited stylesheets
$query = $db->simple_select("themes", "stylesheets", "tid = '{$theme_id}'");

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 280Zeile 284
			if(empty($stylesheet['attributes']['attachedto']))
{
$stylesheet['attributes']['attachedto'] = '';

			if(empty($stylesheet['attributes']['attachedto']))
{
$stylesheet['attributes']['attachedto'] = '';

			}


			}


			$properties['disporder'][$stylesheet['attributes']['name']] = $stylesheet['attributes']['disporder'];

$new_stylesheet = array(

			$properties['disporder'][$stylesheet['attributes']['name']] = $stylesheet['attributes']['disporder'];

$new_stylesheet = array(

Zeile 296Zeile 300
			$css_url = "css.php?stylesheet={$sid}";
$cached = cache_stylesheet($theme_id, $stylesheet['attributes']['name'], $stylesheet['value']);
if($cached)

			$css_url = "css.php?stylesheet={$sid}";
$cached = cache_stylesheet($theme_id, $stylesheet['attributes']['name'], $stylesheet['value']);
if($cached)

			{

			{

				$css_url = $cached;
}


				$css_url = $cached;
}


Zeile 329Zeile 333
		$updated_theme = array(
"stylesheets" => $db->escape_string(my_serialize($theme_stylesheets))
);

		$updated_theme = array(
"stylesheets" => $db->escape_string(my_serialize($theme_stylesheets))
);


if(is_array($properties['disporder']))
{
asort($properties['disporder'], SORT_NUMERIC);

// Because inherited stylesheets can mess this up
$loop = 1;
$orders = array();
foreach($properties['disporder'] as $filename => $order)
{
$orders[$filename] = $loop;
++$loop;
}

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

 

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


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

Zeile 391Zeile 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 511Zeile 503
}

/**

}

/**

 
 * @deprecated

 * @param string $url
*
* @return string

 * @param string $url
*
* @return string

Zeile 538Zeile 531
}

/**

}

/**

 
 * @deprecated

 * @param string $url
*
* @return string

 * @param string $url
*
* @return string

Zeile 575Zeile 569
	{
$query = $db->simple_select("themes", "*", "tid='".(int)$parent."'");
$parent_theme = $db->fetch_array($query);

	{
$query = $db->simple_select("themes", "*", "tid='".(int)$parent."'");
$parent_theme = $db->fetch_array($query);

		if(count($properties) == 0 || !is_array($properties))

		if(!is_array($properties) || count($properties) == 0)

		{
$parent_properties = my_unserialize($parent_theme['properties']);
if(!empty($parent_properties))

		{
$parent_properties = my_unserialize($parent_theme['properties']);
if(!empty($parent_properties))

Zeile 638Zeile 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 676Zeile 672
	$total = count($matches[1]);

$parsed_css = array();

	$total = count($matches[1]);

$parsed_css = array();





	for($i=0; $i < $total; $i++)
{
$name = $description = '';

	for($i=0; $i < $total; $i++)
{
$name = $description = '';

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

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

			}
else
{

			}
else
{

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

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

}


}


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

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

Zeile 771Zeile 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
*
* @return array|bool
*/
function get_css_properties($css, $id)

 * @param array|string $css
* @param string $id
*
* @return array|bool
*/
function get_css_properties($css, $id)

{

{

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

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

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

 */
function parse_css_properties($values)
{

	$css_bits = array();



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


if(!$values)
{


if(!$values)
{

Zeile 997Zeile 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 = rtrim($mybb->settings['cdnpath'], '/\\').'/';
if(file_exists($cdnpath."cache/themes/theme{$theme_id}/{$stylesheet['name']}") && filemtime(

Zeile 1021Zeile 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 1047Zeile 1045
			if(count($attached_actions) == 0)
{
$attached_actions = array("global");

			if(count($attached_actions) == 0)
{
$attached_actions = array("global");

			}

			}


foreach($attached_actions as $action)
{


foreach($attached_actions as $action)
{

Zeile 1065Zeile 1063
	$updated_theme = array(
"stylesheets" => $db->escape_string(my_serialize($theme_stylesheets))
);

	$updated_theme = array(
"stylesheets" => $db->escape_string(my_serialize($theme_stylesheets))
);





	// Do we have a theme present? If so, update the stylesheet display orders
if($update_disporders)
{

	// Do we have a theme present? If so, update the stylesheet display orders
if($update_disporders)
{

Zeile 1073Zeile 1071
		{
$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'];





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

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

		



		$max_disporder = 0;

foreach($stylesheets as $stylesheet)

		$max_disporder = 0;

foreach($stylesheets as $stylesheet)

Zeile 1092Zeile 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 1238Zeile 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 1280Zeile 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 1297Zeile 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 1333Zeile 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 1374Zeile 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 1396Zeile 1397
	if(!$parent)
{
return $list;

	if(!$parent)
{
return $list;

	}
}


	}
}


/**
* @param array $theme
*

/**
* @param array $theme
*

Zeile 1430Zeile 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 1444Zeile 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 1467Zeile 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);