Manage user registrations in REGISTER_APPROVE mode.

diff --git a/include/main.js b/include/main.js
index ef6b059ccfb00f01e75a72bd403364890760b3e1..0fe20955d3bd19e5d1277d3a4dfff3c63631a33b 100644 (file)
--- a/include/main.js
+++ b/include/main.js
@@ -77,8 +77,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 1c680794e49debdeb1bee99c138ffceae63ac209..f11676ebfe10190420cf4fb2bea772b699ea0acc 100644 (file)
--- 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 0831e57bfa723bca2e84e09f6bb593feae110c6e..00c4a31051fc1caaef514e14b1f66363e43cdccf 100644 (file)
--- 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();
 }

diff --git a/util/strings.php b/util/strings.php
index e8f3b47af9e036c649c080f2ac59846ff4643f86..0871da51ef01dcd8ddb16476ae3672432514445f 100644 (file)
--- 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 (file)
index 0000000..d8faf34
--- /dev/null
+++ b/view/en/registrations-top.tpl
@@ -0,0 +1,3 @@
+<h1>User registrations waiting for confirm</h1>
+
+

diff --git a/view/en/registrations.tpl b/view/en/registrations.tpl
new file mode 100644 (file)
index 0000000..c864604
--- /dev/null
+++ b/view/en/registrations.tpl
@@ -0,0 +1 @@
+<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li>

diff --git a/view/it/registrations-top.tpl b/view/it/registrations-top.tpl
new file mode 100644 (file)
index 0000000..8134aa2
--- /dev/null
+++ b/view/it/registrations-top.tpl
@@ -0,0 +1,3 @@
+<h1>Registrazioni in attesa di conferma</h1>
+
+

diff --git a/view/it/registrations.tpl b/view/it/registrations.tpl
new file mode 100644 (file)
index 0000000..698c766
--- /dev/null
+++ b/view/it/registrations.tpl
@@ -0,0 +1 @@
+<li>$fullname ($email) : <a href="$approvelink">Approva</a> - <a href="$denylink">Rifiuta</a></li>

diff --git a/view/it/strings.php b/view/it/strings.php
index 0e6def3dfaa9c6b653be39dc26238ca66e0c09de..b18904eac3de7b132da1d938ec2ac69fd4baf08a 100644 (file)
--- 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';