further enhance the friend confirm reporting
This commit is contained in:
parent
0ddfdce6a4
commit
3531f466e5
|
@ -32,6 +32,12 @@ function dfrn_confirm_post(&$a) {
|
||||||
$my_prvkey = $r[0]['prvkey'];
|
$my_prvkey = $r[0]['prvkey'];
|
||||||
$local_uid = $r[0]['uid'];
|
$local_uid = $r[0]['uid'];
|
||||||
|
|
||||||
|
|
||||||
|
if(! strstr($my_prvkey,'BEGIN RSA PRIVATE KEY')) {
|
||||||
|
$message = t('Our site encryption key is apparently messed up.');
|
||||||
|
xml_status(3,$message);
|
||||||
|
}
|
||||||
|
|
||||||
// verify everything
|
// verify everything
|
||||||
|
|
||||||
$decrypted_source_url = "";
|
$decrypted_source_url = "";
|
||||||
|
@ -39,7 +45,7 @@ function dfrn_confirm_post(&$a) {
|
||||||
|
|
||||||
|
|
||||||
if(! strlen($decrypted_source_url)) {
|
if(! strlen($decrypted_source_url)) {
|
||||||
$message = t('empty site URL was provided.');
|
$message = t('Empty site URL was provided or URL could not be decrypted by us.');
|
||||||
xml_status(3,$message);
|
xml_status(3,$message);
|
||||||
// NOTREACHED
|
// NOTREACHED
|
||||||
}
|
}
|
||||||
|
@ -80,7 +86,7 @@ function dfrn_confirm_post(&$a) {
|
||||||
intval($local_uid)
|
intval($local_uid)
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$message = t('The ID provided is a duplicate on our system. Please try again.');
|
$message = 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
|
xml_status(1,$message); // Birthday paradox - duplicate dfrn-id
|
||||||
// NOTREACHED
|
// NOTREACHED
|
||||||
}
|
}
|
||||||
|
@ -91,7 +97,7 @@ function dfrn_confirm_post(&$a) {
|
||||||
intval($dfrn_record)
|
intval($dfrn_record)
|
||||||
);
|
);
|
||||||
if(! count($r)) {
|
if(! count($r)) {
|
||||||
$message = t('Unable to set your credentials on our system.');
|
$message = t('Unable to set your contact credentials on our system.');
|
||||||
xml_status(3,$message);
|
xml_status(3,$message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -165,7 +171,7 @@ function dfrn_confirm_post(&$a) {
|
||||||
intval($dfrn_record)
|
intval($dfrn_record)
|
||||||
);
|
);
|
||||||
if($r === false) { // should not happen unless schema is messed up
|
if($r === false) { // should not happen unless schema is messed up
|
||||||
$message = t('Unable to update your contact profile on our system');
|
$message = t('Unable to update your contact profile details on our system');
|
||||||
xml_status(3,$message);
|
xml_status(3,$message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue