From e25ded6d9611e4bada5474b7c7d7c96ad95c930e Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 31 May 2011 17:35:24 -0700
Subject: don't count wall posts in unseen network total

---
 mod/ping.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'mod')

diff --git a/mod/ping.php b/mod/ping.php
index b736ea995..6e8618bbd 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -8,7 +8,7 @@ function ping_init(&$a) {
 		xml_status(0);
 
 	$r = q("SELECT COUNT(*) AS `total` FROM `item` 
-		WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d",
+		WHERE `unseen` = 1 AND `visible` = 1 AND `deleted` = 0 AND `uid` = %d AND `wall` = 0 ",
 		intval(local_user())
 	);
 	$network = $r[0]['total'];
@@ -25,8 +25,7 @@ function ping_init(&$a) {
 	);
 	$intro = $r[0]['total'];
 
-	if ($a->config['register_policy'] == REGISTER_APPROVE &&	
-		$a->config['admin_email'] === $a->user['email']){
+	if (($a->config['register_policy'] == REGISTER_APPROVE) && (is_site_admin())) {
 			$r = q("SELECT COUNT(*) AS `total` FROM `register`");
 			$register = $r[0]['total'];
 	} else {
-- 
cgit v1.2.3


From b8c4d73377d93cc54cb10fd1c3fac173c8f57627 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 31 May 2011 19:24:26 -0700
Subject: show group affiliations in contact editor

---
 mod/contacts.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'mod')

diff --git a/mod/contacts.php b/mod/contacts.php
index 4baa2d2d7..e7a800500 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -249,6 +249,15 @@ function contacts_content(&$a) {
 			$sparkle = '';
 		}
 
+		$grps = '';
+		$member_of = member_of($r[0]['id']);
+		if(is_array($member_of) && count($member_of)) {
+			$grps = t('Member of: ') . EOL . '<ul>';
+			foreach($member_of as $member)
+				$grps .= '<li><a href="group/' . $member['id'] . '" title="' . t('Edit') . '" ><img src="images/spencil.gif" alt="' . t('Edit') . '" /></a> <a href="network/' . $member['id'] . '">' . $member['name'] . '</a></li>';
+			$grps .= '</ul>';
+		}
+
 		$insecure = '<div id="profile-edit-insecure"><p><img src="images/unlock_icon.gif" alt="' . t('Privacy Unavailable') . '" />&nbsp;'
 			. t('Private communications are not available for this contact.') . '</p></div>';
 
@@ -275,6 +284,7 @@ function contacts_content(&$a) {
 			'$altcrepair' => t('Repair contact URL settings'),
 			'$lblcrepair' => t("Repair contact URL settings \x28WARNING: Advanced\x29"),
 			'$lblrecent' => t('View conversations'),
+			'$grps' => $grps,
 			'$delete' => t('Delete contact'),
 			'$poll_interval' => contact_poll_interval($r[0]['priority']),
 			'$lastupdtext' => t('Last updated: '),
-- 
cgit v1.2.3