diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/application.php | 3 | ||||
| -rw-r--r-- | core/functions.php | 3 | ||||
| -rw-r--r-- | core/include/feed/main.php | 64 | ||||
| -rw-r--r-- | core/language/de.php | 7 | ||||
| -rw-r--r-- | core/language/en.php | 7 |
5 files changed, 24 insertions, 60 deletions
diff --git a/core/application.php b/core/application.php index 5d2b1f4..7ddf6a0 100644 --- a/core/application.php +++ b/core/application.php @@ -79,7 +79,6 @@ foreach([ 'PAGE.LIST_SIZE' => 10, 'POST.LIST_SIZE' => 10, 'USER.LIST_SIZE' => 10, - 'PAGE.FEED_SIZE' => 25, 'POST.FEED_SIZE' => 25, 'CATEGORY.DESCRIPTION_SIZE' => 200, 'PAGE.DESCRIPTION_SIZE' => 200, @@ -93,9 +92,7 @@ foreach([ 'PAGE.LIST_SORT' => 'time_insert DESC', 'POST.LIST_SORT' => 'time_insert DESC', 'USER.LIST_SORT' => 'time_insert DESC', - 'PAGE.FEED_SORT' => 'time_insert DESC', 'POST.FEED_SORT' => 'time_insert DESC', - 'PAGE.FEED_GUID' => ['id', 'time_insert'], 'POST.FEED_GUID' => ['id', 'time_insert'] ] as $name => $value) { Application::set($name, $value); diff --git a/core/functions.php b/core/functions.php index 8a46b5b..03b3ae5 100644 --- a/core/functions.php +++ b/core/functions.php @@ -142,9 +142,6 @@ function generateCategoryDataTree(array $category_data, $root = 0): array { #=============================================================================== function generatePseudoGUID(EntityInterface $Entity) { switch(get_class($Entity)) { - case "ORM\Entities\Page": - $attr = Application::get('PAGE.FEED_GUID'); - break; case "ORM\Entities\Post": $attr = Application::get('POST.FEED_GUID'); break; diff --git a/core/include/feed/main.php b/core/include/feed/main.php index 637c54b..cbabb2c 100644 --- a/core/include/feed/main.php +++ b/core/include/feed/main.php @@ -1,56 +1,40 @@ <?php #=============================================================================== +# HEADER: Content-Type for XML document +#=============================================================================== +HTTP::responseHeader(HTTP::HEADER_CONTENT_TYPE, HTTP::CONTENT_TYPE_XML); + +#=============================================================================== # Get repositories #=============================================================================== +$PostRepository = Application::getRepository('Post'); $UserRepository = Application::getRepository('User'); #=============================================================================== -# HEADER: Content-Type for XML document +# Get list of posts to show in the feed #=============================================================================== -HTTP::responseHeader(HTTP::HEADER_CONTENT_TYPE, HTTP::CONTENT_TYPE_XML); +$posts = $PostRepository->getPaginated( + Application::get('POST.FEED_SORT'), + Application::get('POST.FEED_SIZE') +); #=============================================================================== -# Post feed +# Build item templates #=============================================================================== -if(!isset($param) OR $param !== 'page') { - $PostRepository = Application::getRepository('Post'); - - $posts = $PostRepository->getPaginated( - Application::get('POST.FEED_SORT'), - Application::get('POST.FEED_SIZE') - ); - - foreach($posts as $Post) { - $User = $UserRepository->find($Post->get('user')); +foreach($posts as $Post) { + $User = $UserRepository->find($Post->get('user')); + try { + $ItemTemplate = Template\Factory::build('feed/item'); + } catch(Template\Exception $Exception) { + # Backward compatibility if feed/item.php does not exist. $ItemTemplate = Template\Factory::build('feed/item_post'); - $ItemTemplate->set('POST', generateItemTemplateData($Post)); - $ItemTemplate->set('USER', generateItemTemplateData($User)); - - $post_templates[] = $ItemTemplate; } -} - -#=============================================================================== -# Page feed -#=============================================================================== -if(!isset($param) OR $param !== 'post') { - $PageRepository = Application::getRepository('Page'); - - $pages = $PageRepository->getPaginated( - Application::get('PAGE.FEED_SORT'), - Application::get('PAGE.FEED_SIZE') - ); - foreach($pages as $Page) { - $User = $UserRepository->find($Page->get('user')); + $ItemTemplate->set('POST', generateItemTemplateData($Post)); + $ItemTemplate->set('USER', generateItemTemplateData($User)); - $ItemTemplate = Template\Factory::build('feed/item_page'); - $ItemTemplate->set('PAGE', generateItemTemplateData($Page)); - $ItemTemplate->set('USER', generateItemTemplateData($User)); - - $page_templates[] = $ItemTemplate; - } + $templates[] = $ItemTemplate; } #=============================================================================== @@ -58,10 +42,10 @@ if(!isset($param) OR $param !== 'post') { #=============================================================================== $FeedTemplate = Template\Factory::build('feed/main'); $FeedTemplate->set('FEED', [ - 'TYPE' => $param ?? NULL, + 'TYPE' => 'post', 'LIST' => [ - 'POSTS' => $post_templates ?? [], - 'PAGES' => $page_templates ?? [], + 'POSTS' => $templates ?? [], + 'PAGES' => [], ] ]); diff --git a/core/language/de.php b/core/language/de.php index a525218..4eecfe5 100644 --- a/core/language/de.php +++ b/core/language/de.php @@ -214,10 +214,3 @@ $LANGUAGE['title_user_overview'] = "{$LANGUAGE['user_overview']} [%d]"; #=============================================================================== $LANGUAGE['title_search_request'] = 'Volltextsuche'; $LANGUAGE['title_search_results'] = 'Ergebnisse für "%s"'; - -#=============================================================================== -# Feed names -#=============================================================================== -$LANGUAGE['feed_name_items'] = '%s [alle Inhalte]'; -$LANGUAGE['feed_name_pages'] = '%s [nur Seiten]'; -$LANGUAGE['feed_name_posts'] = '%s [nur Beiträge]'; diff --git a/core/language/en.php b/core/language/en.php index 29e330a..66bcaf3 100644 --- a/core/language/en.php +++ b/core/language/en.php @@ -214,10 +214,3 @@ $LANGUAGE['title_user_overview'] = "{$LANGUAGE['user_overview']} [%d]"; #=============================================================================== $LANGUAGE['title_search_request'] = 'Fulltext search'; $LANGUAGE['title_search_results'] = 'Results for "%s"'; - -#=============================================================================== -# Feed names -#=============================================================================== -$LANGUAGE['feed_name_items'] = '%s [all content]'; -$LANGUAGE['feed_name_pages'] = '%s [only pages]'; -$LANGUAGE['feed_name_posts'] = '%s [only posts]'; |