Only assign a uid to the profile if not defined by now

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 2c11f43b9c442273bdf53985df44d4091ed555b3..87ad9a9e97e3211e918574ff5fcbb1c384682c7d 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -33,24 +33,16 @@ function profile_init(App $a)
                $a->page['aside'] = '';
        }
 
-       if ($a->argc > 1) {
-               $which = htmlspecialchars($a->argv[1]);
-       } else {
-               $r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1");
-               if (DBA::isResult($r)) {
-                       $a->internalRedirect('profile/' . $r[0]['nickname']);
-               } else {
-                       Logger::log('profile error: mod_profile ' . $a->query_string, Logger::DEBUG);
-                       notice(L10n::t('Requested profile is not available.') . EOL);
-                       $a->error = 404;
-                       return;
-               }
+       if ($a->argc < 2) {
+               System::httpExit(400);
        }
 
+       $which = filter_var($a->argv[1], FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_LOW | FILTER_FLAG_STRIP_HIGH | FILTER_FLAG_STRIP_BACKTICK);
+
        $profile = 0;
        if (local_user() && $a->argc > 2 && $a->argv[2] === 'view') {
                $which = $a->user['nickname'];
-               $profile = htmlspecialchars($a->argv[1]);
+               $profile = filter_var($a->argv[1], FILTER_SANITIZE_NUMBER_INT);
        } else {
                DFRN::autoRedir($a, $which);
        }
@@ -139,6 +131,7 @@ function profile_content(App $a, $update = 0)
        require_once 'include/items.php';
 
        $groups = [];
+       $remote_cid = null;
 
        $tab = 'posts';
        $o = '';
@@ -158,6 +151,7 @@ function profile_content(App $a, $update = 0)
                $cdata = Contact::getPublicAndUserContacID(remote_user(), $a->profile['profile_uid']);
                if (!empty($cdata['user'])) {
                        $groups = Group::getIdsByContactId($cdata['user']);
+                       $remote_cid = $cdata['user'];
                }
        }
 
@@ -211,9 +205,8 @@ function profile_content(App $a, $update = 0)
                }
        }
 
-
        // 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'], $remote_contact, $groups);
+       $sql_extra = Item::getPermissionsSQLByUserId($a->profile['profile_uid'], $remote_contact, $groups, $remote_cid);
        $sql_extra2 = '';
 
        if ($update) {
@@ -325,7 +318,7 @@ function profile_content(App $a, $update = 0)
                }
        }
 
-       $o .= conversation($a, $items, $pager, 'profile', $update, false, 'created', local_user());
+       $o .= conversation($a, $items, $pager, 'profile', $update, false, 'created', $a->profile['profile_uid']);
 
        if (!$update) {
                $o .= $pager->renderMinimal(count($items));