makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Most style operations functional ... broke various theme, imageset and template operations in the process

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4358 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-08-09 22:04:28 +00:00
parent e9c616f732
commit baa01d15f2
2 changed files with 475 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

522
phpBB/adm/admin_styles.php
View file

@ -13,9 +13,8 @@
// TODO // TODO
// BBCode support -> M-3 // BBCode support -> M-3
// Previews of templates, imagesets, themes ... unified -> M-3
// Add custom theme classes // Add custom theme classes
// Allow import/upload/install of styles with partial style elements
// Previews of templates, imagesets, themes ... unified
// Security review // Security review
if (!empty($setmodules)) if (!empty($setmodules))
@ -69,12 +68,12 @@ else
} }
// Set some basic vars // Set some basic vars
$error = array(); $error = $cfg = $stylecfg = array();
$archive_types = $archive_preg = $tmp_path = '';
$safe_mode = (@ini_get('safe_mode') && @strtolower(ini_get('safe_mode')) == 'on') ? true : false; $safe_mode = (@ini_get('safe_mode') && @strtolower(ini_get('safe_mode')) == 'on') ? true : false;
// Generate list of archive types inc. regexp | match // Generate list of archive types inc. regexp | match
$archive_types = $archive_preg = '';
foreach (array('zip' => 'zlib', 'tar' => '', 'tar.gz' => 'zlib', 'tar.bz2' => 'bz2') as $type => $module) foreach (array('zip' => 'zlib', 'tar' => '', 'tar.gz' => 'zlib', 'tar.bz2' => 'bz2') as $type => $module)
{ {
if ($module && !@extension_loaded($module)) if ($module && !@extension_loaded($module))
@ -115,6 +114,82 @@ switch ($mode)
break; break;
case 'delete': case 'delete':
if ($style_id)
{
$new_style_id = (!empty($_POST['newid'])) ? intval($_POST['newid']) : false;
$sql = 'SELECT style_name
FROM ' . STYLES_TABLE . "
WHERE style_id = $style_id";
$result = $db->sql_query($sql);
if (!extract($db->sql_fetchrow($result)))
{
trigger_error($user->lang['NO_STYLE']);
}
// Get list of other styles
$sql = 'SELECT style_id, style_name
FROM ' . STYLES_TABLE . "
WHERE style_id <> $style_id
ORDER BY style_id";
$result = $db->sql_query($sql);
$options = '';
if (!($row = $db->sql_fetchrow($result)))
{
trigger_error($user->lang['ONLY_STYLE']);
}
do
{
$options .= '<option value="' . $row['style_id'] . '">' . $row['style_name'] . '</option>';
}
while ($row = $db->sql_fetchrow($result));
if ($update && $new_style_id)
{
$sql = 'DELETE FROM ' . STYLES_TABLE . "
WHERE style_id = $style_id";
$db->sql_query($sql);
$sql = 'UPDATE ' . STYLES_TABLE . "
SET style_id = $new_style_id
WHERE style_id = $style_id";
$db->sql_query($sql);
add_log('admin', 'LOG_DELETE_STYLE', $style_name);
trigger_error($user->lang['STYLE_DELETED']);
}
// Output list of themes
adm_page_header($user->lang['DELETE_STYLE']);
?>
<h1><?php echo $user->lang['DELETE_STYLE']; ?></h1>
<p><?php echo $user->lang['DELETE_STYLE_EXPLAIN']; ?></p>
<form name="style" method="post" action="<?php echo "admin_styles.$phpEx$SID&amp;mode=$mode&amp;action=$action&amp;id=$id"; ?>"><table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
<tr>
<th colspan="2"><?php echo $user->lang['DELETE_STYLE']; ?></td>
</tr>
<tr>
<td class="row1" width="40%"><b><?php echo $user->lang['STYLE_NAME']; ?>:</b></td>
<td class="row2"><b><?php echo $style_name; ?></b></td>
</tr>
<tr>
<td class="row1" width="40%"><b><?php echo $user->lang['REPLACE_STYLE']; ?>:</b><br /><span class="gensmall"><?php echo $user->lang['REPLACE_STYLE_EXPLAIN']; ?></span></td>
<td class="row2"><select name="newid"><?php echo $options; ?></select></td>
</tr>
<tr>
<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="update" value="<?php echo $user->lang['DELETE']; ?>"; />&nbsp;&nbsp;<input class="btnlite" type="submit" name="cancel" value="<?php echo $user->lang['CANCEL']; ?>"; /></td>
</tr>
</table></form>
<?php
adm_page_footer();
}
break; break;
case 'export': case 'export':
@ -148,7 +223,7 @@ switch ($mode)
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$var_ary = array('style_id', 'style_name', 'style_copyright', 'template_id', 'template_name', 'template_path', 'template_copyright', 'template_storedb', 'bbcode_bitfield', 'theme_id', 'theme_name', 'theme_path', 'theme_copyright', 'theme_storedb', 'theme_data', 'imageset_id', 'imageset_name', 'imageset_path', 'imageset_copyright'); $var_ary = array('style_id', 'style_name', 'style_copyright', 'template_id', 'template_name', 'template_path', 'template_copyright', 'template_storedb', 'bbcode_bitfield', 'theme_id', 'theme_name', 'theme_path', 'theme_copyright', 'theme_storedb', 'theme_mtime', 'theme_data', 'imageset_id', 'imageset_name', 'imageset_path', 'imageset_copyright');
foreach ($var_ary as $var) foreach ($var_ary as $var)
{ {
$$var = (!empty($style_row[$var])) ? $style_row[$var] : ''; $$var = (!empty($style_row[$var])) ? $style_row[$var] : '';
@ -170,6 +245,7 @@ switch ($mode)
); );
unset($style_cfg); unset($style_cfg);
// Export template core code
if ($inc_template) if ($inc_template)
{ {
$template_cfg = addslashes($template_name) . "\n"; $template_cfg = addslashes($template_name) . "\n";
@ -210,6 +286,8 @@ switch ($mode)
} }
unset($template_cfg); unset($template_cfg);
} }
// Export theme core code
if ($inc_theme) if ($inc_theme)
{ {
$theme_cfg = addslashes($theme_name) . "\n"; $theme_cfg = addslashes($theme_name) . "\n";
@ -238,6 +316,8 @@ switch ($mode)
unset($theme_data); unset($theme_data);
unset($theme_cfg); unset($theme_cfg);
} }
// Export imageset core code
if ($inc_imageset) if ($inc_imageset)
{ {
$imageset_cfg = addslashes($imageset_name) . "\n"; $imageset_cfg = addslashes($imageset_name) . "\n";
@ -364,27 +444,89 @@ switch ($mode)
case 'add': case 'add':
case 'edit': case 'edit':
case 'install': case 'install':
$style_path = (!empty($_REQUEST['name'])) ? htmlspecialchars($_REQUEST['name']) : ''; $style_path = (!empty($_REQUEST['path'])) ? htmlspecialchars($_REQUEST['path']) : '';
$root_path = '';
$element_ary = array('template' => STYLES_TPL_TABLE, 'theme' => STYLES_CSS_TABLE, 'imageset' => STYLES_IMAGE_TABLE); $element_ary = array('template' => STYLES_TPL_TABLE, 'theme' => STYLES_CSS_TABLE, 'imageset' => STYLES_IMAGE_TABLE);
$phpbbversion = preg_replace('#^2\.([0-9]+?)\.([0-9]+?).*?$#', '\1.\2', $config['version']);
// Process parameters ... if we're installing and a style path is set
// we'll grab the relevant data from the cfg file // Importing/uploading then check data and extract archive
if ($action == 'install' && $style_path) if (!empty($_FILES['upload_file']['name']) || !empty($_POST['import_file']))
{ {
if (!($cfg = @file("{$phpbb_root_path}styles/$style_path/style.cfg"))) if (!empty($_FILES['upload_file']['name']))
{ {
trigger_error($user->lang['NO_STYLE']); $realname = htmlspecialchars($_FILES['upload_file']['name']);
$filename = htmlspecialchars($_FILES['upload_file']['tmp_name']);
if (!is_uploaded_file($filename))
{
trigger_error("$filename was not uploaded");
}
}
else
{
$realname = htmlspecialchars($_POST['import_file']);
$filename = "{$phpbb_root_path}store/$realname";
} }
$style_name = trim($cfg[0]); if (!preg_match('#(' . $archive_preg . ')$#i', $realname, $match))
$style_copyright = trim($cfg[1]); {
$style_version = preg_replace('#^2\.([0-9]+?)\.([0-9]+?).*?$#', '\1.\2', trim($cfg[2])); $error[] = sprintf($user->lang['UPLOAD_WRONG_TYPE'], $archive_types);
$reqd_template = trim($cfg[3]); }
$reqd_theme = trim($cfg[4]); $path = preg_replace('#^(.*?)' . preg_quote($match[0]) . '$#', '\1', $realname);
$reqd_imageset = trim($cfg[5]);
$phpbbversion = preg_replace('#^2\.([0-9]+?)\.([0-9]+?).*?$#', '\1.\2', $config['version']); // Attempt to extract the files to a temporary directory in store
$tmp_path = $phpbb_root_path . 'store/tmp_' . substr(uniqid(''), 0, 10) . '/';
if (!@mkdir($tmp_path))
{
trigger_error("Cannot create $tmp_path", E_USER_ERROR);
}
include($phpbb_root_path . 'includes/functions_compress.'.$phpEx);
switch ($match[0])
{
case '.zip':
$zip = new compress_zip('r', $filename);
break;
default:
$zip = new compress_tar('r', $filename, $match[0]);
}
$zip->extract($tmp_path);
$zip->close();
unset($cfg);
}
// Installing, importing/uploading then obtain the style cfg information
if (($action == 'install' && $style_path) || (!empty($_FILES['upload_file']['name']) || !empty($_POST['import_file'])))
{
$root_path = ($action == 'install') ? "{$phpbb_root_path}styles/$style_path/" : "$tmp_path";
if (!($fp = @fopen("{$root_path}style.cfg", 'rb')))
{
$error[] = $user->lang['STYLE_ERR_NOT_STYLE'];
}
else
{
$stylecfg = explode("\n", fread($fp, filesize("{$root_path}style.cfg")));
}
fclose($fp);
}
// Installing, importing/uploading then grab the element info else grab the
// submitted params
if (sizeof($stylecfg))
{
$style_name = trim($stylecfg[0]);
$style_copyright = trim($stylecfg[1]);
$style_version = preg_replace('#^2\.([0-9]+?)\.([0-9]+?).*?$#', '\1.\2', trim($stylecfg[2]));
$reqd_template = trim($stylecfg[3]);
$reqd_theme = trim($stylecfg[4]);
$reqd_imageset = trim($stylecfg[5]);
foreach ($element_ary as $element => $table) foreach ($element_ary as $element => $table)
{ {
@ -396,7 +538,7 @@ switch ($mode)
} }
else else
{ {
if (!($cfg = @file("{$phpbb_root_path}styles/$style_path/$element/$element.cfg"))) if (!($cfg = @file("$root_path$element/$element.cfg")))
{ {
$error[] = sprintf($user->lang['REQUIRES_' . $l_element], ${'reqd_' . $element}); $error[] = sprintf($user->lang['REQUIRES_' . $l_element], ${'reqd_' . $element});
} }
@ -426,29 +568,46 @@ switch ($mode)
} }
} }
$s_hidden_fields = '<input type="hidden" name="name" value="' . $style_path . '" />'; $s_hidden_fields = '<input type="hidden" name="path" value="' . $style_path . '" />';
} }
else else
{ {
// NOTE: Data here is stripslashed! Ensure it's escaped when entering the DB // NOTE: Data here is stripslashed! Ensure it's escaped when entering the DB
$style_name = (!empty($_POST['style_name'])) ? stripslashes(htmlspecialchars($_POST['style_name'])) : ''; $style_name = (!empty($_POST['name'])) ? stripslashes(htmlspecialchars($_POST['name'])) : '';
$style_copyright = (!empty($_POST['style_copyright'])) ? stripslashes(htmlspecialchars($_POST['style_copyright'])) : ''; $style_copyright = (!empty($_POST['copyright'])) ? stripslashes(htmlspecialchars($_POST['copyright'])) : '';
$template_id = (!empty($_POST['template_id'])) ? intval($_POST['template_id']) : 0; $template_id = (!empty($_POST['template_id'])) ? intval($_POST['template_id']) : 0;
$theme_id = (!empty($_POST['theme_id'])) ? intval($_POST['theme_id']) : 0; $theme_id = (!empty($_POST['theme_id'])) ? intval($_POST['theme_id']) : 0;
$imageset_id = (!empty($_POST['imageset_id'])) ? intval($_POST['imageset_id']) : 0; $imageset_id = (!empty($_POST['imageset_id'])) ? intval($_POST['imageset_id']) : 0;
$basis = (!empty($_POST['basis'])) ? intval($_POST['basis']) : false; if (!empty($_POST['basis']))
{
$basis = intval($_POST['basis']);
$sql = 'SELECT template_id, theme_id, imageset_id
FROM ' . STYLES_TABLE . "
WHERE style_id = $basis";
$result = $db->sql_query($sql);
if (!extract($db->sql_fetchrow($result)))
{
$error[] = $user->lang['NO_STYLE'];
}
$db->sql_freeresult($result);
}
} }
$style_active = (!empty($_POST['style_active'])) ? ((!$_POST['style_active']) ? 0 : 1) : 1;
$style_default = (!empty($_POST['style_default'])) ? ((!$_POST['style_default']) ? 0 : 1) : 0; // Common params
$style_active = (isset($_POST['style_active'])) ? ((!empty($_POST['style_active'])) ? 1 : 0) : 1;
$style_default = (isset($_POST['style_default'])) ? ((!empty($_POST['style_active'])) ? 1 : 0) : (($config['default_style'] == $style_id) ? 1 : 0);
// User has submitted form ... so let's process it // User has submitted form and no errors have occured
if ($update && !sizeof($error)) if ($update && !sizeof($error))
{ {
if ($action == 'install') // We're installing/uploading/importing
if (sizeof($stylecfg))
{ {
foreach ($element_ary as $element => $table) foreach ($element_ary as $element => $table)
{ {
@ -482,12 +641,21 @@ switch ($mode)
switch ($element) switch ($element)
{ {
case 'template': case 'template':
$template_storedb = (!is_writeable("{$phpbb_root_path}styles/$style_path/template")) ? 1 : 0; $template_path = str_replace(' ', '_', $template_name);
if ($action != 'install')
{
@mkdir("{$phpbb_root_path}styles/$template_path", 0777);
@chmod("{$phpbb_root_path}styles/$template_path", 0777);
copy_files($root_path, filelist("{$root_path}template", '', '*'), "$template_path/template");
}
$template_storedb = (!is_writeable("{$phpbb_root_path}styles/$template_path/template")) ? 1 : 0;
$sql_ary = array( $sql_ary = array(
'template_name' => $template_name, 'template_name' => $template_name,
'template_copyright' => $template_copyright, 'template_copyright' => $template_copyright,
'template_path' => $style_path, 'template_path' => $template_path,
'template_storedb' => $template_storedb 'template_storedb' => $template_storedb
); );
@ -501,7 +669,7 @@ switch ($mode)
if ($template_storedb) if ($template_storedb)
{ {
$filelist = filelist("{$phpbb_root_path}styles/$style_path/template", '', 'html'); $filelist = filelist("{$root_path}template", '', 'html');
store_templates('insert', $template_id, $style_path, $filelist); store_templates('insert', $template_id, $style_path, $filelist);
} }
@ -512,21 +680,30 @@ switch ($mode)
break; break;
case 'theme': case 'theme':
$theme_storedb = 0; $theme_path = str_replace(' ', '_', $theme_name);
if (!is_writeable("{$phpbb_root_path}styles/$style_path/theme/stylesheet.css")) if ($action != 'install')
{ {
$theme_data = implode('', file("{$phpbb_root_path}styles/$style_path/theme/stylesheet.css"));
@mkdir("{$phpbb_root_path}styles/$theme_path", 0777);
@chmod("{$phpbb_root_path}styles/$theme_path", 0777);
copy_files($root_path, filelist("{$root_path}theme", '', '*'), "$theme_path/theme");
}
$theme_storedb = 0;
if (!is_writeable("{$phpbb_root_path}styles/$theme_path/theme/stylesheet.css"))
{
$theme_data = str_replace('./', "styles/$theme_path/theme/", implode('', file("$root_path/theme/stylesheet.css")));
$theme_storedb = 1; $theme_storedb = 1;
} }
$sql_ary = array( $sql_ary = array(
'theme_name' => $theme_name, 'theme_name' => $theme_name,
'theme_copyright' => $theme_copyright, 'theme_copyright' => $theme_copyright,
'theme_path' => $style_path, 'theme_path' => $theme_path,
'theme_storedb' => $theme_storedb, 'theme_storedb' => $theme_storedb,
'theme_data' => ($theme_storedb) ? $theme_data : '', 'theme_data' => ($theme_storedb) ? $theme_data : '',
'theme_mtime' => ($theme_storedb) ? filemtime("{$phpbb_root_path}styles/$style_path/theme/stylesheet.css") : 0 'theme_mtime' => ($theme_storedb) ? filemtime("{$phpbb_root_path}styles/$theme_path/theme/stylesheet.css") : 0
); );
$sql = 'INSERT INTO ' . STYLES_CSS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $sql = 'INSERT INTO ' . STYLES_CSS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
@ -539,20 +716,29 @@ switch ($mode)
break; break;
case 'imageset': case 'imageset':
$imageset_path = str_replace(' ', '_', $imageset_name);
if ($action != 'install')
{
@mkdir("{$phpbb_root_path}styles/$imageset_path", 0777);
@chmod("{$phpbb_root_path}styles/$imageset_path", 0777);
copy_files("{$root_path}imageset", filelist("{$root_path}imageset", '', '*'), "$imageset_path/imageset");
}
$cfg = file("{$phpbb_root_path}styles/$imageset_path/imageset/imageset.cfg");
$sql_img_ary = array(); $sql_img_ary = array();
$cfg = file("{$phpbb_root_path}styles/$style_path/imageset/imageset.cfg");
for ($i = 3; $i < sizeof($cfg); $i++) for ($i = 3; $i < sizeof($cfg); $i++)
{ {
$tmp = explode('||', $cfg[$i]); $tmp = explode('||', $cfg[$i]);
$sql_img_ary[$tmp[0]] = str_replace('{PATH}', "styles/$style_path/imageset/", trim($tmp[1])); $sql_img_ary[$tmp[0]] = str_replace('{PATH}', "styles/$imageset_path/imageset/", trim($tmp[1]));
} }
$sql_ary = array( $sql_ary = array(
'imageset_name' => $imageset_name, 'imageset_name' => $imageset_name,
'imageset_copyright' => $imageset_copyright, 'imageset_copyright' => $imageset_copyright,
'imageset_path' => $style_path, 'imageset_path' => $imageset_path,
); );
$sql_ary += $sql_img_ary; $sql_ary += $sql_img_ary;
@ -567,25 +753,26 @@ switch ($mode)
} }
} }
} }
}
if (!sizeof($error)) if (!sizeof($error))
{ {
if (empty($style_name)) if ($action != 'edit' && empty($style_name))
{ {
$error[] = $user->lang['STYLE_ERR_STYLE_NAME']; $error[] = $user->lang['STYLE_ERR_STYLE_NAME'];
} }
if (strlen($style_name) > 30) if ($action != 'edit' && strlen($style_name) > 30)
{ {
$error[] = $user->lang['STYLE_ERR_NAME_LONG']; $error[] = $user->lang['STYLE_ERR_NAME_LONG'];
} }
if (!preg_match('#^[a-z0-9_\-\+\. ]+$#i', $style_name)) if ($action != 'edit' && !preg_match('#^[a-z0-9_\-\+\. ]+$#i', $style_name))
{ {
$error[] = $user->lang['STYLE_ERR_NAME_CHARS']; $error[] = $user->lang['STYLE_ERR_NAME_CHARS'];
} }
if (strlen($style_copyright) > 60) if ($action != 'edit' && strlen($style_copyright) > 60)
{ {
$error[] = $user->lang['STYLE_ERR_COPY_LONG']; $error[] = $user->lang['STYLE_ERR_COPY_LONG'];
} }
@ -595,32 +782,39 @@ switch ($mode)
$error[] = $user->lang['STYLE_ERR_NO_IDS']; $error[] = $user->lang['STYLE_ERR_NO_IDS'];
} }
$sql_where = ($action == 'add' || $action == 'install') ? "WHERE style_name = '" . $db->sql_escape($style_name) . "'" : "WHERE style_id <> $style_id AND style_name = '" . $db->sql_escape($style_name) . "'"; $sql_where = ($action != 'edit') ? "style_name = '" . $db->sql_escape($style_name) . "'" : "style_id = $style_id";
$sql = 'SELECT style_name $sql = 'SELECT style_name
FROM ' . STYLES_TABLE . " FROM ' . STYLES_TABLE . "
$sql_where"; WHERE $sql_where";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result)) if (extract($db->sql_fetchrow($result)) && $action != 'edit')
{ {
$error[] = $user->lang['STYLE_ERR_NAME_EXIST']; $error[] = $user->lang['STYLE_ERR_NAME_EXIST'];
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
if (!sizeof($error)) if (!sizeof($error))
{ {
$sql_ary = array( $sql_ary = array(
'style_name' => $style_name,
'style_copyright' => $style_copyright,
'template_id' => $template_id, 'template_id' => $template_id,
'theme_id' => $theme_id, 'theme_id' => $theme_id,
'imageset_id' => $imageset_id, 'imageset_id' => $imageset_id,
'style_active' => $style_active,
); );
if ($action != 'edit')
{
$sql_ary += array(
'style_name' => $style_name,
'style_copyright' => $style_copyright,
);
}
$sql = ($action == 'add' || $action == 'install') ? 'INSERT INTO ' . STYLES_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary) : 'UPDATE ' . STYLES_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE style_id = $style_id"; $sql = ($action != 'edit') ? 'INSERT INTO ' . STYLES_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary) : 'UPDATE ' . STYLES_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE style_id = $style_id";
$db->sql_query($sql); $db->sql_query($sql);
if ($action == 'add' || $action == 'install') if ($action != 'edit')
{ {
$style_id = $db->sql_nextid(); $style_id = $db->sql_nextid();
} }
@ -630,14 +824,27 @@ switch ($mode)
set_config('default_style', $style_id); set_config('default_style', $style_id);
} }
$log = ($action == 'add' || $action == 'install') ? 'LOG_ADD_STYLE' : 'LOG_EDIT_STYLE'; if ($tmp_path)
{
cleanup_folder($tmp_path);
}
$log = ($action != 'edit') ? 'LOG_ADD_STYLE' : 'LOG_EDIT_STYLE';
add_log('admin', $log, $style_name); add_log('admin', $log, $style_name);
$message = ($action == 'add' || $action == 'install') ? 'STYLED_ADDED' : 'STYLE_EDITED'; $message = ($action != 'edit') ? 'STYLE_ADDED' : 'STYLE_EDITED';
trigger_error($user->lang[$message]); trigger_error($user->lang[$message]);
} }
} }
} }
// Something went wrong ... so we'll clean up any decompressed
// uploaded/imported archives. It means the user will have to
// reupload but hum ho it's better than leaving old files
// laying around
if ($tmp_path)
{
cleanup_folder($tmp_path);
} }
// Either an error occured or the user has just entered the form // Either an error occured or the user has just entered the form
@ -692,7 +899,7 @@ switch ($mode)
<p><?php echo $user->lang[$l_prefix . '_STYLE_EXPLAIN']; ?></p> <p><?php echo $user->lang[$l_prefix . '_STYLE_EXPLAIN']; ?></p>
<form name="style" method="post" action="<?php echo "admin_styles.$phpEx$SID&amp;mode=$mode&amp;action=$action&amp;id=$style_id"; ?>"><table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center"> <form name="style" method="post" action="<?php echo "admin_styles.$phpEx$SID&amp;mode=$mode&amp;action=$action&amp;id=$style_id"; ?>"<?php echo (!$safe_mode && is_writeable("{$phpbb_root_path}styles")) ? ' enctype="multipart/form-data"' : ''; ?>><table class="bg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center">
<tr> <tr>
<th colspan="2"><?php echo $user->lang[$l_prefix . '_STYLE']; ?></th> <th colspan="2"><?php echo $user->lang[$l_prefix . '_STYLE']; ?></th>
</tr> </tr>
@ -713,7 +920,7 @@ switch ($mode)
<td class="row1"><b><?php echo $user->lang['STYLE_NAME']; ?>:</b></td> <td class="row1"><b><?php echo $user->lang['STYLE_NAME']; ?>:</b></td>
<td class="row2"><?php <td class="row2"><?php
echo ($action == 'add') ? '<input class="post" type="text" name="style_name" maxlength="30" size="30" value="' . $style_name . '" />' : '<b>' . $style_name . '</b>'; echo ($action == 'add') ? '<input class="post" type="text" name="name" maxlength="30" size="30" value="' . $style_name . '" />' : '<b>' . $style_name . '</b>';
?></td> ?></td>
</tr> </tr>
@ -721,7 +928,7 @@ switch ($mode)
<td class="row1"><b><?php echo $user->lang['STYLE_COPYRIGHT']; ?>:</b></td> <td class="row1"><b><?php echo $user->lang['STYLE_COPYRIGHT']; ?>:</b></td>
<td class="row2"><?php <td class="row2"><?php
echo ($action == 'add') ? '<input class="post" type="text" name="style_copyright" maxlength="60" size="30" value="' . $style_copyright . '" />' : '<b>' . $style_copyright . '</b>'; echo ($action == 'add') ? '<input class="post" type="text" name="copyright" maxlength="60" size="30" value="' . $style_copyright . '" />' : '<b>' . $style_copyright . '</b>';
?></td> ?></td>
</tr> </tr>
@ -749,26 +956,10 @@ switch ($mode)
?></td> ?></td>
</tr> </tr>
<tr>
<td class="row1"><b><?php echo $user->lang['STYLE_ACTIVE']; ?>:</b></td>
<td class="row2"><input type="radio" name="style_active" value="1"<?php echo $active_yes; ?> /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="style_active" value="0"<?php echo $active_no; ?> /> <?php echo $user->lang['NO']; ?></td>
</tr>
<?php <?php
if ($style_id != $config['default_style'])
{
?>
<tr>
<td class="row1"><b><?php echo $user->lang['STYLE_DEFAULT']; ?>:</b></td>
<td class="row2"><input type="radio" name="default_style" value="1"<?php echo $style_default_yes; ?> /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="default_style" value="0"<?php echo $style_default_no; ?> /> <?php echo $user->lang['NO']; ?></td>
</tr>
<?php
}
// Import, upload and basis options // Import, upload and basis options
if ($action == 'add' && !$safe_mode && is_writeable("{$phpbb_root_path}styles")) if (($action == 'add' || $action == 'import') && !$safe_mode && is_writeable("{$phpbb_root_path}styles"))
{ {
$store_options = ''; $store_options = '';
$dp = opendir("{$phpbb_root_path}store"); $dp = opendir("{$phpbb_root_path}store");
@ -798,6 +989,28 @@ switch ($mode)
<?php <?php
} }
?>
<tr>
<th colspan="2">&nbsp;</th>
</tr>
<tr>
<td class="row1"><b><?php echo $user->lang['STYLE_ACTIVE']; ?>:</b></td>
<td class="row2"><input type="radio" name="style_active" value="1"<?php echo $active_yes; ?> /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="style_active" value="0"<?php echo $active_no; ?> /> <?php echo $user->lang['NO']; ?></td>
</tr>
<?php
if ($style_id != $config['default_style'])
{
?>
<tr>
<td class="row1"><b><?php echo $user->lang['STYLE_DEFAULT']; ?>:</b></td>
<td class="row2"><input type="radio" name="default_style" value="1"<?php echo $style_default_yes; ?> /> <?php echo $user->lang['YES']; ?> &nbsp; <input type="radio" name="default_style" value="0"<?php echo $style_default_no; ?> /> <?php echo $user->lang['NO']; ?></td>
</tr>
<?php
}
?> ?>
<tr> <tr>
<td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="update" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" /><?php echo $s_hidden_fields; ?></td> <td class="cat" colspan="2" align="center"><input class="btnmain" type="submit" name="update" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" /><?php echo $s_hidden_fields; ?></td>
@ -902,7 +1115,7 @@ switch ($mode)
?> ?>
<tr> <tr>
<td class="row1"><?php echo $cfg['name']; ?></td> <td class="row1"><?php echo $cfg['name']; ?></td>
<td class="row1" colspan="5" align="center"><a href="<?php echo "admin_styles.$phpEx$SID&amp;mode=$mode&amp;action=install&amp;name=" . urlencode($cfg['path']); ?>"><?php echo $user->lang['INSTALL']; ?></a></td> <td class="row1" colspan="5" align="center"><a href="<?php echo "admin_styles.$phpEx$SID&amp;mode=$mode&amp;action=install&amp;path=" . urlencode($cfg['path']); ?>"><?php echo $user->lang['INSTALL']; ?></a></td>
</tr> </tr>
<?php <?php
@ -922,7 +1135,7 @@ switch ($mode)
?> ?>
<tr> <tr>
<td class="cat" colspan="6" align="right"><?php echo $user->lang['CREATE_STYLE']; ?>: <input class="post" type="text" name="style_name" value="" maxlength="30" size="25" /> <?php echo $user->lang['FROM']; ?> <select name="basis"><?php echo $basis_options; ?></select> <input class="btnmain" type="submit" name="add" value="<?php echo $user->lang['SUBMIT']; ?>" /></td> <td class="cat" colspan="6" align="right"><?php echo $user->lang['CREATE_STYLE']; ?>: <input class="post" type="text" name="name" value="" maxlength="30" size="25" /> <?php echo $user->lang['FROM']; ?> <select name="basis"><?php echo '<option class="sep" value="">' . $user->lang['OPTIONAL_BASIS'] . '</option>' . $basis_options; ?></select> <input class="btnmain" type="submit" name="add" value="<?php echo $user->lang['SUBMIT']; ?>" /></td>
</tr> </tr>
</table></form> </table></form>
<?php <?php
@ -1258,6 +1471,8 @@ switch ($mode)
case 'export': case 'export':
if ($template_id) if ($template_id)
{ {
$files = $data = array();
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_TPL_TABLE . " FROM ' . STYLES_TPL_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $template_id";
@ -1269,20 +1484,35 @@ switch ($mode)
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
if ($update)
{
$cfg = addslashes($template_name) . "\n"; $cfg = addslashes($template_name) . "\n";
$cfg .= addslashes($template_copyright) . "\n"; $cfg .= addslashes($template_copyright) . "\n";
$cfg .= addslashes($config['version']) . "\n"; $cfg .= addslashes($config['version']) . "\n";
$cfg .= addslashes($bbcode_bitfield) . "\n"; $cfg .= addslashes($bbcode_bitfield);
if ($template_storedb) if ($template_storedb)
{ {
// TODO $sql = 'SELECT template_filename, template_data
// eek FROM ' . STYLES_TPLDATA_TABLE . "
WHERE template_id = $template_id";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$data[] = array(
'src' => $row['template_data'],
'prefix' => 'template/' . $row['template_filename']
);
}
$db->sql_freeresult($result);
} }
else else
{ {
$files = array(array('src' => "styles/$template_path/template/", 'prefix-' => "styles/$template_path/", 'prefix+' => false, 'exclude' => 'template.cfg')); $files = array(array('src' => "styles/$template_path/template/", 'prefix-' => "styles/$template_path/", 'prefix+' => false, 'exclude' => 'template.cfg'));
$data = array(array('src' => trim($cfg), 'prefix' => 'template/template.cfg')); }
$data[] = array('src' => trim($cfg), 'prefix' => 'template/template.cfg');
} }
export('template', $template_id, $template_name, $template_path, $files, $data); export('template', $template_id, $template_name, $template_path, $files, $data);
@ -1562,12 +1792,11 @@ function viewsource(url)
// Where is the template stored? // Where is the template stored?
if (!$template_storedb && is_writeable("{$phpbb_root_path}styles/$template_path/template/$tplname")) if (!$template_storedb && is_writeable("{$phpbb_root_path}styles/$template_path/template/$tplname"))
{ {
// Grab template data
if (!($fp = fopen("{$phpbb_root_path}styles/$template_path/template/$tplname", 'wb'))) if (!($fp = fopen("{$phpbb_root_path}styles/$template_path/template/$tplname", 'wb')))
{ {
trigger_error($user->lang['NO_TEMPLATE']); trigger_error($user->lang['NO_TEMPLATE']);
} }
$stylesheet = fwrite($fp, stripslashes($stylesheet)); $stylesheet = fwrite($fp, $tpldata);
fclose($fp); fclose($fp);
} }
else else
@ -1717,7 +1946,7 @@ function viewsource(url)
?> ?>
<tr> <tr>
<td class="row2" align="center"><textarea class="post" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;" cols="<?php echo $tplcols; ?>" rows="<?php echo $tplrows; ?>" name="tpldata"><?php echo htmlentities($tpldata); ?></textarea></td> <td class="row2" align="center"><textarea class="post" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;" cols="<?php echo $tplcols; ?>" rows="<?php echo $tplrows; ?>" name="tpldata"><?php echo htmlspecialchars($tpldata); ?></textarea></td>
</tr> </tr>
<tr> <tr>
<td class="cat" align="center"><input class="btnlite" type="submit" name="update" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" /></td> <td class="cat" align="center"><input class="btnlite" type="submit" name="update" value="<?php echo $user->lang['SUBMIT']; ?>" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="<?php echo $user->lang['RESET']; ?>" /></td>
@ -1732,7 +1961,6 @@ function viewsource(url)
break; break;
} }
// Front page // Front page
front('template', array('cache', 'details', 'refresh', 'export', 'delete', 'preview')); front('template', array('cache', 'details', 'refresh', 'export', 'delete', 'preview'));
break; break;
@ -2278,21 +2506,24 @@ function csspreview()
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$cfg = addslashes($theme_name) . "\n"; if ($update)
$cfg .= addslashes($theme_copyright) . "\n";
$cfg .= addslashes($config['version']) . "\n";
if ($css_storedb)
{ {
$files = array(array('src' => "styles/$theme_path/theme/", 'prefix-' => "styles/$theme_path/", 'prefix+' => false, 'exclude' => "$theme_path.css,theme.cfg")); $cfg = addslashes(trim($theme_name)) . "\n";
$data = array(array('src' => $css_data, 'prefix' => "theme/$theme_path.css"), array('src' => trim($cfg), 'prefix' => "theme/theme.cfg")); $cfg .= addslashes(trim($theme_copyright)) . "\n";
$cfg .= addslashes(trim($config['version']));
if ($theme_storedb)
{
$files = array(array('src' => "styles/$theme_path/theme/", 'prefix-' => "styles/$theme_path/", 'prefix+' => false, 'exclude' => "stylesheet.css,style.cfg"));
$data = array(array('src' => $theme_data, 'prefix' => "theme/stylesheet.css"), array('src' => trim($cfg), 'prefix' => 'theme/theme.cfg'));
} }
else else
{ {
$files = array(array('src' => "styles/$theme_path/theme/", 'prefix-' => "styles/$theme_path/", 'prefix+' => false, 'exclude' => "theme.cfg")); $files = array(array('src' => "styles/$theme_path/theme/", 'prefix-' => "styles/$theme_path/", 'prefix+' => false, 'exclude' => 'theme.cfg'));
$data = array(array('src' => trim($cfg), 'prefix' => "theme/theme.cfg")); $data = array(array('src' => trim($cfg), 'prefix' => 'theme/theme.cfg'));
}
unset($theme_data);
} }
unset($css_data);
export('theme', $theme_id, $theme_name, $theme_path, $files, $data); export('theme', $theme_id, $theme_name, $theme_path, $files, $data);
} }
@ -2578,12 +2809,32 @@ function remove($type, $id, $name, $path, $storedb = false)
} }
function cleanup_folder($path)
{
$filelist = filelist($path, '', '*');
krsort($filelist);
foreach ($filelist as $filepath => $file_ary)
{
foreach ($file_ary as $file)
{
@unlink("$path$filepath$file");
}
if (file_exists("$path$filepath"))
{
@rmdir("$path$filepath");
}
}
@rmdir("$path");
}
function details($type, $mode, $action, $id) function details($type, $mode, $action, $id)
{ {
global $phpbb_root_path, $phpEx, $SID, $config, $db, $user; global $phpbb_root_path, $phpEx, $SID, $config, $db, $user;
global $archive_preg, $safe_mode; global $archive_preg, $safe_mode;
$update = (!$update) ? true : false; $update = (!empty($_POST['update'])) ? true : false;
switch ($type) switch ($type)
{ {
@ -2629,7 +2880,7 @@ function details($type, $mode, $action, $id)
$s_hidden_fields = ''; $s_hidden_fields = '';
} }
else if ($action == 'install' && $update) else if ($action == 'install')
{ {
if (empty($_GET['name'])) if (empty($_GET['name']))
{ {
@ -2730,16 +2981,14 @@ function details($type, $mode, $action, $id)
} }
$cfg = file("$tmp_path$type/$type.cfg"); $cfg = file("$tmp_path$type/$type.cfg");
if ($name == '')
{
$name = trim($cfg[0]); $name = trim($cfg[0]);
}
$copyright = trim($cfg[1]); $copyright = trim($cfg[1]);
$version = trim($cfg[2]); $version = trim($cfg[2]);
unset($cfg); unset($cfg);
} }
else if ($action == 'install') else if ($action == 'install')
{ {
// NOT CONSISTENT WITH style installation
$path = (!empty($_POST['path'])) ? htmlspecialchars($_POST['path']) : ''; $path = (!empty($_POST['path'])) ? htmlspecialchars($_POST['path']) : '';
if (!($cfg = file("{$phpbb_root_path}styles/$path/$type/$type.cfg"))) if (!($cfg = file("{$phpbb_root_path}styles/$path/$type/$type.cfg")))
@ -2747,10 +2996,10 @@ function details($type, $mode, $action, $id)
trigger_error($user->lang['NO_' . $l_type]); trigger_error($user->lang['NO_' . $l_type]);
} }
$name = (!empty($_POST['name'])) ? htmlspecialchars($_POST['name']) : trim($cfg[0]); $name = trim($cfg[0]);
$storedb = (!empty($_POST['storedb'])) ? 1 : 0;
$copyright = trim($cfg[1]); $copyright = trim($cfg[1]);
$version = trim($cfg[2]); $version = trim($cfg[2]);
$storedb = (!empty($_POST['storedb'])) ? 1 : 0;
unset($cfg); unset($cfg);
} }
@ -2814,16 +3063,9 @@ function details($type, $mode, $action, $id)
case 'template': case 'template':
$filelist = filelist("{$phpbb_root_path}styles/$path/$type", '', 'html'); $filelist = filelist("{$phpbb_root_path}styles/$path/$type", '', 'html');
foreach ($filelist as $pathfile => $file_ary) if (!is_writeable("{$phpbb_root_path}styles/$path/$type"))
{
foreach ($file_ary as $file)
{
if (!is_writeable("{$phpbb_root_path}styles/$path/$type$pathfile/$file"))
{ {
$storedb = 1; $storedb = 1;
break;
}
}
} }
break; break;
@ -2844,20 +3086,9 @@ function details($type, $mode, $action, $id)
} }
if ($action == 'add' && !$safe_mode && is_writeable("{$phpbb_root_path}styles")) if ($action == 'add' && !$safe_mode && is_writeable("{$phpbb_root_path}styles"))
{ {
if (file_exists("{$phpbb_root_path}styles/$path/$type/"))
{
for ($i = 1; $i < 100; $i++)
{
if (!file_exists("$phpbb_root_path/styles/{$path}_{$i}/$type/"))
{
$path .= "_$i";
break;
}
}
}
umask(0); umask(0);
if (@mkdir("{$phpbb_root_path}styles/$path", 0777)) if (@mkdir("{$phpbb_root_path}styles/$path", 0777))
{ {
@ -2872,6 +3103,9 @@ function details($type, $mode, $action, $id)
} }
} }
if (!empty($_FILES['upload_file']) || !empty($_POST['import_file'])) if (!empty($_FILES['upload_file']) || !empty($_POST['import_file']))
{ {
// TODO // TODO
@ -3342,11 +3576,57 @@ function store_templates($mode, $id, $path, $filelist)
} }
} }
function copy_files($src, $filelist, $dst)
{
global $phpbb_root_path;
if (!(is_writable("{$phpbb_root_path}styles")))
{
return false;
}
umask(0);
if (!file_exists("{$phpbb_root_path}styles/$dst"))
{
@mkdir("{$phpbb_root_path}styles/$dst", 0777);
chmod("{$phpbb_root_path}styles/$dst", 0777);
}
@ksort($filelist);
foreach ($filelist as $filepath => $file_ary)
{
$filepath = (substr($filepath, 0, 1) != '/') ? "/$filepath" : $filepath;
if ($filepath && !file_exists("{$phpbb_root_path}styles/$dst$filepath"))
{
@mkdir("{$phpbb_root_path}styles/$dst$filepath", 0777);
chmod("{$phpbb_root_path}styles/$dst$filepath", 0777);
}
foreach ($file_ary as $file)
{
if (!file_exists("{$phpbb_root_path}styles/$dst$filepath$file"))
{
@rename("$src$filepath$file", "{$phpbb_root_path}styles/$dst$filepath$file");
@chmod("{$phpbb_root_path}styles/$dst$filepath$file", 0777);
}
}
if ($filepath && file_exists("$src$filepath"))
{
@rmdir("$src$filepath");
}
}
@rmdir("$src/$dst");
@rmdir($src);
}
function export($type, $id, $name, $path, &$files, &$data) function export($type, $id, $name, $path, &$files, &$data)
{ {
global $phpbb_root_path, $phpEx, $SID, $config, $user, $mode, $action; global $phpbb_root_path, $phpEx, $SID, $config, $user, $mode, $action;
include($phpbb_root_path . 'includes/functions_compress.'.$phpEx); $update = (!empty($_POST['update'])) ? true : false;
if ($update) if ($update)
{ {

15
phpBB/language/en/lang_admin.php
View file

@ -100,10 +100,6 @@ $lang += array(
'log_delete_word' => '<b>Deleted word censor</b>', 'log_delete_word' => '<b>Deleted word censor</b>',
'log_edit_word' => '<b>Edited word censor</b><br />&#187; %s', 'log_edit_word' => '<b>Edited word censor</b><br />&#187; %s',
'log_add_word' => '<b>Added word censor</b><br />&#187; %s', 'log_add_word' => '<b>Added word censor</b><br />&#187; %s',
'log_template_edit' => '<b>Edited template</b><br />%s / %s',
'log_imageset_edit' => '<b>Edited imageset</b><br />&#187; %s',
'log_style_edit' => '<b>Edited style</b><br />&#187; %s',
'log_theme_edit' => '<b>Edited theme</b><br />&#187; %s',
'log_db_backup' => '<b>Database backup</b>', 'log_db_backup' => '<b>Database backup</b>',
'log_db_restore' => '<b>Database restore</b>', 'log_db_restore' => '<b>Database restore</b>',
'log_search_index' => '<b>Re-indexed search system</b><br />&#187; %s', 'log_search_index' => '<b>Re-indexed search system</b><br />&#187; %s',
@ -184,6 +180,8 @@ $lang += array(
'LOG_ADD_STYLE' => '<b>Added new style</b><br />&#187; %s', 'LOG_ADD_STYLE' => '<b>Added new style</b><br />&#187; %s',
'LOG_EDIT_STYLE' => '<b>Edited style</b><br />&#187; %s', 'LOG_EDIT_STYLE' => '<b>Edited style</b><br />&#187; %s',
'LOG_EXPORT_STYLE' => '<b>Exported style</b><br />&#187; %s',
'LOG_DELETE_STYLE' => '<b>Deleted style</b><br />&#187; %s',
'LOG_EDIT_TEMPLATE' => '<b>Edited template</b><br />&#187; %s [%s]', 'LOG_EDIT_TEMPLATE' => '<b>Edited template</b><br />&#187; %s [%s]',
'LOG_CLEAR_TPLCACHE'=> '<b>Cleared template cache</b><br />&#187; %s', 'LOG_CLEAR_TPLCACHE'=> '<b>Cleared template cache</b><br />&#187; %s',
@ -973,6 +971,14 @@ $lang += array(
'INCLUDE_IMAGESET' => 'Include imageset', 'INCLUDE_IMAGESET' => 'Include imageset',
'STYLE_EXPORTED' => 'Style exported succesfully and stored in %s', 'STYLE_EXPORTED' => 'Style exported succesfully and stored in %s',
'DELETE_STYLE' => 'Delete style',
'DELETE_STYLE_EXPLAIN' => 'Here you can remove the selected style. You cannot remove all the style elements from here. These must be deleted individually via their respective forms. Take care in deleting styles there is no undo facility.',
'REPLACE_STYLE' => 'Replace style with',
'REPLACE_STYLE_EXPLAIN' => 'This style will replace the one being deleted for members that use it.',
'ONLY_STYLE' => 'This is the only remaining style, you cannot delete it',
'STYLE_DELETED' => 'Style deleted successfully',
'STYLE_ERR_NOT_STYLE' => 'The imported or uploaded file did not contain a valid style archive.',
'STYLE_ERR_MORE_ELEMENTS'=> 'You must select at least two style elements.', 'STYLE_ERR_MORE_ELEMENTS'=> 'You must select at least two style elements.',
'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style', 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style',
'STYLE_ERR_NAME_LONG' => 'The style name can be no longer than 30 characters', 'STYLE_ERR_NAME_LONG' => 'The style name can be no longer than 30 characters',
@ -1249,6 +1255,7 @@ $lang += array(
'EXPORT_DOWNLOAD' => 'Download', 'EXPORT_DOWNLOAD' => 'Download',
'INSTALL' => 'Install', 'INSTALL' => 'Install',
'FROM' => 'from', // "Create new style .... from ..." 'FROM' => 'from', // "Create new style .... from ..."
'OPTIONAL_BASIS' => 'Optional basis',
'NO_IMAGESET' => 'Cannot find imageset on filesystem', 'NO_IMAGESET' => 'Cannot find imageset on filesystem',
'NO_THEME' => 'Cannot find theme on filesystem', 'NO_THEME' => 'Cannot find theme on filesystem',
'NO_TEMPLATE' => 'Cannot find template on filesystem', 'NO_TEMPLATE' => 'Cannot find template on filesystem',