Show the actual name of the user the tweet comes from

[tweeper.git] / tweeper.php

diff --git a/tweeper.php b/tweeper.php
index 94d91c3..923b303 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -47,20 +47,21 @@ class Tweeper {
     return Tweeper::epoch_to_gmdate($timestamp);
   }
 
-  private static function get_contents($uri) {
-    # https://www.wjsams.com/c/docs/Wiki/Php-HowToSetUserAgentOnFileGetContents
-    $opts = array(
-      'http' => array(
-        'method' => "GET",
-        'header' => join(array(
-          "Accept-language: en\r\n",
-          "User-Agent: {" + Tweeper::$USER_AGENT + "}\r\n"
-        ))
-      )
-    );
+  private static function get_contents($url)
+  {
+    $ch = curl_init($url);
+    curl_setopt_array($ch, array(
+      CURLOPT_HEADER => FALSE,
+      CURLOPT_FOLLOWLOCATION => TRUE,  // follow http redirects to get the real URL
+      CURLOPT_RETURNTRANSFER => TRUE,
+      CURLOPT_SSL_VERIFYHOST => FALSE,
+      CURLOPT_SSL_VERIFYPEER => FALSE,
+      CURLOPT_HTTPHEADER => array('Accept-language: en'),
+      CURLOPT_USERAGENT => Tweeper::$USER_AGENT,
+    ));
+    $contents = curl_exec($ch);
+    curl_close($ch);
 
-    $context = stream_context_create($opts);
-    $contents = file_get_contents($uri, false, $context);
     return $contents;
   }
 
@@ -68,13 +69,13 @@ class Tweeper {
   {
     $ch = curl_init($url);
     curl_setopt_array($ch, array(
-        CURLOPT_HEADER => TRUE,
-        CURLOPT_NOBODY => TRUE,
-        CURLOPT_FOLLOWLOCATION => TRUE,  // follow http redirects to get the real URL
-        CURLOPT_RETURNTRANSFER => TRUE,
-        CURLOPT_SSL_VERIFYHOST => FALSE,
-        CURLOPT_SSL_VERIFYPEER => FALSE,
-        CURLOPT_USERAGENT => Tweeper::$USER_AGENT,
+      CURLOPT_HEADER => TRUE,
+      CURLOPT_NOBODY => TRUE,
+      CURLOPT_FOLLOWLOCATION => TRUE,  // follow http redirects to get the real URL
+      CURLOPT_RETURNTRANSFER => TRUE,
+      CURLOPT_SSL_VERIFYHOST => FALSE,
+      CURLOPT_SSL_VERIFYPEER => FALSE,
+      CURLOPT_USERAGENT => Tweeper::$USER_AGENT,
     ));
     curl_exec($ch);
     $url_info = curl_getinfo($ch);
@@ -204,7 +205,7 @@ $url = parse_url($options['src_url']);
 if (FALSE === $url || empty($url["host"]))
   die("Invalid url: ${options['src_url']}\n");
 
-$stylesheet = __DIR__ . "/rss_converter_" . $url["host"] . ".xsl";
+$stylesheet = "file://" . __DIR__ . "/rss_converter_" . $url["host"] . ".xsl";
 if (FALSE === file_exists($stylesheet))
   die("Conversion to RSS not supported: {$url["host"]}\n");