diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-01 07:56:27 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-06-01 07:56:27 +0200 |
| commit | 2413a6b422d5c49024d9c2c9cff79cbc82ba3a56 (patch) | |
| tree | c531676a196ad7defdeefd56ea2519afd4c61a44 /mod | |
| parent | 745d075397941e0a84d017342bb9c4c4a4c1ef5b (diff) | |
| parent | fc34641d4a69580a4e7fd5c3806c22d009d5d037 (diff) | |
| download | volse-hubzilla-2413a6b422d5c49024d9c2c9cff79cbc82ba3a56.tar.gz volse-hubzilla-2413a6b422d5c49024d9c2c9cff79cbc82ba3a56.tar.bz2 volse-hubzilla-2413a6b422d5c49024d9c2c9cff79cbc82ba3a56.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/contacts.php | 10 | ||||
| -rw-r--r-- | mod/ping.php | 5 |
2 files changed, 12 insertions, 3 deletions
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') . '" /> ' . 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: '), 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 { |