Merge branch 'friendika-master'

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 1c680794e49debdeb1bee99c138ffceae63ac209..49157c4442dd4bf16fb891a274481159d1b28a93 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 ",
@@ -126,5 +136,32 @@ function notifications_content(&$a) {
        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
+}