diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2012-02-20 11:44:58 -0800 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2012-02-20 11:44:58 -0800 |
| commit | 2507d09682fda0806b4599e440fe8e32711072f8 (patch) | |
| tree | a56e349b63f91539ffe32558948d734252102af4 | |
| parent | 2fe479034cec335079d802eb70f41e4737858b2b (diff) | |
| parent | dd09c2d125a109de6089a2122faa4e9c2ecd8f5d (diff) | |
| download | volse-hubzilla-2507d09682fda0806b4599e440fe8e32711072f8.tar.gz volse-hubzilla-2507d09682fda0806b4599e440fe8e32711072f8.tar.bz2 volse-hubzilla-2507d09682fda0806b4599e440fe8e32711072f8.zip | |
Merge pull request #41 from fabrixxm/master
fix connection request in mod/ping
| -rw-r--r--[-rwxr-xr-x] | mod/dfrn_confirm.php | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | mod/ping.php | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index abacd9906..5a24f0089 100755..100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -252,7 +252,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $message = unxmlify($xml->message); // human readable text of what may have gone wrong. switch($status) { case 0: - notice( t("Confirmation completed successfully.") . EOL); + info( t("Confirmation completed successfully.") . EOL); if(strlen($message)) notice( t('Remote site reported: ') . $message . EOL); break; diff --git a/mod/ping.php b/mod/ping.php index db68332bd..9c2e385d6 100755..100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -5,6 +5,7 @@ require_once("include/datetime.php"); function ping_init(&$a) { header("Content-type: text/xml"); + echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?> <result>"; @@ -90,22 +91,20 @@ function ping_init(&$a) { } - $intros1 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, + $intros1 = q("SELECT `intro`.`id`, `intro`.`datetime`, `fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo` FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid`!=0", intval(local_user()) ); - $intros2 = q("SELECT COUNT(`intro`.`id`) AS `total`, `intro`.`id`, `intro`.`datetime`, + $intros2 = q("SELECT `intro`.`id`, `intro`.`datetime`, `contact`.`name`, `contact`.`url`, `contact`.`photo` FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id` WHERE `intro`.`uid` = %d AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id`!=0", intval(local_user()) ); - $intro = $intros1[0]['total'] + $intros2[0]['total']; - if ($intros1[0]['total']==0) $intros1=Array(); - if ($intros2[0]['total']==0) $intros2=Array(); + $intro = count($intros1) + count($intros2); $intros = $intros1+$intros2; |