friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Some more notices (#5424)

This commit is contained in:
Michael Vogel 2018-07-20 20:07:54 +02:00 committed by Hypolite Petovan
parent 4f2ae88684
commit 7382be2766
6 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/ACL.php
View File

@ -258,6 +258,11 @@ class ACL extends BaseObject
*/ */
public static function getFullSelectorHTML(array $user = null, $show_jotnets = false) public static function getFullSelectorHTML(array $user = null, $show_jotnets = false)
{ {
if (empty($user['uid'])) {
return '';
}
$perms = self::getDefaultUserPermissions($user); $perms = self::getDefaultUserPermissions($user);
$jotnets = ''; $jotnets = '';

11
src/Model/Item.php
View File

@ -1204,6 +1204,17 @@ class Item extends BaseObject
return $contact_id; return $contact_id;
} }
// This function will finally cover most of the preparation functionality in mod/item.php
public static function prepare(&$item)
{
$data = BBCode::getAttachmentData($item['body']);
if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $item['body'], $match, PREG_SET_ORDER) || isset($data["type"]))
&& ($posttype != Item::PT_PERSONAL_NOTE)) {
$posttype = Item::PT_PAGE;
$objecttype = ACTIVITY_OBJ_BOOKMARK;
}
}
public static function insert($item, $force_parent = false, $notify = false, $dontcache = false) public static function insert($item, $force_parent = false, $notify = false, $dontcache = false)
{ {
$a = get_app(); $a = get_app();

14
src/Network/Probe.php
View File

@ -119,7 +119,7 @@ class Probe
if (!is_object($xrd)) { if (!is_object($xrd)) {
$ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']); $ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
logger("Probing timeout for ".$url, LOGGER_DEBUG); logger("Probing timeout for ".$url, LOGGER_DEBUG);
return false; return false;
} }
@ -731,7 +731,7 @@ class Probe
$redirects = 0; $redirects = 0;
$ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]); $ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
return false; return false;
} }
$data = $ret['body']; $data = $ret['body'];
@ -798,7 +798,7 @@ class Probe
private static function pollNoscrape($noscrape_url, $data) private static function pollNoscrape($noscrape_url, $data)
{ {
$ret = Network::curl($noscrape_url); $ret = Network::curl($noscrape_url);
if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
return false; return false;
} }
$content = $ret['body']; $content = $ret['body'];
@ -1036,7 +1036,7 @@ class Probe
private static function pollHcard($hcard_url, $data, $dfrn = false) private static function pollHcard($hcard_url, $data, $dfrn = false)
{ {
$ret = Network::curl($hcard_url); $ret = Network::curl($hcard_url);
if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
return false; return false;
} }
$content = $ret['body']; $content = $ret['body'];
@ -1283,7 +1283,7 @@ class Probe
} }
} elseif (normalise_link($pubkey) == 'http://') { } elseif (normalise_link($pubkey) == 'http://') {
$ret = Network::curl($pubkey); $ret = Network::curl($pubkey);
if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
return false; return false;
} }
$pubkey = $ret['body']; $pubkey = $ret['body'];
@ -1315,7 +1315,7 @@ class Probe
// Fetch all additional data from the feed // Fetch all additional data from the feed
$ret = Network::curl($data["poll"]); $ret = Network::curl($data["poll"]);
if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
return false; return false;
} }
$feed = $ret['body']; $feed = $ret['body'];
@ -1525,7 +1525,7 @@ class Probe
private static function feed($url, $probe = true) private static function feed($url, $probe = true)
{ {
$ret = Network::curl($url); $ret = Network::curl($url);
if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
return false; return false;
} }
$feed = $ret['body']; $feed = $ret['body'];

2
src/Protocol/DFRN.php
View File

@ -1189,7 +1189,7 @@ class DFRN
$ret = Network::curl($url); $ret = Network::curl($url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
Contact::markForArchival($contact); Contact::markForArchival($contact);
return -2; // timed out return -2; // timed out
} }

4
src/Protocol/PortableContact.php
View File

@ -1003,7 +1003,7 @@ class PortableContact
// Quit if there is a timeout. // Quit if there is a timeout.
// But we want to make sure to only quit if we are mostly sure that this server url fits. // But we want to make sure to only quit if we are mostly sure that this server url fits.
if (DBM::is_result($gserver) && ($orig_server_url == $server_url) && if (DBM::is_result($gserver) && ($orig_server_url == $server_url) &&
(!$serverret["success"] && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT))) { (!empty($serverret["errno"]) && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT))) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]); DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
return false; return false;
@ -1018,7 +1018,7 @@ class PortableContact
$serverret = Network::curl($server_url."/.well-known/host-meta", false, $redirects, ['timeout' => 20]); $serverret = Network::curl($server_url."/.well-known/host-meta", false, $redirects, ['timeout' => 20]);
// Quit if there is a timeout // Quit if there is a timeout
if (!$serverret["success"] && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($serverret["errno"]) && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]); DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
return false; return false;

4
src/Worker/OnePoll.php
View File

@ -185,7 +185,7 @@ class OnePoll
$ret = Network::curl($url); $ret = Network::curl($url);
if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
// set the last-update so we don't keep polling // set the last-update so we don't keep polling
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
Contact::markForArchival($contact); Contact::markForArchival($contact);
@ -321,7 +321,7 @@ class OnePoll
$ret = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]); $ret = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
unlink($cookiejar); unlink($cookiejar);
if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) { if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
// set the last-update so we don't keep polling // set the last-update so we don't keep polling
DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
Contact::markForArchival($contact); Contact::markForArchival($contact);