clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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"
This commit is contained in:
Hypolite Petovan 2016-10-02 15:23:05 -04:00
parent 4021109696
commit 08a30bc1c6
5 changed files with 152 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mod/update_community.php
View File

@ -2,20 +2,21 @@
// 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"); header('Content-type: text/html');
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
echo "<section>"; echo '<section>';
$text = community_content($a,true); $text = community_content($a, true);
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/"; $pattern = '/<img([^>]*) src="([^"]*)"/';
$replace = "<img\${1} dst=\"\${2}\""; $replace = '<img${1} dst="${2}"';
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />'; 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"; $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"; $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
@ -24,10 +25,11 @@ function update_community_content(&$a) {
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
}
echo str_replace("\t",' ',$text); // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
echo "</section>"; echo str_replace("\t", ' ', $text);
echo '</section>';
echo "</body></html>\r\n"; echo "</body></html>\r\n";
killme(); killme();
} }

30
mod/update_display.php
View File

@ -2,24 +2,24 @@
// 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']); $profile_uid = intval($_GET['p']);
header("Content-type: text/html"); header('Content-type: text/html');
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
echo "<section>"; echo '<section>';
$text = display_content($a, $profile_uid);
$text = display_content($a,$profile_uid); $pattern = '/<img([^>]*) src="([^"]*)"/';
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/"; $replace = '<img${1} dst="${2}"';
$replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />'; 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"; $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"; $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
@ -28,11 +28,11 @@ function update_display_content(&$a) {
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text); $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 str_replace("\t", ' ', $text);
echo "</section>"; echo '</section>';
echo "</body></html>\r\n"; echo "</body></html>\r\n";
killme(); killme();
} }

36
mod/update_network.php
View File

@ -2,27 +2,29 @@
// 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']); $profile_uid = intval($_GET['p']);
header("Content-type: text/html"); header('Content-type: text/html');
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
echo "<section>"; echo '<section>';
if (!get_pconfig($profile_uid, "system", "no_auto_update") OR ($_GET['force'] == 1)) if (!get_pconfig($profile_uid, 'system', 'no_auto_update') or ($_GET['force'] == 1)) {
$text = network_content($a,$profile_uid); $text = network_content($a, $profile_uid);
else } else {
$text = ""; $text = '';
}
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/"; $pattern = '/<img([^>]*) src="([^"]*)"/';
$replace = "<img\${1} dst=\"\${2}\""; $replace = '<img${1} dst="${2}"';
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />'; 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"; $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"; $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
@ -31,11 +33,11 @@ function update_network_content(&$a) {
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text); $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 str_replace("\t", ' ', $text);
echo "</section>"; echo '</section>';
echo "</body></html>\r\n"; echo "</body></html>\r\n";
killme(); killme();
} }

38
mod/update_notes.php
View File

@ -2,39 +2,34 @@
/** /**
* Module: update_profile * 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)
require_once('mod/notes.php'); {
function update_notes_content(&$a) {
$profile_uid = intval($_GET['p']); $profile_uid = intval($_GET['p']);
header("Content-type: text/html"); header('Content-type: text/html');
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
echo "<section>"; echo '<section>';
/** /**
*
* Grab the page inner contents by calling the content function from the profile module directly, * 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 * 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. * 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 * 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. * on the client side and then swap the image back.
*
*/ */
$text = notes_content($a, $profile_uid);
$text = notes_content($a,$profile_uid); $pattern = '/<img([^>]*) src="([^"]*)"/';
$replace = '<img${1} dst="${2}"';
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />'; 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"; $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"; $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
@ -43,14 +38,11 @@ function update_notes_content(&$a) {
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
}
/** // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
* reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well echo str_replace("\t", ' ', $text);
*/ echo '</section>';
echo str_replace("\t",' ',$text);
echo "</section>";
echo "</body></html>\r\n"; echo "</body></html>\r\n";
killme(); killme();
} }

40
mod/update_profile.php
View File

@ -2,43 +2,38 @@
/** /**
* 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'); {
function update_profile_content(&$a) {
$profile_uid = intval($_GET['p']); $profile_uid = intval($_GET['p']);
header("Content-type: text/html"); header('Content-type: text/html');
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
/** /*
* We can remove this hack once Internet Explorer recognises HTML5 natively * We can remove this hack once Internet Explorer recognises HTML5 natively
*/ */
echo "<section>"; echo '<section>';
/** /**
*
* Grab the page inner contents by calling the content function from the profile module directly, * 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 * 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. * 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 * 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. * on the client side and then swap the image back.
*
*/ */
$text = profile_content($a, $profile_uid);
$text = profile_content($a,$profile_uid); $pattern = '/<img([^>]*) src="([^"]*)"/';
$replace = '<img${1} dst="${2}"';
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />'; 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"; $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"; $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
@ -47,14 +42,11 @@ function update_profile_content(&$a) {
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
}
/** // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
* reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well echo str_replace("\t", ' ', $text);
*/ echo '</section>';
echo str_replace("\t",' ',$text);
echo "</section>";
echo "</body></html>\r\n"; echo "</body></html>\r\n";
killme(); killme();
} }