diff --git a/phpBB/adm/admin_styles.php b/phpBB/adm/admin_styles.php index ba0c722116..25179daf49 100644 --- a/phpBB/adm/admin_styles.php +++ b/phpBB/adm/admin_styles.php @@ -672,6 +672,7 @@ function viewsource(url) case 'edit': // General parameters $class = (isset($_POST['classname'])) ? htmlspecialchars($_POST['classname']) : ''; + $customclass = (!empty($_POST['customclass'])) ? htmlspecialchars($_POST['customclass']) : ''; $txtcols = (isset($_POST['txtcols'])) ? max(20, intval($_POST['txtcols'])) : 76; $txtrows = (isset($_POST['txtrows'])) ? max(5, intval($_POST['txtrows'])) : 10; @@ -686,10 +687,10 @@ function viewsource(url) 'table', 'th', '.cat', '.catdiv', 'td', '.row1', '.row2', '.row3', '.spacer', 'hr', ), 'forms' => array( - 'form', 'input', 'select', '.textarea', '.post', '.btnlite', '.btnmain', '.btnbbcode', + 'form', 'input', 'select', 'textarea', '.post', '.btnlite', '.btnmain', '.btnbbcode', ), 'bbcode' => array( - '.b', '.u', '.i', '.color', '.size', '.code', '.quote', 'flash', '.syntaxbg', '.syntaxcomment', '.syntaxdefault', '.syntaxhtml', '.syntaxkeyword', '.syntaxstring', + '.b', '.u', '.i', '.color', '.size', '.code', '.quote', '.flash', '.syntaxbg', '.syntaxcomment', '.syntaxdefault', '.syntaxhtml', '.syntaxkeyword', '.syntaxstring', ), 'custom' => array(), ); @@ -747,20 +748,23 @@ function viewsource(url) } // Pull out list of "custom" tags - if (preg_match_all('#([a-z\.:]+?) {.*?}#si', $stylesheet, $matches)) + $class_used = $test_ary = array(); + if (preg_match_all('/^([a-z0-9\.:#>]+?)[ \t]*?\{.*?\}/msi', $stylesheet, $matches)) { - $test_ary = array(); foreach ($base_classes as $category => $class_ary) { - $test_ary += $class_ary; + $test_ary = array_merge($test_ary, $class_ary); } - $matches = preg_replace('#^\.#', '', $matches[1]); - foreach ($matches as $value) + foreach ($matches[1] as $value) { if (!in_array($value, $test_ary)) { -// $base_classes['custom'][] = $value; + $base_classes['custom'][] = $value; + } + else + { + $class_used[] = $value; } } unset($matches); @@ -778,14 +782,14 @@ function viewsource(url) $css_element = array(); if (!empty($_POST['rawcss']) && (!empty($_POST['hidecss']) || !empty($_POST['preview']) || $update)) { - $css_element = preg_replace("#;[\r\n]*#s", "\n", stripslashes($_POST['rawcss'])); + $css_element = trim(stripslashes(htmlspecialchars(preg_replace("#;[\r\n]*#s", "\n", $_POST['rawcss'])))); $css_element = explode("\n", $css_element); } else if (($showcss && !empty($_POST['showcss'])) || !empty($_POST['preview']) || $update) { if (!empty($_POST['cssother'])) { - $css_element = explode('; ', stripslashes($_POST['cssother'])); + $css_element = explode(';', stripslashes(htmlspecialchars(trim($_POST['cssother'])))); } foreach ($match_elements as $type => $match_ary) @@ -800,18 +804,38 @@ function viewsource(url) } } } - else if (preg_match('#^' . $class . ' {(.*?)}#m', $stylesheet, $matches)) + else if (preg_match('#^' . $class . '[ \t]*?\{(.*?)\}#ms', $stylesheet, $matches)) { - $css_element = explode('; ', ltrim(substr($matches[1], 0, -2))); + $css_element = explode(';', substr(trim($matches[1]), 0, -1)); } + $css_element = preg_replace('#^\s*(.*?)\s*$#', '\1', $css_element); + // User wants to submit data ... - if ($update) - { - $updated_element = implode('; ', $css_element) . ';'; - if (preg_match('#^' . $class . ' {(.*?)}#m', $stylesheet)) + if ($update || $customclass) + { + if ($update) { - $stylesheet = preg_replace('#^(' . $class . ' {).*?(})#m', '\1 ' . $updated_element . ' \2', $stylesheet); + $updated_element = trim(implode('; ', $css_element)) . ';'; + if (preg_match('#^' . $class . '[ \t]*?\{(.*?)\}#ms', $stylesheet)) + { + $stylesheet = preg_replace('#^(' . $class . '[ \t]*?\{).*?(\})#m', '\1 ' . $updated_element . ' \2', $stylesheet); + } + $error[] = $user->lang['THEME_UPDATED']; + } + else + { + // Check custom class name is valid + if (!preg_match('/^[a-z0-9#:\.]+$/i', $customclass)) + { + $error[] = $user->lang['THEME_ERR_CLASS_CHARS']; + } + else + { + $stylesheet .= "\n$customclass { }"; + $base_classes['custom'][] = $customclass; + $error[] = $user->lang['THEME_CLASS_ADDED']; + } } // Where is the CSS stored? @@ -839,8 +863,6 @@ function viewsource(url) } $cache->destroy('sql', STYLES_CSS_TABLE); - - $error[] = $user->lang['THEME_UPDATED']; add_log('admin', 'LOG_EDIT_THEME', $theme_name); } @@ -871,7 +893,7 @@ function viewsource(url) { foreach ($css_element as $key => $element) { - if (preg_match('#^' . preg_quote($match, '#') . ': (.*?)$#', $element, $matches)) + if (preg_match('#^' . preg_quote($match, '#') . ':[ \t]*?(.*?)$#', $element, $matches)) { switch ($type) { @@ -921,10 +943,12 @@ function viewsource(url) $class_options .= ''; foreach ($class_ary as $class_name) { + $used = (in_array($class_name, $class_used) || $category == 'custom') ? ' style="color:red"' : ''; $selected = ($class_name == $class) ? ' selected="selected"' : ''; - $class_options .= ''; + $class_options .= '' . (($category == 'custom') ? $class_name : $user->lang['CSS_' . str_replace('.', '', strtoupper($class_name))]) . ''; } } + unset($class_used); // Grab list of potential images for class backgrounds $imglist = filelist("{$phpbb_root_path}styles/$theme_path/theme"); @@ -980,6 +1004,7 @@ function csspreview()

lang['EDIT_THEME_EXPLAIN']; ?>

+

lang['SELECTED_THEME']; ?>:

' . implode('
', $error) . ''; + echo '' . implode('
', $error) . ''; } ?> @@ -1036,9 +1061,9 @@ function csspreview() ' . implode('
', $error) . ''; + echo '' . implode('
', $error) . ''; } ?> @@ -2579,12 +2604,14 @@ function install($type, $action, $id) $imageset_id = (!empty($_POST['imageset_id'])) ? intval($_POST['imageset_id']) : 0; $basis = (isset($_POST['basis'])) ? intval($_POST['basis']) : 0; - if ($basis || $update) + // If we have a basis or we're editing we want some additional info ... else + // we need nothing + if ($basis || ($update && $action != 'add')) { switch ($type) { case 'style': - $sql_select = ($action != 'details') ? 'style_name, template_id, theme_id, imageset_id' : 'style_name'; + $sql_select = ($action != 'edit') ? 'style_name, template_id, theme_id, imageset_id' : 'style_name'; break; case 'template': $sql_select = 'template_id, template_name, template_path, template_storedb'; diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index e0a849b105..b7d79cbb37 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -412,6 +412,7 @@ $lang += array( 'acl_f_postcount' => 'Increment post counter', 'acl_f_moderate' => 'Posts are moderated', + 'acl_u_hideonline' => 'Can hide online status', 'acl_u_viewonline' => 'Can view all online', 'acl_u_viewprofile' => 'Can view profiles', 'acl_u_sendemail' => 'Can send emails', @@ -979,7 +980,8 @@ $lang += array( // Styling $lang += array( - 'MANAGE_STYLE_EXPLAIN' => 'Here you can manage the available styles on your board. A style consists off a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterix, * Also listed is the total user count for each style, note that overriding user styles will not be reflected here.', + 'STYLES' => 'Styles', + 'STYLES_EXPLAIN' => 'Here you can manage the available styles on your board. A style consists off a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterix, * Also listed is the total user count for each style, note that overriding user styles will not be reflected here.', 'STYLE_NAME' => 'Style name', 'STYLE_USED_BY' => 'Used by', 'STYLE_ACTIVATE' => 'Activate', @@ -1010,7 +1012,7 @@ $lang += array( 'STYLE_IMPORT_BASIS' => 'Import style from store', 'STYLE_EXPORT' => 'Export Style', - 'STYLE_EXPORT_EXPLAIN' => 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least two. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and ommit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', + 'STYLE_EXPORT_EXPLAIN' => 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and ommit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'INCLUDE_TEMPLATE' => 'Include template', 'INCLUDE_THEME' => 'Include theme', 'INCLUDE_IMAGESET' => 'Include imageset', @@ -1104,7 +1106,8 @@ $lang += array( 'THEME_LOCATION_EXPLAIN'=> 'Images are always stored on the filesystem.', '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. Using the raw mode you can style additional CSS elements such as borders, etc. You only need set the parameters you need, e.g. if you do not want a background image leave that parameter unset. You may also add additional "custom" classes should your template or style make use of them.', + '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 add additional parameters such as borders, etc. Only set parameters you need else leave them blank or unset. Default classes used by this theme are coloured red in the select box. You may also add additional "custom" classes should your template or style make use of them.', + 'SELECTED_THEME' => 'Selected theme', 'SELECT_CLASS' => 'Select class', 'SHOW_RAW_CSS' => 'Show CSS', 'HIDE_RAW_CSS' => 'Hide CSS', @@ -1158,7 +1161,7 @@ $lang += array( 'CSS_SIZE' => 'Size', 'CSS_CODE' => 'Code', 'CSS_QUOTE' => 'Quote', - 'CSS_flash' => 'Flash', + 'CSS_FLASH' => 'Flash', 'CSS_SYNTAXBG' => 'Syntax Background', 'CSS_SYNTAXCOMMENT' => 'Syntax Comments', 'CSS_SYNTAXDEFAULT' => 'Syntax Default', @@ -1170,11 +1173,11 @@ $lang += array( 'CSS_ANCHOR_ACTIVE' => 'Active', 'CSS_ANCHOR_VISITED'=> 'Visited', 'CSS_ANCHOR_HOVER' => 'Hover', - 'BACKGROUND' => 'Background', + 'CSS_PARAMETER' => 'Parameter', 'CSS_VALUE' => 'Value', 'RAW_CSS' => 'Raw CSS', - '' => '', + 'BACKGROUND' => 'Background', 'BACKGROUND_COLOUR' => 'Background colour', 'BACKGROUND_IMAGE' => 'Background image', 'BACKGROUND_REPEAT' => 'Repeat background', @@ -1198,7 +1201,8 @@ $lang += array( 'CSS_CLASS_NAME' => 'CSS class name', 'CUSTOM_CLASS' => 'Custom Class', - 'THEME_UPDATED' => 'Theme updated successfully', + 'THEME_CLASS_ADDED' => 'Custom class added successfully', + 'THEME_UPDATED' => 'Class updated successfully', 'THEME_ADDED_DB' => 'New theme added to database', 'THEME_ADDED' => 'New theme added on filesystem', 'THEME_DETAILS_UPDATE' => 'Theme details updated', @@ -1271,6 +1275,7 @@ $lang += array( 'THEME_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters', 'THEME_ERR_ARCHIVE' => 'Please select an archive method', 'THEME_ERR_NOT_THEME' => 'The archive you specified does not contain a valid theme.', + 'THEME_ERR_CLASS_CHARS' => 'Only alphanumeric characters plus ., : and # are valid in class names.', 'IMAGESET_ERR_STYLE_NAME' => 'You must supply a name for this imageset', 'IMAGESET_ERR_NAME_CHARS' => 'The imageset name can only contain alphanumeric characters, -, +, _ and space', 'IMAGESET_ERR_NAME_LONG' => 'The imageset name can be no longer than 30 characters',