tweeper: make is_cli() stricter

[tweeper.git] / tweeper.php

diff --git a/tweeper.php b/tweeper.php
index 178176d..f07382b 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -213,6 +213,12 @@ class Tweeper {
     return $this->json_to_xml($html, '/window._sharedData = (.*);/', 'instagram');
   }
 
     return $this->json_to_xml($html, '/window._sharedData = (.*);/', 'instagram');
   }
 

+  private function preprocess_html_facebook_com($html) {
+    $html = str_replace('<!--', '', $html);
+    $html = str_replace('-->', '', $html);
+    return $html;
+  }
+

   private function html_to_xml($html, $host) {
     $xmlDoc = new DOMDocument();
 
   private function html_to_xml($html, $host) {
     $xmlDoc = new DOMDocument();
 


@@ -244,7 +250,10 @@ class Tweeper {
       return NULL;
     }
 
       return NULL;
     }
 

-    $xsltProcessor = $this->load_stylesheet($url["host"]);
+    // Strip the leading www. to be more forgiving on input URLs
+    $host = preg_replace('/^www\./', '', $url["host"]);
+
+    $xsltProcessor = $this->load_stylesheet($host);

     if (NULL === $xsltProcessor) {
       return NULL;
     }
     if (NULL === $xsltProcessor) {
       return NULL;
     }


@@ -254,7 +263,12 @@ class Tweeper {
       return NULL;
     }
 
       return NULL;
     }
 

-    $xmlDoc = $this->html_to_xml($html, $url["host"]);
+    $preprocess_html_host_method = 'preprocess_html_' . str_replace(".", "_", $host);
+    if (method_exists($this, $preprocess_html_host_method)) {
+      $html = call_user_func_array(array($this, $preprocess_html_host_method), array($html));
+    }
+
+    $xmlDoc = $this->html_to_xml($html, $host);

     if (NULL === $xmlDoc) {
       return NULL;
     }
     if (NULL === $xmlDoc) {
       return NULL;
     }


@@ -271,7 +285,7 @@ class Tweeper {
 
 function is_cli()
 {
 
 function is_cli()
 {

-  return (substr(php_sapi_name(), 0, 3) == 'cli');
+  return (php_sapi_name() === "cli");

 }
 
 function usage($argv)
 }
 
 function usage($argv)