use consistent tagging patterns with relationship partner

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 2c79781e98eef379bc65fd7499cd51b60e233c6f..93ca82bb0ccfb0d999096bd94db5f187090368c8 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -72,6 +72,16 @@ function notifications_content(&$a) {
                '$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
        )); 
 
+
+       $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 ",
@@ -84,20 +94,23 @@ function notifications_content(&$a) {
 
                foreach($r as $rr) {
 
-                       $friend_selected = (($rr['network'] === 'dfrn') ? ' checked="checked" ' : ' disabled ');
+                       $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'] === 'dfrn') {
+                       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')
                                ));
                        }                       
 
@@ -105,7 +118,7 @@ function notifications_content(&$a) {
 
                        $o .= replace_macros($tpl,array(
                                '$str_notifytype' => t('Notification type: '),
-                               '$notify_type' => (($rr['network'] === 'dfrn') ? t('Friend/Connect Request') : t('New Follower')),
+                               '$notify_type' => (($rr['network'] !== 'stat') ? t('Friend/Connect Request') : t('New Follower')),
                                '$dfrn_text' => $dfrn_text,     
                                '$dfrn_id' => $rr['issued-id'],
                                '$uid' => $_SESSION['uid'],
@@ -116,12 +129,42 @@ function notifications_content(&$a) {
                                '$url' => $rr['url'],
                                '$knowyou' => $knowyou,
                                '$approve' => t('Approve'),
-                               '$note' => $rr['note']
+                               '$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 .= "<ul>";
+                               $o .= replace_macros($tpl, array(
+                                       '$fullname'     => $rr['name'],
+                                       '$email'                => $rr['email'],
+                                       '$approvelink'  => "regmod/allow/".$rr['hash'],
+                                       '$denylink'     => "regmod/deny/".$rr['hash'],
+                               ));
+                               $o .= "</ul>";
+                       }
+               }
+               else
+                       notice( t('No registrations.') . EOL);
+
+       }
+
+       $o .= paginate($a);
        return $o;
-}
\ No newline at end of file
+}