| Zeile 149 | Zeile 149 |
|---|
{
if($options['templateset'])
{
|
{
if($options['templateset'])
{
|
$sid = $options['templateset'];
| $sid = (int)$options['templateset'];
|
}
else
{
| }
else
{
|
| Zeile 220 | Zeile 220 |
|---|
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'];
}
|
| Zeile 262 | Zeile 262 |
|---|
$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']))
|
if(empty($stylesheet['attributes']['lastmodified']))
|
{
| {
|
$stylesheet['attributes']['lastmodified'] = TIME_NOW;
|
$stylesheet['attributes']['lastmodified'] = TIME_NOW;
|
}
| }
|
if(empty($stylesheet['attributes']['disporder']))
{
$stylesheet['attributes']['disporder'] = $loop;
|
if(empty($stylesheet['attributes']['disporder']))
{
$stylesheet['attributes']['disporder'] = $loop;
|
}
| }
|
if(empty($stylesheet['attributes']['attachedto']))
{
|
if(empty($stylesheet['attributes']['attachedto']))
{
|
| Zeile 304 | Zeile 306 |
|---|
if(!$attachedto)
{
$attachedto = "global";
|
if(!$attachedto)
{
$attachedto = "global";
|
}
| }
|
// private.php?compose,folders|usercp.php,global|global
$attachedto = explode("|", $attachedto);
|
// private.php?compose,folders|usercp.php,global|global
$attachedto = explode("|", $attachedto);
|
| Zeile 327 | Zeile 329 |
|---|
}
// 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}'");
}
update_theme_stylesheet_list($theme_id);
| update_theme_stylesheet_list($theme_id);
|
// And done?
return $theme_id;
|
// And done?
return $theme_id;
|
| Zeile 388 | Zeile 373 |
|---|
{
global $mybb;
|
{
global $mybb;
|
$filename = str_replace('/', '', $filename);
| $filename = basename($filename);
|
$tid = (int) $tid;
$theme_directory = "cache/themes/theme{$tid}";
|
$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 420 | Zeile 410 |
|---|
"theme" => $theme_directory
);
$stylesheet = parse_theme_variables($stylesheet, $theme_vars);
|
"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)
|
$fp = @fopen(MYBB_ROOT . "{$theme_directory}/{$filename}", "wb");
if(!$fp)
|
| Zeile 441 | Zeile 431 |
|---|
@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 472 | Zeile 443 |
|---|
*
* @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 458 |
|---|
return $stylesheet;
}
|
return $stylesheet;
}
|
| | /**
* @param array $stylesheet
*
* @return bool
*/
|
function resync_stylesheet($stylesheet)
{
global $db;
// Try and fix any missing cache file names
if(!$stylesheet['cachefile'] && $stylesheet['name'])
|
function resync_stylesheet($stylesheet)
{
global $db;
// Try and fix any missing cache file names
if(!$stylesheet['cachefile'] && $stylesheet['name'])
|
{
| {
|
$stylesheet['cachefile'] = $stylesheet['name'];
$db->update_query("themestylesheets", array('cachefile' => $db->escape_string($stylesheet['name'])), "sid='{$stylesheet['sid']}'");
}
| $stylesheet['cachefile'] = $stylesheet['name'];
$db->update_query("themestylesheets", array('cachefile' => $db->escape_string($stylesheet['name'])), "sid='{$stylesheet['sid']}'");
}
|
| Zeile 524 | Zeile 500 |
|---|
return false;
}
|
return false;
}
|
| | /**
* @deprecated
* @param string $url
*
* @return string
*/
|
function fix_css_urls($url)
|
function fix_css_urls($url)
|
{
| {
|
if(!preg_match("#^([a-z0-9]+\:|/)#i", $url) && strpos($url, "../../../") === false)
|
if(!preg_match("#^([a-z0-9]+\:|/)#i", $url) && strpos($url, "../../../") === false)
|
{
| {
|
return "url(../../../{$url})";
|
return "url(../../../{$url})";
|
}
| }
|
else
{
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 567 |
|---|
{
$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 632 | Zeile 630 |
|---|
);
$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 705 | Zeile 705 |
|---|
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 747 |
|---|
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'])
|
| Zeile 755 | Zeile 767 |
|---|
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 899 | Zeile 917 |
|---|
return $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 914 | Zeile 938 |
|---|
$new_stylesheet[$db->escape_string($key)] = $db->escape_string($value);
}
}
|
$new_stylesheet[$db->escape_string($key)] = $db->escape_string($value);
}
}
|
|
|
$sid = $db->insert_query("themestylesheets", $new_stylesheet);
return $sid;
}
|
$sid = $db->insert_query("themestylesheets", $new_stylesheet);
return $sid;
}
|
| | /**
* @param int $tid
* @param bool|array $theme
* @param bool $update_disporders
*
* @return bool
*/
|
function update_theme_stylesheet_list($tid, $theme = false, $update_disporders = true)
{
|
function update_theme_stylesheet_list($tid, $theme = false, $update_disporders = true)
{
|
global $db, $cache;
| global $mybb, $db, $cache, $plugins;
|
$stylesheets = array();
|
$stylesheets = array();
|
| Zeile 983 | Zeile 1014 |
|---|
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 1015 | Zeile 1051 |
|---|
{
$theme_stylesheets['inherited']["{$attached_file}_{$action}"][$css_url] = $stylesheet['inherited'];
}
|
{
$theme_stylesheets['inherited']["{$attached_file}_{$action}"][$css_url] = $stylesheet['inherited'];
}
|
}
}
| }
}
|
}
|
}
|
|
|
// 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
if($update_disporders)
{
| // Do we have a theme present? If so, update the stylesheet display orders
if($update_disporders)
{
|
| Zeile 1031 | Zeile 1067 |
|---|
{
$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 1048 | Zeile 1084 |
|---|
if(!isset($properties['disporder'][$stylesheet['name']]))
{
$orphaned_stylesheets[] = $stylesheet['name'];
|
if(!isset($properties['disporder'][$stylesheet['name']]))
{
$orphaned_stylesheets[] = $stylesheet['name'];
|
continue;
| continue;
|
}
if($properties['disporder'][$stylesheet['name']] > $max_disporder)
| }
if($properties['disporder'][$stylesheet['name']] > $max_disporder)
|
| Zeile 1064 | Zeile 1100 |
|---|
$loop = $max_disporder + 1;
$max_disporder = $loop;
foreach($orphaned_stylesheets as $stylesheet)
|
$loop = $max_disporder + 1;
$max_disporder = $loop;
foreach($orphaned_stylesheets as $stylesheet)
|
{
| {
|
$orders[$stylesheet] = $loop;
++$loop;
}
| $orders[$stylesheet] = $loop;
++$loop;
}
|
| Zeile 1072 | Zeile 1108 |
|---|
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)
{
| {
foreach($child_list as $id)
{
|
| Zeile 1091 | Zeile 1127 |
|---|
return true;
}
|
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 1111 | Zeile 1152 |
|---|
}
if(!isset($themes_by_parent[$tid]) || !is_array($themes_by_parent[$tid]))
|
}
if(!isset($themes_by_parent[$tid]) || !is_array($themes_by_parent[$tid]))
|
{
return false;
}
| {
return false;
}
|
reset($themes_by_parent);
|
reset($themes_by_parent);
|
reset($themes_by_parent[$tid]);
$themes = array();
| reset($themes_by_parent[$tid]);
$themes = array();
|
foreach($themes_by_parent[$tid] as $key => $theme)
{
|
foreach($themes_by_parent[$tid] as $key => $theme)
{
|
| Zeile 1128 | Zeile 1169 |
|---|
if(is_array($parents))
{
$themes = array_merge($themes, $parents);
|
if(is_array($parents))
{
$themes = array_merge($themes, $parents);
|
}
}
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 1166 | Zeile 1212 |
|---|
$children = make_child_theme_list($theme['tid']);
if(is_array($children))
|
$children = make_child_theme_list($theme['tid']);
if(is_array($children))
|
{
| {
|
$themes = array_merge($themes, $children);
}
}
|
$themes = array_merge($themes, $children);
}
}
|
|
|
return $themes;
}
|
return $themes;
}
|
| | /**
* @return array
*/
|
function cache_themes()
{
global $db, $theme_cache;
| function cache_themes()
{
global $db, $theme_cache;
|
| Zeile 1203 | Zeile 1252 |
|---|
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 1217 | Zeile 1270 |
|---|
while($user_themes = $db->fetch_array($query))
{
if($user_themes['style'] == 0)
|
while($user_themes = $db->fetch_array($query))
{
if($user_themes['style'] == 0)
|
{
| {
|
$user_themes['style'] = $themes['default'];
}
| $user_themes['style'] = $themes['default'];
}
|
| Zeile 1246 | Zeile 1299 |
|---|
}
if(!is_array($theme_cache[$parent]))
|
}
if(!is_array($theme_cache[$parent]))
|
{
return;
}
foreach($theme_cache[$parent] as $theme)
{
| {
return;
}
foreach($theme_cache[$parent] as $theme)
{
|
$popup = new PopupMenu("theme_{$theme['tid']}", $lang->options);
if($theme['tid'] > 1)
{
| $popup = new PopupMenu("theme_{$theme['tid']}", $lang->options);
if($theme['tid'] > 1)
{
|
| Zeile 1284 | Zeile 1337 |
|---|
// 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 1332 | Zeile 1393 |
|---|
}
}
|
}
}
|
| | /**
* @param array $theme
*
* @return array|bool
*/
|
function fetch_theme_stylesheets($theme)
{
// Fetch list of all of the stylesheets for this theme
$file_stylesheets = my_unserialize($theme['stylesheets']);
if(!is_array($file_stylesheets))
|
function fetch_theme_stylesheets($theme)
{
// Fetch list of all of the stylesheets for this theme
$file_stylesheets = my_unserialize($theme['stylesheets']);
if(!is_array($file_stylesheets))
|
{
| {
|
return false;
}
| return false;
}
|
| Zeile 1388 | Zeile 1454 |
|---|
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);
|