oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-17 04:15:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move xml_status and http_status_exit

Browse source 
move functions
This commit is contained in:
Adam Magness 2018-01-26 23:37:55 -05:00
parent a32ba32ff4
commit cd3643d174
18 changed files with 87 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mod/dfrn_confirm.php
View file

@ -493,7 +493,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
$user = dba::selectFirst('user', [], ['nickname' => $node]);
if (!DBM::is_result($user)) {
$message = L10n::t('No user record found for \'%s\' ', $node);
xml_status(3, $message); // failure
Network::xmlStatus(3, $message); // failure
// NOTREACHED
}
@ -503,7 +503,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
if (!strstr($my_prvkey, 'PRIVATE KEY')) {
$message = L10n::t('Our site encryption key is apparently messed up.');
xml_status(3, $message);
Network::xmlStatus(3, $message);
}
// verify everything
@ -514,7 +514,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
if (!strlen($decrypted_source_url)) {
$message = L10n::t('Empty site URL was provided or URL could not be decrypted by us.');
xml_status(3, $message);
Network::xmlStatus(3, $message);
// NOTREACHED
}
@ -530,7 +530,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
if (!DBM::is_result($contact)) {
// this is either a bogus confirmation (?) or we deleted the original introduction.
$message = L10n::t('Contact record was not found for you on our site.');
xml_status(3, $message);
Network::xmlStatus(3, $message);
return; // NOTREACHED
}
}
@ -544,7 +544,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
if (!$foreign_pubkey) {
$message = L10n::t('Site public key not available in contact record for URL %s.', $decrypted_source_url);
xml_status(3, $message);
Network::xmlStatus(3, $message);
}
$decrypted_dfrn_id = "";
@ -560,7 +560,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
if (dba::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
$message = L10n::t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
xml_status(1, $message); // Birthday paradox - duplicate dfrn-id
Network::xmlStatus(1, $message); // Birthday paradox - duplicate dfrn-id
// NOTREACHED
}
@ -571,7 +571,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
);
if (!DBM::is_result($r)) {
$message = L10n::t('Unable to set your contact credentials on our system.');
xml_status(3, $message);
Network::xmlStatus(3, $message);
}
// It's possible that the other person also requested friendship.
@ -626,7 +626,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
);
if (!DBM::is_result($r)) { // indicates schema is messed up or total db failure
$message = L10n::t('Unable to update your contact profile details on our system');
xml_status(3, $message);
Network::xmlStatus(3, $message);
}
// Otherwise everything seems to have worked and we are almost done. Yay!
@ -707,7 +707,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
}
}
}
xml_status(0); // Success
Network::xmlStatus(0); // Success
return; // NOTREACHED
////////////////////// End of this scenario ///////////////////////////////////////////////
}