From ed714c3e6d42ad1cf00e4af2305828742683decf Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 14 Feb 2014 21:00:10 +0000 Subject: add missing '&' before 't' in url construction --- feed.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'feed.php') diff --git a/feed.php b/feed.php index bdce666d2..d9f52b5a2 100644 --- a/feed.php +++ b/feed.php @@ -299,7 +299,7 @@ function rss_buildItems(&$rss, &$data, $opt) { $src_l = ''; if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)), 300)) { - $more = 'w='.$size[0].'&h='.$size[1].'t='.@filemtime(mediaFN($id)); + $more = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id)); $src_r = ml($id, $more); } if($rev && $size = media_image_preview_size($id, $rev, new JpegMeta(mediaFN($id, $rev)), 300)) { @@ -347,7 +347,7 @@ function rss_buildItems(&$rss, &$data, $opt) { case 'html': if($ditem['media']) { if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)))) { - $more = 'w='.$size[0].'&h='.$size[1].'t='.@filemtime(mediaFN($id)); + $more = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id)); $src = ml($id, $more); $content = ''.$id.''; } else { @@ -378,7 +378,7 @@ function rss_buildItems(&$rss, &$data, $opt) { default: if($ditem['media']) { if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)))) { - $more = 'w='.$size[0].'&h='.$size[1].'t='.@filemtime(mediaFN($id)); + $more = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id)); $src = ml($id, $more); $content = ''.$id.''; } else { -- cgit v1.2.3 From 27538f87e374a7f00a3b58fc5533819465f4c166 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 14 Feb 2014 21:04:08 +0000 Subject: make media links in rss feeds absolute This resolves issues with broken images when the wiki feed is hosted by third parties (e.g. FeedBurner), as mentioned in FS#2931 comments. --- feed.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'feed.php') diff --git a/feed.php b/feed.php index d9f52b5a2..34ce23c89 100644 --- a/feed.php +++ b/feed.php @@ -300,11 +300,11 @@ function rss_buildItems(&$rss, &$data, $opt) { if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)), 300)) { $more = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id)); - $src_r = ml($id, $more); + $src_r = ml($id, $more, true, '&', true); } if($rev && $size = media_image_preview_size($id, $rev, new JpegMeta(mediaFN($id, $rev)), 300)) { $more = 'rev='.$rev.'&w='.$size[0].'&h='.$size[1]; - $src_l = ml($id, $more); + $src_l = ml($id, $more, true, '&', true); } $content = ''; if($src_r) { @@ -348,7 +348,7 @@ function rss_buildItems(&$rss, &$data, $opt) { if($ditem['media']) { if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)))) { $more = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id)); - $src = ml($id, $more); + $src = ml($id, $more, true, '&', true); $content = ''.$id.''; } else { $content = ''; @@ -379,7 +379,7 @@ function rss_buildItems(&$rss, &$data, $opt) { if($ditem['media']) { if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)))) { $more = 'w='.$size[0].'&h='.$size[1].'&t='.@filemtime(mediaFN($id)); - $src = ml($id, $more); + $src = ml($id, $more, true, '&', true); $content = ''.$id.''; } else { $content = ''; -- cgit v1.2.3 From 3bf4233a75bbb00df6c04707d1a52fdb84e8be16 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 26 Feb 2014 01:49:29 +0000 Subject: add HOST and PORT to feed cache key --- feed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'feed.php') diff --git a/feed.php b/feed.php index 34ce23c89..960131b15 100644 --- a/feed.php +++ b/feed.php @@ -21,7 +21,7 @@ $opt = rss_parseOptions(); // the feed is dynamic - we need a cache for each combo // (but most people just use the default feed so it's still effective) $cache = getCacheName(join('', array_values($opt)).$_SERVER['REMOTE_USER'], '.feed'); -$key = join('', array_values($opt)).$_SERVER['REMOTE_USER']; +$key = join('', array_values($opt)).$_SERVER['REMOTE_USER'].$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT']; $cache = new cache($key, '.feed'); // prepare cache depends -- cgit v1.2.3 From 4a193141ca703475cd9625b3127016b7c49f507e Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 26 Feb 2014 01:50:39 +0000 Subject: remove rendundant line --- feed.php | 1 - 1 file changed, 1 deletion(-) (limited to 'feed.php') diff --git a/feed.php b/feed.php index 960131b15..e64d5aa3e 100644 --- a/feed.php +++ b/feed.php @@ -20,7 +20,6 @@ $opt = rss_parseOptions(); // the feed is dynamic - we need a cache for each combo // (but most people just use the default feed so it's still effective) -$cache = getCacheName(join('', array_values($opt)).$_SERVER['REMOTE_USER'], '.feed'); $key = join('', array_values($opt)).$_SERVER['REMOTE_USER'].$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT']; $cache = new cache($key, '.feed'); -- cgit v1.2.3 From 26b26af6b5c3033fc16a799159e374f21d4fb599 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 26 Feb 2014 01:52:56 +0000 Subject: add security character '$' around REMOTE_USER in cache key to avoid key clashes --- feed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'feed.php') diff --git a/feed.php b/feed.php index e64d5aa3e..c158dc46a 100644 --- a/feed.php +++ b/feed.php @@ -20,7 +20,7 @@ $opt = rss_parseOptions(); // the feed is dynamic - we need a cache for each combo // (but most people just use the default feed so it's still effective) -$key = join('', array_values($opt)).$_SERVER['REMOTE_USER'].$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT']; +$key = join('', array_values($opt)).'$'.$_SERVER['REMOTE_USER'].'$'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT']; $cache = new cache($key, '.feed'); // prepare cache depends -- cgit v1.2.3