| 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 30 | Zeile 28 |
|---|
}
$theme = $tree['theme'];
|
}
$theme = $tree['theme'];
|
|
|
// Do we have MyBB 1.2 template's we're importing?
$css_120 = "";
| // Do we have MyBB 1.2 template's we're importing?
$css_120 = "";
|
| Zeile 44 | Zeile 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 90 | Zeile 88 |
|---|
unset($theme['cssbits']);
unset($theme['themebits']);
|
unset($theme['cssbits']);
unset($theme['themebits']);
|
}
| }
|
if(is_array($theme['properties']))
{
foreach($theme['properties'] as $property => $value)
{
if($property == "tag" || $property == "value")
|
if(is_array($theme['properties']))
{
foreach($theme['properties'] as $property => $value)
{
if($property == "tag" || $property == "value")
|
{
| {
|
continue;
|
continue;
|
}
| }
|
if($property == 'colors' || $property == 'disporder')
{
$data = my_unserialize($value['value']);
| if($property == 'colors' || $property == 'disporder')
{
$data = my_unserialize($value['value']);
|
| Zeile 115 | Zeile 113 |
|---|
}
$properties[$property] = $value['value'];
|
}
$properties[$property] = $value['value'];
|
}
| }
|
}
if(empty($mybb->input['name']))
| }
if(empty($mybb->input['name']))
|
| 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)
|
{
// PostgreSQL causes apache to stop sending content sometimes and
// causes the page to stop loading during many queries all at one time
| {
// PostgreSQL causes apache to stop sending content sometimes and
// causes the page to stop loading during many queries all at one time
|
| Zeile 199 | Zeile 201 |
|---|
echo " ";
flush();
}
|
echo " ";
flush();
}
|
|
|
$db->insert_query("templates", $template);
}
|
$db->insert_query("templates", $template);
}
|
|
|
$properties['templateset'] = $sid;
}
| $properties['templateset'] = $sid;
}
|
| Zeile 213 | Zeile 215 |
|---|
if(!isset($options['parent']))
{
$options['parent'] = 0;
|
if(!isset($options['parent']))
{
$options['parent'] = 0;
|
}
| }
|
$theme_id = build_new_theme($name, $properties, $options['parent']);
|
$theme_id = build_new_theme($name, $properties, $options['parent']);
|
}
| }
|
// Overriding an existing - delete refs.
else
{
| // Overriding an existing - delete refs.
else
{
|
| Zeile 232 | Zeile 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}'");
if($db->num_rows($query))
{
$inherited_stylesheets = my_unserialize($db->fetch_field($query, "stylesheets"));
|
// Retrieve a list of inherited stylesheets
$query = $db->simple_select("themes", "stylesheets", "tid = '{$theme_id}'");
if($db->num_rows($query))
{
$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;
|
| Zeile 334 | Zeile 338 |
|---|
}
update_theme_stylesheet_list($theme_id);
|
}
update_theme_stylesheet_list($theme_id);
|
|
|
// And done?
return $theme_id;
}
| // And done?
return $theme_id;
}
|
| Zeile 354 | Zeile 358 |
|---|
{
$find[] = "{{$variable}}";
$replace[] = $variables[$variable];
|
{
$find[] = "{{$variable}}";
$replace[] = $variables[$variable];
|
}
| }
|
return str_replace($find, $replace, $string);
}
|
return str_replace($find, $replace, $string);
}
|
|
|
/**
* Caches a stylesheet to the file system.
*
| /**
* Caches a stylesheet to the file system.
*
|
| Zeile 374 | Zeile 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 592 | Zeile 601 |
|---|
foreach($parent_stylesheets as $location => $value)
{
if($location == "inherited")
|
foreach($parent_stylesheets as $location => $value)
{
if($location == "inherited")
|
{
| {
|
continue;
}
| continue;
}
|
| Zeile 614 | Zeile 623 |
|---|
}
}
}
|
}
}
}
|
}
| }
|
if(!$inherited_properties)
{
$theme_vars = array(
| if(!$inherited_properties)
{
$theme_vars = array(
|
| Zeile 623 | 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))
{
| $updated_theme = array();
if(!empty($stylesheets))
{
|
| Zeile 788 | 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 984 | 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 1008 | Zeile 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 1044 | Zeile 1055 |
|---|
{
$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(
"stylesheets" => $db->escape_string(my_serialize($theme_stylesheets))
);
|
// Now we have our list of built stylesheets, save them
$updated_theme = array(
"stylesheets" => $db->escape_string(my_serialize($theme_stylesheets))
);
|
|
|
// 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 1066 | Zeile 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)
{
if(!isset($properties['disporder'][$stylesheet['name']]))
|
$max_disporder = 0;
foreach($stylesheets as $stylesheet)
{
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))
{
$loop = $max_disporder + 1;
| if(!empty($orphaned_stylesheets))
{
$loop = $max_disporder + 1;
|
| Zeile 1145 | Zeile 1156 |
|---|
}
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[$tid]);
|
reset($themes_by_parent);
reset($themes_by_parent[$tid]);
|
|
|
$themes = array();
|
$themes = array();
|
|
|
foreach($themes_by_parent[$tid] as $key => $theme)
{
$themes[] = $theme['tid'];
| foreach($themes_by_parent[$tid] as $key => $theme)
{
$themes[] = $theme['tid'];
|
| Zeile 1162 | Zeile 1173 |
|---|
if(is_array($parents))
{
$themes = array_merge($themes, $parents);
|
if(is_array($parents))
{
$themes = array_merge($themes, $parents);
|
}
}
| }
}
|
return $themes;
}
| return $themes;
}
|
| Zeile 1211 | Zeile 1222 |
|---|
}
return $themes;
|
}
return $themes;
|
}
| }
|
/**
* @return array
*/
| /**
* @return array
*/
|
| Zeile 1225 | 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 1232 | Zeile 1244 |
|---|
if($theme['def'] == 1)
{
$theme_cache['default'] = $theme['tid'];
|
if($theme['def'] == 1)
{
$theme_cache['default'] = $theme['tid'];
|
}
}
}
| }
}
}
|
// Do we have no themes assigned as default?
if(empty($theme_cache['default']))
{
| // Do we have no themes assigned as default?
if(empty($theme_cache['default']))
{
|
| Zeile 1267 | 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'];
}
else
{
$themes[$user_themes['style']]['users'] = (int)$user_themes['users'];
|
{
$themes[$user_themes['style']]['users'] += (int)$user_themes['users'];
}
else
{
$themes[$user_themes['style']]['users'] = (int)$user_themes['users'];
|
}
}
// Restrucure the theme array to something we can "loop-de-loop" with
foreach($themes as $key => $theme)
{
if($key == "default")
{
continue;
}
| }
}
// Restrucure the theme array to something we can "loop-de-loop" with
foreach($themes as $key => $theme)
{
if($key == "default")
{
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 1299 | 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 1308 | Zeile 1321 |
|---|
if($theme_cache['num_themes'] > 2)
{
$popup->add_item($lang->delete_theme, "index.php?module=style-themes&action=delete&tid={$theme['tid']}&my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_theme_deletion}')");
|
if($theme_cache['num_themes'] > 2)
{
$popup->add_item($lang->delete_theme, "index.php?module=style-themes&action=delete&tid={$theme['tid']}&my_post_key={$mybb->post_code}", "return AdminCP.deleteConfirmation(this, '{$lang->confirm_theme_deletion}')");
|
}
| }
|
if($theme['def'] != 1)
{
|
if($theme['def'] != 1)
{
|
| Zeile 1320 | Zeile 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&action=force&tid={$theme['tid']}&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&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();
|
| Zeile 1356 | Zeile 1370 |
|---|
if($key == "default")
{
continue;
|
if($key == "default")
{
continue;
|
}
| }
|
$theme_cache[$theme['pid']][$theme['tid']] = $theme;
|
$theme_cache[$theme['pid']][$theme['tid']] = $theme;
|
}
| }
|
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;
|
}
| }
|
foreach($theme_cache[$parent] as $theme)
{
|
foreach($theme_cache[$parent] as $theme)
{
|
| Zeile 1381 | Zeile 1395 |
|---|
}
if(!$parent)
|
}
if(!$parent)
|
{
| {
|
return $list;
}
}
| return $list;
}
}
|
| Zeile 1417 | 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 1431 | 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 1454 | Zeile 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 1548 | 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];
|