Date: Sun, 2 Oct 2016 19:23:05 +0000 (-0400) Subject: Fix Issue #2822 - Update update_*.php files with new bandwitdh_saver user setting X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=08a30bc1c6c68d81895e0d8c8905680c7d26221f;p=friendica.git Fix Issue #2822 - Update update_*.php files with new bandwitdh_saver user setting - Fix formatting according to PSR-2 - Add bandwitdh_saver setting check before replacing with "Embedded content - Please reload" --- diff --git a/mod/update_community.php b/mod/update_community.php index 512629b005..fab04531e4 100644 --- a/mod/update_community.php +++ b/mod/update_community.php @@ -2,20 +2,21 @@ // See update_profile.php for documentation -require_once('mod/community.php'); +require_once 'mod/community.php'; -function update_community_content(&$a) { +function update_community_content(&$a) +{ + header('Content-type: text/html'); + echo "\r\n"; + echo '

'; - header("Content-type: text/html"); - echo "\r\n"; - echo "

"; + $text = community_content($a, true); + $pattern = '/]*) src="([^"]*)"/'; + $replace = ''; + if (get_pconfig(local_user(), 'system', 'bandwith_saver')) { + $replace = '
'.t('[Embedded content - reload page to view]').'
'; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $text = preg_replace($pattern, $replace, $text); $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; @@ -24,10 +25,11 @@ function update_community_content(&$a) { $text = preg_replace($pattern, $replace, $text); $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; $text = preg_replace($pattern, $replace, $text); - - echo str_replace("\t",' ',$text); - echo "

"; - echo "\r\n"; - killme(); - -} \ No newline at end of file + } + + // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well + echo str_replace("\t", ' ', $text); + echo '

'; + echo "\r\n"; + killme(); +} diff --git a/mod/update_display.php b/mod/update_display.php index 25b0f77926..024e620040 100644 --- a/mod/update_display.php +++ b/mod/update_display.php @@ -2,37 +2,37 @@ // See update_profile.php for documentation -require_once('mod/display.php'); -require_once('include/group.php'); - -function update_display_content(&$a) { - - $profile_uid = intval($_GET['p']); - - header("Content-type: text/html"); - echo "\r\n"; - echo "

"; - - - $text = display_content($a,$profile_uid); - $pattern = "/]*) src=\"([^\"]*)\"/"; - $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); - $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; - $text = preg_replace($pattern, $replace, $text); - - - echo str_replace("\t",' ',$text); - echo "

"; - echo "\r\n"; - killme(); - +require_once 'mod/display.php'; +require_once 'include/group.php'; + +function update_display_content(&$a) +{ + $profile_uid = intval($_GET['p']); + + header('Content-type: text/html'); + echo "\r\n"; + echo '

'; + + $text = display_content($a, $profile_uid); + $pattern = '/]*) src="([^"]*)"/'; + $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); + $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $text = preg_replace($pattern, $replace, $text); + } + + // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well + echo str_replace("\t", ' ', $text); + echo '

'; + echo "\r\n"; + killme(); } diff --git a/mod/update_network.php b/mod/update_network.php index 1bf3746575..f8dd8ccc49 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -2,40 +2,42 @@ // See update_profile.php for documentation -require_once('mod/network.php'); -require_once('include/group.php'); - -function update_network_content(&$a) { - - $profile_uid = intval($_GET['p']); - - header("Content-type: text/html"); - echo "\r\n"; - echo "

"; - - if (!get_pconfig($profile_uid, "system", "no_auto_update") OR ($_GET['force'] == 1)) - $text = network_content($a,$profile_uid); - else - $text = ""; - - $pattern = "/]*) src=\"([^\"]*)\"/"; - $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); - $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; - $text = preg_replace($pattern, $replace, $text); - - - echo str_replace("\t",' ',$text); - echo "

"; - echo "\r\n"; - killme(); - +require_once 'mod/network.php'; +require_once 'include/group.php'; + +function update_network_content(&$a) +{ + $profile_uid = intval($_GET['p']); + + header('Content-type: text/html'); + echo "\r\n"; + echo '

'; + + if (!get_pconfig($profile_uid, 'system', 'no_auto_update') or ($_GET['force'] == 1)) { + $text = network_content($a, $profile_uid); + } else { + $text = ''; + } + + $pattern = '/]*) src="([^"]*)"/'; + $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); + $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $text = preg_replace($pattern, $replace, $text); + } + + // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well + echo str_replace("\t", ' ', $text); + echo '

'; + echo "\r\n"; + killme(); } diff --git a/mod/update_notes.php b/mod/update_notes.php index 6b8fff5115..34aed407b3 100644 --- a/mod/update_notes.php +++ b/mod/update_notes.php @@ -2,55 +2,47 @@ /** * Module: update_profile - * Purpose: AJAX synchronisation of profile page - * + * Purpose: AJAX synchronisation of profile page. */ +require_once 'mod/notes.php'; +function update_notes_content(&$a) +{ + $profile_uid = intval($_GET['p']); -require_once('mod/notes.php'); + header('Content-type: text/html'); + echo "\r\n"; -function update_notes_content(&$a) { + echo '

'; - $profile_uid = intval($_GET['p']); + /** + * Grab the page inner contents by calling the content function from the profile module directly, + * but move any image src attributes to another attribute name. This is because + * some browsers will prefetch all the images for the page even if we don't need them. + * The only ones we need to fetch are those for new page additions, which we'll discover + * on the client side and then swap the image back. + */ + $text = notes_content($a, $profile_uid); - header("Content-type: text/html"); - echo "\r\n"; - - echo "

"; - - /** - * - * Grab the page inner contents by calling the content function from the profile module directly, - * but move any image src attributes to another attribute name. This is because - * some browsers will prefetch all the images for the page even if we don't need them. - * The only ones we need to fetch are those for new page additions, which we'll discover - * on the client side and then swap the image back. - * - */ - - $text = notes_content($a,$profile_uid); - - $pattern = "/]*) src=\"([^\"]*)\"/"; - $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); - $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $pattern = '/]*) src="([^"]*)"/'; + $replace = '"; - echo "\r\n"; - killme(); - -} \ No newline at end of file + if (get_pconfig(local_user(), 'system', 'bandwith_saver')) { + $replace = '
'.t('[Embedded content - reload page to view]').'
'; + $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); + $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $text = preg_replace($pattern, $replace, $text); + } + + // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well + echo str_replace("\t", ' ', $text); + echo '

'; + echo "\r\n"; + killme(); +} diff --git a/mod/update_profile.php b/mod/update_profile.php index 2492a48ee4..79a4792f3e 100644 --- a/mod/update_profile.php +++ b/mod/update_profile.php @@ -2,59 +2,51 @@ /** * Module: update_profile - * Purpose: AJAX synchronisation of profile page - * + * Purpose: AJAX synchronisation of profile page. */ +require_once 'mod/profile.php'; +function update_profile_content(&$a) +{ + $profile_uid = intval($_GET['p']); -require_once('mod/profile.php'); + header('Content-type: text/html'); + echo "\r\n"; -function update_profile_content(&$a) { + /* + * We can remove this hack once Internet Explorer recognises HTML5 natively + */ - $profile_uid = intval($_GET['p']); + echo '

'; - header("Content-type: text/html"); - echo "\r\n"; + /** + * Grab the page inner contents by calling the content function from the profile module directly, + * but move any image src attributes to another attribute name. This is because + * some browsers will prefetch all the images for the page even if we don't need them. + * The only ones we need to fetch are those for new page additions, which we'll discover + * on the client side and then swap the image back. + */ + $text = profile_content($a, $profile_uid); - /** - * We can remove this hack once Internet Explorer recognises HTML5 natively - */ - - echo "

"; - - /** - * - * Grab the page inner contents by calling the content function from the profile module directly, - * but move any image src attributes to another attribute name. This is because - * some browsers will prefetch all the images for the page even if we don't need them. - * The only ones we need to fetch are those for new page additions, which we'll discover - * on the client side and then swap the image back. - * - */ - - $text = profile_content($a,$profile_uid); - - $pattern = "/]*) src=\"([^\"]*)\"/"; - $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); - $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $pattern = '/]*) src="([^"]*)"/'; + $replace = '"; - echo "\r\n"; - killme(); - -} \ No newline at end of file + if (get_pconfig(local_user(), 'system', 'bandwith_saver')) { + $replace = '
'.t('[Embedded content - reload page to view]').'
'; + $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); + $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $text = preg_replace($pattern, $replace, $text); + } + + // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well + echo str_replace("\t", ' ', $text); + echo '

'; + echo "\r\n"; + killme(); +}