@@ -33,13 +33,13 @@ |
||
33 | 33 | protected $data = array(); |
34 | 34 | |
35 | 35 | /** |
36 | - * Construct |
|
37 | - * |
|
38 | - * @param \phpbb\db\driver\driver_interface $db Database connection |
|
39 | - * @param string $items_table Table name |
|
40 | - * @param string $pk Primary key |
|
41 | - * @param string $sql_where Column restriction |
|
42 | - */ |
|
36 | + * Construct |
|
37 | + * |
|
38 | + * @param \phpbb\db\driver\driver_interface $db Database connection |
|
39 | + * @param string $items_table Table name |
|
40 | + * @param string $pk Primary key |
|
41 | + * @param string $sql_where Column restriction |
|
42 | + */ |
|
43 | 43 | public function __construct(\phpbb\db\driver\driver_interface $db, $items_table, $pk, $sql_where = '') |
44 | 44 | { |
45 | 45 | $this->db = $db; |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
59 | - * {@inheritdoc} |
|
60 | - */ |
|
59 | + * {@inheritdoc} |
|
60 | + */ |
|
61 | 61 | public function to_array() |
62 | 62 | { |
63 | 63 | $attributes = $this->get_attributes(); |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
77 | - * {@inheritdoc} |
|
78 | - */ |
|
77 | + * {@inheritdoc} |
|
78 | + */ |
|
79 | 79 | public function to_db() |
80 | 80 | { |
81 | 81 | $this->check_required(); |
@@ -14,12 +14,12 @@ |
||
14 | 14 | class nestedset extends builder |
15 | 15 | { |
16 | 16 | /** |
17 | - * Construct |
|
18 | - * |
|
19 | - * @param \phpbb\db\driver\driver_interface $db Database connection |
|
20 | - * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around |
|
21 | - * @param string $table_name Table name |
|
22 | - */ |
|
17 | + * Construct |
|
18 | + * |
|
19 | + * @param \phpbb\db\driver\driver_interface $db Database connection |
|
20 | + * @param \phpbb\lock\db $lock Lock class used to lock the table when moving forums around |
|
21 | + * @param string $table_name Table name |
|
22 | + */ |
|
23 | 23 | public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\lock\db $lock, $table_name) |
24 | 24 | { |
25 | 25 | parent::__construct( |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | protected $user; |
16 | 16 | |
17 | 17 | /** |
18 | - * Constructor |
|
19 | - * |
|
20 | - * @param \phpbb\user $user |
|
21 | - * @return \phpbb\template\twig\extension |
|
22 | - */ |
|
18 | + * Constructor |
|
19 | + * |
|
20 | + * @param \phpbb\user $user |
|
21 | + * @return \phpbb\template\twig\extension |
|
22 | + */ |
|
23 | 23 | public function __construct(\phpbb\user $user) |
24 | 24 | { |
25 | 25 | $this->user = $user; |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | /** |
39 | - * Format user date |
|
40 | - * |
|
41 | - * @param int $gmepoch unix timestamp |
|
42 | - * @param string $format date format in date() notation. | used to indicate relative dates, for example |d m Y|, h:i is translated to Today, h:i. |
|
43 | - * @param bool $forcedate force non-relative date format. |
|
44 | - * |
|
45 | - * @return mixed translated date |
|
46 | - */ |
|
39 | + * Format user date |
|
40 | + * |
|
41 | + * @param int $gmepoch unix timestamp |
|
42 | + * @param string $format date format in date() notation. | used to indicate relative dates, for example |d m Y|, h:i is translated to Today, h:i. |
|
43 | + * @param bool $forcedate force non-relative date format. |
|
44 | + * |
|
45 | + * @return mixed translated date |
|
46 | + */ |
|
47 | 47 | public function format_date_filter($timestamp, $format = false, $forcedate = false) |
48 | 48 | { |
49 | 49 | return $this->user->format_date($timestamp, $format, $forcedate); |
@@ -43,7 +43,7 @@ |
||
43 | 43 | |
44 | 44 | /** |
45 | 45 | * return bool |
46 | - */ |
|
46 | + */ |
|
47 | 47 | protected function image_directory_is_ready() |
48 | 48 | { |
49 | 49 | $root_path = $this->container->getParameter('core.root_path'); |
@@ -9,11 +9,11 @@ discard block |
||
9 | 9 | * @ignore |
10 | 10 | */ |
11 | 11 | if (!defined('IN_PHPBB')) { |
12 | - exit; |
|
12 | + exit; |
|
13 | 13 | } |
14 | 14 | |
15 | 15 | if (empty($lang) || !is_array($lang)) { |
16 | - $lang = []; |
|
16 | + $lang = []; |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | // DEVELOPERS PLEASE NOTE |
@@ -33,74 +33,74 @@ discard block |
||
33 | 33 | // |
34 | 34 | |
35 | 35 | $lang = array_merge($lang, [ |
36 | - 'ACP_SITEMAKER' => 'SiteMaker', |
|
37 | - 'ACP_SM_SETTINGS' => 'Settings', |
|
36 | + 'ACP_SITEMAKER' => 'SiteMaker', |
|
37 | + 'ACP_SM_SETTINGS' => 'Settings', |
|
38 | 38 | |
39 | - 'BLOCKS_CLEANUP' => 'Blocks Cleanup', |
|
40 | - 'BLOCKS_CLEANUP_EXPLAIN' => 'The following items were found to no longer exist or unreachable, and you can therefore delete all blocks associated to them. Please keep in mind that some of these may be false positives', |
|
41 | - 'BLOCKS_CLEANUP_BLOCKS' => 'Invalid Blocks (e.g. from uninstalled extensions):', |
|
42 | - 'BLOCKS_CLEANUP_ROUTES' => 'Unreachable/broken Pages:', |
|
43 | - 'BLOCKS_CLEANUP_STYLES' => 'Uninstalled Styles (ids):', |
|
44 | - 'BLOCKS_CLEANUP_SUCCESS' => 'Blocks purged sucessfully', |
|
39 | + 'BLOCKS_CLEANUP' => 'Blocks Cleanup', |
|
40 | + 'BLOCKS_CLEANUP_EXPLAIN' => 'The following items were found to no longer exist or unreachable, and you can therefore delete all blocks associated to them. Please keep in mind that some of these may be false positives', |
|
41 | + 'BLOCKS_CLEANUP_BLOCKS' => 'Invalid Blocks (e.g. from uninstalled extensions):', |
|
42 | + 'BLOCKS_CLEANUP_ROUTES' => 'Unreachable/broken Pages:', |
|
43 | + 'BLOCKS_CLEANUP_STYLES' => 'Uninstalled Styles (ids):', |
|
44 | + 'BLOCKS_CLEANUP_SUCCESS' => 'Blocks purged sucessfully', |
|
45 | 45 | |
46 | - 'FILEMANAGER_SETTINGS' => 'File Manager Settings', |
|
47 | - 'FILEMANAGER_STATUS' => 'Status', |
|
48 | - 'FILEMANAGER_NO_EXIST' => 'You will need to install the File Manager before you can enable it. Installation instructions are found <a href="%s" target="_blank" rel="noopener noreferrer"><strong>here</strong></a>', |
|
49 | - 'FILEMENAGER_NOT_WRITABLE' => 'Filemanager config folder (root/ResponsiveFilemanager/filemanager/config/) is not writable. Please change the permissions to writable by all (777 or -rwxrwxrwx within your FTP Client)', |
|
50 | - 'FILEMANAGER_IMAGE_AUTO_RESIZE' => 'Automatically resize uploaded images?', |
|
51 | - 'FILEMANAGER_IMAGE_AUTO_RESIZE_DIMENSIONS' => 'Resize to specified dimensions', |
|
52 | - 'FILEMANAGER_IMAGE_AUTO_RESIZING_MODE' => 'Auto resizing mode', |
|
53 | - 'FILEMANAGER_IMAGE_MAX_DIMENSIONS' => 'Max. image size', |
|
54 | - 'FILEMANAGER_IMAGE_MAX_MODE' => 'Max. image size mode', |
|
55 | - 'FILEMANAGER_IMAGE_MODE_EXPLAIN' => 'Used to calculate the height/width if you only provide height or width but not both above', |
|
56 | - 'FILEMANAGER_IMAGE_MODE_AUTO' => 'Auto', |
|
57 | - 'FILEMANAGER_IMAGE_MODE_CROP' => 'Crop', |
|
58 | - 'FILEMANAGER_IMAGE_MODE_EXACT' => 'Exact', |
|
59 | - 'FILEMANAGER_IMAGE_MODE_LANDSCAPE' => 'Landscape', |
|
60 | - 'FILEMANAGER_IMAGE_MODE_PORTRAIT' => 'Portrait', |
|
61 | - 'FILEMANAGER_WATERMARK' => 'Watermark', |
|
62 | - 'FILEMANAGER_WATERMARK_EXPLAIN' => 'URL of image to use as watermark on all uploaded images', |
|
63 | - 'FILEMANAGER_WATERMARK_POSITION' => 'Watermark position', |
|
64 | - 'FILEMANAGER_WATERMARK_POSITION_EXPLAIN' => 'Select a pre-determined position where the watermark should appear or enter the coordinates e.g. 50x100', |
|
65 | - 'FILEMANAGER_WATERMARK_POSITION_TL' => 'Top Left', |
|
66 | - 'FILEMANAGER_WATERMARK_POSITION_T' => 'Top', |
|
67 | - 'FILEMANAGER_WATERMARK_POSITION_TR' => 'Top Right', |
|
68 | - 'FILEMANAGER_WATERMARK_POSITION_L' => 'Left', |
|
69 | - 'FILEMANAGER_WATERMARK_POSITION_M' => 'Middle', |
|
70 | - 'FILEMANAGER_WATERMARK_POSITION_R' => 'Right', |
|
71 | - 'FILEMANAGER_WATERMARK_POSITION_BL' => 'Bottom Left', |
|
72 | - 'FILEMANAGER_WATERMARK_POSITION_B' => 'Bottom', |
|
73 | - 'FILEMANAGER_WATERMARK_POSITION_BR' => 'Bottom Right', |
|
74 | - 'FILEMANAGER_WATERMARK_POSITION_SUFFIX' => 'or', |
|
75 | - 'FILEMANAGER_WATERMARK_PADDING' => 'Watermark padding', |
|
76 | - 'FILEMANAGER_WATERMARK_PADDING_EXPLAIN' => 'If using a pre-determined position you can adjust the padding from the edges. If using co-ordinates, this value is ignored', |
|
46 | + 'FILEMANAGER_SETTINGS' => 'File Manager Settings', |
|
47 | + 'FILEMANAGER_STATUS' => 'Status', |
|
48 | + 'FILEMANAGER_NO_EXIST' => 'You will need to install the File Manager before you can enable it. Installation instructions are found <a href="%s" target="_blank" rel="noopener noreferrer"><strong>here</strong></a>', |
|
49 | + 'FILEMENAGER_NOT_WRITABLE' => 'Filemanager config folder (root/ResponsiveFilemanager/filemanager/config/) is not writable. Please change the permissions to writable by all (777 or -rwxrwxrwx within your FTP Client)', |
|
50 | + 'FILEMANAGER_IMAGE_AUTO_RESIZE' => 'Automatically resize uploaded images?', |
|
51 | + 'FILEMANAGER_IMAGE_AUTO_RESIZE_DIMENSIONS' => 'Resize to specified dimensions', |
|
52 | + 'FILEMANAGER_IMAGE_AUTO_RESIZING_MODE' => 'Auto resizing mode', |
|
53 | + 'FILEMANAGER_IMAGE_MAX_DIMENSIONS' => 'Max. image size', |
|
54 | + 'FILEMANAGER_IMAGE_MAX_MODE' => 'Max. image size mode', |
|
55 | + 'FILEMANAGER_IMAGE_MODE_EXPLAIN' => 'Used to calculate the height/width if you only provide height or width but not both above', |
|
56 | + 'FILEMANAGER_IMAGE_MODE_AUTO' => 'Auto', |
|
57 | + 'FILEMANAGER_IMAGE_MODE_CROP' => 'Crop', |
|
58 | + 'FILEMANAGER_IMAGE_MODE_EXACT' => 'Exact', |
|
59 | + 'FILEMANAGER_IMAGE_MODE_LANDSCAPE' => 'Landscape', |
|
60 | + 'FILEMANAGER_IMAGE_MODE_PORTRAIT' => 'Portrait', |
|
61 | + 'FILEMANAGER_WATERMARK' => 'Watermark', |
|
62 | + 'FILEMANAGER_WATERMARK_EXPLAIN' => 'URL of image to use as watermark on all uploaded images', |
|
63 | + 'FILEMANAGER_WATERMARK_POSITION' => 'Watermark position', |
|
64 | + 'FILEMANAGER_WATERMARK_POSITION_EXPLAIN' => 'Select a pre-determined position where the watermark should appear or enter the coordinates e.g. 50x100', |
|
65 | + 'FILEMANAGER_WATERMARK_POSITION_TL' => 'Top Left', |
|
66 | + 'FILEMANAGER_WATERMARK_POSITION_T' => 'Top', |
|
67 | + 'FILEMANAGER_WATERMARK_POSITION_TR' => 'Top Right', |
|
68 | + 'FILEMANAGER_WATERMARK_POSITION_L' => 'Left', |
|
69 | + 'FILEMANAGER_WATERMARK_POSITION_M' => 'Middle', |
|
70 | + 'FILEMANAGER_WATERMARK_POSITION_R' => 'Right', |
|
71 | + 'FILEMANAGER_WATERMARK_POSITION_BL' => 'Bottom Left', |
|
72 | + 'FILEMANAGER_WATERMARK_POSITION_B' => 'Bottom', |
|
73 | + 'FILEMANAGER_WATERMARK_POSITION_BR' => 'Bottom Right', |
|
74 | + 'FILEMANAGER_WATERMARK_POSITION_SUFFIX' => 'or', |
|
75 | + 'FILEMANAGER_WATERMARK_PADDING' => 'Watermark padding', |
|
76 | + 'FILEMANAGER_WATERMARK_PADDING_EXPLAIN' => 'If using a pre-determined position you can adjust the padding from the edges. If using co-ordinates, this value is ignored', |
|
77 | 77 | |
78 | - 'FORUM_INDEX_SETTINGS' => 'Forum Index Settings', |
|
79 | - 'FORUM_INDEX_SETTINGS_EXPLAIN' => 'These settings only apply when there is no startpage defined', |
|
78 | + 'FORUM_INDEX_SETTINGS' => 'Forum Index Settings', |
|
79 | + 'FORUM_INDEX_SETTINGS_EXPLAIN' => 'These settings only apply when there is no startpage defined', |
|
80 | 80 | |
81 | - 'HIDE' => 'Hide', |
|
82 | - 'HIDE_BIRTHDAY' => 'Hide Birthday section', |
|
83 | - 'HIDE_LOGIN' => 'Hide login box', |
|
84 | - 'HIDE_ONLINE' => 'Hide Whos online section', |
|
81 | + 'HIDE' => 'Hide', |
|
82 | + 'HIDE_BIRTHDAY' => 'Hide Birthday section', |
|
83 | + 'HIDE_LOGIN' => 'Hide login box', |
|
84 | + 'HIDE_ONLINE' => 'Hide Whos online section', |
|
85 | 85 | |
86 | - 'LAYOUT_BLOG' => 'Blog', |
|
87 | - 'LAYOUT_CUSTOM' => 'Custom', |
|
88 | - 'LAYOUT_HOLYGRAIL' => 'Holy Grail', |
|
89 | - 'LAYOUT_PORTAL' => 'Portal', |
|
90 | - 'LAYOUT_PORTAL_ALT' => 'Portal (alt)', |
|
91 | - 'LAYOUT_SETTINGS' => 'Layout Settings', |
|
86 | + 'LAYOUT_BLOG' => 'Blog', |
|
87 | + 'LAYOUT_CUSTOM' => 'Custom', |
|
88 | + 'LAYOUT_HOLYGRAIL' => 'Holy Grail', |
|
89 | + 'LAYOUT_PORTAL' => 'Portal', |
|
90 | + 'LAYOUT_PORTAL_ALT' => 'Portal (alt)', |
|
91 | + 'LAYOUT_SETTINGS' => 'Layout Settings', |
|
92 | 92 | |
93 | - 'LOG_DELETED_BLOCKS_FOR_STYLE' => 'Sitemaker blocks deleted for missing style with id %s', |
|
94 | - 'LOG_DELETED_BLOCKS_FOR_ROUTE' => 'Sitemaker blocks deleted for broken pages:<br />%s', |
|
95 | - 'LOG_DELETED_BLOCKS' => 'Invalid Sitemaker blocks deleted:<br />%s', |
|
93 | + 'LOG_DELETED_BLOCKS_FOR_STYLE' => 'Sitemaker blocks deleted for missing style with id %s', |
|
94 | + 'LOG_DELETED_BLOCKS_FOR_ROUTE' => 'Sitemaker blocks deleted for broken pages:<br />%s', |
|
95 | + 'LOG_DELETED_BLOCKS' => 'Invalid Sitemaker blocks deleted:<br />%s', |
|
96 | 96 | |
97 | - 'NAVIGATION_SETTINGS' => 'Navigation Settings', |
|
98 | - 'NO_NAVBAR' => 'None', |
|
97 | + 'NAVIGATION_SETTINGS' => 'Navigation Settings', |
|
98 | + 'NO_NAVBAR' => 'None', |
|
99 | 99 | |
100 | - 'SELECT_NAVBAR_MENU' => 'Select main navigation menu', |
|
101 | - 'SETTINGS_SAVED' => 'Your settings have been saved', |
|
102 | - 'SHOW' => 'Show', |
|
103 | - 'SHOW_FORUM_NAV' => 'Show ’Forum’ in navigation bar?', |
|
104 | - 'SHOW_FORUM_NAV_EXPLAIN' => 'When a page is set as startpage instead of the forum index, should we display ’Forum’ in navigation bar', |
|
105 | - 'SHOW_FORUM_NAV_WITH_ICON' => 'Yes - with icon:', |
|
100 | + 'SELECT_NAVBAR_MENU' => 'Select main navigation menu', |
|
101 | + 'SETTINGS_SAVED' => 'Your settings have been saved', |
|
102 | + 'SHOW' => 'Show', |
|
103 | + 'SHOW_FORUM_NAV' => 'Show ’Forum’ in navigation bar?', |
|
104 | + 'SHOW_FORUM_NAV_EXPLAIN' => 'When a page is set as startpage instead of the forum index, should we display ’Forum’ in navigation bar', |
|
105 | + 'SHOW_FORUM_NAV_WITH_ICON' => 'Yes - with icon:', |
|
106 | 106 | ]); |