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

[ticket/701] Fix tests and move declarations to services file

Browse Source 
B3P-701
This commit is contained in:
Marc Alexander
2021-09-04 17:15:12 +02:00
parent bca0afa86d
commit 9f374290ad
11 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
controller/helper.php
View File

@@ -230,16 +230,9 @@ class helper
*/
public function assign_module_vars($row, $template_module)
{
$use_fa = 0;
$fa_styles = explode(';', $this->config['board3_portal_fa_styles']);
foreach ($fa_styles as $fa_style)
{
if ($this->user->style['style_name'] == $fa_style)
{
$use_fa = 1;
break;
}
}
$fa_styles = json_decode($this->config['board3_portal_fa_styles']);
$use_fa = !empty($fa_styles) && in_array($this->user->style['style_name'], $fa_styles);
if (is_array($template_module))
{
$this->template->assign_block_vars('modules_' . $this->portal_columns->number_to_string($row['module_column']), array(
@@ -250,8 +243,8 @@ class helper
'MODULE_ID' => $row['module_id'],
'IMAGE_WIDTH' => $row['module_image_width'],
'IMAGE_HEIGHT' => $row['module_image_height'],
'FA_ICON' => utf8_htmlspecialchars($row['module_fa_icon']),
'FA_SIZE' => $row['module_fa_size'],
'FA_ICON' => isset($row['module_fa_icon']) ? utf8_htmlspecialchars($row['module_fa_icon']) : '',
'FA_SIZE' => $row['module_fa_size'] ?? '',
'FA_ENABLED' => $use_fa,
));
}
@@ -264,8 +257,8 @@ class helper
'IMAGE_HEIGHT' => $row['module_image_height'],
'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']),
'FA_ICON' => utf8_htmlspecialchars($row['module_fa_icon']),
'FA_SIZE' => $row['module_fa_size'],
'FA_ICON' => isset($row['module_fa_icon']) ? utf8_htmlspecialchars($row['module_fa_icon']) : '',
'FA_SIZE' => $row['module_fa_size'] ?? '',
'FA_ENABLED' => $use_fa,
));
}