diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 34cc9cf25..e8bc50926 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -168,7 +168,7 @@ function dfrn_request_post(App $a) $parms['key'] // this was already escaped ); if (DBM::is_result($r)) { - Group::addMember(User::getDefaultGroup($uid, $r[0]["network"]), $r[0]['id']); + Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']); if (isset($photo)) { Contact::updateAvatar($photo, local_user(), $r[0]["id"], true); diff --git a/mod/editpost.php b/mod/editpost.php index af8f4e317..f28e7a50b 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -38,6 +38,8 @@ function editpost_content(App $a) { return; } + $geotag = ''; + $o .= replace_macros(get_markup_template("section_title.tpl"),[ '$title' => L10n::t('Edit post') ]); diff --git a/mod/install.php b/mod/install.php index f3969a6f2..3adcb75aa 100644 --- a/mod/install.php +++ b/mod/install.php @@ -222,6 +222,7 @@ function install_content(App $a) { $dbdata = notags(trim($_POST['dbdata'])); $phpath = notags(trim($_POST['phpath'])); + $adminmail = notags(trim($_POST['adminmail'])); $tpl = get_markup_template('install_db.tpl'); $o .= replace_macros($tpl, [ diff --git a/mod/localtime.php b/mod/localtime.php index b10f1571a..9a754ac80 100644 --- a/mod/localtime.php +++ b/mod/localtime.php @@ -30,7 +30,7 @@ function localtime_content(App $a) $t = 'now'; } - $o .= '
' . L10n::t('Friendica provides this service for sharing events with other networks and friends in unknown timezones.') . '
'; diff --git a/mod/lostpass.php b/mod/lostpass.php index 73167e6fe..56ad7e30e 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -125,6 +125,7 @@ function lostpass_form() function lostpass_generate_password($user) { $o = ''; + $a = get_app(); $new_password = User::generateNewPassword(); $result = User::updatePassword($user['uid'], $new_password); diff --git a/mod/message.php b/mod/message.php index f1e3b7645..8940ee44b 100644 --- a/mod/message.php +++ b/mod/message.php @@ -250,7 +250,6 @@ function message_content(App $a) '$to' => L10n::t('To:'), '$showinputs' => 'true', '$prefill' => $prefill, - '$autocomp' => $autocomp, '$preid' => $preid, '$subject' => L10n::t('Subject:'), '$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '', diff --git a/mod/network.php b/mod/network.php index 834eedf49..3013e9498 100644 --- a/mod/network.php +++ b/mod/network.php @@ -444,7 +444,7 @@ function networkFlatView(App $a, $update = 0) } if (strlen($file)) { - $sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ", + $sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ", dbesc(protect_sprintf($file)), intval(TERM_OBJ_POST), intval(TERM_FILE), intval(local_user())); } else { $sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`"; diff --git a/mod/notify.php b/mod/notify.php index 0ab2b0d41..dff7d147f 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -77,7 +77,7 @@ function notify_content(App $a) $notif_content .= L10n::t('No more system notifications.'); } - $o .= replace_macros($notif_tpl, [ + $o = replace_macros($notif_tpl, [ '$notif_header' => L10n::t('System Notifications'), '$tabs' => false, // $tabs, '$notif_content' => $notif_content, diff --git a/mod/photos.php b/mod/photos.php index 9515d1795..4b031e5b5 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -865,7 +865,7 @@ function photos_post(App $a) // Create item container $lat = $lon = null; - if ($exif && $exif['GPS'] && Feature::isEnabled($channel_id, 'photo_location')) { + if ($exif && $exif['GPS'] && Feature::isEnabled($page_owner_uid, 'photo_location')) { $lat = Photo::getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']); $lon = Photo::getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']); } diff --git a/mod/ping.php b/mod/ping.php index 1bb8f147f..62ab2644c 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -571,8 +571,8 @@ function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_inf $forums = []; if (count($forums_unseen)) { foreach ($forums_unseen as $key => $item) { - $forums[$count . ':forum'] = $item['count']; - $forums[$count . ':@attributes'] = ['id' => $item['id']]; + $forums[$key . ':forum'] = $item['count']; + $forums[$key . ':@attributes'] = ['id' => $item['id']]; } $data['forums'] = $forums; } diff --git a/mod/probe.php b/mod/probe.php index b4f6ff3a4..5e7a5253f 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -15,7 +15,7 @@ function probe_content(App $a) killme(); } - $o .= '