unsafe chars in admin, add img to diaspora markdown processor

[friendica.git] / mod / ping.php

diff --git a/mod/ping.php b/mod/ping.php
index 6e8618bbdcc5424c5e110c4f40955824b24d898e..924f9ff76bff228c0db16ff41e91c34d2c59d25c 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -25,25 +25,24 @@ 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' ",
                intval(local_user()),
                dbesc($myurl)
        );
-
        $mail = $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";
+       }
+
        
        header("Content-type: text/xml");
-       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";
+       echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home><register>$register</register></result>\r\n";
 
        killme();
 }