valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly remove and replace favicon color when favicon gets manually removed/uploaded

This commit is contained in:
Andrew Dolgov 2013-04-15 18:22:48 +04:00
parent 86f7d2a9f2
commit bc7a144dd5
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/pref/feeds.php
View File

@ -464,6 +464,9 @@ class Pref_Feeds extends Handler_Protected {
if (db_num_rows($result) != 0) { if (db_num_rows($result) != 0) {
@unlink(ICONS_DIR . "/$feed_id.ico"); @unlink(ICONS_DIR . "/$feed_id.ico");
db_query($this->link, "UPDATE ttrss_feeds SET favicon_avg_color = NULL
where id = '$feed_id'");
} }
return; return;
@ -498,8 +501,19 @@ class Pref_Feeds extends Handler_Protected {
if (db_num_rows($result) != 0) { if (db_num_rows($result) != 0) {
@unlink(ICONS_DIR . "/$feed_id.ico"); @unlink(ICONS_DIR . "/$feed_id.ico");
rename($icon_file, ICONS_DIR . "/$feed_id.ico"); if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
require_once "colors.php";
$favicon_color = db_escape_string($this->link,
calculate_avg_color(ICONS_DIR . "/$feed_id.ico"));
db_query($this->link, "UPDATE ttrss_feeds SET
favicon_avg_color = '$favicon_color'
WHERE id = '$feed_id'");
$rc = 0; $rc = 0;
}
} else { } else {
$rc = 2; $rc = 2;
} }

2
include/colors.php
View File

@ -336,6 +336,6 @@ function hsl2rgb($arr) {
} }
} }
} }
return false; return '';
} }
?> ?>

5
include/rssfuncs.php
View File

@ -417,12 +417,11 @@
$favicon_color = db_escape_string($link, $favicon_color = db_escape_string($link,
calculate_avg_color($favicon_file)); calculate_avg_color($favicon_file));
if ($debug_enabled) _debug("color: $favicon_color");
$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'"; $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
} }
db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW() $favicon_colorstring db_query($link, "UPDATE ttrss_feeds SET favicon_last_checked = NOW()
$favicon_colorstring
WHERE id = '$feed'"); WHERE id = '$feed'");
} }