diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php
index f1fb27986..a0a0239aa 100644
--- a/addon/oembed/oembed.php
+++ b/addon/oembed/oembed.php
@@ -34,9 +34,10 @@ function oembed_settings(&$a,&$o) {
if(! local_user())
return;
$uofy = get_pconfig(local_user(), 'oembed', 'use_for_youtube' );
-
- $o .='
+
OEmbed
';
}
diff --git a/boot.php b/boot.php
index a829daf9c..f42d6beda 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000);
-define ( 'FRIENDIKA_VERSION', '2.2.996' );
+define ( 'FRIENDIKA_VERSION', '2.2.997' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1059 );
diff --git a/include/group.php b/include/group.php
index d1b336946..804d0c58f 100644
--- a/include/group.php
+++ b/include/group.php
@@ -185,3 +185,15 @@ function expand_groups($a) {
$ret[] = $rr['contact-id'];
return $ret;
}
+
+
+function member_of($c) {
+
+ $r = q("SELECT `group`.`name`, `group`.`id` FROM `group` LEFT JOIN `group_member` ON `group_member`.`gid` = `group`.`id` WHERE `group_member`.`contact-id` = %d AND `group`.`deleted` = 0 ORDER BY `group`.`name` ASC ",
+ intval($c)
+ );
+
+ return $r;
+
+}
+
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 . '
';
+ }
+
$insecure = '
'
. t('Private communications are not available for this contact.') . '
';
@@ -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 {
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index 97134aedd..3246e4470 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -42,6 +42,8 @@ $insecure
$blocked
$ignored
+$grps
+