keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reverting too extensive formatting changes

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

23
mod/update_community.php
View file

@ -2,21 +2,21 @@
// 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');
function update_community_content(&$a) {
header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n";
echo '<section>';
echo "<section>";
$text = community_content($a, true);
$pattern = '/<img([^>]*) src="([^"]*)"/';
$replace = '<img${1} dst="${2}"';
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$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 />';
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";
@ -27,9 +27,8 @@ function update_community_content(&$a)
$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 str_replace("\t", " ", $text);
echo "</section>";
echo "</body></html>\r\n";
killme();
}

30
mod/update_display.php
View file

@ -2,24 +2,25 @@
// 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');
$profile_uid = intval($_GET["p"]);
header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n";
echo '<section>';
echo "<section>";
$text = display_content($a, $profile_uid);
$pattern = '/<img([^>]*) src="([^"]*)"/';
$replace = '<img${1} dst="${2}"';
$text = display_content($a,$profile_uid);
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$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 />';
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";
@ -30,9 +31,8 @@ function update_display_content(&$a)
$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 str_replace("\t", " ", $text);
echo "</section>";
echo "</body></html>\r\n";
killme();
}

31
mod/update_network.php
View file

@ -2,29 +2,29 @@
// 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');
$profile_uid = intval($_GET["p"]);
header("Content-type: text/html");
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);
} else {
$text = '';
$text = "";
}
$pattern = '/<img([^>]*) src="([^"]*)"/';
$replace = '<img${1} dst="${2}"';
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$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 />';
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";
@ -35,9 +35,8 @@ function update_network_content(&$a)
$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 str_replace("\t", " ", $text);
echo "</section>";
echo "</body></html>\r\n";
killme();
}

32
mod/update_notes.php
View file

@ -1,35 +1,39 @@
<?php
/**
* Module: update_profile
* Purpose: AJAX synchronisation of profile page.
* Module: update_notes
* Purpose: AJAX synchronisation of notes 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');
function update_notes_content(&$a) {
$profile_uid = intval($_GET["p"]);
header("Content-type: text/html");
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,
* 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="([^"]*)"/';
$replace = '<img${1} dst="${2}"';
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$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 />';
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";
@ -41,8 +45,8 @@ function update_notes_content(&$a)
}
// 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";
killme();
}

33
mod/update_profile.php
View file

@ -2,22 +2,20 @@
/**
* 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');
function update_profile_content(&$a) {
$profile_uid = intval($_GET["p"]);
header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n";
/*
* We can remove this hack once Internet Explorer recognises HTML5 natively
*/
echo '<section>';
// We can remove this hack once Internet Explorer recognises HTML5 natively
echo "<section>";
/**
* Grab the page inner contents by calling the content function from the profile module directly,
@ -26,14 +24,15 @@ function update_profile_content(&$a)
* 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}"';
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$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 />';
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";
@ -45,8 +44,8 @@ function update_profile_content(&$a)
}
// 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";
killme();
}