diff --git a/include/main.js b/include/main.js
index 5c4363690..fcd1d6fee 100644
--- a/include/main.js
+++ b/include/main.js
@@ -83,8 +83,12 @@
if(mail == 0) { mail = ''; }
$('#mail-update').html(mail);
var intro = $(this).find('intro').text();
+ var register = $(this).find('register').text();
if(intro == 0) { intro = ''; }
+ if(register != 0 && intro != '') { intro = intro+'/'+register; }
+ if(register != 0 && intro == '') { intro = '0/'+register; }
$('#notify-update').html(intro);
+
});
}) ;
}
diff --git a/mod/notifications.php b/mod/notifications.php
index 1c680794e..f11676ebf 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -126,5 +126,31 @@ function notifications_content(&$a) {
else
notice( t('No notifications.') . EOL);
+ if ($a->config['register_policy'] = REGISTER_APPROVE &&
+ $a->config['admin_email'] = $a->user['email']){
+ $o .= load_view_file('view/registrations-top.tpl');
+
+ $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))) {
+ $tpl = load_view_file("view/registrations.tpl");
+ foreach($r as $rr) {
+ $o .= "
";
+ $o .= replace_macros($tpl, array(
+ '$fullname' => $rr['name'],
+ '$email' => $rr['email'],
+ '$approvelink' => "regmod/allow/".$rr['hash'],
+ '$denylink' => "regmod/deny/".$rr['hash'],
+ ));
+ $o .= "
";
+ }
+ }
+ else
+ notice( t('No registrations.') . EOL);
+
+ }
+
return $o;
-}
\ No newline at end of file
+}
diff --git a/mod/ping.php b/mod/ping.php
index 0831e57bf..00c4a3105 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -25,6 +25,15 @@ function ping_init(&$a) {
);
$intro = $r[0]['total'];
+ if ($a->config['register_policy'] = REGISTER_APPROVE &&
+ $a->config['admin_email'] = $a->user['email']){
+ $r = q("SELECT COUNT(*) AS `total` FROM `register`");
+ $register = $r[0]['total'];
+ } else {
+ $register = "0";
+ }
+
+
$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
$r = q("SELECT COUNT(*) AS `total` FROM `mail`
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
@@ -35,7 +44,7 @@ function ping_init(&$a) {
$mail = $r[0]['total'];
header("Content-type: text/xml");
- echo "\r\n$intro$mail$network$home\r\n";
+ echo "\r\n$register$intro$mail$network$home\r\n";
killme();
}
diff --git a/util/strings.php b/util/strings.php
index e8f3b47af..0871da51e 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -242,6 +242,7 @@ $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
$a->strings['New Follower'] = 'New Follower';
$a->strings['Approve'] = 'Approve';
$a->strings['No notifications.'] = 'No notifications.';
+$a->strings['No registrations.'] = 'No registrations.';
$a->strings['Login failed.'] = 'Login failed.';
$a->strings["Welcome back "] = "Welcome back ";
$a->strings['Photo Albums'] = 'Photo Albums';
diff --git a/view/en/registrations-top.tpl b/view/en/registrations-top.tpl
new file mode 100644
index 000000000..d8faf3439
--- /dev/null
+++ b/view/en/registrations-top.tpl
@@ -0,0 +1,3 @@
+User registrations waiting for confirm
+
+
diff --git a/view/en/registrations.tpl b/view/en/registrations.tpl
new file mode 100644
index 000000000..c8646043e
--- /dev/null
+++ b/view/en/registrations.tpl
@@ -0,0 +1 @@
+$fullname ($email) : Approve - Deny
diff --git a/view/it/registrations-top.tpl b/view/it/registrations-top.tpl
new file mode 100644
index 000000000..8134aa210
--- /dev/null
+++ b/view/it/registrations-top.tpl
@@ -0,0 +1,3 @@
+Registrazioni in attesa di conferma
+
+
diff --git a/view/it/registrations.tpl b/view/it/registrations.tpl
new file mode 100644
index 000000000..698c766f7
--- /dev/null
+++ b/view/it/registrations.tpl
@@ -0,0 +1 @@
+$fullname ($email) : Approva - Rifiuta
diff --git a/view/it/strings.php b/view/it/strings.php
index 0e6def3df..b18904eac 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -244,6 +244,7 @@ $a->strings['Friend/Connect Request'] = 'Richiesta Amicizia/Connessione';
$a->strings['New Follower'] = 'Nuovo Seguace';
$a->strings['Approve'] = 'Approva';
$a->strings['No notifications.'] = 'Nessuna notifica.';
+$a->strings['No registrations.'] = 'Nessuna registrazione.';
$a->strings['Login failed.'] = 'Accesso fallito.';
$a->strings["Welcome back "] = "Bentornato ";
$a->strings['Photo Albums'] = 'Album Foto';