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

[feature/bbcode-icon-name] Update instances to bbcode font icon

Browse source 
PHPBB3-17326
This commit is contained in:
Daniel James 2024-06-09 12:30:46 +01:00
parent 43012c61e8
commit 47f3c23f3f
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/adm/style/acp_bbcodes.html
View file

@ -45,9 +45,13 @@
<dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt>
<dd><input type="checkbox" class="radio" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd>
</dl>
</fieldset>
<fieldset>
<legend>{L_APPEARANCE}</legend>
<dl>
<dt><label for="bbcode_icon_name">{L_BBCODE_ICON_NAME}</label><br /><span>{L_BBCODE_ICON_NAME_EXPLAIN}</span></dt>
<dd><input type="text" name="bbcode_icon_name" id="bbcode_icon_name" value="{{ BBCODE_ICON_NAME }}" /></dd>
<dt><label for="bbcode_font_icon">{L_BBCODE_FONT_ICON}</label><br /><span>{L_BBCODE_FONT_ICON_EXPLAIN}</span></dt>
<dd><input type="text" name="bbcode_font_icon" id="bbcode_font_icon" value="{{ BBCODE_FONT_ICON }}" /></dd>
</dl>
</fieldset>

22
phpBB/includes/acp/acp_bbcodes.php
View file

@ -44,12 +44,12 @@ class acp_bbcodes
switch ($action)
{
case 'add':
$bbcode_match = $bbcode_tpl = $bbcode_helpline = $bbcode_icon_name = '';
$bbcode_match = $bbcode_tpl = $bbcode_helpline = $bbcode_font_icon = '';
$display_on_posting = 0;
break;
case 'edit':
$sql = 'SELECT bbcode_match, bbcode_tpl, display_on_posting, bbcode_helpline, bbcode_icon_name
$sql = 'SELECT bbcode_match, bbcode_tpl, display_on_posting, bbcode_helpline, bbcode_font_icon
FROM ' . BBCODES_TABLE . '
WHERE bbcode_id = ' . $bbcode_id;
$result = $db->sql_query($sql);
@ -65,7 +65,7 @@ class acp_bbcodes
$bbcode_tpl = htmlspecialchars($row['bbcode_tpl'], ENT_COMPAT);
$display_on_posting = $row['display_on_posting'];
$bbcode_helpline = $row['bbcode_helpline'];
$bbcode_icon_name = $row['bbcode_icon_name'];
$bbcode_font_icon = $row['bbcode_font_icon'];
break;
case 'modify':
@ -89,7 +89,7 @@ class acp_bbcodes
$bbcode_match = $request->variable('bbcode_match', '');
$bbcode_tpl = html_entity_decode($request->variable('bbcode_tpl', '', true), ENT_COMPAT);
$bbcode_helpline = $request->variable('bbcode_helpline', '', true);
$bbcode_icon_name = $request->variable('bbcode_icon_name', '');
$bbcode_font_icon = $request->variable('bbcode_font_icon', '');
break;
}
@ -108,7 +108,7 @@ class acp_bbcodes
'BBCODE_MATCH' => $bbcode_match,
'BBCODE_TPL' => $bbcode_tpl,
'BBCODE_HELPLINE' => $bbcode_helpline,
'BBCODE_ICON_NAME' => $bbcode_icon_name,
'BBCODE_FONT_ICON' => $bbcode_font_icon,
'DISPLAY_ON_POSTING' => $display_on_posting,
);
@ -159,7 +159,7 @@ class acp_bbcodes
* @var string bbcode_match The bbcode usage string to match
* @var string bbcode_tpl The bbcode HTML replacement string
* @var string bbcode_helpline The bbcode help line string
* @var string bbcode_icon_name The name of the bbcode FA icon
* @var string bbcode_font_icon The name of the bbcode FA icon
* @var array hidden_fields Array of hidden fields for use when
* submitting form when $warn_unsafe is true
* @since 3.1.0-a3
@ -172,7 +172,7 @@ class acp_bbcodes
'bbcode_match',
'bbcode_tpl',
'bbcode_helpline',
'bbcode_icon_name',
'bbcode_font_icon',
'hidden_fields',
);
extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_modify_create', compact($vars)));
@ -245,9 +245,9 @@ class acp_bbcodes
trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
}
if (strlen($bbcode_icon_name) > 255)
if (strlen($bbcode_font_icon) > 255)
{
trigger_error($user->lang['BBCODE_ICON_NAME_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
trigger_error($user->lang['BBCODE_FONT_ICON_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);
}
/**
@ -262,7 +262,7 @@ class acp_bbcodes
'bbcode_tpl' => $bbcode_tpl,
'display_on_posting' => $display_on_posting,
'bbcode_helpline' => $bbcode_helpline,
'bbcode_icon_name' => $bbcode_icon_name,
'bbcode_font_icon' => $bbcode_font_icon,
'first_pass_match' => $data['first_pass_match'],
'first_pass_replace' => $data['first_pass_replace'],
'second_pass_match' => $data['second_pass_match'],
@ -347,7 +347,7 @@ class acp_bbcodes
'bbcode_match' => $bbcode_match,
'bbcode_tpl' => htmlspecialchars($bbcode_tpl, ENT_COMPAT),
'bbcode_helpline' => $bbcode_helpline,
'bbcode_icon_name' => $bbcode_icon_name,
'bbcode_font_icon' => $bbcode_font_icon,
'display_on_posting' => $display_on_posting,
)))
, 'confirm_bbcode.html');

6
phpBB/language/en/acp/posting.php
View file

@ -54,9 +54,9 @@ $lang = array_merge($lang, array(
'BBCODE_HELPLINE_TEXT' => 'Help line text',
'BBCODE_HELPLINE_TOO_LONG' => 'The help line you entered is too long.',
'BBCODE_ICON_NAME' => 'Button icon',
'BBCODE_ICON_NAME_EXPLAIN' => 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. <a href="https://fontawesome.com/v4/icons/">Click here</a> to view the list of available icons.',
'BBCODE_ICON_NAME_TOO_LONG' => 'The icon name you have 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. <a href="https://fontawesome.com/v4/icons/" target="_blank">Click here</a> to view the list of available icons.',
'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.',