strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3453 from rabuzarus/20170508_-_camelCase

Browse source 
Probe.php:  some work for standardization
This commit is contained in:
Hypolite Petovan 2017-05-08 12:42:42 -04:00 committed by GitHub
commit bb6a27bb06
3 changed files with 383 additions and 255 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/ostatus.php
View file

@ -101,7 +101,7 @@ class ostatus {
} }
if (count($avatarlist) > 0) { if (count($avatarlist) > 0) {
krsort($avatarlist); krsort($avatarlist);
$author["author-avatar"] = Probe::fix_avatar(current($avatarlist), $author["author-link"]); $author["author-avatar"] = Probe::fixAvatar(current($avatarlist), $author["author-link"]);
} }
$displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue; $displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
@ -1162,7 +1162,7 @@ class ostatus {
$arr["owner-name"] = $single_conv->actor->portablecontacts_net->displayName; $arr["owner-name"] = $single_conv->actor->portablecontacts_net->displayName;
$arr["owner-link"] = $actor; $arr["owner-link"] = $actor;
$arr["owner-avatar"] = Probe::fix_avatar($single_conv->actor->image->url, $arr["owner-link"]); $arr["owner-avatar"] = Probe::fixAvatar($single_conv->actor->image->url, $arr["owner-link"]);
$arr["author-name"] = $arr["owner-name"]; $arr["author-name"] = $arr["owner-name"];
$arr["author-link"] = $arr["owner-link"]; $arr["author-link"] = $arr["owner-link"];
@ -1227,7 +1227,7 @@ class ostatus {
$arr["author-name"] = $single_conv->object->actor->contact->displayName; $arr["author-name"] = $single_conv->object->actor->contact->displayName;
} }
$arr["author-link"] = $single_conv->object->actor->url; $arr["author-link"] = $single_conv->object->actor->url;
$arr["author-avatar"] = Probe::fix_avatar($single_conv->object->actor->image->url, $arr["author-link"]); $arr["author-avatar"] = Probe::fixAvatar($single_conv->object->actor->image->url, $arr["author-link"]);
$arr["app"] = $single_conv->object->provider->displayName."#"; $arr["app"] = $single_conv->object->provider->displayName."#";
//$arr["verb"] = $single_conv->object->verb; //$arr["verb"] = $single_conv->object->verb;

6
mod/dfrn_request.php
View file

@ -133,7 +133,7 @@ function dfrn_request_post(App $a) {
if (! x($parms,'photo')) { if (! x($parms,'photo')) {
notice( t('Warning: profile location has no profile photo.') . EOL ); notice( t('Warning: profile location has no profile photo.') . EOL );
} }
$invalid = Probe::valid_dfrn($parms); $invalid = Probe::validDfrn($parms);
if ($invalid) { if ($invalid) {
notice( sprintf( tt("%d required parameter was not found at the given location", notice( sprintf( tt("%d required parameter was not found at the given location",
"%d required parameters were not found at the given location", "%d required parameters were not found at the given location",
@ -455,7 +455,7 @@ function dfrn_request_post(App $a) {
$network = $data["network"]; $network = $data["network"];
// Canonicalise email-style profile locator // Canonicalise email-style profile locator
$url = Probe::webfinger_dfrn($url,$hcard); $url = Probe::webfingerDfrn($url,$hcard);
if (substr($url,0,5) === 'stat:') { if (substr($url,0,5) === 'stat:') {
@ -535,7 +535,7 @@ function dfrn_request_post(App $a) {
if (! x($parms,'photo')) { if (! x($parms,'photo')) {
notice( t('Warning: profile location has no profile photo.') . EOL ); notice( t('Warning: profile location has no profile photo.') . EOL );
} }
$invalid = Probe::valid_dfrn($parms); $invalid = Probe::validDfrn($parms);
if ($invalid) { if ($invalid) {
notice( sprintf( tt("%d required parameter was not found at the given location", notice( sprintf( tt("%d required parameter was not found at the given location",
"%d required parameters were not found at the given location", "%d required parameters were not found at the given location",

626
src/Network/Probe.php
View file

File diff suppressed because it is too large Load diff