- $notif_content[] = replace_macros($sugg, [
- '$str_notifytype' => L10n::t('Notification type: '),
- '$notify_type' => $it['notify_type'],
- '$intro_id' => $it['intro_id'],
- '$madeby' => sprintf(L10n::t('suggested by %s'), $it['madeby']),
- '$contact_id' => $it['contact-id'],
- '$photo' => $it['photo'],
- '$fullname' => $it['name'],
- '$url' => $it['url'],
- '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($it['hidden'] == 1), ''],
- '$activity' => ['activity', L10n::t('Post a new friend activity'), $it['post_newfriend'], L10n::t('if applicable')],
-
- '$knowyou' => $it['knowyou'],
- '$approve' => L10n::t('Approve'),
- '$note' => $it['note'],
- '$request' => $it['request'],
- '$ignore' => L10n::t('Ignore'),
- '$discard' => L10n::t('Discard'),
+ $notif_content[] = Renderer::replaceMacros($sugg, [
+ '$type' => $notif['label'],
+ '$str_notifytype' => L10n::t('Notification type:'),
+ '$notify_type'=> $notif['notify_type'],
+ '$intro_id' => $notif['intro_id'],
+ '$lbl_madeby' => L10n::t('Suggested by:'),
+ '$madeby' => $notif['madeby'],
+ '$madeby_url' => $notif['madeby_url'],
+ '$madeby_zrl' => $notif['madeby_zrl'],
+ '$madeby_addr'=> $notif['madeby_addr'],
+ '$contact_id' => $notif['contact_id'],
+ '$photo' => $notif['photo'],
+ '$fullname' => $notif['name'],
+ '$url' => $notif['url'],
+ '$zrl' => $notif['zrl'],
+ '$lbl_url' => L10n::t('Profile URL'),
+ '$addr' => $notif['addr'],
+ '$hidden' => ['hidden', L10n::t('Hide this contact from others'), ($notif['hidden'] == 1), ''],
+ '$knowyou' => $notif['knowyou'],
+ '$approve' => L10n::t('Approve'),
+ '$note' => $notif['note'],
+ '$request' => $notif['request'],
+ '$ignore' => L10n::t('Ignore'),
+ '$discard' => L10n::t('Discard'),