Vergleich admin/inc/functions_themes.php - 1.8.15 - 1.8.38

  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 59Zeile 57
				}
}
$css_120 .= "}\n";

				}
}
$css_120 .= "}\n";

		}
}


		}
}


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

Zeile 102Zeile 100
			}

if($property == 'colors' || $property == 'disporder')

			}

if($property == 'colors' || $property == 'disporder')

			{

			{

				$data = my_unserialize($value['value']);

if(!is_array($data))

				$data = my_unserialize($value['value']);

if(!is_array($data))

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']) && $existingtheme)

	{
return -3;
}

	{
return -3;
}

	else if($existingtheme['tid'])

	else if($existingtheme)

	{
$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)
{
if(check_template($template['value']))

		foreach($templates as $template)
{
if(check_template($template['value']))

Zeile 175Zeile 164
				$security_check = true;
break;
}

				$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 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")

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

			{

			{

				continue;

				continue;

			}

			}


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


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

			}


			}


			if(empty($stylesheet['attributes']['disporder']))

			if(empty($stylesheet['attributes']['disporder']))

			{

			{

				$stylesheet['attributes']['disporder'] = $loop;
}

if(empty($stylesheet['attributes']['attachedto']))

				$stylesheet['attributes']['disporder'] = $loop;
}

if(empty($stylesheet['attributes']['attachedto']))

			{

			{

				$stylesheet['attributes']['attachedto'] = '';
}


				$stylesheet['attributes']['attachedto'] = '';
}


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}'");
}





	update_theme_stylesheet_list($theme_id);

	update_theme_stylesheet_list($theme_id);





	// And done?
return $theme_id;
}

	// And done?
return $theme_id;
}

Zeile 364Zeile 351
 * @return string Parsed string with variables replaced
*/
function parse_theme_variables($string, $variables=array())

 * @return string Parsed string with variables replaced
*/
function parse_theme_variables($string, $variables=array())

{

{

	$find = array();
$replace = array();
foreach(array_keys($variables) as $variable)

	$find = array();
$replace = array();
foreach(array_keys($variables) as $variable)

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)

	{

	{

		$theme_directory = "cache/themes";
$filename = $tid."_".$filename;
}

		$theme_directory = "cache/themes";
$filename = $tid."_".$filename;
}

Zeile 405Zeile 397
		{
$theme_directory = "cache/themes";
$filename = $tid."_".$filename;

		{
$theme_directory = "cache/themes";
$filename = $tid."_".$filename;

		}

		}

		else
{
// Add in empty index.html!
$fp = @fopen(MYBB_ROOT . $theme_directory."/index.html", "w");
@fwrite($fp, "");
@fclose($fp);

		else
{
// Add in empty index.html!
$fp = @fopen(MYBB_ROOT . $theme_directory."/index.html", "w");
@fwrite($fp, "");
@fclose($fp);


}
}


}
}


$theme_vars = array(
"theme" => $theme_directory


$theme_vars = array(
"theme" => $theme_directory

Zeile 424Zeile 416

$fp = @fopen(MYBB_ROOT . "{$theme_directory}/{$filename}", "wb");
if(!$fp)


$fp = @fopen(MYBB_ROOT . "{$theme_directory}/{$filename}", "wb");
if(!$fp)

	{
return false;
}

	{
return false;
}


@fwrite($fp, $stylesheet);
@fclose($fp);


@fwrite($fp, $stylesheet);
@fclose($fp);

Zeile 435Zeile 427
	$filename_min = str_replace('.css', '.min.css', $filename);
$fp_min = @fopen(MYBB_ROOT . "{$theme_directory}/{$filename_min}", "wb");
if(!$fp_min)

	$filename_min = str_replace('.css', '.min.css', $filename);
$fp_min = @fopen(MYBB_ROOT . "{$theme_directory}/{$filename_min}", "wb");
if(!$fp_min)

	{
return false;
}

	{
return false;
}

	@fwrite($fp_min, $stylesheet_min);
@fclose($fp_min);


	@fwrite($fp_min, $stylesheet_min);
@fclose($fp_min);


Zeile 508Zeile 500
	}

return false;

	}

return false;

}

}


/**


/**

 
 * @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 603Zeile 597

$parent_stylesheets = my_unserialize($parent_theme['stylesheets']);
if(!empty($parent_stylesheets))


$parent_stylesheets = my_unserialize($parent_theme['stylesheets']);
if(!empty($parent_stylesheets))

		{

		{

			foreach($parent_stylesheets as $location => $value)
{
if($location == "inherited")
{
continue;

			foreach($parent_stylesheets as $location => $value)
{
if($location == "inherited")
{
continue;

				}

				}


foreach($value as $action => $sheets)
{


foreach($value as $action => $sheets)
{

Zeile 618Zeile 612
						$stylesheets[$location][$action][] = $stylesheet;
$inherited_check = "{$location}_{$action}";
if(!empty($parent_stylesheets['inherited'][$inherited_check][$stylesheet]))

						$stylesheets[$location][$action][] = $stylesheet;
$inherited_check = "{$location}_{$action}";
if(!empty($parent_stylesheets['inherited'][$inherited_check][$stylesheet]))

						{

						{

							$stylesheets['inherited'][$inherited_check][$stylesheet] = $parent_stylesheets['inherited'][$inherited_check][$stylesheet];
}
else

							$stylesheets['inherited'][$inherited_check][$stylesheet] = $parent_stylesheets['inherited'][$inherited_check][$stylesheet];
}
else

Zeile 627Zeile 621
						}
}
}

						}
}
}

			}

			}

		}

		}

	}


	}


	if(!$inherited_properties)
{
$theme_vars = array(

	if(!$inherited_properties)
{
$theme_vars = array(

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

Zeile 650Zeile 646
	}

return $tid;

	}

return $tid;

}


}


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

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

Zeile 674Zeile 670
	// Fetch out classes and comments
preg_match_all('#(\/\*(.|[\r\n])*?\*\/)?([a-z0-9a+\\\[\]\-\"=_:>\*\.\#\,\s\(\)\|~|@\^]+)(\s*)\{(.*?)\}\n#msi', $stripped_css, $matches, PREG_PATTERN_ORDER);
$total = count($matches[1]);

	// Fetch out classes and comments
preg_match_all('#(\/\*(.|[\r\n])*?\*\/)?([a-z0-9a+\\\[\]\-\"=_:>\*\.\#\,\s\(\)\|~|@\^]+)(\s*)\{(.*?)\}\n#msi', $stripped_css, $matches, PREG_PATTERN_ORDER);
$total = count($matches[1]);





	$parsed_css = array();

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

	$parsed_css = array();

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

Zeile 698Zeile 694
		{
$already_parsed[$class_id]++;
$class_id .= "_".$already_parsed[$class_id];

		{
$already_parsed[$class_id]++;
$class_id .= "_".$already_parsed[$class_id];

		}

		}

		else
{
$already_parsed[$class_id] = 1;

		else
{
$already_parsed[$class_id] = 1;

Zeile 720Zeile 716
function get_selectors_as_options($css, $selected_item=null)
{
$select = "";

function get_selectors_as_options($css, $selected_item=null)
{
$select = "";


if(!is_array($css))
{


if(!is_array($css))
{

		$css = css_to_array($css);
}


		$css = css_to_array($css);
}


Zeile 769Zeile 765
	if(!$b['name'])
{
$b['name'] = $b['class_name'];

	if(!$b['name'])
{
$b['name'] = $b['class_name'];

	}

	}

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

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

}

}


/**
* @param array|string $css


/**
* @param array|string $css

Zeile 782Zeile 778
function get_css_properties($css, $id)
{
if(!is_array($css))

function get_css_properties($css, $id)
{
if(!is_array($css))

	{

	{

		$css = css_to_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.
*

/**
* Parses CSS supported properties and returns them as an array.
*

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 864Zeile 862
	if($css)
{
$parsed_css = css_to_array($css);

	if($css)
{
$parsed_css = css_to_array($css);

	}

	}


if(!$class_id)


if(!$class_id)

	{

	{

		$class_id = $parsed_css[$selector]['class_name'];

		$class_id = $parsed_css[$selector]['class_name'];

	}


	}


	// The specified class ID cannot be found, add CSS to end of file
if(!$css || !$parsed_css[$selector])

	// The specified class ID cannot be found, add CSS to end of file
if(!$css || !$parsed_css[$selector])

	{

	{

		return $css."{$class_id}\n{\n{$generated_css}\n}\n\n";
}
// Valid CSS, swap out old, swap in new

		return $css."{$class_id}\n{\n{$generated_css}\n}\n\n";
}
// Valid CSS, swap out old, swap in new

Zeile 888Zeile 886
		$break = strrpos($selector, "_");
$actual_occurance = 0;
if($break !== false)

		$break = strrpos($selector, "_");
$actual_occurance = 0;
if($break !== false)

		{

		{

			$actual_occurance = (int)substr($selector, ($break+1));
}


			$actual_occurance = (int)substr($selector, ($break+1));
}


Zeile 934Zeile 932
	global $db;

$stylesheet['tid'] = $tid;

	global $db;

$stylesheet['tid'] = $tid;

	unset($stylesheet['sid']);


	unset($stylesheet['sid']);


	$new_stylesheet = array();
foreach($stylesheet as $key => $value)
{

	$new_stylesheet = array();
foreach($stylesheet as $key => $value)
{

Zeile 982Zeile 980
			if($stylesheet['tid'] != $tid)
{
$stylesheet['inherited'] = $stylesheet['tid'];

			if($stylesheet['tid'] != $tid)
{
$stylesheet['inherited'] = $stylesheet['tid'];

			}

			}


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

$theme_stylesheets = array();


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

$theme_stylesheets = array();





	foreach($stylesheets as $name => $stylesheet)
{
$sid = $stylesheet['sid'];

	foreach($stylesheets as $name => $stylesheet)
{
$sid = $stylesheet['sid'];

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."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
{

			}
else
{

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 1079Zeile 1077
		$properties = $theme['properties'];

if(!is_array($properties))

		$properties = $theme['properties'];

if(!is_array($properties))

		{

		{

			$properties = my_unserialize($theme['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 1125Zeile 1123
		foreach($child_list as $id)
{
update_theme_stylesheet_list($id, false, $update_disporders);

		foreach($child_list as $id)
{
update_theme_stylesheet_list($id, false, $update_disporders);

		}
}

$cache->update_default_theme();


		}
}

$cache->update_default_theme();


	return true;
}


	return true;
}


Zeile 1175Zeile 1173
		if(is_array($parents))
{
$themes = array_merge($themes, $parents);

		if(is_array($parents))
{
$themes = array_merge($themes, $parents);

		}
}

		}
}


return $themes;
}


return $themes;
}

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

Zeile 1304Zeile 1303
		unset($themes);
}


		unset($themes);
}


	if(!is_array($theme_cache[$parent]))

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

	{
return;
}

	{
return;
}

Zeile 1312Zeile 1311
	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 1376Zeile 1377
		unset($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;
}

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


Zeile 1561Zeile 1563

foreach($to_add as $class_id => $array)
{


foreach($to_add as $class_id => $array)
{

		if($already_parsed[$class_id])

		if(isset($already_parsed[$class_id]))

		{
$already_parsed[$class_id]++;
$class_id .= "_".$already_parsed[$class_id];

		{
$already_parsed[$class_id]++;
$class_id .= "_".$already_parsed[$class_id];