saved searches on search page, templates: Invalid argument supplied for foreach(...

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 90f62fa4767ab98f7f8d40cb52aa6b877285bbc1..8c32ee8628bbe5250a9dd163e6cb4d09c2f245d3 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -3,7 +3,7 @@
 function notifications_post(&$a) {
 
        if(! local_user()) {
-               goaway($a->get_baseurl());
+               goaway(z_root());
        }
        
        $request_id = (($a->argc > 1) ? $a->argv[1] : 0);
@@ -60,7 +60,7 @@ function notifications_content(&$a) {
 
        if(! local_user()) {
                notice( t('Permission denied.') . EOL);
-               goaway($a->get_baseurl());
+               return;
        }
 
        $o = '';
@@ -122,23 +122,25 @@ function notifications_content(&$a) {
                                continue;
 
                        }
-                       $friend_selected = (($rr['network'] !== 'stat') ? ' checked="checked" ' : ' disabled ');
-                       $fan_selected = (($rr['network'] === 'stat') ? ' checked="checked" disabled ' : '');
+                       $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'] !== 'stat') {
-                               $knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no'));
-
+                       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' => t('Fan/Admirer')
+                                       '$as_fan' => (($rr['network'] == NETWORK_DIASPORA) ? t('Sharer') : t('Fan/Admirer'))
                                ));
                        }                       
 
@@ -146,7 +148,7 @@ function notifications_content(&$a) {
 
                        $o .= replace_macros($tpl,array(
                                '$str_notifytype' => t('Notification type: '),
-                               '$notify_type' => (($rr['network'] !== 'stat') ? t('Friend/Connect Request') : t('New Follower')),
+                               '$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'],
@@ -167,30 +169,6 @@ function notifications_content(&$a) {
        else
                info( t('No notifications.') . EOL);
 
-/*
-       if ($a->config['register_policy'] == REGISTER_APPROVE &&        
-               $a->config['admin_email'] === $a->user['email']){
-               $o .= '<h1>' . t('User registrations waiting for confirm') . '</h1>' . "\r\n";
-               
-               $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))) {
-                       $o .= '<ul>';
-                       foreach($r as $rr) {
-                               $o .= '<li>' . sprintf('%s (%s) : ', $rr['name'],$rr['email']) 
-                                       . '<a href="regmod/allow/' . $rr['hash'] .'">' . t('Approve') 
-                                       . '</a> - <a href="regmod/deny/' . $rr['hash'] . '">' . t('Deny') . '</a></li>' . "\r\n";
-                       }
-                       $o .= "</ul>";
-               }
-               else
-                       info( t('No registrations.') . EOL);
-
-       }
-*/
-
        $o .= paginate($a);
        return $o;
 }