makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 20:08:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- make required_template/required_theme/required_imageset in style.cfg work as intended

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7208 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2007-03-19 11:56:03 +00:00
parent 3aa765f980
commit 2ed600a60d
1 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
phpBB/includes/acp/acp_styles.php
View file

@ -1760,9 +1760,9 @@ parse_css_file = {PARSE_CSS_FILE}
{ {
$style_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['style_name'], $style_row['style_copyright'], $config['version']), $this->style_cfg); $style_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['style_name'], $style_row['style_copyright'], $config['version']), $this->style_cfg);
$style_cfg .= (!$inc_template) ? "\ntemplate = {$style_row['template_name']}" : ''; $style_cfg .= (!$inc_template) ? "\nrequired_template = {$style_row['template_name']}" : '';
$style_cfg .= (!$inc_theme) ? "\ntheme = {$style_row['theme_name']}" : ''; $style_cfg .= (!$inc_theme) ? "\nrequired_theme = {$style_row['theme_name']}" : '';
$style_cfg .= (!$inc_imageset) ? "\nimageset = {$style_row['imageset_name']}" : ''; $style_cfg .= (!$inc_imageset) ? "\nrequired_imageset = {$style_row['imageset_name']}" : '';
$data[] = array( $data[] = array(
'src' => $style_cfg, 'src' => $style_cfg,
@ -2522,9 +2522,9 @@ parse_css_file = {PARSE_CSS_FILE}
'style_copyright' => $installcfg['copyright'] 'style_copyright' => $installcfg['copyright']
); );
$reqd_template = (isset($installcfg['required_template'])) ? $installcfg['required_template'] : ''; $reqd_template = (isset($installcfg['required_template'])) ? $installcfg['required_template'] : false;
$reqd_theme = (isset($installcfg['required_theme'])) ? $installcfg['required_theme'] : ''; $reqd_theme = (isset($installcfg['required_theme'])) ? $installcfg['required_theme'] : false;
$reqd_imageset = (isset($installcfg['required_imageset'])) ? $installcfg['required_imageset'] : ''; $reqd_imageset = (isset($installcfg['required_imageset'])) ? $installcfg['required_imageset'] : false;
// Check to see if each element is already installed, if it is grab the id // Check to see if each element is already installed, if it is grab the id
foreach ($element_ary as $element => $table) foreach ($element_ary as $element => $table)
@ -2535,7 +2535,12 @@ parse_css_file = {PARSE_CSS_FILE}
$element . '_copyright' => '') $element . '_copyright' => '')
); );
$this->test_installed($element, $error, $root_path, ${'reqd_' . $element}, $style_row[$element . '_id'], $style_row[$element . '_name'], $style_row[$element . '_copyright']); $this->test_installed($element, $error, (${'reqd_' . $element}) ? $phpbb_root_path . 'styles/' . $reqd_template . '/' : $root_path, ${'reqd_' . $element}, $style_row[$element . '_id'], $style_row[$element . '_name'], $style_row[$element . '_copyright']);
if (!$style_row[$element . '_name'])
{
$style_row[$element . '_name'] = $reqd_template;
}
} }
break; break;
@ -2567,7 +2572,12 @@ parse_css_file = {PARSE_CSS_FILE}
{ {
if ($mode == 'style') if ($mode == 'style')
{ {
$this->install_style($error, 'install', $root_path, $style_row['style_id'], $style_row['style_name'], $install_path, $style_row['style_copyright'], $style_row['style_active'], $style_row['style_default'], $style_row); foreach ($element_ary as $element => $table)
{
${$element . '_root_path'} = (${'reqd_' . $element}) ? $phpbb_root_path . 'styles/' . ${'reqd_' . $element} . '/' : false;
${$element . '_path'} = (${'reqd_' . $element}) ? ${'reqd_' . $element} : false;
}
$this->install_style($error, 'install', $root_path, $style_row['style_id'], $style_row['style_name'], $install_path, $style_row['style_copyright'], $style_row['style_active'], $style_row['style_default'], $style_row, $template_root_path, $template_path, $theme_root_path, $theme_path, $imageset_root_path, $imageset_path);
} }
else else
{ {
@ -2770,6 +2780,21 @@ parse_css_file = {PARSE_CSS_FILE}
} }
/** /**
$reqd_template = (isset($installcfg['required_template'])) ? $installcfg['required_template'] : false;
$reqd_theme = (isset($installcfg['required_theme'])) ? $installcfg['required_theme'] : false;
$reqd_imageset = (isset($installcfg['required_imageset'])) ? $installcfg['required_imageset'] : false;
// Check to see if each element is already installed, if it is grab the id
foreach ($element_ary as $element => $table)
{
$style_row = array_merge($style_row, array(
$element . '_id' => 0,
$element . '_name' => '',
$element . '_copyright' => '')
);
$this->test_installed($element, $error, $root_path, ${'reqd_' . $element}, $style_row[$element . '_id'], $style_row[$element . '_name'], $style_row[$element . '_copyright']);
* Is this element installed? If not, grab its cfg details * Is this element installed? If not, grab its cfg details
*/ */
function test_installed($element, &$error, $root_path, $reqd_name, &$id, &$name, &$copyright) function test_installed($element, &$error, $root_path, $reqd_name, &$id, &$name, &$copyright)
@ -2827,7 +2852,7 @@ parse_css_file = {PARSE_CSS_FILE}
/** /**
* Install/Add style * Install/Add style
*/ */
function install_style(&$error, $action, $root_path, &$id, $name, $path, $copyright, $active, $default, &$style_row) function install_style(&$error, $action, $root_path, &$id, $name, $path, $copyright, $active, $default, &$style_row, $template_root_path = false, $template_path = false, $theme_root_path = false, $theme_path = false, $imageset_root_path = false, $imageset_path = false)
{ {
global $config, $db, $user; global $config, $db, $user;
@ -2873,7 +2898,7 @@ parse_css_file = {PARSE_CSS_FILE}
// and do the install if necessary // and do the install if necessary
if (!$style_row[$element . '_id']) if (!$style_row[$element . '_id'])
{ {
$this->install_element($element, $error, $action, $root_path, $style_row[$element . '_id'], $style_row[$element . '_name'], $path, $style_row[$element . '_copyright']); $this->install_element($element, $error, $action, (${$element . '_root_path'}) ? ${$element . '_root_path'} : $root_path, $style_row[$element . '_id'], $style_row[$element . '_name'], (${$element . '_path'}) ? ${$element . '_path'} : $path, $style_row[$element . '_copyright']);
} }
} }