From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 10 Feb 2014 19:03:58 +0000 (+0400)
Subject: af_comics: add happyjar
X-Git-Tag: 1.12~49
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f826070c560661c7d2eff0bb16b7782cc524937d;p=tt-rss.git

af_comics: add happyjar
---

diff --git a/include/functions.php b/include/functions.php
index 821ca83f..8e8832a5 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -339,7 +339,7 @@
 		}
 	}
 
-	function fetch_file_contents($url, $type = false, $login = false, $pass = false, $post_query = false, $timeout = false, $timestamp = 0) {
+	function fetch_file_contents($url, $type = false, $login = false, $pass = false, $post_query = false, $timeout = false, $timestamp = 0, $useragent = false) {
 
 		global $fetch_last_error;
 		global $fetch_last_error_code;
@@ -376,7 +376,8 @@
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 			curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-			curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
+			curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
+				SELF_USER_AGENT);
 			curl_setopt($ch, CURLOPT_ENCODING, "");
 			curl_setopt($ch, CURLOPT_REFERER, $url);
 
diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php
index e8b5a00c..5d3ccf07 100644
--- a/plugins/af_comics/init.php
+++ b/plugins/af_comics/init.php
@@ -30,6 +30,7 @@ class Af_Comics extends Plugin {
 		<li>Dilbert</li>
 		<li>Explosm</li>
 		<li>GoComics</li>
+		<li>Happy Jar</li>
 		<li>Penny Arcade</li>
 		<li>Three word phrase</li>
 		<li>Whomp</li>";
@@ -48,12 +49,21 @@ class Af_Comics extends Plugin {
 		if (strpos($article["guid"], "bunicomic.com") !== FALSE ||
 				strpos($article["guid"], "buttersafe.com") !== FALSE ||
 				strpos($article["guid"], "whompcomic.com") !== FALSE ||
+				strpos($article["guid"], "happyjar.com") !== FALSE ||
 				strpos($article["guid"], "csectioncomics.com") !== FALSE) {
 
 			 if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
 
+
+				// lol at people who block clients by user agent
+				// oh noes my ad revenue Q_Q
+
+				$res = fetch_file_contents($article["link"], false, false, false,
+					 false, false, 0,
+					 "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
+
 				$doc = new DOMDocument();
-				@$doc->loadHTML(fetch_file_contents($article["link"]));
+				@$doc->loadHTML($res);
 
 				$basenode = false;