aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-04 16:42:11 -0800
committerFriendika <info@friendika.com>2011-01-04 16:42:11 -0800
commit45c1559b38a54a8280b3339c0b1b30be1d7c473d (patch)
treeb4ad35da385525b5183af44b0c8eaa6d73047df7 /mod
parent45d8676dc294b3d275a5d62138ad3c0dcfa8fc13 (diff)
parentea978af9c198b5f02c8c0b3d376a1e598f181912 (diff)
downloadvolse-hubzilla-45c1559b38a54a8280b3339c0b1b30be1d7c473d.tar.gz
volse-hubzilla-45c1559b38a54a8280b3339c0b1b30be1d7c473d.tar.bz2
volse-hubzilla-45c1559b38a54a8280b3339c0b1b30be1d7c473d.zip
Merge branch 'fabrixxm-master'
Diffstat (limited to 'mod')
-rw-r--r--mod/notifications.php28
-rw-r--r--mod/ping.php11
2 files changed, 37 insertions, 2 deletions
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 .= "<ul>";
+ $o .= replace_macros($tpl, array(
+ '$fullname' => $rr['name'],
+ '$email' => $rr['email'],
+ '$approvelink' => "regmod/allow/".$rr['hash'],
+ '$denylink' => "regmod/deny/".$rr['hash'],
+ ));
+ $o .= "</ul>";
+ }
+ }
+ 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 "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home></result>\r\n";
+ echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><register>$register</register><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home></result>\r\n";
killme();
}