[ticket/17326] Differentiate between invalid and too long icon name

PHPBB-17326
This commit is contained in:
Marc Alexander 2025-02-15 10:44:08 +01:00
parent bf15d1ea42
commit 29c19bb764
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 8 additions and 3 deletions

View file

@ -236,7 +236,12 @@ class acp_bbcodes
trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
}
if (strlen($bbcode_font_icon) > 64 || preg_match('/^[\w-]+$/', $bbcode_font_icon))
if (strlen($bbcode_font_icon) > 64)
{
trigger_error($user->lang['BBCODE_FONT_ICON_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
}
if (!empty($bbcode_font_icon) && !preg_match('/^[\w-]+$/', $bbcode_font_icon))
{
trigger_error($user->lang['BBCODE_FONT_ICON_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
}

View file

@ -55,8 +55,8 @@ $lang = array_merge($lang, array(
'BBCODE_HELPLINE_TOO_LONG' => 'The help line you entered is too long.',
'BBCODE_FONT_ICON' => 'BBCode icon',
'BBCODE_FONT_ICON_EXPLAIN' => 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. %1$sClick here%2$s to view the list of available icons. Only solid style icons are supported.',
'BBCODE_FONT_ICON_INVALID' => 'The icon name you have entered is too long.',
'BBCODE_FONT_ICON_INVALID' => 'The icon name you have entered is invalid.',
'BBCODE_FONT_ICON_TOO_LONG' => 'The icon name you have entered is too long.',
'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.',
'BBCODE_INVALID' => 'Your BBCode is constructed in an invalid form.',
'BBCODE_INVALID_TEMPLATE' => 'Your BBCodes template is invalid.',