| Zeile 19 | Zeile 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 65 | Zeile 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 87 | Zeile 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 130 | Zeile 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 146 | Zeile 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 166 | Zeile 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 183 | Zeile 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 201 | Zeile 203 |
|---|
}
$db->insert_query("templates", $template);
|
}
$db->insert_query("templates", $template);
|
}
| }
|
$properties['templateset'] = $sid;
|
$properties['templateset'] = $sid;
|
}
| }
|
// Not overriding an existing theme
if(empty($options['tid']))
|
// Not overriding an existing theme
if(empty($options['tid']))
|
| Zeile 220 | Zeile 222 |
|---|
else
{
$db->delete_query("themestylesheets", "tid='{$options['tid']}'");
|
else
{
$db->delete_query("themestylesheets", "tid='{$options['tid']}'");
|
$db->update_query("themes", array("properties" => $db->escape_string(serialize($properties))), "tid='{$options['tid']}'");
| $db->update_query("themes", array("properties" => $db->escape_string(my_serialize($properties))), "tid='{$options['tid']}'");
|
$theme_id = $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 240 | Zeile 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 262 | Zeile 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;
|
}
| }
|
if(empty($stylesheet['attributes']['lastmodified']))
{
|
if(empty($stylesheet['attributes']['lastmodified']))
{
|
| Zeile 327 | Zeile 331 |
|---|
}
// Now we have our list of built stylesheets, save them
$updated_theme = array(
|
}
// Now we have our list of built stylesheets, save them
$updated_theme = array(
|
"stylesheets" => $db->escape_string(serialize($theme_stylesheets))
| "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(serialize($properties));
}
|
|
$db->update_query("themes", $updated_theme, "tid='{$theme_id}'");
}
| $db->update_query("themes", $updated_theme, "tid='{$theme_id}'");
}
|
| Zeile 388 | Zeile 375 |
|---|
{
global $mybb;
|
{
global $mybb;
|
$filename = str_replace('/', '', $filename);
| $filename = basename($filename);
|
$tid = (int) $tid;
|
$tid = (int) $tid;
|
$theme_directory = "cache/themes/theme{$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 413 | Zeile 405 |
|---|
@fwrite($fp, "");
@fclose($fp);
|
@fwrite($fp, "");
@fclose($fp);
|
}
}
| }
}
|
$theme_vars = array(
"theme" => $theme_directory
);
$stylesheet = parse_theme_variables($stylesheet, $theme_vars);
|
$theme_vars = array(
"theme" => $theme_directory
);
$stylesheet = parse_theme_variables($stylesheet, $theme_vars);
|
$stylesheet = preg_replace_callback("#url\((\"|'|)(.*)\\1\)#", create_function('$matches', 'return fix_css_urls($matches[2]);'), $stylesheet);
| $stylesheet = preg_replace_callback("#url\((\"|'|)([^\"'\s]*?)\\1\)#", 'fix_css_urls_callback', $stylesheet);
|
$fp = @fopen(MYBB_ROOT . "{$theme_directory}/{$filename}", "wb");
if(!$fp)
{
return false;
}
|
$fp = @fopen(MYBB_ROOT . "{$theme_directory}/{$filename}", "wb");
if(!$fp)
{
return false;
}
|
|
|
@fwrite($fp, $stylesheet);
@fclose($fp);
| @fwrite($fp, $stylesheet);
@fclose($fp);
|
| Zeile 435 | Zeile 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);
|
if($mybb->settings['usecdn'] && !empty($mybb->settings['cdnpath']))
{
$cdn_path = rtrim($mybb->settings['cdnpath'], '/\\');
$cache_themes_dir = $cdn_path . '/' . $theme_directory;
$copy_to_cdn = true;
if(!is_dir($cache_themes_dir))
{
if(!@mkdir($cache_themes_dir))
{
$copy_to_cdn = false;
}
}
if($copy_to_cdn)
{
@copy(MYBB_ROOT . "{$theme_directory}/{$filename}", "{$cache_themes_dir}/{$filename}");
@copy(MYBB_ROOT . "{$theme_directory}/{$filename_min}", "{$cache_themes_dir}/{$filename_min}");
}
}
| copy_file_to_cdn(MYBB_ROOT . "{$theme_directory}/{$filename}");
copy_file_to_cdn(MYBB_ROOT . "{$theme_directory}/{$filename_min}");
|
return "{$theme_directory}/{$filename}";
}
|
return "{$theme_directory}/{$filename}";
}
|
| Zeile 469 | Zeile 442 |
|---|
/**
* Minify a stylesheet to remove comments, linebreaks, whitespace,
* unnecessary semicolons, and prefers #rgb over #rrggbb.
|
/**
* Minify a stylesheet to remove comments, linebreaks, whitespace,
* unnecessary semicolons, and prefers #rgb over #rrggbb.
|
*
| *
|
* @param $stylesheet string The stylesheet in it's untouched form.
* @return string The minified stylesheet
|
* @param $stylesheet string The stylesheet in it's untouched form.
* @return string The minified stylesheet
|
*/
| */
|
function minify_stylesheet($stylesheet)
{
// Remove comments.
| function minify_stylesheet($stylesheet)
{
// Remove comments.
|
| Zeile 487 | Zeile 460 |
|---|
return $stylesheet;
}
|
return $stylesheet;
}
|
| | /**
* @param array $stylesheet
*
* @return bool
*/
|
function resync_stylesheet($stylesheet)
{
global $db;
| function resync_stylesheet($stylesheet)
{
global $db;
|
| Zeile 513 | Zeile 491 |
|---|
update_theme_stylesheet_list($stylesheet['tid']);
if($stylesheet['sid'] != 1)
|
update_theme_stylesheet_list($stylesheet['tid']);
if($stylesheet['sid'] != 1)
|
{
| {
|
$db->update_query("themestylesheets", array('lastmodified' => TIME_NOW), "sid='{$stylesheet['sid']}'");
}
}
return true;
|
$db->update_query("themestylesheets", array('lastmodified' => TIME_NOW), "sid='{$stylesheet['sid']}'");
}
}
return true;
|
}
| }
|
return false;
}
|
return false;
}
|
| | /**
* @deprecated
* @param string $url
*
* @return string
*/
|
function fix_css_urls($url)
{
if(!preg_match("#^([a-z0-9]+\:|/)#i", $url) && strpos($url, "../../../") === false)
|
function fix_css_urls($url)
{
if(!preg_match("#^([a-z0-9]+\:|/)#i", $url) && strpos($url, "../../../") === false)
|
{
| {
|
return "url(../../../{$url})";
}
else
{
return "url({$url})";
}
|
return "url(../../../{$url})";
}
else
{
return "url({$url})";
}
|
}
| }
/**
* @param array $matches Matches.
*
* @return string
*/
function fix_css_urls_callback($matches)
{
return fix_css_urls($matches[2]);
}
/**
* @deprecated
* @param string $url
*
* @return string
*/
|
function unfix_css_urls($url)
{
return str_replace("../../../", "", $url);
| function unfix_css_urls($url)
{
return str_replace("../../../", "", $url);
|
| Zeile 569 | Zeile 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 579 | Zeile 579 |
|---|
if($property == "inherited")
{
continue;
|
if($property == "inherited")
{
continue;
|
}
| }
|
$properties[$property] = $value;
if(!empty($parent_properties['inherited'][$property]))
{
| $properties[$property] = $value;
if(!empty($parent_properties['inherited'][$property]))
{
|
| Zeile 621 | Zeile 621 |
|---|
}
}
}
|
}
}
}
|
}
}
}
| }
}
}
|
if(!$inherited_properties)
{
$theme_vars = array(
| if(!$inherited_properties)
{
$theme_vars = array(
|
| Zeile 632 | Zeile 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(serialize($stylesheets));
| $updated_theme['stylesheets'] = $db->escape_string(my_serialize($stylesheets));
|
}
|
}
|
$updated_theme['properties'] = $db->escape_string(serialize($properties));
| $updated_theme['properties'] = $db->escape_string(my_serialize($properties));
|
if(count($updated_theme) > 0)
{
|
if(count($updated_theme) > 0)
{
|
| Zeile 668 | Zeile 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 679 | Zeile 681 |
|---|
$comments = $matches[1][$i];
preg_match_all("#Name:(.*)#i", $comments, $name_match);
if(isset($name_match[count($name_match)-1][0]))
|
$comments = $matches[1][$i];
preg_match_all("#Name:(.*)#i", $comments, $name_match);
if(isset($name_match[count($name_match)-1][0]))
|
{
| {
|
$name = trim($name_match[count($name_match)-1][0]);
}
preg_match_all("#Description:(.*)#i", $comments, $description_match);
| $name = trim($name_match[count($name_match)-1][0]);
}
preg_match_all("#Description:(.*)#i", $comments, $description_match);
|
| Zeile 689 | Zeile 691 |
|---|
}
$class_id = md5($class_name);
if(isset($already_parsed[$class_id]))
|
}
$class_id = md5($class_name);
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];
|
}
| }
|
else
{
$already_parsed[$class_id] = 1;
| else
{
$already_parsed[$class_id] = 1;
|
| Zeile 705 | Zeile 707 |
|---|
return $parsed_css;
}
|
return $parsed_css;
}
|
function get_selectors_as_options($css, $selected_item="")
| /**
* @param array|string $css
* @param int $selected_item
*
* @return string
*/
function get_selectors_as_options($css, $selected_item=null)
|
{
$select = "";
if(!is_array($css))
{
$css = css_to_array($css);
|
{
$select = "";
if(!is_array($css))
{
$css = css_to_array($css);
|
}
| }
|
$selected = false;
|
$selected = false;
|
| Zeile 741 | Zeile 749 |
|---|
return $select;
}
|
return $select;
}
|
| | /**
* @param array $a
* @param array $b
*
* @return int
*/
|
function css_selectors_sort_cmp($a, $b)
{
if(!$a['name'])
|
function css_selectors_sort_cmp($a, $b)
{
if(!$a['name'])
|
{
| {
|
$a['name'] = $a['class_name'];
|
$a['name'] = $a['class_name'];
|
}
| }
|
if(!$b['name'])
{
$b['name'] = $b['class_name'];
| if(!$b['name'])
{
$b['name'] = $b['class_name'];
|
| Zeile 755 | Zeile 769 |
|---|
return strcmp($a['name'], $b['name']);
}
|
return strcmp($a['name'], $b['name']);
}
|
| | /**
* @param array|string $css
* @param string $id
*
* @return array|bool
*/
|
function get_css_properties($css, $id)
{
if(!is_array($css))
| function get_css_properties($css, $id)
{
if(!is_array($css))
|
| Zeile 777 | Zeile 797 |
|---|
*/
function parse_css_properties($values)
{
|
*/
function parse_css_properties($values)
{
|
$css_bits = array();
| $css_bits = array(
'extra' => null,
);
|
if(!$values)
{
|
if(!$values)
{
|
| Zeile 897 | Zeile 919 |
|---|
$css = preg_replace("#{\n*#s", "{\n", $css);
$css = preg_replace("#\s*\}\s*#", "\n}\n\n", $css);
return $css;
|
$css = preg_replace("#{\n*#s", "{\n", $css);
$css = preg_replace("#\s*\}\s*#", "\n}\n\n", $css);
return $css;
|
}
| }
|
|
|
| | /**
* @param array $stylesheet
* @param int $tid
*
* @return bool|int
*/
|
function copy_stylesheet_to_theme($stylesheet, $tid)
{
global $db;
| function copy_stylesheet_to_theme($stylesheet, $tid)
{
global $db;
|
| Zeile 920 | Zeile 948 |
|---|
return $sid;
}
|
return $sid;
}
|
function update_theme_stylesheet_list($tid, $theme = false, $update_disporders = false)
| /**
* @param int $tid
* @param bool|array $theme
* @param bool $update_disporders
*
* @return bool
*/
function update_theme_stylesheet_list($tid, $theme = false, $update_disporders = true)
|
{
|
{
|
global $db, $cache;
| global $mybb, $db, $cache, $plugins;
|
$stylesheets = array();
$child_list = make_child_theme_list($tid);
$parent_list = make_parent_theme_list($tid);
|
$stylesheets = array();
$child_list = make_child_theme_list($tid);
$parent_list = make_parent_theme_list($tid);
|
|
|
if(!is_array($parent_list))
{
return false;
}
|
if(!is_array($parent_list))
{
return false;
}
|
|
|
$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'));
while($stylesheet = $db->fetch_array($query))
|
$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'));
while($stylesheet = $db->fetch_array($query))
|
{
| {
|
if(empty($stylesheets[$stylesheet['name']]))
{
if($stylesheet['tid'] != $tid)
| if(empty($stylesheets[$stylesheet['name']]))
{
if($stylesheet['tid'] != $tid)
|
| Zeile 960 | Zeile 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 983 | Zeile 1018 |
|---|
break;
}
}
|
break;
}
}
|
| | }
if(is_object($plugins))
{
$plugins->run_hooks('update_theme_stylesheet_list_set_css_url', $css_url);
|
}
$attachedto = $stylesheet['attachedto'];
| }
$attachedto = $stylesheet['attachedto'];
|
| Zeile 1021 | Zeile 1061 |
|---|
// Now we have our list of built stylesheets, save them
$updated_theme = array(
|
// Now we have our list of built stylesheets, save them
$updated_theme = array(
|
"stylesheets" => $db->escape_string(serialize($theme_stylesheets))
| "stylesheets" => $db->escape_string(my_serialize($theme_stylesheets))
|
);
// Do we have a theme present? If so, update the stylesheet display orders
| );
// Do we have a theme present? If so, update the stylesheet display orders
|
| Zeile 1040 | Zeile 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)
{
|
if(!$properties['disporder'][$stylesheet['name']])
{
| if(!isset($properties['disporder'][$stylesheet['name']]))
{
|
$orphaned_stylesheets[] = $stylesheet['name'];
continue;
|
$orphaned_stylesheets[] = $stylesheet['name'];
continue;
|
}
if($properties['disporder'][$stylesheet['name']] > $max_disporder)
{
$max_disporder = $properties['disporder'][$stylesheet['name']];
| |
}
|
}
|
$orders[$stylesheet['name']] = $properties['disporder'][$stylesheet['name']];
}
| if($properties['disporder'][$stylesheet['name']] > $max_disporder)
{
$max_disporder = $properties['disporder'][$stylesheet['name']];
}
$orders[$stylesheet['name']] = $properties['disporder'][$stylesheet['name']];
}
|
if(!empty($orphaned_stylesheets))
{
|
if(!empty($orphaned_stylesheets))
{
|
| Zeile 1069 | Zeile 1109 |
|---|
++$loop;
}
}
|
++$loop;
}
}
|
|
|
asort($orders);
$properties['disporder'] = $orders;
|
asort($orders);
$properties['disporder'] = $orders;
|
$updated_theme['properties'] = $db->escape_string(serialize($properties));
| $updated_theme['properties'] = $db->escape_string(my_serialize($properties));
|
}
$db->update_query("themes", $updated_theme, "tid = '{$tid}'");
// Do we have any children themes that need updating too?
|
}
$db->update_query("themes", $updated_theme, "tid = '{$tid}'");
// Do we have any children themes that need updating too?
|
if(count($child_list) > 0)
{
| if(is_array($child_list) && count($child_list) > 0)
{
|
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();
return true;
}
|
$cache->update_default_theme();
return true;
}
|
| | /**
* @param int $tid
*
* @return array|bool
*/
|
function make_parent_theme_list($tid)
{
static $themes_by_parent;
| function make_parent_theme_list($tid)
{
static $themes_by_parent;
|
| Zeile 1121 | Zeile 1166 |
|---|
$themes = array();
foreach($themes_by_parent[$tid] as $key => $theme)
|
$themes = array();
foreach($themes_by_parent[$tid] as $key => $theme)
|
{
$themes[] = $theme['tid'];
$parents = make_parent_theme_list($theme['pid']);
| {
$themes[] = $theme['tid'];
$parents = make_parent_theme_list($theme['pid']);
|
if(is_array($parents))
{
|
if(is_array($parents))
{
|
| Zeile 1133 | Zeile 1178 |
|---|
return $themes;
}
|
return $themes;
}
|
|
/**
* @param int $tid
*
* @return array|null
*/
|
function make_child_theme_list($tid)
{
static $themes_by_child;
| function make_child_theme_list($tid)
{
static $themes_by_child;
|
| Zeile 1143 | Zeile 1193 |
|---|
{
$theme_cache = cache_themes();
foreach($theme_cache as $key => $theme)
|
{
$theme_cache = cache_themes();
foreach($theme_cache as $key => $theme)
|
{
| {
|
if($key == "default")
{
continue;
| if($key == "default")
{
continue;
|
| Zeile 1174 | Zeile 1224 |
|---|
return $themes;
}
|
return $themes;
}
|
| | /**
* @return array
*/
|
function cache_themes()
{
global $db, $theme_cache;
| function cache_themes()
{
global $db, $theme_cache;
|
| Zeile 1183 | Zeile 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 1203 | Zeile 1257 |
|---|
return $theme_cache;
}
|
return $theme_cache;
}
|
| | /**
* @param int $parent
* @param int $depth
*/
|
function build_theme_list($parent=0, $depth=0)
{
global $mybb, $db, $table, $lang, $page; // Global $table is bad, but it will have to do for now
| function build_theme_list($parent=0, $depth=0)
{
global $mybb, $db, $table, $lang, $page; // Global $table is bad, but it will have to do for now
|
| Zeile 1221 | Zeile 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 1238 | Zeile 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]))
| }
if(!isset($theme_cache[$parent]) || !is_array($theme_cache[$parent]))
|
{
return;
}
| {
return;
}
|
| Zeile 1253 | Zeile 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&action=edit&tid={$theme['tid']}");
| if($theme['tid'] > 1)
{
$popup->add_item($lang->edit_theme, "index.php?module=style-themes&action=edit&tid={$theme['tid']}");
|
| Zeile 1265 | Zeile 1324 |
|---|
}
if($theme['def'] != 1)
|
}
if($theme['def'] != 1)
|
{
| {
|
$popup->add_item($lang->set_as_default, "index.php?module=style-themes&action=set_default&tid={$theme['tid']}&my_post_key={$mybb->post_code}");
$set_default = "<a href=\"index.php?module=style-themes&action=set_default&tid={$theme['tid']}&my_post_key={$mybb->post_code}\"><img src=\"styles/{$page->style}/images/icons/make_default.png\" alt=\"{$lang->set_as_default}\" style=\"vertical-align: middle;\" title=\"{$lang->set_as_default}\" /></a>";
|
$popup->add_item($lang->set_as_default, "index.php?module=style-themes&action=set_default&tid={$theme['tid']}&my_post_key={$mybb->post_code}");
$set_default = "<a href=\"index.php?module=style-themes&action=set_default&tid={$theme['tid']}&my_post_key={$mybb->post_code}\"><img src=\"styles/{$page->style}/images/icons/make_default.png\" alt=\"{$lang->set_as_default}\" style=\"vertical-align: middle;\" title=\"{$lang->set_as_default}\" /></a>";
|
}
| }
|
else
{
$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&action=force&tid={$theme['tid']}&my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_theme_forced}')");
|
else
{
$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&action=force&tid={$theme['tid']}&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&action=export&tid={$theme['tid']}");
$popup->add_item($lang->duplicate_theme, "index.php?module=style-themes&action=duplicate&tid={$theme['tid']}");
|
}
$popup->add_item($lang->export_theme, "index.php?module=style-themes&action=export&tid={$theme['tid']}");
$popup->add_item($lang->duplicate_theme, "index.php?module=style-themes&action=duplicate&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();
|
|
|
// Fetch & build any child themes
build_theme_list($theme['tid'], ++$depth);
}
}
|
// Fetch & build any child themes
build_theme_list($theme['tid'], ++$depth);
}
}
|
// returns an array which can be sent to generate_select_box()
| /**
* returns an array which can be sent to generate_select_box()
*
* @param int $ignoretid
* @param int $parent
* @param int $depth
*
* @return null|string
*/
|
function build_theme_array($ignoretid = null, $parent=0, $depth=0)
{
global $list;
| function build_theme_array($ignoretid = null, $parent=0, $depth=0)
{
global $list;
|
| Zeile 1309 | Zeile 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 1332 | Zeile 1400 |
|---|
}
}
|
}
}
|
| | /**
* @param array $theme
*
* @return array|bool
*/
|
function fetch_theme_stylesheets($theme)
{
// Fetch list of all of the stylesheets for this theme
| function fetch_theme_stylesheets($theme)
{
// Fetch list of all of the stylesheets for this theme
|
| Zeile 1358 | Zeile 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 1372 | Zeile 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 1388 | Zeile 1461 |
|---|
return $stylesheets;
}
|
return $stylesheets;
}
|
| | /**
* @param string $css
*
* @return string
*/
|
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 1484 | Zeile 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];
|