Manage user registrations in REGISTER_APPROVE mode.
This commit is contained in:
parent
2bf99df385
commit
0df91fd9a2
|
@ -77,8 +77,12 @@
|
||||||
if(mail == 0) { mail = ''; }
|
if(mail == 0) { mail = ''; }
|
||||||
$('#mail-update').html(mail);
|
$('#mail-update').html(mail);
|
||||||
var intro = $(this).find('intro').text();
|
var intro = $(this).find('intro').text();
|
||||||
|
var register = $(this).find('register').text();
|
||||||
if(intro == 0) { intro = ''; }
|
if(intro == 0) { intro = ''; }
|
||||||
|
if(register != 0 && intro != '') { intro = intro+'/'+register; }
|
||||||
|
if(register != 0 && intro == '') { intro = '0/'+register; }
|
||||||
$('#notify-update').html(intro);
|
$('#notify-update').html(intro);
|
||||||
|
|
||||||
});
|
});
|
||||||
}) ;
|
}) ;
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,5 +126,31 @@ function notifications_content(&$a) {
|
||||||
else
|
else
|
||||||
notice( t('No notifications.') . EOL);
|
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;
|
return $o;
|
||||||
}
|
}
|
11
mod/ping.php
11
mod/ping.php
|
@ -25,6 +25,15 @@ function ping_init(&$a) {
|
||||||
);
|
);
|
||||||
$intro = $r[0]['total'];
|
$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'] ;
|
$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
|
||||||
$r = q("SELECT COUNT(*) AS `total` FROM `mail`
|
$r = q("SELECT COUNT(*) AS `total` FROM `mail`
|
||||||
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
|
WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
|
||||||
|
@ -35,7 +44,7 @@ function ping_init(&$a) {
|
||||||
$mail = $r[0]['total'];
|
$mail = $r[0]['total'];
|
||||||
|
|
||||||
header("Content-type: text/xml");
|
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();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
|
@ -242,6 +242,7 @@ $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
|
||||||
$a->strings['New Follower'] = 'New Follower';
|
$a->strings['New Follower'] = 'New Follower';
|
||||||
$a->strings['Approve'] = 'Approve';
|
$a->strings['Approve'] = 'Approve';
|
||||||
$a->strings['No notifications.'] = 'No notifications.';
|
$a->strings['No notifications.'] = 'No notifications.';
|
||||||
|
$a->strings['No registrations.'] = 'No registrations.';
|
||||||
$a->strings['Login failed.'] = 'Login failed.';
|
$a->strings['Login failed.'] = 'Login failed.';
|
||||||
$a->strings["Welcome back "] = "Welcome back ";
|
$a->strings["Welcome back "] = "Welcome back ";
|
||||||
$a->strings['Photo Albums'] = 'Photo Albums';
|
$a->strings['Photo Albums'] = 'Photo Albums';
|
||||||
|
|
3
view/en/registrations-top.tpl
Normal file
3
view/en/registrations-top.tpl
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
<h1>User registrations waiting for confirm</h1>
|
||||||
|
|
||||||
|
|
1
view/en/registrations.tpl
Normal file
1
view/en/registrations.tpl
Normal file
|
@ -0,0 +1 @@
|
||||||
|
<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li>
|
3
view/it/registrations-top.tpl
Normal file
3
view/it/registrations-top.tpl
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
<h1>Registrazioni in attesa di conferma</h1>
|
||||||
|
|
||||||
|
|
1
view/it/registrations.tpl
Normal file
1
view/it/registrations.tpl
Normal file
|
@ -0,0 +1 @@
|
||||||
|
<li>$fullname ($email) : <a href="$approvelink">Approva</a> - <a href="$denylink">Rifiuta</a></li>
|
|
@ -244,6 +244,7 @@ $a->strings['Friend/Connect Request'] = 'Richiesta Amicizia/Connessione';
|
||||||
$a->strings['New Follower'] = 'Nuovo Seguace';
|
$a->strings['New Follower'] = 'Nuovo Seguace';
|
||||||
$a->strings['Approve'] = 'Approva';
|
$a->strings['Approve'] = 'Approva';
|
||||||
$a->strings['No notifications.'] = 'Nessuna notifica.';
|
$a->strings['No notifications.'] = 'Nessuna notifica.';
|
||||||
|
$a->strings['No registrations.'] = 'Nessuna registrazione.';
|
||||||
$a->strings['Login failed.'] = 'Accesso fallito.';
|
$a->strings['Login failed.'] = 'Accesso fallito.';
|
||||||
$a->strings["Welcome back "] = "Bentornato ";
|
$a->strings["Welcome back "] = "Bentornato ";
|
||||||
$a->strings['Photo Albums'] = 'Album Foto';
|
$a->strings['Photo Albums'] = 'Album Foto';
|
||||||
|
|
Loading…
Reference in a new issue