Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 07:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8854 from MrPetovan/bug/notices

Browse source 
Address various notices again
This commit is contained in:
Michael Vogel 2020-07-09 21:45:27 +02:00 • committed by GitHub
commit ced0effa2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 32 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/App/Page.php
View file

@ -276,7 +276,7 @@ class Page implements ArrayAccess
// If you're just visiting, let javascript take you home
if (!empty($_SESSION['visitor_home'])) {
$homebase = $_SESSION['visitor_home'];
} elseif (local_user()) {
} elseif (!empty($app->user['nickname'])) {
$homebase = 'profile/' . $app->user['nickname'];
}

10
src/BaseModule.php
View file

@ -96,11 +96,11 @@ abstract class BaseModule
* Functions used to protect against Cross-Site Request Forgery
* The security token has to base on at least one value that an attacker can't know - here it's the session ID and the private key.
* In this implementation, a security token is reusable (if the user submits a form, goes back and resubmits the form, maybe with small changes;
* or if the security token is used for ajax-calls that happen several times), but only valid for a certain amout of time (3hours).
* The "typename" seperates the security tokens of different types of forms. This could be relevant in the following case:
* A security token is used to protekt a link from CSRF (e.g. the "delete this profile"-link).
* or if the security token is used for ajax-calls that happen several times), but only valid for a certain amount of time (3hours).
* The "typename" separates the security tokens of different types of forms. This could be relevant in the following case:
* A security token is used to protect a link from CSRF (e.g. the "delete this profile"-link).
* If the new page contains by any chance external elements, then the used security token is exposed by the referrer.
* Actually, important actions should not be triggered by Links / GET-Requests at all, but somethimes they still are,
* Actually, important actions should not be triggered by Links / GET-Requests at all, but sometimes they still are,
* so this mechanism brings in some damage control (the attacker would be able to forge a request to a form of this type, but not to forms of other types).
*/
public static function getFormSecurityToken($typename = '')
@ -108,7 +108,7 @@ abstract class BaseModule
$a = DI::app();
$timestamp = time();
$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename);
$sec_hash = hash('whirlpool', ($a->user['guid'] ?? '') . ($a->user['prvkey'] ?? '') . session_id() . $timestamp . $typename);
return $timestamp . '.' . $sec_hash;
}

2
src/Model/UserItem.php
View file

@ -75,7 +75,7 @@ class UserItem
private static function setNotificationForUser(array $item, int $uid)
{
$thread = Item::selectFirstThreadForUser($uid, ['ignored'], ['iid' => $item['parent'], 'deleted' => false]);
if ($thread['ignored']) {
if (!empty($thread['ignored'])) {
return;
}

8
src/Module/HoverCard.php
View file

@ -26,7 +26,7 @@ use Friendica\Core\Session;
use Friendica\DI;
use Friendica\Model\Profile;
use Friendica\Model\User;
use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Network\HTTPException;
/**
* Loads a profile for the HoverCard view
@ -44,11 +44,15 @@ class HoverCard extends BaseModule
// Show the profile hovercard
$nickname = $parameters['profile'];
} else {
throw new NotFoundException(DI::l10n()->t('No profile'));
throw new HTTPException\NotFoundException(DI::l10n()->t('No profile'));
}
Profile::load($a, $nickname);
if (empty($a->profile)) {
throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
}
$page = DI::page();
if (!empty($a->profile['page-flags']) && ($a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) {