X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotifications.php;h=8c32ee8628bbe5250a9dd163e6cb4d09c2f245d3;hb=8f6ae2b66044a36996ac92a8db1a540db9c71fe3;hp=1064729ffdf2de1abebb0451d7feb9a949d524e7;hpb=6348e70daa113e8b3203de8fbc919d08c90d972e;p=friendica.git
diff --git a/mod/notifications.php b/mod/notifications.php
index 1064729ffd..8c32ee8628 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -2,39 +2,49 @@
function notifications_post(&$a) {
- if((! x($_SESSION,'authenticated')) || (! (x($_SESSION,'uid')))) {
- goaway($a->get_baseurl());
+ if(! local_user()) {
+ goaway(z_root());
}
- $request_id = (($a->argc > 1) ? $a->argv[0] : 0);
+ $request_id = (($a->argc > 1) ? $a->argv[1] : 0);
- if($request_id == "all")
+ if($request_id === "all")
return;
if($request_id) {
- $r = q("SELECT `id` FROM `intro`
- WHERE `request-id` = %d
- AND `uid` = %d LIMIT 1",
- intval($request_id),
- intval($_SESSION['uid'])
+ $r = q("SELECT * FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($request_id),
+ intval(local_user())
);
if(count($r)) {
$intro_id = $r[0]['id'];
+ $contact_id = $r[0]['contact-id'];
}
else {
- $_SESSION['sysmsg'] .= "Invalid request identifier." . EOL;
+ notice( t('Invalid request identifier.') . EOL);
return;
}
- if($_POST['submit'] == 'Discard') {
- $r = q("DELETE `intro` WHERE `id` = %d LIMIT 1", intval($intro_id));
- $r = q("DELETE `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($request_id),
- intval($_SESSION['uid']));
+
+ // If it is a friend suggestion, the contact is not a new friend but an existing friend
+ // that should not be deleted.
+
+ $fid = $r[0]['fid'];
+
+ if($_POST['submit'] == t('Discard')) {
+ $r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1",
+ intval($intro_id)
+ );
+ if(! $fid) {
+ $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1",
+ intval($contact_id),
+ intval(local_user())
+ );
+ }
return;
}
- if($_POST['submit'] == 'Ignore') {
+ if($_POST['submit'] == t('Ignore')) {
$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d LIMIT 1",
intval($intro_id));
return;
@@ -48,51 +58,117 @@ function notifications_post(&$a) {
function notifications_content(&$a) {
- $o = '';
-
- if((! x($_SESSION,'authenticated')) || (! (x($_SESSION,'uid')))) {
- goaway($a->get_baseurl());
+ if(! local_user()) {
+ notice( t('Permission denied.') . EOL);
+ return;
}
+ $o = '';
+ $o .= '';
+
if(($a->argc > 1) && ($a->argv[1] == 'all'))
$sql_extra = '';
else
$sql_extra = " AND `ignore` = 0 ";
+ $o .= '' . t('Pending Friend/Connect Notifications') . '
' . "\r\n";
+
+ $o .= '' . "\r\n";
+
- $tpl = file_get_contents('view/intros-top.tpl');
- $o .= replace_macros($tpl,array(
- '$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
- '$hide_text' => ((strlen($sql_extra)) ? 'Show Ignored Requests' : 'Hide Ignored Requests')
- ));
-dbg(2);
- $r = q("SELECT `intro`.`id` AS `intro-id`, `intro`.*, `contact`.*
- FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
+ $r = q("SELECT COUNT(*) AS `total` FROM `intro`
+ WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
+ intval($_SESSION['uid'])
+ );
+ if($r && count($r)) {
+ $a->set_pager_total($r[0]['total']);
+ $a->set_pager_itemspage(20);
+ }
+
+ $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`,`fcontact`.`url` AS `furl`,`fcontact`.`photo` AS `fphoto`,`fcontact`.`request` AS `frequest`
+ FROM `intro` LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
intval($_SESSION['uid']));
-dbg(0);
- if(($r !== false) && (count($r))) {
+ if(($r !== false) && (count($r))) {
- $tpl = file_get_contents("view/intros.tpl");
+ $sugg = get_markup_template('suggestions.tpl');
+ $tpl = get_markup_template("intros.tpl");
foreach($r as $rr) {
+ if($rr['fid']) {
+
+ $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+ $o .= replace_macros($sugg,array(
+ '$str_notifytype' => t('Notification type: '),
+ '$notify_type' => t('Friend Suggestion'),
+ '$intro_id' => $rr['intro_id'],
+ '$madeby' => sprintf( t('suggested by %s'),$rr['name']),
+ '$contact_id' => $rr['contact-id'],
+ '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/default-profile.jpg"),
+ '$fullname' => $rr['fname'],
+ '$url' => $rr['furl'],
+ '$knowyou' => $knowyou,
+ '$approve' => t('Approve'),
+ '$note' => $rr['note'],
+ '$request' => $rr['frequest'] . '?addr=' . $return_addr,
+ '$ignore' => t('Ignore'),
+ '$discard' => t('Discard')
+
+ ));
+
+ continue;
+
+ }
+ $friend_selected = (($rr['network'] !== NETWORK_OSTATUS) ? ' checked="checked" ' : ' disabled ');
+ $fan_selected = (($rr['network'] === NETWORK_OSTATUS) ? ' checked="checked" disabled ' : '');
+ $dfrn_tpl = get_markup_template('netfriend.tpl');
+
+ $knowyou = '';
+ $dfrn_text = '';
+
+ if($rr['network'] === NETWORK_DFRN || $rr['network'] === NETWORK_DIASPORA) {
+ if($rr['network'] === NETWORK_DFRN)
+ $knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no'));
+ else
+ $knowyou = '';
+ $dfrn_text = replace_macros($dfrn_tpl,array(
+ '$intro_id' => $rr['intro_id'],
+ '$friend_selected' => $friend_selected,
+ '$fan_selected' => $fan_selected,
+ '$approve_as' => t('Approve as: '),
+ '$as_friend' => t('Friend'),
+ '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer'))
+ ));
+ }
+
+
$o .= replace_macros($tpl,array(
- '$intro_id' => $rr['intro-id'],
- '$dfrn-id' => $rr['issued-id'],
+ '$str_notifytype' => t('Notification type: '),
+ '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
+ '$dfrn_text' => $dfrn_text,
+ '$dfrn_id' => $rr['issued-id'],
'$uid' => $_SESSION['uid'],
- '$contact-id' => $rr['contact-id'],
+ '$intro_id' => $rr['intro_id'],
+ '$contact_id' => $rr['contact-id'],
'$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/default-profile.jpg"),
'$fullname' => $rr['name'],
- '$knowyou' => (($rr['knowyou']) ? 'yes' : 'no'),
'$url' => $rr['url'],
- '$note' => $rr['note']
+ '$knowyou' => $knowyou,
+ '$approve' => t('Approve'),
+ '$note' => $rr['note'],
+ '$ignore' => t('Ignore'),
+ '$discard' => t('Discard')
+
));
}
}
else
- $_SESSION['sysmsg'] .= "No notifications." . EOL;
+ info( t('No notifications.') . EOL);
+ $o .= paginate($a);
return $o;
-}
\ No newline at end of file
+}