1 files changed, 4 insertions, 61 deletions

diff --git a/index.php b/index.php
index 7f5457a..7c3f54d 100644
--- a/index.php
+++ b/index.php
@@ -73,71 +73,14 @@ print_header("", "home");
             <a href="https://bbs.archlinux32.org/extern.php?action=feed&fid=12&type=atom" title="Arch 32 News RSS Feed" class="rss-icon"><img width="16" height="16" src="/static/rss.c5ebdc5318d6.png" alt="RSS Feed" /></a>
 <?php
 
-//apcu_clear_cache();
-$news32 = apcu_fetch('news32', $apcu_success);
-if( $apcu_success == false ) {
-  $news32_reachable = apcu_fetch('news32_reachable', $apcu_success);
-  if ($apcu_success == false) {
-    if (site_is_reachable('https://bbs.archlinux32.org/extern.php?action=feed&fid=12&type=atom'))
-      $news32_reachable = 'YES';
-    else
-      $news32_reachable = 'NO';
-    apcu_store('news32_reachable', $news32_reachable, 300);
-  }
-  if ($news32_reachable == 'YES') {
-    $ch = curl_init('https://bbs.archlinux32.org/extern.php?action=feed&fid=12&type=atom');
-    if( $ch != null && $ch != false ) {
-      curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-      curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-      $news32 = curl_exec($ch);
-      $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-      curl_close($ch);
-      if( $httpcode >= 200 && $httpcode < 300 ) {
-        apcu_store('news32',  $news32, 300);
-      } else {
-        $news32 = false;
-      }
-    } else {
-      $news32 = false;
-      $news32status = "HTTP return code was $httpcode";
-    }
-  } else {
-    $news = false;
-  }
-}
-if( $news32 != false ) {
-  $news32 = simplexml_load_string($news32);
-}
-
-$news64 = apcu_fetch('news64', $apcu_success);
-if( $apcu_success == false ) {
-  $ch = curl_init("https://archlinux.org/feeds/news/");
-  if( $ch != null && $ch != false ) {
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-    $news64 = curl_exec($ch);
-    $httpcode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-    curl_close($ch);
-    if( $httpcode >= 200 && $httpcode < 300 ) {
-      apcu_store('news64',  $news64, 300);
-    } else {
-      $news64 = false;
-    }
-  } else {
-    $news64 = false;
-    $news64status = "HTTP return code was $httpcode";
-  }
-}
-if( $news64 != false ) {
-  $news64 = simplexml_load_string($news64);
-}
+$news32 = get_news('news32', 'https://bbs.archlinux32.org/extern.php?action=feed&fid=12&type=atom', 300);
+$news64 = get_news('news64', 'https://archlinux.org/feeds/news/', 300);
 
 $news = array();
 
 if ($news32 === false) {
   print "            <h4>\n";
-  print "              sorry, arch 32 news are currently unavailable ($news32status)\n";
+  print "              sorry, arch 32 news are currently unavailable\n";
   print "            </h4>\n";
 } else {
   foreach($news32 -> {'entry'} as $entry) {
@@ -158,7 +101,7 @@ if ($news32 === false) {
 }
 if ($news64 === false) {
   print "            <h4>\n";
-  print "              sorry, upstream arch news are currently unavailable ($news64status)\n";
+  print "              sorry, upstream arch news are currently unavailable\n";
   print "            </h4>\n";
 } else {
   foreach($news64 -> {'channel'} -> {'item'} as $entry) {