From 2637831d9056862f7c3db718702116ef4652629a Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 1 Aug 2011 21:02:25 -0700 Subject: some more zot changes migrating back to f9a mainline --- mod/notifications.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod/notifications.php') diff --git a/mod/notifications.php b/mod/notifications.php index c6f073058..244563adc 100644 --- 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 = ''; -- cgit v1.2.3 From a6d88fb8f7a1538f0b6af915107582b5189e25a0 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 15 Aug 2011 18:17:19 -0700 Subject: diaspora friend approvals --- mod/notifications.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mod/notifications.php') diff --git a/mod/notifications.php b/mod/notifications.php index 244563adc..07403d4b4 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -122,14 +122,14 @@ 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') { + if($rr['network'] === NETWORK_DFRN) { $knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no')); $dfrn_text = replace_macros($dfrn_tpl,array( @@ -138,7 +138,7 @@ function notifications_content(&$a) { '$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 +146,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'], -- cgit v1.2.3 From 8e3506048a3c8bc6fd8fb86fdbf813ff9fb3adc9 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 15 Aug 2011 19:31:45 -0700 Subject: diaspora confirm cleanup --- mod/notifications.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mod/notifications.php') diff --git a/mod/notifications.php b/mod/notifications.php index 07403d4b4..8c32ee862 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -129,9 +129,11 @@ function notifications_content(&$a) { $knowyou = ''; $dfrn_text = ''; - if($rr['network'] === NETWORK_DFRN) { - $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, -- cgit v1.2.3