diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index a162109e09..2388a4e1e0 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -11,7 +11,7 @@

{L_EXPLAIN}

- +
{L_TITLE}
@@ -108,7 +108,35 @@ - + + + « {L_BACK} @@ -116,13 +144,15 @@

{L_EDIT_TEMPLATE_EXPLAIN}

+

{L_SELECTED_TEMPLATE}: {SELECTED_TEMPLATE}

+
{L_SELECT_TEMPLATE}
-
-
 
+
+
@@ -171,24 +201,179 @@
{L_TEMPLATE_EDITOR}
-
+
{TEMPLATE_FILE}
-
+
- +
-
+
{S_HIDDEN_FIELDS} - +
+ + + + + +

{L_EDIT_THEME}

+ +

{L_EDIT_THEME_EXPLAIN}

+ +

{L_SELECTED_THEME}: {SELECTED_THEME}

+ + +

{L_SHOW_RAW_CSS_NOTE}

+

{L_SHOW_RAW_CSS_EXPLAIN}

+ + +
+
+ {L_SELECT_CLASS} +
+
+
+
+ +
+
+
{S_CLASS}
+
+ +
+
+ + + +
+ + + +
+ {L_THEME_EDITOR} +
+
+
+
+ +
+ + + +
+ {L_BACKGROUND} +
+

{L_CSS_COLOUR_EXPLAIN}
+
  [ {L_COLOUR_SWATCH} ]
+
+
+
+
+
+
+
+
+
+
+ +
+ {L_FOREGROUND} +
+

{L_CSS_COLOUR_EXPLAIN}
+
  [ {L_COLOUR_SWATCH} ]
+
+
+

{L_FONT_FACE_EXPLAIN}
+
+
+
+
+
+
+
+
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
+
+
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
+
+
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
+
+
+
+
+
+ + + +
+ {S_HIDDEN_FIELDS} +   + +   + +   + + +
+ +
+ + + +
+

{L_CUSTOM_CLASS}

+ +

{L_CUSTOM_CLASS_EXPLAIN}

+ +
+ +
+ {L_CUSTOM_CLASS} +
+
+
+
+
+ +
+ +
+ +
+ « {L_BACK} @@ -205,7 +390,7 @@
- +
{L_TITLE}
@@ -235,7 +420,7 @@
{FORMAT_BUTTONS}
- +
@@ -249,7 +434,7 @@

{L_EXPLAIN}

- + @@ -273,7 +458,10 @@ {installed.L_STYLE_ACT_DEACT} | - {installed.S_OPTIONS} | {L_PREVIEW} + {installed.S_OPTIONS} + + | {L_PREVIEW} + @@ -286,7 +474,7 @@ - colspan="2">{uninstalled.NAME}
{L_COPYRIGHT}: {uninstalled.COPYRIGHT} + colspan="2">{uninstalled.NAME}
{L_COPYRIGHT}: {uninstalled.COPYRIGHT} diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 3ded19938e..1da2291e8f 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -108,7 +108,7 @@ pagination_sep = \'{PAGINATION_SEP}\' return; } break; - + case 'install': $this->install($mode); return; @@ -118,7 +118,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $this->add($mode); return; break; - + case 'details': if ($style_id) { @@ -126,7 +126,7 @@ pagination_sep = \'{PAGINATION_SEP}\' return; } break; - + case 'edit': if ($style_id) { @@ -136,11 +136,8 @@ pagination_sep = \'{PAGINATION_SEP}\' return $this->edit_imageset($style_id); case 'template': return $this->edit_template($style_id); - /** - * @todo Implement the theme editor - */ - //case 'theme': - // return $this->edit_theme($style_id); + case 'theme': + return $this->edit_theme($style_id); } } break; @@ -149,7 +146,7 @@ pagination_sep = \'{PAGINATION_SEP}\' switch ($mode) { case 'style': - + switch ($action) { case 'activate': @@ -161,19 +158,19 @@ pagination_sep = \'{PAGINATION_SEP}\' } $sql = 'UPDATE ' . STYLES_TABLE . ' - SET style_active = ' . (($action == 'activate') ? 1 : 0) . ' + SET style_active = ' . (($action == 'activate') ? 1 : 0) . ' WHERE style_id = ' . $style_id; $db->sql_query($sql); // Set style to default for any member using deactivated style if ($action == 'deactivate') { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_style = ' . $config['default_style'] . " + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_style = ' . $config['default_style'] . " WHERE user_style = $style_id"; $db->sql_query($sql); - $sql = 'UPDATE ' . FORUMS_TABLE . ' + $sql = 'UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_style = ' . $style_id; $db->sql_query($sql); @@ -207,7 +204,7 @@ pagination_sep = \'{PAGINATION_SEP}\' { $filelist = array('' => array()); - $sql = 'SELECT template_filename, template_mtime + $sql = 'SELECT template_filename, template_mtime FROM ' . STYLES_TPLDATA_TABLE . " WHERE template_id = $style_id"; $result = $db->sql_query($sql); @@ -232,7 +229,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $this->store_templates('update', $style_id, $template_row['template_path'], $filelist); unset($filelist); } - + break; } @@ -245,7 +242,7 @@ pagination_sep = \'{PAGINATION_SEP}\' { // Refresh/Renew theme cache case 'refresh': - + $sql = 'SELECT * FROM ' . STYLES_CSS_TABLE . " WHERE theme_id = $style_id"; @@ -260,12 +257,12 @@ pagination_sep = \'{PAGINATION_SEP}\' if ($theme_row['theme_storedb'] && file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css")) { - $theme_data = implode('', file("{$phpbb_root_path}styles/" . $theme_row['theme_path'] . '/theme/stylesheet.css')); + $theme_data = file_get_contents("{$phpbb_root_path}styles/" . $theme_row['theme_path'] . '/theme/stylesheet.css'); // Match CSS imports $matches = array(); preg_match_all('/@import url\(\"(.*)\"\);/i', $theme_data, $matches); - + if (sizeof($matches)) { foreach ($matches[0] as $idx => $match) @@ -273,11 +270,11 @@ pagination_sep = \'{PAGINATION_SEP}\' $theme_data = str_replace($match, $this->load_css_file($theme_row['theme_path'], $matches[1][$idx]), $theme_data); } } - + // Save CSS contents $sql_ary = array( 'theme_mtime' => @filemtime("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"), - 'theme_data' => $theme_data + 'theme_data' => str_replace('./', 'styles/' . $theme_info['theme_path'] . '/theme/', $theme_data) ); $sql = 'UPDATE ' . STYLES_CSS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " @@ -312,7 +309,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $sql_from = STYLES_TABLE; $sql = 'SELECT user_style, COUNT(user_style) AS style_count - FROM ' . USERS_TABLE . ' + FROM ' . USERS_TABLE . ' GROUP BY user_style'; $result = $db->sql_query($sql); @@ -323,7 +320,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $db->sql_freeresult($result); break; - + case 'template': $sql_from = STYLES_TPL_TABLE; break; @@ -357,7 +354,7 @@ pagination_sep = \'{PAGINATION_SEP}\' ) ); - $sql = "SELECT * + $sql = "SELECT * FROM $sql_from"; $result = $db->sql_query($sql); @@ -368,7 +365,7 @@ pagination_sep = \'{PAGINATION_SEP}\' { $installed[] = $row[$mode . '_name']; $basis_options .= ''; - + $stylevis = ($mode == 'style' && !$row['style_active']) ? 'activate' : 'deactivate'; $s_options = array(); @@ -376,14 +373,14 @@ pagination_sep = \'{PAGINATION_SEP}\' { $s_options[] = '' . $user->lang[strtoupper($option)] . ''; } - + $template->assign_block_vars('installed', array( 'S_DEFAULT_STYLE' => ($mode == 'style' && $row['style_id'] == $config['default_style']) ? true : false, 'U_EDIT' => $this->u_action . '&action=' . (($mode == 'style') ? 'details' : 'edit') . '&id=' . $row[$mode . '_id'], 'U_STYLE_ACT_DEACT' => $this->u_action . '&action=' . $stylevis . '&id=' . $row[$mode . '_id'], 'L_STYLE_ACT_DEACT' => $user->lang['STYLE_' . strtoupper($stylevis)], 'S_OPTIONS' => implode(' | ', $s_options), - 'U_PREVIEW' => "{$phpbb_root_path}index.$phpEx$SID&$mode=" . $row[$mode . '_id'], + 'U_PREVIEW' => ($mode == 'style') ? "{$phpbb_root_path}index.$phpEx$SID&$mode=" . $row[$mode . '_id'] : '', 'NAME' => $row[$mode . '_name'], 'STYLE_COUNT' => ($mode == 'style' && isset($style_count[$row['style_id']])) ? $style_count[$row['style_id']] : 0, @@ -394,7 +391,7 @@ pagination_sep = \'{PAGINATION_SEP}\' // Grab uninstalled items $new_ary = $cfg = array(); - + /** * @todo grab templates/themes/imagesets from style directories */ @@ -460,8 +457,10 @@ pagination_sep = \'{PAGINATION_SEP}\' $text_rows = max(5, min(999, request_var('text_rows', 20))); $save_changes = (isset($_POST['save'])) ? true : false; - // make sure template_file path doesn't go upwards ;-) + // make sure template_file path doesn't go upwards $template_file = str_replace('..', '.', $template_file); + // we want newlines no carriage returns! + $template_data = str_replace(array("\n\r", "\r"), array("\n", "\n"), $template_data); // Retrieve some information about the template $sql = 'SELECT template_storedb, template_path, template_name @@ -499,8 +498,8 @@ pagination_sep = \'{PAGINATION_SEP}\' // If it's not stored in the db yet, then update the template setting and store all template files in the db if (!$template_info['template_storedb']) { - $sql = 'UPDATE ' . STYLES_TPL_TABLE . ' - SET template_storedb = 1 + $sql = 'UPDATE ' . STYLES_TPL_TABLE . ' + SET template_storedb = 1 WHERE template_id = ' . $template_id; $db->sql_query($sql); @@ -512,9 +511,9 @@ pagination_sep = \'{PAGINATION_SEP}\' } // Update the template_data table entry for this template file - $sql = 'UPDATE ' . STYLES_TPLDATA_TABLE . " - SET template_data = '" . $db->sql_escape($template_data) . "', template_mtime = " . time() . " - WHERE template_id = $template_id + $sql = 'UPDATE ' . STYLES_TPLDATA_TABLE . " + SET template_data = '" . $db->sql_escape($template_data) . "', template_mtime = " . time() . " + WHERE template_id = $template_id AND template_filename = '" . $db->sql_escape($template_file) . "'"; $db->sql_query($sql); @@ -524,7 +523,7 @@ pagination_sep = \'{PAGINATION_SEP}\' // destroy the cached version of the template @unlink("{$phpbb_root_path}cache/tpl_{$template_info['template_name']}_" . str_replace('/', '.', $template_file) . ".$phpEx"); - add_log('admin', 'LOG_EDIT_TEMPLATE', $template_info['template_name'], $template_file); + add_log('admin', 'LOG_TEMPLATE_EDIT', $template_info['template_name'], $template_file); trigger_error($user->lang['TEMPLATE_FILE_UPDATED'] . $additional . adm_back_link($this->u_action . "&action=edit&id=$template_id&text_rows=$text_rows&template_file=$template_file")); } @@ -546,8 +545,8 @@ pagination_sep = \'{PAGINATION_SEP}\' } else { - $sql = 'SELECT * - FROM ' . STYLES_TPLDATA_TABLE . " + $sql = 'SELECT * + FROM ' . STYLES_TPLDATA_TABLE . " WHERE template_id = $template_id"; $result = $db->sql_query($sql); @@ -643,6 +642,7 @@ pagination_sep = \'{PAGINATION_SEP}\' 'U_ACTION' => $this->u_action . "&action=edit&id=$template_id&text_rows=$text_rows", 'U_BACK' => $this->u_action, + 'SELECTED_TEMPLATE' => $template_info['template_name'], 'TEMPLATE_FILE' => $template_file, 'TEMPLATE_DATA' => htmlentities($template_data), 'TEXT_ROWS' => $text_rows) @@ -650,9 +650,430 @@ pagination_sep = \'{PAGINATION_SEP}\' } /** - * Edit imagesets + * Provides a css editor and a basic easier to use stylesheet editing tool for less experienced (or lazy) users + * + * @param int $theme_id specifies which theme is being edited */ - function edit_imageset($style_id) + function edit_theme($theme_id) + { + global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $config, $db, $cache, $user, $template; + + $this->page_title = 'EDIT_THEME'; + + // get user input + $text_rows = max(5, min(999, request_var('text_rows', 20))); + $hide_css = request_var('hidecss', false); + $show_css = !$hide_css && request_var('showcss', false); + $edit_class = request_var('css_class', ''); + $custom_class = request_var('custom_class', ''); + $css_data = (!empty($_POST['css_data'])) ? ((STRIP) ? stripslashes($_POST['css_data']) : $_POST['css_data']) : ''; + $submit = isset($_POST['submit']) ? true : false; + $add_custom = isset($_POST['add_custom']) ? true : false; + $matches = array(); + + // we want newlines no carriage returns! + $css_data = str_replace(array("\n\r", "\r"), array("\n", "\n"), $css_data); + + // Retrieve some information about the theme + $sql = 'SELECT theme_storedb, theme_path, theme_name, theme_data + FROM ' . STYLES_CSS_TABLE . " + WHERE theme_id = $theme_id"; + $result = $db->sql_query($sql); + + if (!($theme_info = $db->sql_fetchrow($result))) + { + trigger_error($user->lang['NO_THEME']); + } + $db->sql_freeresult($result); + + $stylesheet_path = $phpbb_root_path . 'styles/' . $theme_info['theme_path'] . '/theme/stylesheet.css'; + // Get the CSS data from either database or filesystem + if (!$theme_info['theme_storedb']) + { + if (!file_exists($stylesheet_path) || !($stylesheet = file_get_contents($stylesheet_path))) + { + trigger_error($user->lang['NO_THEME']); + } + } + else + { + $stylesheet = &$theme_info['theme_data']; + } + + // Pull out a list of classes + $classes = array(); + if (preg_match_all('/^([a-z0-9\.:#> \t]+?)[ \t\n]*?\{.*?\}/msi', $stylesheet, $matches)) + { + $classes = $matches[1]; + } + + // Generate html for the list of classes + $s_hidden_fields = array(); + $s_classes = ''; + sort($classes); + foreach ($classes as $class) + { + $selected = ($class == $edit_class) ? ' selected="selected"' : ''; + $s_classes .= ''; + } + + $template->assign_vars(array( + 'S_EDIT_THEME' => true, + 'S_SHOWCSS' => $show_css, + 'S_CLASSES' => $s_classes, + 'S_CLASS' => $edit_class, + + 'U_ACTION' => $this->u_action . "&action=edit&id=$theme_id&showcss=$show_css&text_rows=$text_rows", + 'U_BACK' => $this->u_action, + + 'SELECTED_THEME' => $theme_info['theme_name'], + 'TEXT_ROWS' => $text_rows) + ); + + // only continue if we are really editing anything + if (!$edit_class && !$add_custom) + { + return; + } + + // These are the elements for the simple view + $match_elements = array( + 'colors' => array('background-color', 'color',), + 'sizes' => array('font-size', 'line-height',), + 'images' => array('background-image',), + 'repeat' => array('background-repeat',), + 'other' => array('font-weight', 'font-family', 'font-style', 'text-decoration',), + ); + + // Used in an sprintf statement to generate appropriate output for rawcss mode + $map_elements = array( + 'colors' => '%s', + 'sizes' => '%d', + 'images' => 'url(\'./%s\')', + 'repeat' => '%s', + 'other' => '%s', + ); + + $units = array('px', '%', 'em', 'pt'); + $repeat_types = array( + '' => $user->lang['UNSET'], + 'none' => $user->lang['REPEAT_NO'], + 'repeat-x' => $user->lang['REPEAT_X'], + 'repeat-y' => $user->lang['REPEAT_Y'], + 'both' => $user->lang['REPEAT_ALL'], + ); + + // Fill css_data with the class contents from the stylesheet + // in case we just selected a class and it's not filled yet + if (!$css_data && !$submit && !isset($_POST['hidecss']) && !isset($_POST['showcss']) && !$add_custom) + { + preg_match('#^[ \t]*?' . preg_quote($edit_class, '#') . '[ \t\n]*?\{(.*?)\}#ms', $stylesheet, $matches); + + if (!isset($matches[1])) + { + trigger_error($user->lang['NO_CLASS']); + } + + $css_data = implode(";\n", array_diff(array_map('trim', explode("\n", preg_replace("#;[\n]*#s", "\n", $matches[1]))), array(''))); + if ($css_data) + { + $css_data .= ';'; + } + } + + // If we don't show raw css and the user did not submit any modification + // then generate a list of css elements and output them via the template + if (!$show_css && !$submit && !$add_custom) + { + $css_elements = array_diff(array_map('trim', explode("\n", preg_replace("#;[\n]*#s", "\n", $css_data))), array('')); + + // Grab list of potential images for the "images" type + $imglist = filelist($phpbb_root_path . 'styles/' . $theme_info['theme_name'] . '/theme'); + + foreach ($match_elements as $type => $match_ary) + { + foreach ($match_ary as $match) + { + $var = str_replace('-', '_', $match); + $value = ''; + $unit = ''; + + if (sizeof($css_elements)) + { + // first read in the setting + foreach ($css_elements as $key => $element) + { + if (preg_match('#^' . preg_quote($match, '#') . ':[ \t\n]*?(.*?)$#', $element, $matches)) + { + switch ($type) + { + case 'sizes': + $value = trim($matches[1]); + + if (preg_match('#(.*?)(px|%|em|pt)#', $matches[1], $matches)) + { + $unit = trim($matches[2]); + $value = trim($matches[1]); + } + break; + + case 'images': + if (preg_match('#url\(\'(.*?)\'\)#', $matches[1], $matches)) + { + $value = trim($matches[1]); + } + break; + + case 'colors': + $value = trim($matches[1]); + if ($value[0] == '#') + { + $value = substr($value, 1); + } + break; + + default: + $value = trim($matches[1]); + } + + // Remove this element from array + unset($css_elements[$key]); + break; + } + } + } + + // then display it in the template + switch ($type) + { + case 'sizes': + // generate a list of units + $s_units = ''; + foreach ($units as $unit_option) + { + $selected = ($unit_option == $unit) ? ' selected="selected"' : ''; + $s_units .= ""; + } + $s_units = '' . $s_units; + + $template->assign_vars(array( + strtoupper($var) => $value, + 'S_' . strtoupper($var) . '_UNITS' => $s_units) + ); + break; + + case 'images': + // generate a list of images for this setting + $s_imglist = ''; + foreach ($imglist as $path => $img_ary) + { + foreach ($img_ary as $img) + { + $img = htmlspecialchars(((substr($path, 0, 1) == '/') ? substr($path, 1) : $path) . $img); + + $selected = (preg_match('#' . preg_quote($img) . '$#', $value)) ? ' selected="selected"' : ''; + $s_imglist .= ""; + } + } + $s_imglist = '' . $s_imglist; + + $template->assign_vars(array( + 'S_' . strtoupper($var) => $s_imglist) + ); + unset($s_imglist); + break; + + case 'repeat': + // generate a list of repeat options + $s_repeat_types = ''; + foreach ($repeat_types as $repeat_type => $repeat_lang) + { + $selected = ($value == $repeat_type) ? ' selected="selected"' : ''; + $s_repeat_types .= ""; + } + + $template->assign_vars(array( + 'S_' . strtoupper($var) => $s_repeat_types) + ); + + default: + $template->assign_vars(array( + strtoupper($var) => $value) + ); + } + } + } + + // Any remaining elements must be custom data so we save that in a hidden field + if (sizeof($css_elements)) + { + $s_hidden_fields['cssother'] = implode(' ;; ', $css_elements); + } + + unset($imglist, $css_elements); + } + // else if we are showing raw css or the user submitted data from the simple view + // then we need to turn the given information into raw css + elseif (!$css_data && !$add_custom) + { + foreach ($match_elements as $type => $match_ary) + { + foreach ($match_ary as $match) + { + $var = str_replace('-', '_', $match); + $value = ''; + $unit = ''; + + // retrieve and validate date for this setting + switch ($type) + { + case 'sizes': + $value = request_var($var, 0); + $unit = request_var($var . '_unit', ''); + + if ((request_var($var, '') === '') || !in_array($unit, $units)) + { + continue 2; + } + break; + + case 'images': + $value = str_replace('..', '.', request_var($var, '')); + if (!file_exists($value)) + { + continue 2; + } + break; + + case 'colors': + $value = request_var($var, ''); + if (preg_match('#^(?:[A-Z0-9]{6}|[A-Z]{3})$#', $value)) + { + $value = '#' . $value; + } + break; + + default: + $value = request_var($var, ''); + } + + // use the element mapping to create raw css code + if ($value !== '') + { + $css_data .= $match . ': ' . sprintf($map_elements[$type], $value) . $unit . ";\n"; + } + } + } + + // append additional data sent to us + if ($other = request_var('cssother', '')) + { + $css_data .= str_replace(' ;; ', ";\n", $other) . ';'; + $css_data = preg_replace("#\*/;\n#", "*/\n", $css_data); + } + } + // make sure we have $show_css set, so we can link to the show_css page if we need to + elseif (!$hide_css) + { + $show_css = true; + } + + if ($submit || $add_custom) + { + if ($submit) + { + // if the user submitted a modification replace the old class definition in the stylesheet + // with the new one + if (preg_match('#^' . preg_quote($edit_class, '#') . '[ \t\n]*?\{(.*?)\}#ms', $stylesheet)) + { + $stylesheet = preg_replace('#^(' . preg_quote($edit_class, '#') . '[ \t\n]*?\{).*?(\})#ms', "$1\n\t" . str_replace("\n", "\n\t", $css_data) . "\n$2", $stylesheet); + } + $message = $user->lang['THEME_UPDATED']; + } + else + { + // check whether the custom class name is valid + if (!preg_match('/^[a-z0-9#:.\- ]+$/i', $add_custom)) + { + trigger_error($user->lang['THEME_ERR_CLASS_CHARS'] . adm_back_link($this->u_action . "&action=edit&id=$theme_id&text_rows=$text_rows")); + } + else + { + // append an empty class definition to the stylesheet + $stylesheet .= "\n$custom_class\n{\n}"; + $message = $user->lang['THEME_CLASS_ADDED']; + } + } + + // where should we store the CSS? + if (!$theme_info['theme_storedb'] && file_exists($stylesheet_path) && is_writeable($stylesheet_path)) + { + // write stylesheet to file + if (!($fp = fopen($stylesheet_path, 'wb'))) + { + trigger_error($user->lang['NO_THEME']); + } + fwrite($fp, $stylesheet); + fclose($fp); + } + else + { + // match CSS imports + preg_match_all('/@import url\(\"(.*)\"\);/i', $stylesheet, $matches); + + if (sizeof($matches)) + { + foreach ($matches[0] as $idx => $match) + { + $stylesheet = str_replace($match, $this->load_css_file($style_row['theme_path'], $matches[1][$idx]), $stylesheet); + } + } + + // Write stylesheet to db + $sql_ary = array( + 'theme_mtime' => time(), + 'theme_storedb' => 1, + 'theme_data' => str_replace('./', 'styles/' . $theme_info['theme_path'] . '/theme/', $stylesheet), + ); + $sql = 'UPDATE ' . STYLES_CSS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' + WHERE theme_id = ' . $theme_id; + $db->sql_query($sql); + + // notify the user if the template was not stored in the db before the mofication + if (!$theme_info['theme_storedb']) + { + add_log('admin', 'LOG_THEME_EDIT_DETAILS', $theme_info['theme_name']); + $message .= '
' . $user->lang['EDIT_THEME_STORED_DB']; + } + } + + $cache->destroy('sql', STYLES_CSS_TABLE); + add_log('admin', ($add_custom) ? 'LOG_THEME_EDIT_ADD' : 'LOG_THEME_EDIT', $theme_info['theme_name'], ($add_custom) ? $custom_class : $edit_class); + + trigger_error($message . adm_back_link($this->u_action . "&action=edit&id=$theme_id&css_class=$edit_class&showcss=$show_css&text_rows=$text_rows")); + } + unset($matches); + + $s_hidden_fields['css_class'] = $edit_class; + + $template->assign_vars(array( + 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), + + 'U_SWATCH' => "{$phpbb_admin_path}swatch.$phpEx$SID&form=acp_theme&name=", + 'UA_SWATCH' => "{$phpbb_admin_path}swatch.$phpEx$SID&form=acp_theme&name=", + + 'CSS_DATA' => htmlspecialchars($css_data)) + ); + } + + + /** + * Edit imagesets + * + * @param int $imageset_id specifies which imageset is being edited + */ + function edit_imageset($imageset_id) { global $db, $user, $phpbb_root_path, $cache, $template; @@ -663,12 +1084,12 @@ pagination_sep = \'{PAGINATION_SEP}\' $imgsize = (!empty($_POST['imgsize'])) ? true : false; $imgwidth = (isset($_POST['imgwidth'])) ? intval($_POST['imgwidth']) : ''; - if ($style_id) + if ($imageset_id) { $sql_select = ($imgname) ? ", $imgname" : ''; $sql = "SELECT imageset_path, imageset_name, imageset_copyright$sql_select FROM " . STYLES_IMAGE_TABLE . " - WHERE imageset_id = $style_id"; + WHERE imageset_id = $imageset_id"; $result = $db->sql_query($sql); if (!extract($db->sql_fetchrow($result))) @@ -693,7 +1114,7 @@ pagination_sep = \'{PAGINATION_SEP}\' 'folders' => array( 'folder', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted',), 'polls' => array( - 'poll_left', 'poll_center', 'poll_right',), + 'poll_left', 'poll_center', 'poll_right',), ); foreach ($imglist as $category => $img_ary) @@ -724,7 +1145,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $sql = 'UPDATE ' . STYLES_IMAGE_TABLE . " SET $imgname = '" . $db->sql_escape($imgpath) . "' - WHERE imageset_id = $style_id"; + WHERE imageset_id = $imageset_id"; $db->sql_query($sql); $cache->destroy('sql', STYLES_IMAGE_TABLE); @@ -816,7 +1237,7 @@ pagination_sep = \'{PAGINATION_SEP}\' 'IMAGELIST_OPTIONS' => $imagesetlist_options, 'IMAGE_SIZE' => $imgsize_bool, 'IMAGE_REQUEST' => (!empty($imgname)) ? '../styles/' . $imageset_path . '/imageset/' . str_replace('{LANG}', $imglang, current(explode('*', $$imgname))) : '', - 'U_ACTION' => $this->u_action . "&action=edit&id=$style_id", + 'U_ACTION' => $this->u_action . "&action=edit&id=$imageset_id", 'U_BACK' => $this->u_action, 'NAME' => $imageset_name, 'ERROR' => !$valid_name @@ -829,7 +1250,7 @@ pagination_sep = \'{PAGINATION_SEP}\' function remove($mode, $style_id) { global $db, $template, $user, $phpbb_root_path, $cache; - + $new_id = request_var('new_id', 0); $update = (isset($_POST['update'])) ? true : false; @@ -857,9 +1278,9 @@ pagination_sep = \'{PAGINATION_SEP}\' } $l_prefix = strtoupper($mode); - + $sql = "SELECT $sql_select - FROM $sql_from + FROM $sql_from WHERE {$mode}_id = $style_id"; $result = $db->sql_query($sql); $style_row = $db->sql_fetchrow($result); @@ -869,10 +1290,10 @@ pagination_sep = \'{PAGINATION_SEP}\' { trigger_error($user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action)); } - - $sql = "SELECT {$mode}_id, {$mode}_name - FROM $sql_from - WHERE {$mode}_id <> $style_id + + $sql = "SELECT {$mode}_id, {$mode}_name + FROM $sql_from + WHERE {$mode}_id <> $style_id ORDER BY {$mode}_name ASC"; $result = $db->sql_query($sql); @@ -894,26 +1315,26 @@ pagination_sep = \'{PAGINATION_SEP}\' if ($update) { - $sql = "DELETE FROM $sql_from + $sql = "DELETE FROM $sql_from WHERE {$mode}_id = $style_id"; $db->sql_query($sql); if ($mode == 'style') { - $sql = 'UPDATE ' . USERS_TABLE . " + $sql = 'UPDATE ' . USERS_TABLE . " SET user_style = $new_id WHERE user_style = $style_id"; $db->sql_query($sql); - $sql = 'UPDATE ' . FORUMS_TABLE . " + $sql = 'UPDATE ' . FORUMS_TABLE . " SET forum_style = $new_id WHERE forum_style = $style_id"; $db->sql_query($sql); } else { - $sql = 'UPDATE ' . STYLES_TABLE . " - SET {$mode}_id = $new_id + $sql = 'UPDATE ' . STYLES_TABLE . " + SET {$mode}_id = $new_id WHERE {$mode}_id = $style_id"; $db->sql_query($sql); } @@ -939,7 +1360,7 @@ pagination_sep = \'{PAGINATION_SEP}\' 'U_ACTION' => $this->u_action . "&action=delete&id=$style_id", 'U_BACK' => $this->u_action, - + 'NAME' => $style_row[$mode . '_name'], ) ); @@ -1029,11 +1450,11 @@ pagination_sep = \'{PAGINATION_SEP}\' $l_prefix = 'IMAGESET'; break; } - + if ($update && !sizeof($error)) { - $sql = "SELECT $sql_select - FROM $sql_from + $sql = "SELECT $sql_select + FROM $sql_from WHERE $sql_where"; $result = $db->sql_query($sql); $style_row = $db->sql_fetchrow($result); @@ -1053,19 +1474,19 @@ pagination_sep = \'{PAGINATION_SEP}\' $style_row[$var] = ''; } } - + $files = $data = array(); if ($mode == 'style') { $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_theme) ? "\ntheme = {$style_row['theme_name']}" : ''; $style_cfg .= (!$inc_imageset) ? "\nimageset = {$style_row['imageset_name']}" : ''; $data[] = array( - 'src' => $style_cfg, + 'src' => $style_cfg, 'prefix' => 'style.cfg' ); @@ -1079,7 +1500,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $template_cfg .= "\nbbcode_bitfield = {$style_row['bbcode_bitfield']}"; $data[] = array( - 'src' => $template_cfg, + 'src' => $template_cfg, 'prefix' => 'template/template.cfg' ); @@ -1087,23 +1508,23 @@ pagination_sep = \'{PAGINATION_SEP}\' if (!$style_row['template_storedb']) { $files[] = array( - 'src' => "styles/{$style_row['template_path']}/template/", - 'prefix-' => "styles/{$style_row['template_path']}/", - 'prefix+' => false, + 'src' => "styles/{$style_row['template_path']}/template/", + 'prefix-' => "styles/{$style_row['template_path']}/", + 'prefix+' => false, 'exclude' => 'template.cfg' ); } else { - $sql = 'SELECT template_filename, template_data - FROM ' . STYLES_TPLDATA_TABLE . " + $sql = 'SELECT template_filename, template_data + FROM ' . STYLES_TPLDATA_TABLE . " WHERE template_id = {$style_row['template_id']}"; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) { $data[] = array( - 'src' => $row['template_data'], + 'src' => $row['template_data'], 'prefix' => 'template/' . $row['template_filename'] ); } @@ -1116,7 +1537,7 @@ pagination_sep = \'{PAGINATION_SEP}\' if ($mode == 'theme' || $inc_theme) { $theme_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['theme_name'], $style_row['theme_copyright'], $config['version']), $this->theme_cfg); - + // Read old cfg file $items = $cache->obtain_cfg_items($style_row); $items = $items['theme']; @@ -1134,21 +1555,21 @@ pagination_sep = \'{PAGINATION_SEP}\' $theme_cfg = str_replace(array('{PARSE_CSS_FILE}', '{PAGINATION_SEP}'), array($items['parse_css_file'], $items['pagination_sep']), $theme_cfg); $files[] = array( - 'src' => "styles/{$style_row['theme_path']}/theme/", - 'prefix-' => "styles/{$style_row['theme_path']}/", - 'prefix+' => false, - 'exclude' => ($style_row['theme_storedb']) ? 'stylesheet.css,theme.cfg' : 'theme.cfg' + 'src' => "styles/{$style_row['theme_path']}/theme/", + 'prefix-' => "styles/{$style_row['theme_path']}/", + 'prefix+' => false, + 'exclude' => ($style_row['theme_storedb']) ? 'stylesheet.css,theme.cfg' : 'theme.cfg' ); $data[] = array( - 'src' => $theme_cfg, + 'src' => $theme_cfg, 'prefix' => 'theme/theme.cfg' ); if ($style_row['theme_storedb']) { $data[] = array( - 'src' => $style_row['theme_data'], + 'src' => $style_row['theme_data'], 'prefix' => 'theme/stylesheet.css' ); } @@ -1162,24 +1583,24 @@ pagination_sep = \'{PAGINATION_SEP}\' $imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], $config['version']), $this->imageset_cfg); $imageset_definitions = explode(', ', $this->imageset_keys); - + foreach ($imageset_definitions as $key) { $imageset_cfg .= "\n" . $key . ' = ' . str_replace("styles/{$style_row['imageset_path']}/imageset/", '{PATH}', $style_row[$key]); } $files[] = array( - 'src' => "styles/{$style_row['imageset_path']}/imageset/", - 'prefix-' => "styles/{$style_row['imageset_path']}/", - 'prefix+' => false, + 'src' => "styles/{$style_row['imageset_path']}/imageset/", + 'prefix-' => "styles/{$style_row['imageset_path']}/", + 'prefix+' => false, 'exclude' => 'imageset.cfg' ); $data[] = array( - 'src' => trim($imageset_cfg), + 'src' => trim($imageset_cfg), 'prefix' => 'imageset/imageset.cfg' ); - + unset($imageset_cfg); } @@ -1224,7 +1645,7 @@ pagination_sep = \'{PAGINATION_SEP}\' { $compress = new compress_tar('w', $phpbb_root_path . "store/$path$ext", $ext); } - + if (sizeof($files)) { foreach ($files as $file_ary) @@ -1256,13 +1677,13 @@ pagination_sep = \'{PAGINATION_SEP}\' } } - $sql = "SELECT {$mode}_id, {$mode}_name + $sql = "SELECT {$mode}_id, {$mode}_name FROM " . (($mode == 'style') ? STYLES_TABLE : $sql_from) . " WHERE {$mode}_id = $style_id"; $result = $db->sql_query($sql); $style_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - + if (!$style_row) { trigger_error($user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action)); @@ -1312,7 +1733,7 @@ pagination_sep = \'{PAGINATION_SEP}\' case 'style': $sql_from = STYLES_TABLE; break; - + case 'template': $sql_from = STYLES_TPL_TABLE; break; @@ -1326,7 +1747,7 @@ pagination_sep = \'{PAGINATION_SEP}\' break; } - $sql = "SELECT * + $sql = "SELECT * FROM $sql_from WHERE {$mode}_id = $style_id"; $result = $db->sql_query($sql); @@ -1388,7 +1809,7 @@ pagination_sep = \'{PAGINATION_SEP}\' } } } - + if ($update && sizeof($error)) { $style_row = array_merge($style_row, array( @@ -1431,14 +1852,14 @@ pagination_sep = \'{PAGINATION_SEP}\' { $theme_data = ''; - if ($style_row['theme_storedb']) + if (!$style_row['theme_storedb']) { - $theme_data = implode('', file("{$phpbb_root_path}styles/" . $style_row['theme_path'] . '/theme/stylesheet.css')); - + $theme_data = file_get_contents("{$phpbb_root_path}styles/" . $style_row['theme_path'] . '/theme/stylesheet.css'); + // Match CSS imports $matches = array(); preg_match_all('/@import url\(\"(.*)\"\);/i', $theme_data, $matches); - + if (sizeof($matches)) { foreach ($matches[0] as $idx => $match) @@ -1451,7 +1872,7 @@ pagination_sep = \'{PAGINATION_SEP}\' if (!$store_db && !$safe_mode && is_writeable("{$phpbb_root_path}styles/{$style_row['theme_path']}/theme/stylesheet.css")) { $store_db = 1; - + if ($fp = @fopen("{$phpbb_root_path}styles/{$style_row['theme_path']}/theme/stylesheet.css", 'wb')) { $store_db = (@fwrite($fp, str_replace("styles/{$style_row['theme_path']}/theme/", './', $theme_data))) ? 0 : 1; @@ -1461,13 +1882,13 @@ pagination_sep = \'{PAGINATION_SEP}\' $theme_data = str_replace('./', "styles/{$style_row['theme_path']}/theme/", $theme_data); $sql_ary += array( - 'theme_mtime' => ($store_db) ? filemtime("{$phpbb_root_path}styles/{$style_row['theme_path']}/theme/stylesheet.css") : 0, - 'theme_storedb' => $store_db, + 'theme_mtime' => ($store_db) ? filemtime("{$phpbb_root_path}styles/{$style_row['theme_path']}/theme/stylesheet.css") : 0, + 'theme_storedb' => $store_db, 'theme_data' => ($store_db) ? $theme_data : '', ); } break; - + case 'template': if ($style_row['template_storedb'] != $store_db) @@ -1476,8 +1897,8 @@ pagination_sep = \'{PAGINATION_SEP}\' if (!$store_db && !$safe_mode && is_writeable("{$phpbb_root_path}styles/{$style_row['template_path']}/template")) { - $sql = 'SELECT * - FROM ' . STYLES_TPLDATA_TABLE . " + $sql = 'SELECT * + FROM ' . STYLES_TPLDATA_TABLE . " WHERE template_id = $style_id"; $result = $db->sql_query($sql); @@ -1496,14 +1917,14 @@ pagination_sep = \'{PAGINATION_SEP}\' if (!$store_db) { - $sql = 'DELETE FROM ' . STYLES_TPLDATA_TABLE . " + $sql = 'DELETE FROM ' . STYLES_TPLDATA_TABLE . " WHERE template_id = $style_id"; $db->sql_query($sql); } } $sql_ary += array( - 'template_storedb' => $store_db, + 'template_storedb' => $store_db, ); } break; @@ -1511,8 +1932,8 @@ pagination_sep = \'{PAGINATION_SEP}\' if (sizeof($sql_ary)) { - $sql = "UPDATE $sql_from - SET " . $db->sql_build_array('UPDATE', $sql_ary) . " + $sql = "UPDATE $sql_from + SET " . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE {$mode}_id = $style_id"; $db->sql_query($sql); @@ -1534,7 +1955,7 @@ pagination_sep = \'{PAGINATION_SEP}\' foreach ($element_ary as $element => $table) { $sql = "SELECT {$element}_id, {$element}_name - FROM $table + FROM $table ORDER BY {$element}_id ASC"; $result = $db->sql_query($sql); @@ -1587,19 +2008,18 @@ pagination_sep = \'{PAGINATION_SEP}\' function load_css_file($path, $filename) { global $phpbb_root_path; - - $handle = "{$phpbb_root_path}styles/$path/theme/$filename"; - - if ($fp = @fopen($handle, 'r')) + + $file = "{$phpbb_root_path}styles/$path/theme/$filename"; + + if (file_exists($file) && ($content = file_get_contents($file))) { - $content = trim(@fread($fp, filesize($handle))); - @fclose($fp); + $content = trim($content); } else { $content = ''; } - + return $content; } @@ -1650,7 +2070,7 @@ pagination_sep = \'{PAGINATION_SEP}\' 'template_filename' => "$pathfile$file", 'template_included' => (isset($includes[$file])) ? implode(':', $includes[$file]) . ':' : '', 'template_mtime' => filemtime("{$phpbb_root_path}styles/$path$pathfile$file"), - 'template_data' => implode('', file("{$phpbb_root_path}styles/$path$pathfile$file")), + 'template_data' => file_get_contents("{$phpbb_root_path}styles/$path$pathfile$file"), ); if ($mode == 'insert') @@ -1659,8 +2079,8 @@ pagination_sep = \'{PAGINATION_SEP}\' } else { - $sql = 'UPDATE ' . STYLES_TPLDATA_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE template_id = $style_id + $sql = 'UPDATE ' . STYLES_TPLDATA_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " + WHERE template_id = $style_id AND template_filename = '" . $db->sql_escape("$pathfile$file") . "'"; } $db->sql_query($sql); @@ -1738,7 +2158,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $this->test_installed($element, $error, $root_path, ${'reqd_' . $element}, $style_row[$element . '_id'], $style_row[$element . '_name'], $style_row[$element . '_copyright']); } - + break; case 'template': @@ -1762,7 +2182,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $style_row['store_db'] = request_var('store_db', 0); $style_row['style_active'] = request_var('style_active', 1); $style_row['style_default'] = request_var('style_default', 0); - + // User has submitted form and no errors have occured if ($update && !sizeof($error)) { @@ -1797,7 +2217,7 @@ pagination_sep = \'{PAGINATION_SEP}\' 'S_STORE_DB' => (isset($style_row[$mode . '_storedb'])) ? $style_row[$mode . '_storedb'] : 0, 'S_STYLE_ACTIVE' => (isset($style_row['style_active'])) ? $style_row['style_active'] : 0, 'S_STYLE_DEFAULT' => (isset($style_row['style_default'])) ? $style_row['style_default'] : 0, - + 'U_ACTION' => $this->u_action . "&action=install&path=" . urlencode($install_path), 'U_BACK' => $this->u_action, @@ -1866,14 +2286,14 @@ pagination_sep = \'{PAGINATION_SEP}\' break; } - $sql = "SELECT $sql_select - FROM $sql_from + $sql = "SELECT $sql_select + FROM $sql_from WHERE {$mode}_id = $basis"; $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - if (!$row) + if (!$row) { $error[] = $user->lang['NO_' . $l_type]; } @@ -1922,7 +2342,7 @@ pagination_sep = \'{PAGINATION_SEP}\' foreach ($element_ary as $element => $table) { $sql = "SELECT {$element}_id, {$element}_name - FROM $table + FROM $table ORDER BY {$element}_id ASC"; $result = $db->sql_query($sql); @@ -1969,7 +2389,7 @@ pagination_sep = \'{PAGINATION_SEP}\' ); } - + /** * Is this element installed? If not, grab its cfg details */ @@ -1982,7 +2402,7 @@ pagination_sep = \'{PAGINATION_SEP}\' case 'template': $sql_from = STYLES_TPL_TABLE; break; - + case 'theme': $sql_from = STYLES_CSS_TABLE; break; @@ -1996,7 +2416,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $chk_name = ($reqd_name !== false) ? $reqd_name : $name; - $sql = "SELECT {$element}_id, {$element}_name + $sql = "SELECT {$element}_id, {$element}_name FROM $sql_from WHERE {$element}_name = '" . $db->sql_escape($chk_name) . "'"; $result = $db->sql_query($sql); @@ -2015,7 +2435,7 @@ pagination_sep = \'{PAGINATION_SEP}\' } $cfg = parse_cfg_file("$root_path$element/$element.cfg", $cfg); - + $name = $cfg['name']; $copyright = $cfg['copyright']; $id = 0; @@ -2097,15 +2517,15 @@ pagination_sep = \'{PAGINATION_SEP}\' $db->sql_transaction('begin'); $sql_ary = array( - 'style_name' => $name, - 'style_copyright' => $copyright, - 'style_active' => $active, - 'template_id' => $style_row['template_id'], - 'theme_id' => $style_row['theme_id'], - 'imageset_id' => $style_row['imageset_id'], + 'style_name' => $name, + 'style_copyright' => $copyright, + 'style_active' => $active, + 'template_id' => $style_row['template_id'], + 'theme_id' => $style_row['theme_id'], + 'imageset_id' => $style_row['imageset_id'], ); - $sql = 'INSERT INTO ' . STYLES_TABLE . ' + $sql = 'INSERT INTO ' . STYLES_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $db->sql_query($sql); @@ -2113,8 +2533,8 @@ pagination_sep = \'{PAGINATION_SEP}\' if ($default) { - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_style = $id + $sql = 'UPDATE ' . USERS_TABLE . " + SET user_style = $id WHERE user_style = " . $config['default_style']; $db->sql_query($sql); @@ -2142,7 +2562,7 @@ pagination_sep = \'{PAGINATION_SEP}\' case 'theme': $sql_from = STYLES_CSS_TABLE; break; - + case 'imageset': $sql_from = STYLES_IMAGE_TABLE; break; @@ -2202,7 +2622,7 @@ pagination_sep = \'{PAGINATION_SEP}\' { @mkdir("{$phpbb_root_path}styles/$path", 0777); @chmod("{$phpbb_root_path}styles/$path", 0777); - + if ($root_path) { $this->copy_files("$root_path$type", filelist("$root_path$type", '', '*'), "$path/$type"); @@ -2211,7 +2631,7 @@ pagination_sep = \'{PAGINATION_SEP}\' */ $sql_ary = array( $mode . '_name' => $name, - $mode . '_copyright' => $copyright, + $mode . '_copyright' => $copyright, $mode . '_path' => $path, ); @@ -2229,8 +2649,8 @@ pagination_sep = \'{PAGINATION_SEP}\' case 'theme': $sql_ary += array( - 'theme_storedb' => (!is_writeable("{$phpbb_root_path}styles/$path/theme/stylesheet.css")) ? 1 : $store_db, - 'theme_data' => ($store_db) ? (($root_path) ? str_replace('./', "styles/$path/theme/", implode('', file("$root_path/$mode/stylesheet.css"))) : '') : '', + 'theme_storedb' => (!is_writeable("{$phpbb_root_path}styles/$path/theme/stylesheet.css")) ? 1 : $store_db, + 'theme_data' => ($store_db) ? (($root_path) ? str_replace('./', "styles/$path/theme/", file_get_contents("$root_path/$mode/stylesheet.css")) : '') : '', 'theme_mtime' => ($store_db) ? filemtime("{$phpbb_root_path}styles/$path/theme/stylesheet.css") : 0 ); break; @@ -2253,13 +2673,13 @@ pagination_sep = \'{PAGINATION_SEP}\' $db->sql_transaction('begin'); - $sql = "INSERT INTO $sql_from + $sql = "INSERT INTO $sql_from " . $db->sql_build_array('INSERT', $sql_ary); $db->sql_query($sql); $id = $db->sql_nextid(); - if ($mode == 'template' && $store_db) + if ($mode == 'template' && $store_db) { $filelist = filelist("{$root_path}template", '', 'html'); $this->store_templates('insert', $id, $name, $filelist); diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 16fa8c07b1..0621be9f03 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -535,6 +535,7 @@ $lang = array_merge($lang, array( 'LOG_TEMPLATE_ADD_DB' => 'Added new template set to database
» %s', 'LOG_TEMPLATE_ADD_FS' => 'Add new template set on filesystem
» %s', 'LOG_TEMPLATE_DELETE' => 'Deleted template set
» %s', + 'LOG_TEMPLATE_EDIT' => 'Edited template set %s
» %s', 'LOG_TEMPLATE_EDIT_DETAILS' => 'Edited template details
» %s', 'LOG_TEMPLATE_EXPORT' => 'Exported template set
» %s', @@ -542,6 +543,8 @@ $lang = array_merge($lang, array( 'LOG_THEME_ADD_FS' => 'Add new theme on filesystem
» %s', 'LOG_THEME_DELETE' => 'Theme deleted
» %s', 'LOG_THEME_EDIT_DETAILS' => 'Edited theme details
» %s', + 'LOG_THEME_EDIT' => 'Edited theme %s
» Modified class %s', + 'LOG_THEME_EDIT_ADD' => 'Edited theme %s
» Added class %s', 'LOG_THEME_EXPORT' => 'Exported theme
» %s', 'LOG_USER_ACTIVE' => 'User activated
» %s', diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index f25b04c108..5dc2865f6c 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -43,12 +43,23 @@ $lang = array_merge($lang, array( 'ADD_THEME_EXPLAIN' => 'Here you can add a new theme. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this theme on an existing one. You may also be able to upload or import (from the store directory) a theme archive. If you upload or import an archive the theme name can be optionally taken from the archive name (to do this leave the theme name blank).', 'ARCHIVE_FORMAT' => 'Archive file type', + 'BACKGROUND' => 'Background', + 'BACKGROUND_COLOUR' => 'Background colour', + 'BACKGROUND_IMAGE' => 'Background image', + 'BACKGROUND_REPEAT' => 'Background repeat', + 'BOLD' => 'Bold', + 'CACHE' => 'Cache', 'COPYRIGHT' => 'Copyright', 'CREATE_IMAGESET' => 'Create new imageset', 'CREATE_STYLE' => 'Create new style', 'CREATE_TEMPLATE' => 'Create new template set', 'CREATE_THEME' => 'Create new theme', + 'CSS_CLASS_NAME' => 'CSS class name', + 'CSS_COLOUR_EXPLAIN' => 'You can either enter a hex number for the colour or use the web safe colour swatch to select one.', + 'CURRENT_IMAGE' => 'Current Image', + 'CUSTOM_CLASS' => 'Custom class', + 'CUSTOM_CLASS_EXPLAIN' => 'You can add additional classes to this theme if you wish. You must provide the actual CSS class name below, it must be the same as that you have or will use in your template. Please remember that class names may contain only alphanumeric characters, periods (.), colons (:), dash (-) and number/hash/pound (#). The new class will be added to class selection above.', 'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.', 'DELETE_FROM_FS' => 'Delete from filesystem', @@ -61,6 +72,7 @@ $lang = array_merge($lang, array( 'DELETE_THEME' => 'Delete theme', 'DELETE_THEME_EXPLAIN' => 'Here you can remove the selected theme from the database. Additionally, if you have permission you can elect to remove the theme from the filesystem. Please note that there is no undo capability. When the theme is deleted it is gone for good. It is recommended that you first export your theme for possible future use.', 'DETAILS' => 'Details', + 'DIMENSIONS_EXPLAIN' => 'Selecting yes here will include width/height parameters.', 'EDIT_DETAILS_IMAGESET' => 'Edit imageset details', 'EDIT_DETAILS_IMAGESET_EXPLAIN' => 'Here you can edit certain imageset details such as its name.', @@ -74,18 +86,32 @@ $lang = array_merge($lang, array( 'EDIT_IMAGESET_EXPLAIN' => 'Here you can edit the individual images which define the imageset. You can also specify dimensions for the image. Dimensions are optional, specifying them can overcome certain rendering issues with some browsers. By not specifying them you reduce the size of the database record a little.', 'EDIT_TEMPLATE' => 'Edit template', 'EDIT_TEMPLATE_EXPLAIN' => 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. If PHP can write to the template files in your styles directory any changes here will be written directly to those files. If PHP cannot write to those files they will be copied into the database and all changes will only be reflected there. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.', - 'EDIT_TEMPLATE_STORED_DB' => 'The template file was unwritable so the template set is now stored in the database containing the modified file.', + 'EDIT_TEMPLATE_STORED_DB' => 'The template file was unwritable so the template set is now stored in the database containing the modified file.', + 'EDIT_THEME' => 'Edit theme', + 'EDIT_THEME_EXPLAIN' => 'Here you can edit the selected theme, changing colours, images, etc. You can switch between a simplified interface where you can set basic colours, etc. and a more advanced "raw CSS" mode. The raw mode allows you to add additional parameters such as borders, etc. Only set parameters you need else leave them blank or undefined.', + 'EDIT_THEME_STORED_DB' => 'The stylesheet file was unwritable so the stylesheet is now stored in the database containing your modification.', 'EXPORT' => 'Export', + 'FOREGROUND' => 'Foreground', + 'FONT_COLOUR' => 'Font colour', + 'FONT_FACE' => 'Font face', + 'FONT_FACE_EXPLAIN' => 'You can specify multiple fonts seperated by commas. If a user doesn\'t have the first font installed the first other working font will be chosen.', + 'FONT_SIZE' => 'Font size', + + 'GLOBAL_IMAGES' => 'Global', + + 'HIDE_CSS' => 'Hide raw CSS', + 'IMAGE_CONFIGURATION' => 'Image configuration', 'IMAGE_WIDTH' => 'Image width', 'IMAGE_HEIGHT' => 'Image height', 'IMAGE' => 'Image', - 'IMAGE_NAME' => 'Image name', 'IMAGE_LOCATION' => 'Image location', + 'IMAGE_NAME' => 'Image name', + 'IMAGE_PARAMETER' => 'Parameter', + 'IMAGE_VALUE' => 'Value', 'IMAGESET_ADDED' => 'New imageset added on filesystem', 'IMAGESET_ADDED_DB' => 'New imageset added to database', - 'IMAGESET_UPDATED' => 'Imageset updated successfully', 'IMAGESET_DELETED' => 'Imageset deleted successfully', 'IMAGESET_DELETED_FS' => 'Imageset removed from database but some files may remain on the filesystem', 'IMAGESET_DETAILS_UPDATED' => 'Imageset details successfully updated', @@ -100,6 +126,87 @@ $lang = array_merge($lang, array( 'IMAGESET_EXPORT_EXPLAIN' => 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'IMAGESET_EXPORTED' => 'Imageset exported succesfully and stored in %s', 'IMAGESET_NAME' => 'Imageset Name', + 'IMAGESET_UPDATED' => 'Imageset updated successfully', + 'ITALIC' => 'Italic', + + 'IMG_BTN_POST' => 'New topic', + 'IMG_BTN_REPLY' => 'Reply topic', + 'IMG_BTN_LOCKED' => 'Topic locked', + 'IMG_BTN_POST_PM' => 'New message', + 'IMG_BTN_REPLY_PM' => 'Reply message', + 'IMG_BTN_DELETE' => 'Delete post', + 'IMG_BTN_QUOTE' => 'Quote post', + 'IMG_BTN_PROFILE' => 'Show profile', + 'IMG_BTN_EMAIL' => 'Send email', + 'IMG_BTN_SEARCH' => 'Search posts', + 'IMG_BTN_WWW' => 'Website', + 'IMG_BTN_INFO' => 'Show post details', + 'IMG_BTN_EDIT' => 'Edit post', + 'IMG_BTN_AIM' => 'AIM', + 'IMG_BTN_ICQ' => 'ICQ', + 'IMG_BTN_JABBER' => 'Jabber', + 'IMG_BTN_YIM' => 'YIM', + 'IMG_BTN_MSNM' => 'MSNM', + 'IMG_BTN_ONLINE' => 'User online', + 'IMG_BTN_OFFLINE' => 'User offline', + 'IMG_BTN_REPORT' => 'Report post', + 'IMG_BTN_PM' => 'Send message', + 'IMG_BTN_FRIEND' => 'Add as friend', + 'IMG_BTN_FOE' => 'Add as foe', + 'IMG_CAT_BUTTONS' => 'Localised buttons', + 'IMG_CAT_CUSTOM' => 'Custom images', + 'IMG_CAT_FOLDERS' => 'Topic icons', + 'IMG_CAT_FORUMS' => 'Forum icons', + 'IMG_CAT_ICONS' => 'General icons', + 'IMG_CAT_KARMA' => 'Karma images', + 'IMG_CAT_LOGOS' => 'Logos', + 'IMG_CAT_POLLS' => 'Polling images', + 'IMG_FOLDER' => 'Topic', + 'IMG_FOLDER_ANNOUNCE' => 'Announcement', + 'IMG_FOLDER_ANNOUNCE_NEW' => 'Announcement new posts', + 'IMG_FOLDER_ANNOUNCE_POSTED' => 'Announcement posted to', + 'IMG_FOLDER_ANNOUNCE_NEW_POSTED' => 'Announcement posted to new', + 'IMG_FOLDER_GLOBAL' => 'Global', + 'IMG_FOLDER_GLOBAL_NEW' => 'Global new posts', + 'IMG_FOLDER_GLOBAL_POSTED' => 'Global posted to', + 'IMG_FOLDER_GLOBAL_NEW_POSTED' => 'Global posted to new', + 'IMG_FOLDER_HOT' => 'Topic hot', + 'IMG_FOLDER_HOT_NEW' => 'Topic hot new posts', + 'IMG_FOLDER_HOT_POSTED' => 'Topic hot posted to', + 'IMG_FOLDER_HOT_NEW_POSTED' => 'Topic hot posted to new', + 'IMG_FOLDER_LOCKED' => 'Topic locked', + 'IMG_FOLDER_LOCKED_NEW' => 'Topic locked new', + 'IMG_FOLDER_LOCKED_POSTED' => 'Topic locked posted to', + 'IMG_FOLDER_LOCKED_NEW_POSTED' => 'Topic locked posted to new', + 'IMG_FOLDER_NEW' => 'Topic new posts', + 'IMG_FOLDER_NEW_POSTED' => 'Topic posted to new', + 'IMG_FOLDER_POSTED' => 'Topic posted to', + 'IMG_FOLDER_STICKY' => 'Sticky topic', + 'IMG_FOLDER_STICKY_POSTED' => 'Sticky topic posted to', + 'IMG_FOLDER_STICKY_NEW' => 'Sticky topic new posts', + 'IMG_FOLDER_STICKY_NEW_POSTED' => 'Sticky topic posted to new', + 'IMG_FORUM' => 'Forum', + 'IMG_FORUM_NEW' => 'Forum new posts', + 'IMG_FORUM_LOCKED' => 'Forum locked', + 'IMG_FORUM_LINK' => 'Forum link', + 'IMG_ICON_UNAPPROVED' => 'Post unapproved', + 'IMG_ICON_REPORTED' => 'Post reported', + 'IMG_ICON_ATTACH' => 'Attachment', + 'IMG_ICON_POST' => 'Minipost', + 'IMG_ICON_POST_NEW' => 'New minipost', + 'IMG_ICON_POST_LATEST' => 'Last post', + 'IMG_ICON_POST_NEWEST' => 'Newest post', + 'IMG_KARMA_LEFT' => 'Karma left end', + 'IMG_KARMA_CENTER' => 'Karma centre', + 'IMG_KARMA_RIGHT' => 'Karma right end', + 'IMG_POLL_LEFT' => 'Poll left end', + 'IMG_POLL_RIGHT' => 'Poll right end', + 'IMG_POLL_CENTER' => 'Poll centre', + 'IMG_SITE_LOGO' => 'Main Logo', + 'IMG_SUB_FORUM' => 'Subforum', + 'IMG_SUB_FORUM_NEW' => 'Subforum new posts', + + 'INCLUDE_DIMENSIONS' => 'Include dimensions', 'INCLUDE_IMAGESET' => 'Include imageset', 'INCLUDE_TEMPLATE' => 'Include template', 'INCLUDE_THEME' => 'Include theme', @@ -116,8 +223,12 @@ $lang = array_merge($lang, array( 'INSTALLED_TEMPLATE' => 'Installed templates', 'INSTALLED_THEME' => 'Installed themes', + 'LINE_SPACING' => 'Line spacing', + 'LOCALISED_IMAGES' => 'Localised', + 'EDITED_IMAGESET' => 'Edited imageset', + 'NO_CLASS' => 'Cannot find class in stylesheet', 'NO_IMAGESET' => 'Cannot find imageset on filesystem', 'NO_IMAGE' => 'No Image', 'NO_STYLE' => 'Cannot find style on filesystem', @@ -135,6 +246,10 @@ $lang = array_merge($lang, array( 'OPTIONAL_BASIS' => 'Optional basis', 'REFRESH' => 'Refresh', + 'REPEAT_NO' => 'None', + 'REPEAT_X' => 'Only horizontally', + 'REPEAT_Y' => 'Only vertically', + 'REPEAT_ALL' => 'Both directions', 'REPLACE_IMAGESET' => 'Replace imageset with', 'REPLACE_IMAGESET_EXPLAIN' => 'This imageset will replace the one you are deleting in any styles that use it.', 'REPLACE_STYLE' => 'Replace style with', @@ -147,8 +262,16 @@ $lang = array_merge($lang, array( 'REQUIRES_TEMPLATE' => 'This style requires the %s template set to be installed.', 'REQUIRES_THEME' => 'This style requires the %s theme to be installed.', + 'SELECT_IMAGE' => 'Select image', 'SELECT_TEMPLATE' => 'Select template file', - 'SELECTED_TEMPLATE' => 'Selected template file', + 'SELECT_CLASS' => 'Select CSS class', + 'SELECTED_IMAGE' => 'Selected Image', + 'SELECTED_IMAGESET' => 'Selected imageset', + 'SELECTED_TEMPLATE' => 'Selected template', + 'SELECTED_TEMPLATE_FILE' => 'Selected template file', + 'SELECTED_THEME' => 'Selected theme', + 'SELECTED_CLASS' => 'Selected CSS class', + 'SHOW_CSS' => 'Show raw CSS', 'STORE_DATABASE' => 'Database', 'STORE_FILESYSTEM' => 'Filesystem', 'STYLE_ACTIVATE' => 'Activate', @@ -204,7 +327,10 @@ $lang = array_merge($lang, array( 'THEME_DELETED' => 'Theme deleted successfully', 'THEME_DELETED_FS' => 'Theme removed from database but files remain on the filesystem', 'THEME_DETAILS_UPDATED' => 'Theme details successfully updated', + 'THEME_EDITOR' => 'Raw CSS theme editor', + 'THEME_EDITOR_HEIGHT' => 'Theme editor height', 'THEME_ERR_ARCHIVE' => 'Please select an archive method', + 'THEME_ERR_CLASS_CHARS' => 'Only alphanumeric characters plus ., :, - and # are valid in class names.', 'THEME_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters', 'THEME_ERR_NAME_CHARS' => 'The theme name can only contain alphanumeric characters, -, +, _ and space', 'THEME_ERR_NAME_EXIST' => 'A theme with that name already exists', @@ -217,100 +343,16 @@ $lang = array_merge($lang, array( 'THEME_LOCATION' => 'Store stylesheet in', 'THEME_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.', 'THEME_NAME' => 'Theme Name', + 'THEME_CLASS_ADDED' => 'Custom class added successfully', + 'THEME_UPDATED' => 'Class updated successfully', + 'UNDERLINE' => 'Underline', 'UNINSTALLED_IMAGESET' => 'Uninstalled imagesets', 'UNINSTALLED_STYLE' => 'Uninstalled styles', 'UNINSTALLED_TEMPLATE' => 'Uninstalled templates', 'UNINSTALLED_THEME' => 'Uninstalled themes', + 'UNSET' => 'Undefined', - // Imageset data - 'SELECTED_IMAGESET' => 'Selected imageset', - 'SELECT_IMAGE' => 'Select image', - 'IMAGE' => 'Image', - 'CURRENT_IMAGE' => 'Current Image', - 'SELECTED_IMAGE' => 'Selected Image', - 'INCLUDE_DIMENSIONS' => 'Include dimensions', - 'DIMENSIONS_EXPLAIN' => 'Selecting yes here will include width/height parameters.', - 'IMAGE_PARAMETER' => 'Parameter', - 'IMAGE_VALUE' => 'Value', - 'LOCALISED_IMAGES' => 'Localised', - 'GLOBAL_IMAGES' => 'Global', - 'IMG_CAT_LOGOS' => 'Logos', - 'IMG_SITE_LOGO' => 'Main Logo', - 'IMG_CAT_BUTTONS' => 'Localised buttons', - 'IMG_BTN_POST' => 'New topic', - 'IMG_BTN_REPLY' => 'Reply topic', - 'IMG_BTN_LOCKED' => 'Topic locked', - 'IMG_BTN_POST_PM' => 'New message', - 'IMG_BTN_REPLY_PM' => 'Reply message', - 'IMG_BTN_DELETE' => 'Delete post', - 'IMG_BTN_QUOTE' => 'Quote post', - 'IMG_BTN_PROFILE' => 'Show profile', - 'IMG_BTN_EMAIL' => 'Send email', - 'IMG_BTN_SEARCH' => 'Search posts', - 'IMG_BTN_WWW' => 'Website', - 'IMG_BTN_INFO' => 'Show post details', - 'IMG_BTN_EDIT' => 'Edit post', - 'IMG_BTN_AIM' => 'AIM', - 'IMG_BTN_ICQ' => 'ICQ', - 'IMG_BTN_JABBER' => 'Jabber', - 'IMG_BTN_YIM' => 'YIM', - 'IMG_BTN_MSNM' => 'MSNM', - 'IMG_BTN_ONLINE' => 'User online', - 'IMG_BTN_OFFLINE' => 'User offline', - 'IMG_BTN_REPORT' => 'Report post', - 'IMG_BTN_PM' => 'Send message', - 'IMG_BTN_FRIEND' => 'Add as friend', - 'IMG_BTN_FOE' => 'Add as foe', - 'IMG_CAT_ICONS' => 'General icons', - 'IMG_ICON_UNAPPROVED' => 'Post unapproved', - 'IMG_ICON_REPORTED' => 'Post reported', - 'IMG_ICON_ATTACH' => 'Attachment', - 'IMG_ICON_POST' => 'Minipost', - 'IMG_ICON_POST_NEW' => 'New minipost', - 'IMG_ICON_POST_LATEST' => 'Last post', - 'IMG_ICON_POST_NEWEST' => 'Newest post', - 'IMG_CAT_FORUMS' => 'Forum icons', - 'IMG_FORUM' => 'Forum', - 'IMG_FORUM_NEW' => 'Forum new posts', - 'IMG_FORUM_LOCKED' => 'Forum locked', - 'IMG_FORUM_LINK' => 'Forum link', - 'IMG_SUB_FORUM' => 'Subforum', - 'IMG_SUB_FORUM_NEW' => 'Subforum new posts', - 'IMG_CAT_FOLDERS' => 'Topic icons', - 'IMG_FOLDER' => 'Topic', - 'IMG_FOLDER_NEW' => 'Topic new posts', - 'IMG_FOLDER_LOCKED' => 'Topic locked', - 'IMG_FOLDER_POSTED' => 'Topic posted to', - 'IMG_FOLDER_NEW_POSTED' => 'Topic posted to new', - 'IMG_FOLDER_LOCKED_NEW' => 'Topic locked new', - 'IMG_FOLDER_LOCKED_POSTED' => 'Topic locked posted to', - 'IMG_FOLDER_LOCKED_NEW_POSTED' => 'Topic locked posted to new', - 'IMG_FOLDER_HOT' => 'Topic hot', - 'IMG_FOLDER_HOT_NEW' => 'Topic hot new posts', - 'IMG_FOLDER_HOT_POSTED' => 'Topic hot posted to', - 'IMG_FOLDER_HOT_NEW_POSTED' => 'Topic hot posted to new', - 'IMG_FOLDER_STICKY' => 'Sticky topic', - 'IMG_FOLDER_STICKY_POSTED' => 'Sticky topic posted to', - 'IMG_FOLDER_STICKY_NEW' => 'Sticky topic new posts', - 'IMG_FOLDER_STICKY_NEW_POSTED' => 'Sticky topic posted to new', - 'IMG_FOLDER_ANNOUNCE' => 'Announcement', - 'IMG_FOLDER_ANNOUNCE_NEW' => 'Announcement new posts', - 'IMG_FOLDER_ANNOUNCE_POSTED' => 'Announcement posted to', - 'IMG_FOLDER_ANNOUNCE_NEW_POSTED' => 'Announcement posted to new', - 'IMG_FOLDER_GLOBAL' => 'Global', - 'IMG_FOLDER_GLOBAL_NEW' => 'Global new posts', - 'IMG_FOLDER_GLOBAL_POSTED' => 'Global posted to', - 'IMG_FOLDER_GLOBAL_NEW_POSTED' => 'Global posted to new', - 'IMG_CAT_POLLS' => 'Polling images', - 'IMG_POLL_LEFT' => 'Poll left end', - 'IMG_POLL_RIGHT' => 'Poll right end', - 'IMG_POLL_CENTER' => 'Poll centre', - 'IMG_CAT_KARMA' => 'Karma images', - 'IMG_KARMA_LEFT' => 'Karma left end', - 'IMG_KARMA_CENTER' => 'Karma centre', - 'IMG_KARMA_RIGHT' => 'Karma right end', - 'IMG_CAT_CUSTOM' => 'Custom images', )); ?> \ No newline at end of file diff --git a/phpBB/style.php b/phpBB/style.php index ad799033e9..e1bc5ef375 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -83,8 +83,8 @@ if ($id && $sid) { exit; } - - $force_load = true; // Ideally this needs to be based on $config['load_tplcompile'] + + /*$force_load = true; // Ideally this needs to be based on $config['load_tplcompile'] if ($theme['theme_mtime'] < filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css') || $force_load) { @@ -103,10 +103,10 @@ if ($id && $sid) } $sql = "UPDATE {$table_prefix}styles_theme - SET theme_data = '" . $db->sql_escape($theme['theme_data']) . "', theme_mtime = " . time() . " + SET theme_data = '" . $db->sql_escape(str_replace('./', "styles/{$theme['theme_path']}/theme/", $theme['theme_data'])) . "', theme_mtime = " . time() . " WHERE theme_id = $id"; $db->sql_query($sql); - } + }*/ header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 3600)); header('Content-type: text/css');
{L_INSTALL}