mexon/friendica
1
0
Fork 0
Code Pull requests Activity

fix some method names (camelcase) in Probe.php and Lock.php

Browse source
This commit is contained in:
rabuzarus 2017-08-02 13:09:42 +02:00
parent e38340dc5f
commit 28eb5d57a7
2 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/Network/Probe.php
View file

@ -37,7 +37,7 @@ class Probe {
* *
* @return array Ordered data * @return array Ordered data
*/ */
private function rearrangeData($data) { private static function rearrangeData($data) {
$fields = array("name", "nick", "guid", "url", "addr", "alias", $fields = array("name", "nick", "guid", "url", "addr", "alias",
"photo", "community", "keywords", "location", "about", "photo", "community", "keywords", "location", "about",
"batch", "notify", "poll", "request", "confirm", "poco", "batch", "notify", "poll", "request", "confirm", "poco",
@ -65,7 +65,7 @@ class Probe {
* *
* @return bool Does the testes hostname belongs to the own server? * @return bool Does the testes hostname belongs to the own server?
*/ */
private function ownHost($host) { private static function ownHost($host) {
$own_host = get_app()->get_hostname(); $own_host = get_app()->get_hostname();
$parts = parse_url($host); $parts = parse_url($host);
@ -90,7 +90,7 @@ class Probe {
* 'lrdd-xml' => Link to LRDD endpoint in XML format * 'lrdd-xml' => Link to LRDD endpoint in XML format
* 'lrdd-json' => Link to LRDD endpoint in JSON format * 'lrdd-json' => Link to LRDD endpoint in JSON format
*/ */
private function xrd($host) { private static function xrd($host) {
// Reset the static variable // Reset the static variable
self::$baseurl = ''; self::$baseurl = '';
@ -183,7 +183,6 @@ class Probe {
* *
* @return string profile link * @return string profile link
*/ */
public static function webfingerDfrn($webbie, &$hcard_url) { public static function webfingerDfrn($webbie, &$hcard_url) {
$profile_link = ''; $profile_link = '';
@ -410,7 +409,7 @@ class Probe {
* *
* @return string switched URL * @return string switched URL
*/ */
private function switch_scheme($url) { private static function switchScheme($url) {
$parts = parse_url($url); $parts = parse_url($url);
if (!isset($parts['scheme'])) { if (!isset($parts['scheme'])) {
@ -434,7 +433,7 @@ class Probe {
* *
* @return array fixed webfinger data * @return array fixed webfinger data
*/ */
private function fix_ostatus($webfinger, $lrdd) { private static function fixOstatus($webfinger, $lrdd) {
if (empty($webfinger['links']) || empty($webfinger['subject'])) { if (empty($webfinger['links']) || empty($webfinger['subject'])) {
return $webfinger; return $webfinger;
} }
@ -455,7 +454,7 @@ class Probe {
return $webfinger; return $webfinger;
} }
$url = self::switch_scheme($webfinger['subject']); $url = self::switchScheme($webfinger['subject']);
$path = str_replace('{uri}', urlencode($url), $lrdd); $path = str_replace('{uri}', urlencode($url), $lrdd);
$webfinger2 = self::webfinger($path); $webfinger2 = self::webfinger($path);
@ -478,7 +477,7 @@ class Probe {
* *
* @return array uri data * @return array uri data
*/ */
private function detect($uri, $network, $uid) { private static function detect($uri, $network, $uid) {
$parts = parse_url($uri); $parts = parse_url($uri);
if (isset($parts["scheme"]) && isset($parts["host"]) && isset($parts["path"])) { if (isset($parts["scheme"]) && isset($parts["host"]) && isset($parts["path"])) {
@ -565,7 +564,7 @@ class Probe {
$webfinger = self::webfinger($path); $webfinger = self::webfinger($path);
// Fix possible problems with GNU Social probing to wrong scheme // Fix possible problems with GNU Social probing to wrong scheme
$webfinger = self::fix_ostatus($webfinger, $link); $webfinger = self::fixOstatus($webfinger, $link);
// We cannot be sure that the detected address was correct, so we don't use the values // We cannot be sure that the detected address was correct, so we don't use the values
if ($webfinger && ($uri != $addr)) { if ($webfinger && ($uri != $addr)) {
@ -640,7 +639,7 @@ class Probe {
* *
* @return array webfinger data * @return array webfinger data
*/ */
private function webfinger($url) { private static function webfinger($url) {
$xrd_timeout = Config::get('system', 'xrd_timeout', 20); $xrd_timeout = Config::get('system', 'xrd_timeout', 20);
$redirects = 0; $redirects = 0;
@ -708,7 +707,7 @@ class Probe {
* *
* @return array noscrape data * @return array noscrape data
*/ */
private function pollNoscrape($noscrape_url, $data) { private static function pollNoscrape($noscrape_url, $data) {
$ret = z_fetch_url($noscrape_url); $ret = z_fetch_url($noscrape_url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false; return false;
@ -863,7 +862,7 @@ class Probe {
* *
* @return array DFRN data * @return array DFRN data
*/ */
private function dfrn($webfinger) { private static function dfrn($webfinger) {
$hcard_url = ""; $hcard_url = "";
$data = array(); $data = array();
@ -934,7 +933,7 @@ class Probe {
* *
* @return array hcard data * @return array hcard data
*/ */
private function pollHcard($hcard_url, $data, $dfrn = false) { private static function pollHcard($hcard_url, $data, $dfrn = false) {
$ret = z_fetch_url($hcard_url); $ret = z_fetch_url($hcard_url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false; return false;
@ -1051,7 +1050,7 @@ class Probe {
* *
* @return array Diaspora data * @return array Diaspora data
*/ */
private function diaspora($webfinger) { private static function diaspora($webfinger) {
$hcard_url = ""; $hcard_url = "";
$data = array(); $data = array();
@ -1128,7 +1127,7 @@ class Probe {
* *
* @return array|bool OStatus data or "false" on error or "true" on short mode * @return array|bool OStatus data or "false" on error or "true" on short mode
*/ */
private function ostatus($webfinger, $short = false) { private static function ostatus($webfinger, $short = false) {
$data = array(); $data = array();
if (is_array($webfinger["aliases"])) { if (is_array($webfinger["aliases"])) {
foreach ($webfinger["aliases"] as $alias) { foreach ($webfinger["aliases"] as $alias) {
@ -1236,7 +1235,7 @@ class Probe {
* *
* @return array profile data * @return array profile data
*/ */
private function pumpioProfileData($profile_link) { private static function pumpioProfileData($profile_link) {
$doc = new DOMDocument(); $doc = new DOMDocument();
if (!@$doc->loadHTMLFile($profile_link)) { if (!@$doc->loadHTMLFile($profile_link)) {
@ -1276,7 +1275,7 @@ class Probe {
* *
* @return array pump.io data * @return array pump.io data
*/ */
private function pumpio($webfinger) { private static function pumpio($webfinger) {
$data = array(); $data = array();
foreach ($webfinger["links"] as $link) { foreach ($webfinger["links"] as $link) {
@ -1324,7 +1323,7 @@ class Probe {
* *
* @return string feed link * @return string feed link
*/ */
private function getFeedLink($url) { private static function getFeedLink($url) {
$doc = new DOMDocument(); $doc = new DOMDocument();
if (!@$doc->loadHTMLFile($url)) { if (!@$doc->loadHTMLFile($url)) {
@ -1367,7 +1366,7 @@ class Probe {
* *
* @return array feed data * @return array feed data
*/ */
private function feed($url, $probe = true) { private static function feed($url, $probe = true) {
$ret = z_fetch_url($url); $ret = z_fetch_url($url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false; return false;
@ -1427,7 +1426,7 @@ class Probe {
* *
* @return array mail data * @return array mail data
*/ */
private function mail($uri, $uid) { private static function mail($uri, $uid) {
if (!validate_email($uri)) { if (!validate_email($uri)) {
return false; return false;

6
src/Util/Lock.php
View file

@ -19,7 +19,7 @@ use dbm;
class Lock { class Lock {
private static $semaphore = array(); private static $semaphore = array();
/** /**
* @brief Check for memcache and open a connection if configured * @brief Check for memcache and open a connection if configured
* *
* @return object|boolean The memcache object - or "false" if not successful * @return object|boolean The memcache object - or "false" if not successful
@ -52,7 +52,7 @@ class Lock {
* *
* @return ressource the semaphore key * @return ressource the semaphore key
*/ */
private static function semaphore_key($fn_name) { private static function semaphoreKey($fn_name) {
$temp = get_temppath(); $temp = get_temppath();
$file = $temp.'/'.$fn_name.'.sem'; $file = $temp.'/'.$fn_name.'.sem';
@ -77,7 +77,7 @@ class Lock {
$start = time(); $start = time();
if (function_exists('sem_get')) { if (function_exists('sem_get')) {
self::$semaphore[$fn_name] = sem_get(self::semaphore_key($fn_name)); self::$semaphore[$fn_name] = sem_get(self::semaphoreKey($fn_name));
if (self::$semaphore[$fn_name]) { if (self::$semaphore[$fn_name]) {
return sem_acquire(self::$semaphore[$fn_name], ($timeout == 0)); return sem_acquire(self::$semaphore[$fn_name], ($timeout == 0));
} }