From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 11:17:12 +0000 (+0400)
Subject: only enable colored favicons in vfeeds; fix RGB triplet packing
X-Git-Tag: 1.7.9~25^2~220
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=63c323f73610d81216801d1023dca724cfd32699;p=tt-rss.git

only enable colored favicons in vfeeds; fix RGB triplet packing
---

diff --git a/classes/feeds.php b/classes/feeds.php
index 64d1d878..22c3497d 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -529,8 +529,8 @@ class Feeds extends Handler_Protected {
 						id=\"RROW-$id\" $mouseover_attrs'>";
 
 					//setting feed headline background color, needs to change text color based on dark/light
-					$favColor = explode("|", $line['favicon_avg_color']);
-					$reply['content'] .= "<div class=\"cdmHeader\" style=\"background-color: rgb($favColor[0], $favColor[1], $favColor[2]);\">";
+					$fav_color = $line['favicon_avg_color'];
+					$reply['content'] .= "<div class=\"cdmHeader\" style=\"background-color: $fav_color;\">";
 					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 
 					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
diff --git a/include/functions.php b/include/functions.php
index 46882c38..6372db1f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2602,6 +2602,9 @@
 						LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
 				}
 
+				if ($vfeed_query_part)
+					$vfeed_query_part .= "favicon_avg_color,";
+
 				$query = "SELECT DISTINCT
 						date_entered,
 						guid,
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index bcc88dc2..2e522175 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -416,9 +416,13 @@
 
 						 require_once "colors.php";
 
-                   if (is_array($favicon_color))
-							  $favicon_colorstring = ",favicon_avg_color = '" .
-							  		_color_pack(array_slice($favicon_color, 0, 3)) . "'";
+						 if (is_array($favicon_color))
+								$tmp = array($favicon_color['red'],
+									$favicon_color['green'],
+									$favicon_color['blue']);
+
+								 $favicon_colorstring = ",favicon_avg_color = '" .
+								_color_pack($tmp) . "'";
                 }
 
 				db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring