perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

Define excluded boards as array to simplify code

Browse source
This commit is contained in:
discomrade 2021-06-10 06:53:23 -02:00
parent 8938989efb
commit 7cc76fa0ad
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
templates/themes/catalog/theme.php
View file

@ -34,8 +34,7 @@
} }
if(isset($settings['has_overboard']) && $settings['has_overboard']) { if(isset($settings['has_overboard']) && $settings['has_overboard']) {
foreach ($overboards_config as &$overboard) { foreach ($overboards_config as &$overboard) {
$exclusions = explode(' ', $overboard['exclude']); $included_boards = array_diff(listBoards(true), $overboard['exclude']);
$included_boards = array_diff(listBoards(true), $exclusions);
$action = generation_strategy("sb_catalog", array($overboard)); $action = generation_strategy("sb_catalog", array($overboard));
if ($action == 'delete') { if ($action == 'delete') {
file_unlink($config['dir']['home'] . $overboard . '/catalog.html'); file_unlink($config['dir']['home'] . $overboard . '/catalog.html');
@ -61,8 +60,7 @@
if(isset($settings['has_overboard']) && $settings['has_overboard']) { if(isset($settings['has_overboard']) && $settings['has_overboard']) {
foreach ($overboards_config as &$overboard) { foreach ($overboards_config as &$overboard) {
if ($overboard['uri'] == $board) { if ($overboard['uri'] == $board) {
$exclusions = explode(' ', $overboard['exclude']); $included_boards = array_diff(listBoards(true), $overboard['exclude']);
$included_boards = array_diff(listBoards(true), $exclusions);
$b->buildOverboardCatalog($board, $settings, $included_boards); $b->buildOverboardCatalog($board, $settings, $included_boards);
} }
} }

6
templates/themes/overboards/overboards.php
View file

@ -2,7 +2,7 @@
/* /*
* When adding a new board, rebuild this theme. If necessary, reconfigure the catalog theme. * When adding a new board, rebuild this theme. If necessary, reconfigure the catalog theme.
* Exclude list is space-separated (e.g. 'exclude' => 'b games music' ) * Exclude list is a PHP array e.g. 'exclude' => array('b', 'games', 'music')
*/ */
$thread_limit = 30; $thread_limit = 30;
@ -12,14 +12,14 @@
'title' => 'Overboard', 'title' => 'Overboard',
'uri' => 'overboard', 'uri' => 'overboard',
'subtitle' => '30 most recently bumped threads', 'subtitle' => '30 most recently bumped threads',
'exclude' => '', 'exclude' => array(),
'thread_limit' => $thread_limit, 'thread_limit' => $thread_limit,
), ),
array( array(
'title' => 'SFW Overboard', 'title' => 'SFW Overboard',
'uri' => 'sfwoverboard', 'uri' => 'sfwoverboard',
'subtitle' => '30 most recently bumped threads from work-safe boards', 'subtitle' => '30 most recently bumped threads from work-safe boards',
'exclude' => 'b', 'exclude' => array('b'),
'thread_limit' => $thread_limit, 'thread_limit' => $thread_limit,
), ),
); );

6
templates/themes/overboards/theme.php
View file

@ -39,8 +39,8 @@
*/ */
class overboards { class overboards {
private $settings; private $settings;
//TODO review if appropriate uses of pass by ref (&$)
function __construct(&$settings) { function __construct($settings) {
$this->settings = $this->parseSettings($settings); $this->settings = $this->parseSettings($settings);
} }
@ -54,7 +54,6 @@
error('Invalid configuration parameters.', true); error('Invalid configuration parameters.', true);
} }
$overboard['exclude'] = explode(' ', $overboard['exclude']);
$overboard['thread_limit'] = intval($overboard['thread_limit']); $overboard['thread_limit'] = intval($overboard['thread_limit']);
if ($overboard['thread_limit'] < 1) if ($overboard['thread_limit'] < 1)
@ -230,3 +229,4 @@
} }
} }