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 e67082191cd6cbb0ff6834f196b42293ce78f9df..38ef3b09e028cec4b842395dec91fc3c33223c55 100644 (file)
--- a/src/Module/Update/Profile.php
+++ b/src/Module/Update/Profile.php
@@ -1,10 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 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;
@@ -12,35 +32,37 @@ use Friendica\Model\Profile as ProfileModel;
 use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'boot.php';
-
 class Profile extends BaseModule
 {
        public static function rawContent(array $parameters = [])
        {
                $a = DI::app();
 
-               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->profile['profile_uid'])) {
+               if (DI::config()->get('system', 'block_public') && !local_user() && !Session::getRemoteContactID($a->profile['uid'])) {
                        throw new ForbiddenException();
                }
 
-               $o = '';
-
                $profile_uid = intval($_GET['p'] ?? 0);
 
                // Ensure we've got a profile owner if updating.
-               $a->profile['profile_uid'] = $profile_uid;
+               $a->profile['uid'] = $profile_uid;
 
-               $remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
-               $is_owner = local_user() == $a->profile['profile_uid'];
-               $last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . $remote_contact;
+               $remote_contact = Session::getRemoteContactID($a->profile['uid']);
+               $is_owner = local_user() == $a->profile['uid'];
+               $last_updated_key = "profile:" . $a->profile['uid'] . ":" . local_user() . ":" . $remote_contact;
 
                if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
                        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['profile_uid']);
+               $sql_extra = Item::getPermissionsSQLByUserId($a->profile['uid']);
 
                $last_updated_array = Session::get('last_updated', []);
 
@@ -70,7 +92,7 @@ class Profile extends BaseModule
                                $sql_extra4
                                $sql_extra
                        ORDER BY `item`.`received` DESC",
-                       $a->profile['profile_uid'],
+                       $a->profile['uid'],
                        GRAVITY_ACTIVITY
                );
 
@@ -78,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();
@@ -99,29 +119,8 @@ class Profile extends BaseModule
 
                $items = DBA::toArray($items_stmt);
 
-               $o .= conversation($a, $items, $pager, 'profile', $profile_uid, false, 'received', $a->profile['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);
        }
 }