mirror of
https://github.com/friendica/friendica
synced 2024-10-11 13:34:33 +02:00
Merge pull request #41 from fabrixxm/master
fix connection request in mod/ping
This commit is contained in:
commit
2507d09682
2
mod/dfrn_confirm.php
Executable file → Normal file
2
mod/dfrn_confirm.php
Executable file → Normal file
|
@ -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;
|
||||
|
|
9
mod/ping.php
Executable file → Normal file
9
mod/ping.php
Executable file → Normal file
|
@ -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;
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue