From 2741726402430f64ffd7a5aeeba093dd91974e92 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 22 Oct 2016 21:33:54 -0400 Subject: [PATCH] Reverting too extensive formatting changes --- mod/update_community.php | 53 ++++++++++++++------------- mod/update_display.php | 56 ++++++++++++++--------------- mod/update_network.php | 63 ++++++++++++++++---------------- mod/update_notes.php | 78 +++++++++++++++++++++------------------- mod/update_profile.php | 77 ++++++++++++++++++++------------------- 5 files changed, 164 insertions(+), 163 deletions(-) diff --git a/mod/update_community.php b/mod/update_community.php index fab04531e4..d5df7ba3bf 100644 --- a/mod/update_community.php +++ b/mod/update_community.php @@ -2,34 +2,33 @@ // See update_profile.php for documentation -require_once 'mod/community.php'; +require_once("mod/community.php"); -function update_community_content(&$a) -{ - header('Content-type: text/html'); - echo "\r\n"; - echo '
'; +function update_community_content(&$a) { - $text = community_content($a, true); - $pattern = '/]*) src="([^"]*)"/'; - $replace = '\r\n"; + echo "
"; - 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); - } + $text = community_content($a, true); + $pattern = "/]*) src=\"([^\"]*)\"/"; + $replace = "'; - echo "\r\n"; - killme(); -} + 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); + } + + echo str_replace("\t", " ", $text); + echo "
"; + echo "\r\n"; + killme(); +} \ No newline at end of file diff --git a/mod/update_display.php b/mod/update_display.php index 024e620040..bd2a52934f 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'; +require_once("mod/display.php"); +require_once("include/group.php"); -function update_display_content(&$a) -{ - $profile_uid = intval($_GET['p']); +function update_display_content(&$a) { - header('Content-type: text/html'); - echo "\r\n"; - echo '
'; + $profile_uid = intval($_GET["p"]); - $text = display_content($a, $profile_uid); - $pattern = '/]*) src="([^"]*)"/'; - $replace = '\r\n"; + echo "
"; - 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(); + $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(); } diff --git a/mod/update_network.php b/mod/update_network.php index f8dd8ccc49..258d03e322 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -2,42 +2,41 @@ // See update_profile.php for documentation -require_once 'mod/network.php'; -require_once 'include/group.php'; +require_once("mod/network.php"); +require_once("include/group.php"); -function update_network_content(&$a) -{ - $profile_uid = intval($_GET['p']); +function update_network_content(&$a) { - header('Content-type: text/html'); - echo "\r\n"; - echo '
'; + $profile_uid = intval($_GET["p"]); - if (!get_pconfig($profile_uid, 'system', 'no_auto_update') or ($_GET['force'] == 1)) { - $text = network_content($a, $profile_uid); - } else { - $text = ''; - } + header("Content-type: text/html"); + echo "\r\n"; + echo "
"; - $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); - } + $pattern = "/]*) src=\"([^\"]*)\"/"; + $replace = "'; - echo "\r\n"; - killme(); + 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); + } + + echo str_replace("\t", " ", $text); + echo "
"; + echo "\r\n"; + killme(); } diff --git a/mod/update_notes.php b/mod/update_notes.php index 34aed407b3..ee9d1d71f5 100644 --- a/mod/update_notes.php +++ b/mod/update_notes.php @@ -1,48 +1,52 @@ \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"; - $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"; - $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); - } + /** + * + * 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. + * + */ - // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well - echo str_replace("\t", ' ', $text); - echo '
'; - echo "\r\n"; - killme(); -} + $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"; + $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(); +} \ No newline at end of file diff --git a/mod/update_profile.php b/mod/update_profile.php index 79a4792f3e..1bc29d82ce 100644 --- a/mod/update_profile.php +++ b/mod/update_profile.php @@ -2,51 +2,50 @@ /** * 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 "
"; - $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); - } + $text = profile_content($a, $profile_uid); - // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well - echo str_replace("\t", ' ', $text); - echo '
'; - echo "\r\n"; - killme(); -} + $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(); +} \ No newline at end of file