X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fnotifications.php;h=93ca82bb0ccfb0d999096bd94db5f187090368c8;hb=7e33c1072a4a948941e2522afe0123899b0abddd;hp=96f50d90be6014c2d3dc140cdf448d19c71b4f17;hpb=65a420b22755f774dc2422f7fdf3709e01289945;p=friendica.git diff --git a/mod/notifications.php b/mod/notifications.php index 96f50d90be..93ca82bb0c 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -8,20 +8,21 @@ function notifications_post(&$a) { $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 + $r = q("SELECT * FROM `intro` + WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($request_id), - intval(get_uid()) + intval(local_user()) ); if(count($r)) { $intro_id = $r[0]['id']; + $contact_id = $r[0]['contact-id']; } else { notice( t('Invalid request identifier.') . EOL); @@ -31,9 +32,9 @@ function notifications_post(&$a) { $r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1", intval($intro_id) ); - $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($request_id), - intval(get_uid()) + $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", + intval($contact_id), + intval(local_user()) ); return; } @@ -65,13 +66,23 @@ function notifications_content(&$a) { $sql_extra = " AND `ignore` = 0 "; - $tpl = file_get_contents('view/intros-top.tpl'); + $tpl = load_view_file('view/intros-top.tpl'); $o .= replace_macros($tpl,array( '$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ), '$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) )); - $r = q("SELECT `intro`.`id` AS `intro-id`, `intro`.*, `contact`.* + + $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`.* FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id` WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ", intval($_SESSION['uid'])); @@ -79,25 +90,81 @@ function notifications_content(&$a) { if(($r !== false) && (count($r))) { - $tpl = file_get_contents("view/intros.tpl"); + $tpl = load_view_file("view/intros.tpl"); foreach($r as $rr) { + $friend_selected = (($rr['network'] !== 'stat') ? ' checked="checked" ' : ' disabled '); + $fan_selected = (($rr['network'] === 'stat') ? ' checked="checked" disabled ' : ''); + $dfrn_tpl = load_view_file('view/netfriend.tpl'); + + $knowyou = ''; + $dfrn_text = ''; + + if($rr['network'] !== 'stat') { + $knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no')); + + $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' => 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'] !== 'stat') ? 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']) ? t('yes') : t('no')), '$url' => $rr['url'], - '$note' => $rr['note'] + '$knowyou' => $knowyou, + '$approve' => t('Approve'), + '$note' => $rr['note'], + '$ignore' => t('Ignore'), + '$discard' => t('Discard') + )); } } else notice( t('No notifications.') . EOL); + if ($a->config['register_policy'] == REGISTER_APPROVE && + $a->config['admin_email'] === $a->user['email']){ + $o .= load_view_file('view/registrations-top.tpl'); + + $r = q("SELECT `register`.*, `contact`.`name`, `user`.`email` + FROM `register` + LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid` + LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;"); + if(($r !== false) && (count($r))) { + $tpl = load_view_file("view/registrations.tpl"); + foreach($r as $rr) { + $o .= "