bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Some more notices (#5526)

Browse source 
* Some more notices

* Fixed nasty to find notice in DFRN and OStatus

* And more notices ...

* Yeah, some removed notices ... again ...
This commit is contained in:
Michael Vogel 2018-07-30 06:41:20 +02:00 • committed by Tobias Diekershoff
commit a2cea16954
10 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/contacts.php
View file

@ -188,7 +188,7 @@ function contacts_post(App $a)
Addon::callHooks('contact_edit_post', $_POST);
$profile_id = intval($_POST['profile-assign']);
$profile_id = intval(defaults($_POST, 'profile-assign', 0));
if ($profile_id) {
if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
notice(L10n::t('Could not locate selected profile.') . EOL);
@ -200,11 +200,11 @@ function contacts_post(App $a)
$notify = intval($_POST['notify']);
$fetch_further_information = intval($_POST['fetch_further_information']);
$fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
$ffi_keyword_blacklist = escape_tags(trim($_POST['ffi_keyword_blacklist']));
$ffi_keyword_blacklist = escape_tags(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
$priority = intval($_POST['poll']);
$priority = intval(defaults($_POST, 'poll', 0));
if ($priority > 5 || $priority < 0) {
$priority = 0;
}

8
mod/dfrn_notify.php
View file

@ -213,6 +213,14 @@ function dfrn_dispatch_public($postdata)
// We now have some contact, so we fetch it
$importer = DBA::fetchFirst("SELECT *, `name` as `senderName`
'' AS `uprvkey`,
'UTC' AS `timezone`,
'' AS `nickname`,
'' AS `sprvkey`,
'' AS `spubkey`,
0 AS `page-flags`,
0 AS `account-type`,
0 AS `prvnets`
FROM `contact`
WHERE NOT `blocked` AND `id` = ? LIMIT 1",
$contact['id']);

2
mod/dirfind.php
View file

@ -211,7 +211,7 @@ function dirfind_content(App $a, $prefix = "") {
$photo_menu = [];
}
} else {
$connlnk = System::baseUrl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
$connlnk = System::baseUrl().'/follow/?url='.(!empty($jj->connect) ? $jj->connect : $jj->url);
$conntxt = L10n::t('Connect');
$photo_menu = [
'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)],

5
mod/photos.php
View file

@ -123,7 +123,10 @@ function photos_init(App $a) {
}
$a->page['aside'] .= $vcard_widget;
$a->page['aside'] .= $photo_albums_widget;
if (!empty($photo_albums_widget)) {
$a->page['aside'] .= $photo_albums_widget;
}
$tpl = get_markup_template("photos_head.tpl");