diff --git a/include/main.js b/include/main.js index 5b9dae4610..c2772000d7 100644 --- a/include/main.js +++ b/include/main.js @@ -47,11 +47,7 @@ if(mail == 0) { mail = ''; $('#mail-update').hide() } else { $('#mail-update').show() } $('#mail-update').html(mail); var intro = $(data).find('intro').text(); - var register = $(data).find('register').text(); - if(intro == 0) { intro = ''; } - if(register != 0 && intro != '') { intro = intro+'/'+register; } - if(register != 0 && intro == '') { intro = '0/'+register; } - if (intro == '') { $('#notify-update').hide() } else { $('#notify-update').show() } + if(intro == 0) { intro = ''; $('#notify-update').hide() } else { $('#notify-update').show() } $('#notify-update').html(intro); }); diff --git a/mod/notifications.php b/mod/notifications.php index 90f62fa476..c6f073058d 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -167,30 +167,6 @@ function notifications_content(&$a) { else info( t('No notifications.') . EOL); -/* - if ($a->config['register_policy'] == REGISTER_APPROVE && - $a->config['admin_email'] === $a->user['email']){ - $o .= '

' . t('User registrations waiting for confirm') . '

' . "\r\n"; - - $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))) { - $o .= '"; - } - else - info( t('No registrations.') . EOL); - - } -*/ - $o .= paginate($a); return $o; } diff --git a/mod/ping.php b/mod/ping.php index 6e8618bbdc..7c31f00c9c 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -25,14 +25,6 @@ function ping_init(&$a) { ); $intro = $r[0]['total']; - if (($a->config['register_policy'] == REGISTER_APPROVE) && (is_site_admin())) { - $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' ", @@ -43,7 +35,7 @@ function ping_init(&$a) { $mail = $r[0]['total']; header("Content-type: text/xml"); - echo "\r\n$register$intro$mail$network$home\r\n"; + echo "\r\n$intro$mail$network$home\r\n"; killme(); }