Merge pull request #483 from niol/github-user-agent-fix

Github user agent fix

Author: SSilence

common.php

@@ -0,0 +1,25 @@
+<?php
+
+$f3 = require(__DIR__.'/libs/f3/base.php');
+
+$f3->set('DEBUG',0);
+$f3->set('version','2.10-SNAPSHOT');
+$f3->set('AUTOLOAD',__dir__.'/;libs/f3/;libs/;libs/WideImage/;daos/;libs/twitteroauth/;libs/FeedWriter/');
+$f3->set('cache',__dir__.'/data/cache');
+$f3->set('BASEDIR',__dir__);
+$f3->set('LOCALES',__dir__.'/public/lang/'); 
+
+// read defaults
+$f3->config('defaults.ini');
+
+// read config, if it exists
+if(file_exists('config.ini'))
+    $f3->config('config.ini');
+
+// init logger
+$f3->set(
+    'logger', 
+    new \helpers\Logger( __dir__.'/data/logs/default.log', $f3->get('logger_level') )
+);
+
+?>

index.php

@@ -1,32 +1,12 @@
 <?php
 
-$f3 = require(__DIR__.'/libs/f3/base.php');
-
-$f3->set('DEBUG',0);
-$f3->set('version','2.10-SNAPSHOT');
-$f3->set('AUTOLOAD',__dir__.'/;libs/f3/;libs/;libs/WideImage/;daos/;libs/twitteroauth/;libs/FeedWriter/');
-$f3->set('cache',__dir__.'/data/cache');
-$f3->set('BASEDIR',__dir__);
-$f3->set('LOCALES',__dir__.'/public/lang/'); 
-
-// read defaults
-$f3->config('defaults.ini');
-
-// read config, if it exists
-if(file_exists('config.ini'))
-    $f3->config('config.ini');
+require(__DIR__.'/common.php');
 
 // Load custom language
 $lang = $f3->get('language');
 if($lang!='0' && $lang!='')
     $f3->set('LANGUAGE', $lang);
 
-// init logger
-$f3->set(
-    'logger', 
-    new \helpers\Logger( __dir__.'/data/logs/default.log', $f3->get('logger_level') )
-);
-
 // init authentication
 $f3->set('auth', new \helpers\Authentication());
 

spouts/github/commits.php

@@ -285,9 +285,17 @@ public function destroy() {
      * @return object JSON object
      */
     public static function getJsonContent($url) {
-        $content = @file_get_contents($url);
+        $v = \F3::get('version');
+        $options  = array('http' => array(
+            'user_agent' => "Selfoss/$v GitHub spout (+http://selfoss.aditu.de)",
+            'ignore_errors' => true
+        ));
+        $context  = stream_context_create($options);
+
+        $content = file_get_contents($url, false, $context);
 
-        if ($content === false) {
+        if( $http_response_header[0] != 'HTTP/1.1 200 OK' ) {
+            \F3::get('logger')->log('github spout error ' . $http_response_header[0] . ': ' . substr($content, 0, 512), \ERROR);
             return false;
         }
 

update.php

@@ -1,24 +1,9 @@
 <?php
 
 chdir(__DIR__);
-$f3 = require(__DIR__.'/libs/f3/base.php');
-
-$f3->set('DEBUG',0);
-$f3->set('AUTOLOAD',__dir__.'/;libs/f3/;libs/;libs/WideImage/;daos/;libs/twitteroauth/;libs/FeedWriter/');
-$f3->set('cache',__dir__.'/data/cache');
-$f3->set('BASEDIR',__dir__);
-
-// read config
-$f3->config('defaults.ini');
-if(file_exists('config.ini')){
-    $f3->config('config.ini');
-}
-
-// init logger
-$f3->set(
-    'logger', 
-    new \helpers\Logger( __dir__.'/data/logs/default.log', $f3->get('logger_level') )
-);
+require(__DIR__.'/common.php');
 
 $loader = new \helpers\ContentLoader();
 $loader->update();
+
+?>