Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/701] Replaces spaces with tabs

Browse Source 
B3P-701
This commit is contained in:
Marc Alexander
2021-09-04 16:27:41 +02:00
parent d0a74065c0
commit bca0afa86d
6 changed files with 126 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acp/portal_module.php
View File

@@ -108,8 +108,8 @@ class portal_module
'board3_show_all_pages' => array('lang' => 'ACP_PORTAL_SHOW_ALL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'board3_show_all_pages' => array('lang' => 'ACP_PORTAL_SHOW_ALL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'board3_show_all_side' => array('lang' => 'PORTAL_SHOW_ALL_SIDE', 'validate' => 'bool', 'type' => 'custom', 'method' => array('board3.portal.modules_helper', 'display_left_right'), 'submit' => array('board3.portal.modules_helper', 'store_left_right'), 'explain' => true), 'board3_show_all_side' => array('lang' => 'PORTAL_SHOW_ALL_SIDE', 'validate' => 'bool', 'type' => 'custom', 'method' => array('board3.portal.modules_helper', 'display_left_right'), 'submit' => array('board3.portal.modules_helper', 'store_left_right'), 'explain' => true),
'legend4' => 'ACP_FA', 'legend4' => 'ACP_FA',
'board3_fa_styles' => array('lang' => 'ACP_FA', 'validate' => 'string', 'type' => 'custom', 'method' => array('board3.portal.modules_helper', 'display_fa_styles'), 'submit' => array('board3.portal.modules_helper', 'store_fa_styles'), 'explain' => true), 'board3_fa_styles' => array('lang' => 'ACP_FA', 'validate' => 'string', 'type' => 'custom', 'method' => array('board3.portal.modules_helper', 'display_fa_styles'), 'submit' => array('board3.portal.modules_helper', 'store_fa_styles'), 'explain' => true),
) )
); );

32
controller/helper.php
View File

@@ -230,16 +230,16 @@ class helper
*/ */
public function assign_module_vars($row, $template_module) public function assign_module_vars($row, $template_module)
{ {
$use_fa = 0; $use_fa = 0;
$fa_styles = explode(';', $this->config['board3_portal_fa_styles']); $fa_styles = explode(';', $this->config['board3_portal_fa_styles']);
foreach ($fa_styles as $fa_style) foreach ($fa_styles as $fa_style)
{ {
if ($this->user->style['style_name'] == $fa_style) if ($this->user->style['style_name'] == $fa_style)
{ {
$use_fa = 1; $use_fa = 1;
break; break;
} }
} }
if (is_array($template_module)) if (is_array($template_module))
{ {
$this->template->assign_block_vars('modules_' . $this->portal_columns->number_to_string($row['module_column']), array( $this->template->assign_block_vars('modules_' . $this->portal_columns->number_to_string($row['module_column']), array(
@@ -250,9 +250,9 @@ class helper
'MODULE_ID' => $row['module_id'], 'MODULE_ID' => $row['module_id'],
'IMAGE_WIDTH' => $row['module_image_width'], 'IMAGE_WIDTH' => $row['module_image_width'],
'IMAGE_HEIGHT' => $row['module_image_height'], 'IMAGE_HEIGHT' => $row['module_image_height'],
'FA_ICON' => utf8_htmlspecialchars($row['module_fa_icon']), 'FA_ICON' => utf8_htmlspecialchars($row['module_fa_icon']),
'FA_SIZE' => $row['module_fa_size'], 'FA_SIZE' => $row['module_fa_size'],
'FA_ENABLED' => $use_fa, 'FA_ENABLED' => $use_fa,
)); ));
} }
else else
@@ -264,9 +264,9 @@ class helper
'IMAGE_HEIGHT' => $row['module_image_height'], 'IMAGE_HEIGHT' => $row['module_image_height'],
'MODULE_ID' => $row['module_id'], 'MODULE_ID' => $row['module_id'],
'TITLE' => (isset($this->user->lang[$row['module_name']])) ? $this->user->lang[$row['module_name']] : utf8_normalize_nfc($row['module_name']), 'TITLE' => (isset($this->user->lang[$row['module_name']])) ? $this->user->lang[$row['module_name']] : utf8_normalize_nfc($row['module_name']),
'FA_ICON' => utf8_htmlspecialchars($row['module_fa_icon']), 'FA_ICON' => utf8_htmlspecialchars($row['module_fa_icon']),
'FA_SIZE' => $row['module_fa_size'], 'FA_SIZE' => $row['module_fa_size'],
'FA_ENABLED' => $use_fa, 'FA_ENABLED' => $use_fa,
)); ));
} }
} }

94
includes/modules_helper.php
View File

@@ -189,52 +189,52 @@ class modules_helper
$this->config->set($key, $value); $this->config->set($key, $value);
} }
/** /**
* Show available styles * Show available styles
* *
* @return string Select with available styles * @return string Select with available styles
*/ */
public function display_fa_styles() public function display_fa_styles()
{ {
global $phpbb_container; global $phpbb_container;
$table_prefix = $phpbb_container->getParameter('core.table_prefix'); $table_prefix = $phpbb_container->getParameter('core.table_prefix');
$db = $phpbb_container->get('dbal.conn'); $db = $phpbb_container->get('dbal.conn');
$selected = explode(';', $this->config['board3_portal_fa_styles']); $selected = explode(';', $this->config['board3_portal_fa_styles']);
$options = ''; $options = '';
$query = 'SELECT style_name $query = 'SELECT style_name
FROM ' . $table_prefix . 'styles'; FROM ' . $table_prefix . 'styles';
$result = $db->sql_query($query); $result = $db->sql_query($query);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$options .= '<option value="' . $row['style_name'] . '"'; $options .= '<option value="' . $row['style_name'] . '"';
foreach ($selected as $style) foreach ($selected as $style)
{ {
if ($style == $row['style_name']) if ($style == $row['style_name'])
{ {
$options .= ' selected'; $options .= ' selected';
break; break;
} }
} }
$options .= '>' . $row['style_name'] . '</option>'; $options .= '>' . $row['style_name'] . '</option>';
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
return '<select id="board3_fa_styles" name="board3_fa_styles[]" multiple>' . $options . '</select>'; return '<select id="board3_fa_styles" name="board3_fa_styles[]" multiple>' . $options . '</select>';
} }
/** /**
* Save styles that have been set as Font Awesome styles * Save styles that have been set as Font Awesome styles
* *
* @param string $key Key of the parameter * @param string $key Key of the parameter
*/ */
public function store_fa_styles($key) public function store_fa_styles($key)
{ {
$style_array = $this->request->variable($key, array('')); $style_array = $this->request->variable($key, array(''));
$styles = ''; $styles = '';
foreach ($style_array as $style) foreach ($style_array as $style)
{ {
$styles .= ($styles == '' ? '' : ';') . $style; $styles .= ($styles == '' ? '' : ';') . $style;
} }
var_dump($styles); var_dump($styles);
$this->config->set('board3_portal_fa_styles', $styles); $this->config->set('board3_portal_fa_styles', $styles);
} }
} }

14
language/de/portal_acp.php
View File

@@ -107,11 +107,11 @@ $lang = array_merge($lang, array(
'PORTAL_BASIC_INSTALL' => 'Füge Basismodule hinzu', 'PORTAL_BASIC_INSTALL' => 'Füge Basismodule hinzu',
'PORTAL_BASIC_UNINSTALL' => 'Entferne Module von Datenbank', 'PORTAL_BASIC_UNINSTALL' => 'Entferne Module von Datenbank',
// Font Awesome // Font Awesome
'ACP_FA' => 'Font Awesome Styles', 'ACP_FA' => 'Font Awesome Styles',
'ACP_FA_EXP' => 'Hier kannst du einstellen welche Styles Font Awesome Icons nutzen sollen.', 'ACP_FA_EXP' => 'Hier kannst du einstellen welche Styles Font Awesome Icons nutzen sollen.',
'MODULE_FA' => 'Font Awesome Icon', 'MODULE_FA' => 'Font Awesome Icon',
'MODULE_FA_EXP' => 'Hier kannst du ein Font Awesome Icon einstellen. Dieses wird verwendet wenn der Style Font Awesome verwendet.', 'MODULE_FA_EXP' => 'Hier kannst du ein Font Awesome Icon einstellen. Dieses wird verwendet wenn der Style Font Awesome verwendet.',
'MODULE_FA_SIZE' => 'Font Awesome Icongröße', 'MODULE_FA_SIZE' => 'Font Awesome Icongröße',
'MODULE_FA_SIZE_EXP' => 'Hier kannst du die Größe des Font Awesome Icons einstellen (in Pixel).', 'MODULE_FA_SIZE_EXP' => 'Hier kannst du die Größe des Font Awesome Icons einstellen (in Pixel).',
)); ));

14
language/en/portal_acp.php
View File

@@ -107,11 +107,11 @@ $lang = array_merge($lang, array(
'PORTAL_BASIC_INSTALL' => 'Adding basic set of modules', 'PORTAL_BASIC_INSTALL' => 'Adding basic set of modules',
'PORTAL_BASIC_UNINSTALL' => 'Removing modules from database', 'PORTAL_BASIC_UNINSTALL' => 'Removing modules from database',
// Font Awesome // Font Awesome
'ACP_FA' => 'Font Awesome styles', 'ACP_FA' => 'Font Awesome styles',
'ACP_FA_EXP' => 'Here you can define which styles should use the Font Awesome icons.', 'ACP_FA_EXP' => 'Here you can define which styles should use the Font Awesome icons.',
'MODULE_FA' => 'Font Awesome icon', 'MODULE_FA' => 'Font Awesome icon',
'MODULE_FA_EXP' => 'Here you can select a Font Awesome icon. This will be used when your selected style uses Font Awesome icons.', 'MODULE_FA_EXP' => 'Here you can select a Font Awesome icon. This will be used when your selected style uses Font Awesome icons.',
'MODULE_FA_SIZE' => 'Font Awesome icon size', 'MODULE_FA_SIZE' => 'Font Awesome icon size',
'MODULE_FA_SIZE_EXP' => 'Here you can change the size of the Font Awesome icon in pixel.', 'MODULE_FA_SIZE_EXP' => 'Here you can change the size of the Font Awesome icon in pixel.',
)); ));

94
migrations/v220_fa.php
View File

@@ -12,54 +12,54 @@ use phpbb\db\migration\migration;
class v220_fa extends migration class v220_fa extends migration
{ {
static public function depends_on() public static function depends_on()
{ {
return array('\board3\portal\migrations\v210_rc3'); return array('\board3\portal\migrations\v210');
} }
public function update_schema() public function update_schema()
{ {
return array( return array(
'add_columns' => array( 'add_columns' => array(
$this->table_prefix . 'portal_modules' => array( $this->table_prefix . 'portal_modules' => array(
'module_fa_icon' => array('VCHAR', ''), 'module_fa_icon' => array('VCHAR', ''),
'module_fa_size' => array('INT:1', 16), 'module_fa_size' => array('INT:1', 16),
), ),
), ),
); );
} }
public function update_data() public function update_data()
{ {
return array( return array(
array('config.add', array('board3_portal_fa_styles', '')), array('config.add', array('board3_portal_fa_styles', '')),
array('custom', array(array(&$this, 'insert_defaults'))), array('custom', array(array(&$this, 'insert_defaults'))),
); );
} }
public function insert_defaults() public function insert_defaults()
{ {
$fa_icons = array( $fa_icons = array(
'\board3\portal\modules\main_menu' => 'fa-bars', '\board3\portal\modules\main_menu' => 'fa-bars',
'\board3\portal\modules\stylechanger' => 'fa-paint-brush', '\board3\portal\modules\stylechanger' => 'fa-paint-brush',
'\board3\portal\modules\birthday_list' => 'fa-birthday-cake', '\board3\portal\modules\birthday_list' => 'fa-birthday-cake',
'\board3\portal\modules\clock' => 'fa-clock-o', '\board3\portal\modules\clock' => 'fa-clock-o',
'\board3\portal\modules\search' => 'fa-search', '\board3\portal\modules\search' => 'fa-search',
'\board3\portal\modules\attachments' => 'fa-paperclip', '\board3\portal\modules\attachments' => 'fa-paperclip',
'\board3\portal\modules\topposters' => 'fa-pencil-square-o', '\board3\portal\modules\topposters' => 'fa-pencil-square-o',
'\board3\portal\modules\latest_members' => 'fa-users', '\board3\portal\modules\latest_members' => 'fa-users',
'\board3\portal\modules\link_us' => 'fa-external-link', '\board3\portal\modules\link_us' => 'fa-external-link',
'\board3\portal\modules\user_menu' => 'fa-user', '\board3\portal\modules\user_menu' => 'fa-user',
'\board3\portal\modules\statistics' => 'fa-bar-chart', '\board3\portal\modules\statistics' => 'fa-bar-chart',
'\board3\portal\modules\calendar' => 'fa-calendar', '\board3\portal\modules\calendar' => 'fa-calendar',
'\board3\portal\modules\leaders' => 'fa-users', '\board3\portal\modules\leaders' => 'fa-users',
'\board3\portal\modules\latest_bots' => 'fa-android', '\board3\portal\modules\latest_bots' => 'fa-android',
'\board3\portal\modules\links' => 'fa-link', '\board3\portal\modules\links' => 'fa-link',
); );
foreach ($fa_icons as $key => $value) foreach ($fa_icons as $key => $value)
{ {
$query = 'UPDATE ' . $this->table_prefix . "portal_modules SET module_fa_icon = '" . $value . "' WHERE module_classname = '" . $this->db->sql_escape($key) . "'"; $query = 'UPDATE ' . $this->table_prefix . "portal_modules SET module_fa_icon = '" . $value . "' WHERE module_classname = '" . $this->db->sql_escape($key) . "'";
$this->db->sql_query($query); $this->db->sql_query($query);
} }
} }
} }