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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2019-08-17 11:02:23 +02:00
commit 7f8182fbb5
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 67 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/adm/style/acp_styles.html
View file

@ -146,7 +146,9 @@
{styles_list.EXTRA} {styles_list.EXTRA}
<td class="{$ROW_CLASS} mark" width="20"> <td class="{$ROW_CLASS} mark" width="20">
<!-- IF styles_list.STYLE_ID --> <!-- IF styles_list.STYLE_ID -->
<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" /> {% if styles_list.STYLE_NAME !== 'prosilver' %}
<input class="checkbox" type="checkbox" name="ids[]" value="{styles_list.STYLE_ID}" />
{% endif %}
<!-- ELSE --> <!-- ELSE -->
<!-- IF styles_list.COMMENT != '' --> <!-- IF styles_list.COMMENT != '' -->
&nbsp; &nbsp;

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

@ -259,6 +259,19 @@ class acp_styles
// Get list of styles to uninstall // Get list of styles to uninstall
$ids = $this->request_vars('id', 0, true); $ids = $this->request_vars('id', 0, true);
// Don't remove prosilver, you can still deactivate it.
$sql = 'SELECT style_id
FROM ' . STYLES_TABLE . "
WHERE style_name = '" . $this->db->sql_escape('prosilver') . "'";
$result = $this->db->sql_query($sql);
$prosilver_id = (int) $this->db->sql_fetchfield('style_id');
$this->db->sql_freeresult($result);
if ($prosilver_id && in_array($prosilver_id, $ids))
{
trigger_error($this->user->lang('UNINSTALL_PROSILVER') . adm_back_link($this->u_action), E_USER_WARNING);
}
// Check if confirmation box was submitted // Check if confirmation box was submitted
if (confirm_box(true)) if (confirm_box(true))
{ {
@ -998,11 +1011,14 @@ class acp_styles
'L_ACTION' => $this->user->lang['EXPORT'] 'L_ACTION' => $this->user->lang['EXPORT']
); */ ); */
// Uninstall if ($style['style_name'] !== 'prosilver')
$actions[] = array( {
'U_ACTION' => $this->u_action . '&amp;action=uninstall&amp;hash=' . generate_link_hash('uninstall') . '&amp;id=' . $style['style_id'], // Uninstall
'L_ACTION' => $this->user->lang['STYLE_UNINSTALL'] $actions[] = array(
); 'U_ACTION' => $this->u_action . '&amp;action=uninstall&amp;hash=' . generate_link_hash('uninstall') . '&amp;id=' . $style['style_id'],
'L_ACTION' => $this->user->lang['STYLE_UNINSTALL']
);
}
// Preview // Preview
$actions[] = array( $actions[] = array(

85
phpBB/language/en/acp/styles.php
View file

@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
if (empty($lang) || !is_array($lang)) if (empty($lang) || !is_array($lang))
{ {
$lang = array(); $lang = [];
} }
// DEVELOPERS PLEASE NOTE // DEVELOPERS PLEASE NOTE
@ -36,55 +36,56 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text // equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
$lang = array_merge($lang, array( $lang = array_merge($lang, [
'ACP_STYLES_EXPLAIN' => 'Here you can manage the available styles on your board. You may alter existing styles, delete, deactivate, reactivate, install new ones. You can also see what a style will look like using the preview function. Also listed is the total user count for each style, note that overriding user styles will not be reflected here.', 'ACP_STYLES_EXPLAIN' => 'Here you can manage the styles available on your board.<br>Please note you cannot uninstall the “<strong>prosilver</strong>” style as it is phpBB’s default and primary parent style.',
'CANNOT_BE_INSTALLED' => 'Cannot be installed', 'CANNOT_BE_INSTALLED' => 'Cannot be installed',
'CONFIRM_UNINSTALL_STYLES' => 'Are you sure you wish to uninstall selected styles?', 'CONFIRM_UNINSTALL_STYLES' => 'Are you sure you wish to uninstall selected styles?',
'COPYRIGHT' => 'Copyright', 'COPYRIGHT' => 'Copyright',
'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.', 'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.',
'DELETE_FROM_FS' => 'Delete from filesystem', 'DELETE_FROM_FS' => 'Delete from filesystem',
'DELETE_STYLE_FILES_FAILED' => 'Error deleting files for style "%s".', 'DELETE_STYLE_FILES_FAILED' => 'Error deleting files for style "%s".',
'DELETE_STYLE_FILES_SUCCESS' => 'Files for style "%s" have been deleted.', 'DELETE_STYLE_FILES_SUCCESS' => 'Files for style "%s" have been deleted.',
'DETAILS' => 'Details', 'DETAILS' => 'Details',
'INHERITING_FROM' => 'Inherits from', 'INHERITING_FROM' => 'Inherits from',
'INSTALL_STYLE' => 'Install style', 'INSTALL_STYLE' => 'Install style',
'INSTALL_STYLES' => 'Install styles', 'INSTALL_STYLES' => 'Install styles',
'INSTALL_STYLES_EXPLAIN' => 'Here you can install new styles.<br />If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.', 'INSTALL_STYLES_EXPLAIN' => 'Here you can install new styles.<br>If you cannot find a specific style in list below, check to make sure style is already installed. If it is not installed, check if it was uploaded correctly.',
'INVALID_STYLE_ID' => 'Invalid style ID.', 'INVALID_STYLE_ID' => 'Invalid style ID.',
'NO_MATCHING_STYLES_FOUND' => 'No styles match your query.', 'NO_MATCHING_STYLES_FOUND' => 'No styles match your query.',
'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected.', 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected.',
'PURGED_CACHE' => 'Cache was purged.', 'PURGED_CACHE' => 'Cache was purged.',
'REQUIRES_STYLE' => 'This style requires the style "%s" to be installed.', 'REQUIRES_STYLE' => 'This style requires the style "%s" to be installed.',
'STYLE_ACTIVATE' => 'Activate', 'STYLE_ACTIVATE' => 'Activate',
'STYLE_ACTIVE' => 'Active', 'STYLE_ACTIVE' => 'Active',
'STYLE_DEACTIVATE' => 'Deactivate', 'STYLE_DEACTIVATE' => 'Deactivate',
'STYLE_DEFAULT' => 'Make default style', 'STYLE_DEFAULT' => 'Make default style',
'STYLE_DEFAULT_CHANGE_INACTIVE' => 'You must activate style before making it default style.', 'STYLE_DEFAULT_CHANGE_INACTIVE' => 'You must activate style before making it default style.',
'STYLE_ERR_INVALID_PARENT' => 'Invalid parent style.', 'STYLE_ERR_INVALID_PARENT' => 'Invalid parent style.',
'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.',
'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_INSTALLED' => 'Style "%s" has been installed.', 'STYLE_INSTALLED' => 'Style "%s" has been installed.',
'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list', 'STYLE_INSTALLED_RETURN_INSTALLED_STYLES' => 'Return to installed styles list',
'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles', 'STYLE_INSTALLED_RETURN_UNINSTALLED_STYLES' => 'Install more styles',
'STYLE_NAME' => 'Style name', 'STYLE_NAME' => 'Style name',
'STYLE_NAME_RESERVED' => 'Style "%s" can not be installed, because the name is reserved.', 'STYLE_NAME_RESERVED' => 'Style "%s" can not be installed, because the name is reserved.',
'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.', 'STYLE_NOT_INSTALLED' => 'Style "%s" was not installed.',
'STYLE_PATH' => 'Style path', 'STYLE_PATH' => 'Style path',
'STYLE_UNINSTALL' => 'Uninstall', 'STYLE_UNINSTALL' => 'Uninstall',
'STYLE_UNINSTALL_DEPENDENT' => 'Style "%s" cannot be uninstalled because it has one or more child styles.', 'STYLE_UNINSTALL_DEPENDENT' => 'Style "%s" cannot be uninstalled because it has one or more child styles.',
'STYLE_UNINSTALLED' => 'Style "%s" uninstalled successfully.', 'STYLE_UNINSTALLED' => 'Style "%s" uninstalled successfully.',
'STYLE_PHPBB_VERSION' => 'phpBB Version', 'STYLE_PHPBB_VERSION' => 'phpBB Version',
'STYLE_USED_BY' => 'Used by (including robots)', 'STYLE_USED_BY' => 'Used by (including robots)',
'STYLE_VERSION' => 'Style version', 'STYLE_VERSION' => 'Style version',
'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', 'UNINSTALL_PROSILVER' => 'You cannot uninstall the style “prosilver”.',
'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.',
'BROWSE_STYLES_DATABASE' => 'Browse styles database', 'BROWSE_STYLES_DATABASE' => 'Browse styles database',
)); ]);