added more curyl braces + spaces between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
parent
4dfe64bd5a
commit
a9bed1422e
|
@ -520,8 +520,9 @@ function avatar_img($email) {
|
||||||
|
|
||||||
call_hooks('avatar_lookup', $avatar);
|
call_hooks('avatar_lookup', $avatar);
|
||||||
|
|
||||||
if(! $avatar['success'])
|
if (! $avatar['success']) {
|
||||||
$avatar['url'] = App::get_baseurl() . '/images/person-175.jpg';
|
$avatar['url'] = App::get_baseurl() . '/images/person-175.jpg';
|
||||||
|
}
|
||||||
|
|
||||||
logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
|
logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
|
||||||
return $avatar['url'];
|
return $avatar['url'];
|
||||||
|
|
|
@ -207,8 +207,9 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
|
||||||
$orig_updated = $updated;
|
$orig_updated = $updated;
|
||||||
|
|
||||||
// The global contacts should contain the original picture, not the cached one
|
// The global contacts should contain the original picture, not the cached one
|
||||||
if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link(App::get_baseurl()."/photo/")))
|
if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link(App::get_baseurl()."/photo/"))) {
|
||||||
$profile_photo = "";
|
$profile_photo = "";
|
||||||
|
}
|
||||||
|
|
||||||
$r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
|
$r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
|
||||||
dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
|
dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
|
||||||
|
|
|
@ -194,18 +194,21 @@ function dfrn_request_post(&$a) {
|
||||||
update_contact_avatar($photo, local_user(), $r[0]["id"], true);
|
update_contact_avatar($photo, local_user(), $r[0]["id"], true);
|
||||||
|
|
||||||
$forwardurl = App::get_baseurl()."/contacts/".$r[0]['id'];
|
$forwardurl = App::get_baseurl()."/contacts/".$r[0]['id'];
|
||||||
} else
|
} else {
|
||||||
$forwardurl = App::get_baseurl()."/contacts";
|
$forwardurl = App::get_baseurl()."/contacts";
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Allow the blocked remote notification to complete
|
* Allow the blocked remote notification to complete
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if(is_array($contact_record))
|
if (is_array($contact_record)) {
|
||||||
$dfrn_request = $contact_record['request'];
|
$dfrn_request = $contact_record['request'];
|
||||||
|
}
|
||||||
|
|
||||||
if(strlen($dfrn_request) && strlen($confirm_key))
|
if (strlen($dfrn_request) && strlen($confirm_key)) {
|
||||||
$s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
|
$s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
|
||||||
|
}
|
||||||
|
|
||||||
// (ignore reply, nothing we can do it failed)
|
// (ignore reply, nothing we can do it failed)
|
||||||
|
|
||||||
|
@ -565,7 +568,7 @@ function dfrn_request_post(&$a) {
|
||||||
);
|
);
|
||||||
|
|
||||||
// find the contact record we just created
|
// find the contact record we just created
|
||||||
if($r) {
|
if ($r) {
|
||||||
$r = q("SELECT `id` FROM `contact`
|
$r = q("SELECT `id` FROM `contact`
|
||||||
WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
|
WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
|
@ -579,14 +582,14 @@ function dfrn_request_post(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if($r === false) {
|
if ($r === false) {
|
||||||
notice( t('Failed to update contact record.') . EOL );
|
notice( t('Failed to update contact record.') . EOL );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$hash = random_string() . (string) time(); // Generate a confirm_key
|
$hash = random_string() . (string) time(); // Generate a confirm_key
|
||||||
|
|
||||||
if(is_array($contact_record)) {
|
if (is_array($contact_record)) {
|
||||||
$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
|
$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
|
||||||
VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
|
VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
|
@ -600,8 +603,9 @@ function dfrn_request_post(&$a) {
|
||||||
|
|
||||||
// This notice will only be seen by the requestor if the requestor and requestee are on the same server.
|
// This notice will only be seen by the requestor if the requestor and requestee are on the same server.
|
||||||
|
|
||||||
if(! $failed)
|
if (! $failed) {
|
||||||
info( t('Your introduction has been sent.') . EOL );
|
info( t('Your introduction has been sent.') . EOL );
|
||||||
|
}
|
||||||
|
|
||||||
// "Homecoming" - send the requestor back to their site to record the introduction.
|
// "Homecoming" - send the requestor back to their site to record the introduction.
|
||||||
|
|
||||||
|
@ -633,8 +637,9 @@ function dfrn_request_post(&$a) {
|
||||||
$uri .= '/'.$a->get_path();
|
$uri .= '/'.$a->get_path();
|
||||||
|
|
||||||
$uri = urlencode($uri);
|
$uri = urlencode($uri);
|
||||||
} else
|
} else {
|
||||||
$uri = App::get_baseurl().'/profile/'.$nickname;
|
$uri = App::get_baseurl().'/profile/'.$nickname;
|
||||||
|
}
|
||||||
|
|
||||||
$url = str_replace('{uri}', $uri, $url);
|
$url = str_replace('{uri}', $uri, $url);
|
||||||
goaway($url);
|
goaway($url);
|
||||||
|
@ -651,16 +656,17 @@ function dfrn_request_post(&$a) {
|
||||||
|
|
||||||
function dfrn_request_content(&$a) {
|
function dfrn_request_content(&$a) {
|
||||||
|
|
||||||
if(($a->argc != 2) || (! count($a->profile)))
|
if (($a->argc != 2) || (! count($a->profile))) {
|
||||||
return "";
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
|
// "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
|
||||||
// to send us to the post section to record the introduction.
|
// to send us to the post section to record the introduction.
|
||||||
|
|
||||||
if(x($_GET,'dfrn_url')) {
|
if (x($_GET,'dfrn_url')) {
|
||||||
|
|
||||||
if(! local_user()) {
|
if (! local_user()) {
|
||||||
info( t("Please login to confirm introduction.") . EOL );
|
info( t("Please login to confirm introduction.") . EOL );
|
||||||
/* setup the return URL to come back to this page if they use openid */
|
/* setup the return URL to come back to this page if they use openid */
|
||||||
$_SESSION['return_url'] = $a->query_string;
|
$_SESSION['return_url'] = $a->query_string;
|
||||||
|
|
Loading…
Reference in a new issue