stuff to make connecting to diaspora profiles easier

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index f11676ebfe10190420cf4fb2bea772b699ea0acc..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 ",
@@ -98,6 +108,9 @@ function notifications_content(&$a) {
                                        '$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')
                                ));
                        }                       
 
@@ -126,8 +139,8 @@ function notifications_content(&$a) {
        else
                notice( t('No notifications.') . EOL);
 
-       if ($a->config['register_policy'] = REGISTER_APPROVE && 
-               $a->config['admin_email'] = $a->user['email']){
+       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`
@@ -152,5 +165,6 @@ function notifications_content(&$a) {
 
        }
 
+       $o .= paginate($a);
        return $o;
 }