Reverting too extensive formatting changes

This commit is contained in:
Hypolite Petovan 2016-10-22 21:33:54 -04:00
parent a843858654
commit 2741726402
5 changed files with 164 additions and 163 deletions

View File

@ -2,34 +2,33 @@
// See update_profile.php for documentation // 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 "<!DOCTYPE html><html><body>\r\n";
echo '<section>';
$text = community_content($a, true); header("Content-type: text/html");
$pattern = '/<img([^>]*) src="([^"]*)"/'; echo "<!DOCTYPE html><html><body>\r\n";
$replace = '<img${1} dst="${2}"'; echo "<section>";
$text = preg_replace($pattern, $replace, $text);
if (get_pconfig(local_user(), 'system', 'bandwith_saver')) { $text = community_content($a, true);
$replace = '<br />'.t('[Embedded content - reload page to view]').'<br />'; $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text); $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 if (get_pconfig(local_user(), "system", "bandwith_saver")) {
echo str_replace("\t", ' ', $text); $replace = "<br />".t("[Embedded content - reload page to view]")."<br />";
echo '</section>'; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
echo "</body></html>\r\n"; $text = preg_replace($pattern, $replace, $text);
killme(); $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 "</section>";
echo "</body></html>\r\n";
killme();
}

View File

@ -2,37 +2,37 @@
// See update_profile.php for documentation // See update_profile.php for documentation
require_once 'mod/display.php'; require_once("mod/display.php");
require_once 'include/group.php'; require_once("include/group.php");
function update_display_content(&$a) function update_display_content(&$a) {
{
$profile_uid = intval($_GET['p']);
header('Content-type: text/html'); $profile_uid = intval($_GET["p"]);
echo "<!DOCTYPE html><html><body>\r\n";
echo '<section>';
$text = display_content($a, $profile_uid); header("Content-type: text/html");
$pattern = '/<img([^>]*) src="([^"]*)"/'; echo "<!DOCTYPE html><html><body>\r\n";
$replace = '<img${1} dst="${2}"'; echo "<section>";
$text = preg_replace($pattern, $replace, $text);
if (get_pconfig(local_user(), 'system', 'bandwith_saver')) {
$replace = '<br />'.t('[Embedded content - reload page to view]').'<br />';
$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 $text = display_content($a,$profile_uid);
echo str_replace("\t", ' ', $text); $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
echo '</section>'; $replace = "<img\${1} dst=\"\${2}\"";
echo "</body></html>\r\n"; $text = preg_replace($pattern, $replace, $text);
killme();
if (get_pconfig(local_user(), "system", "bandwith_saver")) {
$replace = "<br />".t("[Embedded content - reload page to view]")."<br />";
$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 "</section>";
echo "</body></html>\r\n";
killme();
} }

View File

@ -2,42 +2,41 @@
// See update_profile.php for documentation // See update_profile.php for documentation
require_once 'mod/network.php'; require_once("mod/network.php");
require_once 'include/group.php'; require_once("include/group.php");
function update_network_content(&$a) function update_network_content(&$a) {
{
$profile_uid = intval($_GET['p']);
header('Content-type: text/html'); $profile_uid = intval($_GET["p"]);
echo "<!DOCTYPE html><html><body>\r\n";
echo '<section>';
if (!get_pconfig($profile_uid, 'system', 'no_auto_update') or ($_GET['force'] == 1)) { header("Content-type: text/html");
$text = network_content($a, $profile_uid); echo "<!DOCTYPE html><html><body>\r\n";
} else { echo "<section>";
$text = '';
}
$pattern = '/<img([^>]*) src="([^"]*)"/'; if (!get_pconfig($profile_uid, "system", "no_auto_update") OR ($_GET["force"] == 1)) {
$replace = '<img${1} dst="${2}"'; $text = network_content($a, $profile_uid);
$text = preg_replace($pattern, $replace, $text); } else {
$text = "";
}
if (get_pconfig(local_user(), 'system', 'bandwith_saver')) { $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = '<br />'.t('[Embedded content - reload page to view]').'<br />'; $replace = "<img\${1} dst=\"\${2}\"";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $text = preg_replace($pattern, $replace, $text);
$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 if (get_pconfig(local_user(), "system", "bandwith_saver")) {
echo str_replace("\t", ' ', $text); $replace = "<br />".t("[Embedded content - reload page to view]")."<br />";
echo '</section>'; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
echo "</body></html>\r\n"; $text = preg_replace($pattern, $replace, $text);
killme(); $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 "</section>";
echo "</body></html>\r\n";
killme();
} }

View File

@ -1,48 +1,52 @@
<?php <?php
/** /**
* Module: update_profile * Module: update_notes
* Purpose: AJAX synchronisation of profile page. * Purpose: AJAX synchronisation of notes page
*/ */
require_once 'mod/notes.php';
function update_notes_content(&$a) require_once("mod/notes.php");
{
$profile_uid = intval($_GET['p']);
header('Content-type: text/html'); function update_notes_content(&$a) {
echo "<!DOCTYPE html><html><body>\r\n";
echo '<section>'; $profile_uid = intval($_GET["p"]);
/** header("Content-type: text/html");
* Grab the page inner contents by calling the content function from the profile module directly, echo "<!DOCTYPE html><html><body>\r\n";
* 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 = '/<img([^>]*) src="([^"]*)"/'; echo "<section>";
$replace = '<img${1} dst="${2}"';
$text = preg_replace($pattern, $replace, $text);
if (get_pconfig(local_user(), 'system', 'bandwith_saver')) { /**
$replace = '<br />'.t('[Embedded content - reload page to view]').'<br />'; *
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; * Grab the page inner contents by calling the content function from the profile module directly,
$text = preg_replace($pattern, $replace, $text); * but move any image src attributes to another attribute name. This is because
$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; * some browsers will prefetch all the images for the page even if we don't need them.
$text = preg_replace($pattern, $replace, $text); * The only ones we need to fetch are those for new page additions, which we'll discover
$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; * on the client side and then swap the image back.
$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 $text = notes_content($a, $profile_uid);
echo str_replace("\t", ' ', $text);
echo '</section>'; $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
echo "</body></html>\r\n"; $replace = "<img\${1} dst=\"\${2}\"";
killme(); $text = preg_replace($pattern, $replace, $text);
}
if (get_pconfig(local_user(), "system", "bandwith_saver")) {
$replace = "<br />".t("[Embedded content - reload page to view]")."<br />";
$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 "</section>";
echo "</body></html>\r\n";
killme();
}

View File

@ -2,51 +2,50 @@
/** /**
* Module: update_profile * 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) require_once("mod/profile.php");
{
$profile_uid = intval($_GET['p']);
header('Content-type: text/html'); function update_profile_content(&$a) {
echo "<!DOCTYPE html><html><body>\r\n";
/* $profile_uid = intval($_GET["p"]);
* We can remove this hack once Internet Explorer recognises HTML5 natively
*/
echo '<section>'; header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n";
/** // We can remove this hack once Internet Explorer recognises HTML5 natively
* Grab the page inner contents by calling the content function from the profile module directly, echo "<section>";
* 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 = '/<img([^>]*) src="([^"]*)"/'; /**
$replace = '<img${1} dst="${2}"'; * Grab the page inner contents by calling the content function from the profile module directly,
$text = preg_replace($pattern, $replace, $text); * 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.
*/
if (get_pconfig(local_user(), 'system', 'bandwith_saver')) { $text = profile_content($a, $profile_uid);
$replace = '<br />'.t('[Embedded content - reload page to view]').'<br />';
$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 $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
echo str_replace("\t", ' ', $text); $replace = "<img\${1} dst=\"\${2}\"";
echo '</section>'; $text = preg_replace($pattern, $replace, $text);
echo "</body></html>\r\n";
killme(); if (get_pconfig(local_user(), "system", "bandwith_saver")) {
} $replace = "<br />".t("[Embedded content - reload page to view]")."<br />";
$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 "</section>";
echo "</body></html>\r\n";
killme();
}