sql_fetchrow($result));
- if (isset($_POST['update']))
+ if ($update)
{
$sql = "DELETE FROM $table
WHERE {$type}_id = $id";
@@ -2610,6 +2583,8 @@ function details($type, $mode, $action, $id)
global $phpbb_root_path, $phpEx, $SID, $config, $db, $user;
global $archive_preg, $safe_mode;
+ $update = (!$update) ? true : false;
+
switch ($type)
{
case 'theme':
@@ -2630,7 +2605,7 @@ function details($type, $mode, $action, $id)
// Do we want to edit an existing theme or are we creating a new theme
// or submitting an existing one?
- if (empty($_POST['update']))
+ if (!$update)
{
if ($id)
{
@@ -2654,7 +2629,7 @@ function details($type, $mode, $action, $id)
$s_hidden_fields = '';
}
- else if ($action == 'install' && empty($_POST['update']))
+ else if ($action == 'install' && $update)
{
if (empty($_GET['name']))
{
@@ -2701,7 +2676,7 @@ function details($type, $mode, $action, $id)
}
// Do the update thang
- if (isset($_POST['update']))
+ if ($update)
{
if (!$safe_mode && $action == 'add' && is_writeable("{$phpbb_root_path}styles") && (!empty($_FILES['upload_file']['name']) || !empty($_POST['import_file'])))
{
@@ -3229,13 +3204,16 @@ function details($type, $mode, $action, $id)
?>
lang[$l_type . '_NAME']; ?>:
-
+
' : "$name";
+
+?>
lang['COPYRIGHT']; ?>:
' : "$copyright";
?>
@@ -3370,99 +3348,13 @@ function export($type, $id, $name, $path, &$files, &$data)
include($phpbb_root_path . 'includes/functions_compress.'.$phpEx);
- $l_prefix = strtoupper($type);
-
- if (isset($_POST['update']))
+ if ($update)
{
- switch ($_POST['format'])
- {
- case 'tar':
- $ext = 'tar';
- $mimetype = 'x-tar';
- $compress = 'compress_tar';
- break;
-
- case 'zip':
- if (!extension_loaded('zlib'))
- {
- trigger_error($user->lang['NO_SUPPORT_ZIP']);
- }
- $ext = 'zip';
- $mimetype = 'zip';
- $compress = 'compress_zip';
- break;
-
- case 'tar.gz':
- if (!extension_loaded('zlib'))
- {
- trigger_error($user->lang['NO_SUPPORT_GZ']);
- }
- $ext = 'tar.gz';
- $mimetype = 'x-gzip';
- $compress = 'compress_tar';
- break;
-
- case 'tar.bz2':
- if (!extension_loaded('bz2'))
- {
- trigger_error($user->lang['NO_SUPPORT_BZ2']);
- }
- $ext = 'tar.bz2';
- $mimetype = 'x-bzip2';
- $compress = 'compress_tar';
- break;
-
- default:
- $error[] = $user->lang[$l_prefix . '_ERR_ARCHIVE'];
- }
-
- if (!sizeof($error))
- {
- if (!($zip = new $compress('w', "{$phpbb_root_path}store/$path.$ext")))
- {
- trigger_error($user->lang['STORE_UNWRITEABLE']);
- }
-
- if ($files)
- {
- foreach ($files as $file_ary)
- {
- $zip->add_file($file_ary['src'], $file_ary['prefix-'], $file_ary['prefix+'], $file_ary['exclude']);
- }
- }
-
- if ($data)
- {
- foreach ($data as $data_ary)
- {
- $zip->add_data($data_ary['src'], $data_ary['prefix']);
- }
- }
-
- $zip->close();
-
- add_log('admin', 'LOG_EXPORT_' . $l_prefix, $name);
-
- if (empty($_POST['store']))
- {
- header('Pragma: no-cache');
- header("Content-Type: application/$mimetype; name=\"$path.$ext\"");
- header("Content-disposition: attachment; filename=$path.$ext");
-
- $fp = fopen("{$phpbb_root_path}store/$path.$ext", 'rb');
- while ($buffer = fread($fp, 1024))
- {
- echo $buffer;
- }
- fclose($fp);
- @unlink("{$phpbb_root_path}store/{$type}_$path.$ext");
- exit;
- }
-
- trigger_error(sprintf($user->lang[$l_prefix . '_EXPORTED'], "store/$path.$ext"));
- }
+ $error = create_archive($type, $name, $files, $data);
}
+ $l_prefix = strtoupper($type);
+
// Output list of themes
adm_page_header($user->lang[$l_prefix . '_EXPORT']);
@@ -3524,6 +3416,107 @@ function export($type, $id, $name, $path, &$files, &$data)
}
+function create_archive($type, $name, $files, $data)
+{
+ global $phpbb_root_path, $phpEx, $user;
+
+ $path = str_replace(' ', '_', $name);
+
+ $l_prefix = strtoupper($type);
+
+ switch ($_POST['format'])
+ {
+ case 'tar':
+ $ext = 'tar';
+ $mimetype = 'x-tar';
+ $compress = 'compress_tar';
+ break;
+
+ case 'zip':
+ if (!extension_loaded('zlib'))
+ {
+ trigger_error($user->lang['NO_SUPPORT_ZIP']);
+ }
+ $ext = 'zip';
+ $mimetype = 'zip';
+ $compress = 'compress_zip';
+ break;
+
+ case 'tar.gz':
+ if (!extension_loaded('zlib'))
+ {
+ trigger_error($user->lang['NO_SUPPORT_GZ']);
+ }
+ $ext = 'tar.gz';
+ $mimetype = 'x-gzip';
+ $compress = 'compress_tar';
+ break;
+
+ case 'tar.bz2':
+ if (!extension_loaded('bz2'))
+ {
+ trigger_error($user->lang['NO_SUPPORT_BZ2']);
+ }
+ $ext = 'tar.bz2';
+ $mimetype = 'x-bzip2';
+ $compress = 'compress_tar';
+ break;
+
+ default:
+ $error[] = $user->lang[$l_prefix . '_ERR_ARCHIVE'];
+ }
+
+ if (!sizeof($error))
+ {
+ include($phpbb_root_path . 'includes/functions_compress.'.$phpEx);
+
+ if (!($zip = new $compress('w', "{$phpbb_root_path}store/$path.$ext")))
+ {
+ trigger_error($user->lang['STORE_UNWRITEABLE']);
+ }
+
+ if ($files)
+ {
+ foreach ($files as $file_ary)
+ {
+ $zip->add_file($file_ary['src'], $file_ary['prefix-'], $file_ary['prefix+'], $file_ary['exclude']);
+ }
+ }
+
+ if ($data)
+ {
+ foreach ($data as $data_ary)
+ {
+ $zip->add_data($data_ary['src'], $data_ary['prefix']);
+ }
+ }
+
+ $zip->close();
+
+ add_log('admin', 'LOG_EXPORT_' . $l_prefix, $name);
+
+ if (empty($_POST['store']))
+ {
+ header('Pragma: no-cache');
+ header("Content-Type: application/$mimetype; name=\"$path.$ext\"");
+ header("Content-disposition: attachment; filename=$path.$ext");
+
+ $fp = fopen("{$phpbb_root_path}store/$path.$ext", 'rb');
+ while ($buffer = fread($fp, 1024))
+ {
+ echo $buffer;
+ }
+ fclose($fp);
+ @unlink("{$phpbb_root_path}store/$path.$ext");
+ exit;
+ }
+
+ trigger_error(sprintf($user->lang[$l_prefix . '_EXPORTED'], "store/$path.$ext"));
+ }
+
+ return $error;
+}
+
function theme_preview(&$path, &$stylesheet, &$class, &$css_element)
{
global $config, $user;
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php
index 099d57ab2c..0c8bf121f7 100644
--- a/phpBB/language/en/lang_admin.php
+++ b/phpBB/language/en/lang_admin.php
@@ -958,12 +958,11 @@ $lang += array(
'STYLE_ADDED' => 'Style added successfully',
'STYLE_EDITED' => 'Style edited successfully',
- 'ADD_STYLE' => 'Create Template',
- 'ADD_STYLE_EXPLAIN' => 'Here you can add a new template. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this template set on an existing one. You may also be able to upload or import (from the store directory) a template archive. If you upload or import an archive the template name can be optionally taken from the archive name (to do this leave the template name blank).',
- 'INSTALL_STYLE' => 'Install Template',
- 'INSTALL_STYLE_EXPLAIN' => 'Here you can install a new template set. Depending on your server configuration you may have a number of options here.',
+ 'ADD_STYLE' => 'Create Style',
+ 'ADD_STYLE_EXPLAIN' => 'Here you can create a new style. Depending on your server configuration and file permissions you may have additional options. For example you may be able to base this style on an existing one. You may also be able to upload or import (from the store directory) a style archive. If you upload or import an archive the style name will be determined automatically.',
+ 'INSTALL_STYLE' => 'Install Style',
+ 'INSTALL_STYLE_EXPLAIN' => 'Here you can install a new style and if appropriate the corresponding style elements. If you already have the relevant style elements installed they will not be overwritten. Some styles require existing style elements to already be installed. If you try installing such a style and do not have the required elements you will be notified.',
'SELECT_STYLE' => 'Select style',
- 'STYLE_EXISTING_BASIS' => 'Use existing style as basis',
'STYLE_UPLOAD_BASIS' => 'Upload a style',
'STYLE_IMPORT_BASIS' => 'Import style from store',
@@ -974,12 +973,16 @@ $lang += array(
'INCLUDE_IMAGESET' => 'Include imageset',
'STYLE_EXPORTED' => 'Style exported succesfully and stored in %s',
+ '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_NAME_LONG' => 'The style name can be no longer than 30 characters',
'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists',
'STYLE_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters',
'STYLE_ERR_NO_IDS' => 'You must select a template, theme and imageset for this style',
'STYLE_ERR_NAME_CHARS' => 'The style name can only contain alphanumeric characters, -, +, _ and space',
+ 'REQUIRES_TEMPLATE' => 'This style requires the %s template set to be installed.',
+ 'REQUIRES_THEME' => 'This style requires the %s theme to be installed.',
+ 'REQUIRES_IMAGESET' => 'This style requires the %s imageset to be installed.',
'TEMPLATES' => 'Templates',
@@ -1244,6 +1247,8 @@ $lang += array(
'STORE_FILESYSTEM' => 'Filesystem',
'EXPORT_STORE' => 'Store',
'EXPORT_DOWNLOAD' => 'Download',
+ 'INSTALL' => 'Install',
+ 'FROM' => 'from', // "Create new style .... from ..."
'NO_IMAGESET' => 'Cannot find imageset on filesystem',
'NO_THEME' => 'Cannot find theme on filesystem',
'NO_TEMPLATE' => 'Cannot find template on filesystem',