From 1e35475cee83c4e19f7c165011064ae77231924b Mon Sep 17 00:00:00 2001
From: filip <filip.komar@gmail.com>
Date: Fri, 27 Apr 2018 20:03:03 +0200
Subject: show only recent planet&blog post

show localized planet if exists otherwise localized blog
if number of localized titles is less then required add
English planet and English blog as fallback
---
 en/community/index.php | 19 +++++++++++++++----
 en/index.php           | 16 ++++++++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

(limited to 'en')

diff --git a/en/community/index.php b/en/community/index.php
index d2d84b7af..994597015 100644
--- a/en/community/index.php
+++ b/en/community/index.php
@@ -47,10 +47,21 @@ include '../../lib/news.php';
     <div class="col">
         <section>
             <?php
-            if ((strpos($locale, 'en') === 0) || (_r('https://planet.mageia.org/en/') != 'https://planet.mageia.org/en/')) {
-                show_feed($locale, _r('News') . ' (' . _r('Planet') . ')', _r('https://planet.mageia.org/en/'), _r('https://planet.mageia.org/en/') . '?type=rss10', 9, null, true);
-            } else {
-                show_feed($locale, _r('News') . ' (' . _r('Blog') . ')', _r('https://blog.mageia.org/en/'), _r('https://blog.mageia.org/en/') . '?feed=rss', 9, null, true);
+            $loc_planet_url = _r('https://planet.mageia.org/en/');
+            $loc_blog_url = _r('https://blog.mageia.org/en/');
+            $fresh_blog_post_titles = prepare_fresh_blog_post_titles('https://planet.mageia.org/en/', 'https://blog.mageia.org/en/', $loc_planet_url, $loc_blog_url);
+            $loc_posts_title     = $fresh_blog_post_titles[0];
+            $fresh_loc_posts     = $fresh_blog_post_titles[1];
+            $num_fresh_loc_posts = $fresh_blog_post_titles[2];
+            $eng_posts_title     = $fresh_blog_post_titles[3];
+            $fresh_eng_posts     = $fresh_blog_post_titles[4];
+            $num_fresh_eng_posts = count($fresh_eng_posts);
+            
+            if(0 != $num_fresh_loc_posts) {
+                show_feed($locale, _r('Localised news') . " ($loc_posts_title)", '', '', 0, null, true, null, $fresh_loc_posts);
+            }
+            if(0 != $num_fresh_eng_posts) {
+                show_feed($locale, _r('News in English') . " ($eng_posts_title)", '', '', 0, null, true, null, $fresh_eng_posts);
             }
             // don't work:
             //show_feed('Mageia MLs', '', 'https://ml.mageia.org/l/rss/active_lists?count=20&for=10');
diff --git a/en/index.php b/en/index.php
index 8f4e2f130..3015df71b 100755
--- a/en/index.php
+++ b/en/index.php
@@ -233,10 +233,18 @@ $dictionary = read_translation_file($locale, array('index', 'news', 'common_foot
             $prefix  = '<span style="font-weight: bold;">';
             $prefix .= sprintf(_r('Latest news from our <a href="%s">blog</a>:'), _r('https://blog.mageia.org/en/'));
             $prefix .= '</span> ';
-            if (_r('https://planet.mageia.org/en/') != 'https://planet.mageia.org/en/') {
-                show_feed($locale, null, _r('https://planet.mageia.org/en/'), _r('https://planet.mageia.org/en/') . '?type=rss10', 1, null, true, $prefix);
-            } else {
-                show_feed($locale, null, _r('https://blog.mageia.org/en/'), _r('https://blog.mageia.org/en/') . '?feed=rss', 1, null, true, $prefix);
+            $loc_planet_url = _r('https://planet.mageia.org/en/');
+            $loc_blog_url = _r('https://blog.mageia.org/en/');
+            $fresh_blog_post_titles = prepare_fresh_blog_post_titles('https://planet.mageia.org/en/', 'https://blog.mageia.org/en/', $loc_planet_url, $loc_blog_url, 1, 1);
+            $fresh_loc_posts     = $fresh_blog_post_titles[1];
+            $num_fresh_loc_posts = $fresh_blog_post_titles[2];
+            $fresh_eng_posts     = $fresh_blog_post_titles[4];
+            $num_fresh_eng_posts = count($fresh_eng_posts);
+            if(0 != $num_fresh_loc_posts) {
+                show_feed($locale, null, '', '', 0, null, true, $prefix, $fresh_loc_posts);
+            }
+            if(0 != $num_fresh_eng_posts) {
+                show_feed($locale, null, '', '', 0, null, true, $prefix, $fresh_eng_posts);
             }
         ?>
         </div>
-- 
cgit v1.2.1