diff options
| author | Andrew Dolgov <[email protected]> | 2011-12-26 13:11:08 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-12-26 13:11:08 +0400 |
| commit | 3c696512fcf85331158f26078616e5684f46a68e (patch) | |
| tree | 1884f68866d25cc738e631f8a2bfdc38c06f607f /classes | |
| parent | 7a5d9b95c4298660c282dc8879d057e6269d2521 (diff) | |
universal image caching and automatic cache directories maintenance
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/feeds.php | 7 | ||||
| -rw-r--r-- | classes/pref_feeds.php | 29 |
2 files changed, 14 insertions, 22 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 6b498ac00..f9f82cd16 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -184,9 +184,10 @@ class Feeds extends Protected_Handler { catchupArticlesById($this->link, $ids, $cmode);
} */
- //if ($method == "ForceUpdate" && $feed && is_numeric($feed) > 0) {
- // update_rss_feed($this->link, $feed, true);
- //}
+ if ($method == "ForceUpdate" && $feed && is_numeric($feed) > 0) {
+ include "rssfuncs.php";
+ update_rss_feed($this->link, $feed, true);
+ }
if ($method == "MarkAllRead") {
catchup_feed($this->link, $feed, $cat_view);
diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php index b83abd789..5937bfc8a 100644 --- a/classes/pref_feeds.php +++ b/classes/pref_feeds.php @@ -448,12 +448,10 @@ class Pref_Feeds extends Protected_Handler { $checked = ""; } - if (SIMPLEPIE_CACHE_IMAGES) { - print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\" - name=\"cache_images\" + print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\" + name=\"cache_images\" $checked> <label for=\"cache_images\">". - __('Cache images locally (SimplePie only)')."</label>"; - } + __('Cache images locally')."</label>"; $mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result, 0, "mark_unread_on_update")); @@ -655,16 +653,13 @@ class Pref_Feeds extends Protected_Handler { print " "; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l"); - if (SIMPLEPIE_CACHE_IMAGES) { - print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"cache_images\" - name=\"cache_images\" - dojoType=\"dijit.form.CheckBox\"> <label class='insensitive' id=\"cache_images_l\" - for=\"cache_images\">". - __('Cache images locally')."</label>"; + print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"cache_images\" + name=\"cache_images\" + dojoType=\"dijit.form.CheckBox\"> <label class='insensitive' id=\"cache_images_l\" + for=\"cache_images\">". + __('Cache images locally')."</label>"; - - print " "; $this->batch_edit_cbox("cache_images", "cache_images_l"); - } + print " "; $this->batch_edit_cbox("cache_images", "cache_images_l"); print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"mark_unread_on_update\" name=\"mark_unread_on_update\" @@ -741,11 +736,7 @@ class Pref_Feeds extends Protected_Handler { $category_qpart_nocomma = ""; } - if (SIMPLEPIE_CACHE_IMAGES) { - $cache_images_qpart = "cache_images = $cache_images,"; - } else { - $cache_images_qpart = ""; - } + $cache_images_qpart = "cache_images = $cache_images,"; if (!$batch) { |