From a6603a54d9c68d1efee553e747de233f992dc3d2 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 18 May 2011 20:34:18 -0700 Subject: [PATCH] don't send any potentially large embeds over ajax so as to avoid huge prefetch downloads. Strip them out and provide a notice to reload page to view them. Ensures they will only be loaded once. --- include/main.js | 2 +- mod/update_network.php | 9 +++++++++ mod/update_profile.php | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/main.js b/include/main.js index e3e56fa0b4..0d68c2b2b3 100644 --- a/include/main.js +++ b/include/main.js @@ -138,7 +138,7 @@ }); $('.wall-item-outside-wrapper',data).each(function() { var ident = $(this).attr('id'); - if($('#' + ident).length == 0) { + if($('#' + ident).length == 0) { $('img',this).each(function() { $(this).attr('src',$(this).attr('dst')); }); diff --git a/mod/update_network.php b/mod/update_network.php index cf9f11f586..f9914abc28 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -19,6 +19,15 @@ function update_network_content(&$a) { $replace = "'; + $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; + $text = preg_replace($pattern, $replace, $text); + + echo str_replace("\t",' ',$text); echo (($_GET['msie'] == 1) ? '' : ''); echo "\r\n"; diff --git a/mod/update_profile.php b/mod/update_profile.php index 13c519d1c1..40ee33325b 100644 --- a/mod/update_profile.php +++ b/mod/update_profile.php @@ -38,6 +38,14 @@ function update_profile_content(&$a) { $replace = "'; + $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; + $text = preg_replace($pattern, $replace, $text); + /** * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well */