Refactor test mode article fetching logic in index.php and wiki.php. Unified article filtering for both test and live modes, enhancing code clarity and reducing redundancy.
This commit is contained in:
@@ -634,11 +634,10 @@ function newsletterData(array $config, bool $testMode = false): array
|
|||||||
[$start, $end, $periodLabel, $periodKey] = newsletterPeriod($config['period_mode']);
|
[$start, $end, $periodLabel, $periodKey] = newsletterPeriod($config['period_mode']);
|
||||||
$allArticles = fetchLatestArticles($config['wiki_url'], (int)$config['article_fetch_limit']);
|
$allArticles = fetchLatestArticles($config['wiki_url'], (int)$config['article_fetch_limit']);
|
||||||
|
|
||||||
if ($testMode) {
|
// Testversand nutzt denselben Zeitraum wie der Liveversand.
|
||||||
$articles = array_slice($allArticles, 0, (int)$config['article_limit']);
|
|
||||||
$periodKey = 'test-' . date('Y-m-d-H-i-s');
|
|
||||||
} else {
|
|
||||||
$articles = filterArticlesForPeriod($allArticles, $start, $end, (int)$config['article_limit']);
|
$articles = filterArticlesForPeriod($allArticles, $start, $end, (int)$config['article_limit']);
|
||||||
|
if ($testMode) {
|
||||||
|
$periodKey = 'test-' . date('Y-m-d-H-i-s');
|
||||||
}
|
}
|
||||||
|
|
||||||
return [$articles, $periodLabel, $periodKey];
|
return [$articles, $periodLabel, $periodKey];
|
||||||
|
|||||||
8
wiki.php
8
wiki.php
@@ -635,12 +635,10 @@ function newsletterData(array $config, bool $testMode = false): array
|
|||||||
[$start, $end, $periodLabel, $periodKey] = newsletterPeriod($config['period_mode']);
|
[$start, $end, $periodLabel, $periodKey] = newsletterPeriod($config['period_mode']);
|
||||||
$allArticles = fetchLatestArticles($config['wiki_url'], (int)$config['article_fetch_limit']);
|
$allArticles = fetchLatestArticles($config['wiki_url'], (int)$config['article_fetch_limit']);
|
||||||
|
|
||||||
if ($testMode) {
|
// Testversand nutzt denselben Zeitraum wie der Liveversand.
|
||||||
$articles = array_slice($allArticles, 0, (int)$config['article_limit']);
|
|
||||||
$periodLabel = 'aktuelle Übersicht';
|
|
||||||
$periodKey = 'test-' . date('Y-m-d-H-i-s');
|
|
||||||
} else {
|
|
||||||
$articles = filterArticlesForPeriod($allArticles, $start, $end, (int)$config['article_limit']);
|
$articles = filterArticlesForPeriod($allArticles, $start, $end, (int)$config['article_limit']);
|
||||||
|
if ($testMode) {
|
||||||
|
$periodKey = 'test-' . date('Y-m-d-H-i-s');
|
||||||
}
|
}
|
||||||
|
|
||||||
return [$articles, $periodLabel, $periodKey];
|
return [$articles, $periodLabel, $periodKey];
|
||||||
|
|||||||
Reference in New Issue
Block a user