Merge remote-tracking branch 'upstream/develop' into write-tags

[friendica.git] / src / Module / Update / Profile.php
diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php

index d23f766b57d1803d5a82a90e55455ba347c975cf..38ef3b09e028cec4b842395dec91fc3c33223c55 100644 (file)
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -24,6 +24,7 @@ namespace Friendica\Module\Update;
  use Friendica\BaseModule;
  use Friendica\Content\Pager;
  use Friendica\Core\Session;
+use Friendica\Core\System;
  use Friendica\Database\DBA;
  use Friendica\DI;
  use Friendica\Model\Item;
@@ -41,8 +42,6 @@ class Profile extends BaseModule
                         throw new ForbiddenException();
                 }
  
-               $o = '';
-
                 $profile_uid = intval($_GET['p'] ?? 0);
  
                 // Ensure we've got a profile owner if updating.
@@ -56,6 +55,12 @@ class Profile extends BaseModule
                         throw new ForbiddenException(DI::l10n()->t('Access to this profile has been restricted.'));
                 }
  
+               $o = '';
+
+               if (empty($_GET['force']) && DI::pConfig()->get(local_user(), 'system', 'no_auto_update')) {
+                       System::htmlUpdateExit($o);
+               }
+
                 // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
                 $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid']);
  
@@ -95,8 +100,6 @@ class Profile extends BaseModule
                         return '';
                 }
  
-               $pager = new Pager(DI::args()->getQueryString());
-
                 // Set a time stamp for this page. We will make use of it when we
                 // search for new items (update routine)
                 $last_updated_array[$last_updated_key] = time();
@@ -116,29 +119,8 @@ class Profile extends BaseModule
  
                 $items = DBA::toArray($items_stmt);
  
-               $o .= conversation($a, $items, $pager, 'profile', $profile_uid, false, 'received', $a->profile['uid']);
-
-               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>";
-               echo $o;
-               if (DI::pConfig()->get(local_user(), "system", "bandwidth_saver")) {
-                       $replace = "<br />".DI::l10n()->t("[Embedded content - reload page to view]")."<br />";
-                       $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
-                       $o = preg_replace($pattern, $replace, $o);
-                       $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
-                       $o = preg_replace($pattern, $replace, $o);
-                       $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
-                       $o = preg_replace($pattern, $replace, $o);
-                       $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
-                       $o = preg_replace($pattern, $replace, $o);
-               }
+               $o .= conversation($a, $items, 'profile', $profile_uid, false, 'received', $a->profile['uid']);
  
-               // reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
-               echo str_replace("\t", "       ", $o);
-               echo "</section>";
-               echo "</body></html>\r\n";
-               exit();
+               System::htmlUpdateExit($o);
         }
  }