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

Merge

This commit is contained in:
Michael 2020-04-28 08:00:38 +00:00
parent f75009c20c
commit e52e505a48
11 changed files with 51 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/GServer.php
View File

@ -747,7 +747,7 @@ class GServer
return false; return false;
} }
$xrd = XML::parseString($curlResult->getBody(), false); $xrd = XML::parseString($curlResult->getBody());
if (!is_object($xrd)) { if (!is_object($xrd)) {
return false; return false;
} }
@ -796,13 +796,13 @@ class GServer
DBA::close($gcontacts); DBA::close($gcontacts);
$apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $serverdata['nurl']]]); $apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $serverdata['nurl']]]);
while ($gcontact = DBA::fetch($gcontacts)) { while ($apcontact = DBA::fetch($apcontacts)) {
$contacts[Strings::normaliseLink($apcontact['url'])] = $apcontact['url']; $contacts[Strings::normaliseLink($apcontact['url'])] = $apcontact['url'];
} }
DBA::close($apcontacts); DBA::close($apcontacts);
$pcontacts = DBA::select('contact', ['url', 'nurl'], ['uid' => 0, 'baseurl' => [$url, $serverdata['nurl']]]); $pcontacts = DBA::select('contact', ['url', 'nurl'], ['uid' => 0, 'baseurl' => [$url, $serverdata['nurl']]]);
while ($gcontact = DBA::fetch($gcontacts)) { while ($pcontact = DBA::fetch($pcontacts)) {
$contacts[$pcontact['nurl']] = $pcontact['url']; $contacts[$pcontact['nurl']] = $pcontact['url'];
} }
DBA::close($pcontacts); DBA::close($pcontacts);

4
src/Model/Item.php
View File

@ -1249,8 +1249,8 @@ class Item
return; return;
} }
$xo = XML::parseString($item["object"], false); $xo = XML::parseString($item["object"]);
$xt = XML::parseString($item["target"], false); $xt = XML::parseString($item["target"]);
if ($xt->type != Activity\ObjectType::NOTE) { if ($xt->type != Activity\ObjectType::NOTE) {
return; return;

2
src/Module/Admin/Users.php
View File

@ -206,7 +206,7 @@ class Users extends BaseAdmin
$e['register_date'] = Temporal::getRelativeDate($e['register_date']); $e['register_date'] = Temporal::getRelativeDate($e['register_date']);
$e['login_date'] = Temporal::getRelativeDate($e['login_date']); $e['login_date'] = Temporal::getRelativeDate($e['login_date']);
$e['last-item'] = Temporal::getRelativeDate($e['last-item']); $e['lastitem_date'] = Temporal::getRelativeDate($e['last-item']);
$e['is_admin'] = in_array($e['email'], $adminlist); $e['is_admin'] = in_array($e['email'], $adminlist);
$e['is_deletable'] = (intval($e['uid']) != local_user()); $e['is_deletable'] = (intval($e['uid']) != local_user());
$e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False); $e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);

6
src/Network/Probe.php
View File

@ -160,7 +160,7 @@ class Probe
$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0); $ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isSuccess()) { if ($curlResult->isSuccess()) {
$xml = $curlResult->getBody(); $xml = $curlResult->getBody();
$xrd = XML::parseString($xml, false); $xrd = XML::parseString($xml, true);
if (!empty($url)) { if (!empty($url)) {
$host_url = 'https://' . $host; $host_url = 'https://' . $host;
} else { } else {
@ -185,7 +185,7 @@ class Probe
} }
$xml = $curlResult->getBody(); $xml = $curlResult->getBody();
$xrd = XML::parseString($xml, false); $xrd = XML::parseString($xml, true);
$host_url = 'http://'.$host; $host_url = 'http://'.$host;
} }
if (!is_object($xrd)) { if (!is_object($xrd)) {
@ -936,7 +936,7 @@ class Probe
} }
// If it is not JSON, maybe it is XML // If it is not JSON, maybe it is XML
$xrd = XML::parseString($data, false); $xrd = XML::parseString($data, true);
if (!is_object($xrd)) { if (!is_object($xrd)) {
Logger::log("No webfinger data retrievable for ".$url, Logger::DEBUG); Logger::log("No webfinger data retrievable for ".$url, Logger::DEBUG);
return false; return false;

4
src/Protocol/ActivityPub/Transmitter.php
View File

@ -1408,8 +1408,8 @@ class Transmitter
*/ */
private static function createAddTag($item, $data) private static function createAddTag($item, $data)
{ {
$object = XML::parseString($item['object'], false); $object = XML::parseString($item['object']);
$target = XML::parseString($item["target"], false); $target = XML::parseString($item["target"]);
$data['diaspora:guid'] = $item['guid']; $data['diaspora:guid'] = $item['guid'];
$data['actor'] = $item['author-link']; $data['actor'] = $item['author-link'];

12
src/Protocol/DFRN.php
View File

@ -805,7 +805,7 @@ class DFRN
if ($activity) { if ($activity) {
$entry = $doc->createElement($element); $entry = $doc->createElement($element);
$r = XML::parseString($activity, false); $r = XML::parseString($activity);
if (!$r) { if (!$r) {
return false; return false;
} }
@ -831,7 +831,7 @@ class DFRN
$r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link); $r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
// XML does need a single element as root element so we add a dummy element here // XML does need a single element as root element so we add a dummy element here
$data = XML::parseString("<dummy>" . $r->link . "</dummy>", false); $data = XML::parseString("<dummy>" . $r->link . "</dummy>");
if (is_object($data)) { if (is_object($data)) {
foreach ($data->link as $link) { foreach ($data->link as $link) {
$attributes = []; $attributes = [];
@ -2101,7 +2101,7 @@ class DFRN
if (!$verb) { if (!$verb) {
return; return;
} }
$xo = XML::parseString($item["object"], false); $xo = XML::parseString($item["object"]);
if (($xo->type == Activity\ObjectType::PERSON) && ($xo->id)) { if (($xo->type == Activity\ObjectType::PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me? // somebody was poked/prodded. Was it me?
@ -2224,8 +2224,8 @@ class DFRN
} }
if (($item["verb"] == Activity::TAG) && ($item["object-type"] == Activity\ObjectType::TAGTERM)) { if (($item["verb"] == Activity::TAG) && ($item["object-type"] == Activity\ObjectType::TAGTERM)) {
$xo = XML::parseString($item["object"], false); $xo = XML::parseString($item["object"]);
$xt = XML::parseString($item["target"], false); $xt = XML::parseString($item["target"]);
if ($xt->type == Activity\ObjectType::NOTE) { if ($xt->type == Activity\ObjectType::NOTE) {
$item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]); $item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
@ -2413,7 +2413,7 @@ class DFRN
$item["object"] = self::transformActivity($xpath, $object, "object"); $item["object"] = self::transformActivity($xpath, $object, "object");
if (trim($item["object"]) != "") { if (trim($item["object"]) != "") {
$r = XML::parseString($item["object"], false); $r = XML::parseString($item["object"]);
if (isset($r->type)) { if (isset($r->type)) {
$item["object-type"] = $r->type; $item["object-type"] = $r->type;
} }

4
src/Protocol/Diaspora.php
View File

@ -329,7 +329,7 @@ class Diaspora
*/ */
private static function verifyMagicEnvelope($envelope) private static function verifyMagicEnvelope($envelope)
{ {
$basedom = XML::parseString($envelope); $basedom = XML::parseString($envelope, true);
if (!is_object($basedom)) { if (!is_object($basedom)) {
Logger::log("Envelope is no XML file"); Logger::log("Envelope is no XML file");
@ -455,7 +455,7 @@ class Diaspora
$xml = $raw; $xml = $raw;
} }
$basedom = XML::parseString($xml); $basedom = XML::parseString($xml, true);
if (!is_object($basedom)) { if (!is_object($basedom)) {
Logger::log('Received data does not seem to be an XML. Discarding. '.$xml); Logger::log('Received data does not seem to be an XML. Discarding. '.$xml);

20
src/Util/XML.php
View File

@ -433,18 +433,26 @@ class XML
} }
} }
public static function parseString($s, $strict = true) /**
* Parse XML string
*
* @param string $s
* @param boolean $suppress_log
* @return Object
*/
public static function parseString(string $s, bool $suppress_log = false)
{ {
// the "strict" parameter is deactivated
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
$x = @simplexml_load_string($s); $x = @simplexml_load_string($s);
if (!$x) { if (!$x) {
Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]); if (!$suppress_log) {
foreach (libxml_get_errors() as $err) { Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ":" . $err->column, 'message' => $err->message]); foreach (libxml_get_errors() as $err) {
Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ":" . $err->column, 'message' => $err->message]);
}
Logger::debug('Erroring XML string', ['xml' => $s]);
} }
Logger::debug('Erroring XML string', ['xml' => $s]);
libxml_clear_errors(); libxml_clear_errors();
} }
return $x; return $x;

62
view/theme/frio/css/style.css
View File

@ -56,13 +56,13 @@ body a[name]:not([href]) {
visibility: hidden; visibility: hidden;
} }
body a:hover, .btn-link:hover, .btn:hover, body a:hover, .btn-link:hover,
body a:focus, .btn-link:focus, .btn:focus, body a:focus, .btn-link:focus,
body a:active, .btn-link:active, .btn:active, body a:active, .btn-link:active,
body a.active, .btn-link.active, .btn.active { body a.active, .btn-link.active {
color: $link_hover_color; color: $link_hover_color;
outline-color: $link_hover_color;;
text-decoration: none; text-decoration: none;
outline: none;
} }
.wall-item-container a:hover { .wall-item-container a:hover {
@ -197,8 +197,8 @@ blockquote {
padding: 8px 16px; padding: 8px 16px;
color: inherit; color: inherit;
} }
a.btn:hover { .btn:focus {
color: #333; outline-color: $link_hover_color;
} }
.btn-default { .btn-default {
@ -219,17 +219,17 @@ a.btn:hover {
padding: 1px 5px; padding: 1px 5px;
font-size: 12px; font-size: 12px;
} }
.btn-primary { .btn.btn-primary {
background: $nav_bg !important; background: $nav_bg;
color: $btn_primary_color !important; color: $btn_primary_color;
} }
.btn-primary:hover, .btn-primary:focus { .btn.btn-primary:hover, .btn.btn-primary:focus {
color: $btn_primary_color;
background: $btn_primary_hover_color; background: $btn_primary_hover_color;
text-decoration: none; text-decoration: none;
} }
.btn-primary:active, .btn-primary.active { .btn.btn-primary:active, .btn.btn-primary.active {
outline: 0; background: $btn_primary_hover_color;
background: $btn_primary_hover_color !important;
} }
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover, .btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
@ -262,31 +262,7 @@ a.btn:hover {
.btn-separator { .btn-separator {
border-left: 1px solid #777; border-left: 1px solid #777;
} }
/*.btn-info {
background: #6fdbe8;
color: #fff!important;
}
.btn-info:hover, .btn-info:focus {
background: #59d6e4!important;
text-decoration: none;
}
.btn-info:active, .btn-info.active {
outline: 0;
background: #59d6e4;
}*/
.btn-main {
background: $link_color;
color: #fff!important;
}
.btn-main:hover, .btn-main:focus {
background: $link_hover_color !important;
text-decoration: none;
}
.btn-main:active, .btn-main.active {
outline: 0;
background: $link_hover_color;
}
.toggle.btn { .toggle.btn {
border: 1px solid transparent; border: 1px solid transparent;
} }
@ -2202,19 +2178,13 @@ ul.dropdown-menu li:hover {
box-shadow: none; box-shadow: none;
} }
.form-control:focus { .form-control:focus {
/*border: 2px solid #6fdbe8;*/
border: 2px solid $link_color; border: 2px solid $link_color;
outline: 0;
box-shadow: none; box-shadow: none;
} }
.checkbox input[type="checkbox"]:focus + label::before, .checkbox input[type="checkbox"]:focus + label::before,
.checkbox input[type="radio"]:focus + label::before { .radio input[type="radio"]:focus + label::before {
/*border: 2px solid #6fdbe8;*/ outline-color: $link_hover_color;
border: 2px solid $link_color;
outline: 0;
box-shadow: none;
} }
/* Search form */ /* Search form */

2
view/theme/frio/templates/jot.tpl
View File

@ -1,5 +1,5 @@
{{* The button to open the jot - in This theme we move the button with js to the second nav bar *}} {{* The button to open the jot - in This theme we move the button with js to the second nav bar *}}
<a class="btn btn-sm btn-main pull-right" id="jotOpen" href="compose/{{$posttype}}{{if $content}}?body={{$content}}{{/if}}" aria-label="{{$new_post}}" title="{{$new_post}}"><i class="fa fa-pencil-square-o fa-2x"></i></a> <a class="btn btn-sm btn-primary pull-right" id="jotOpen" href="compose/{{$posttype}}{{if $content}}?body={{$content}}{{/if}}" aria-label="{{$new_post}}" title="{{$new_post}}"><i class="fa fa-pencil-square-o fa-2x"></i></a>
<div id="jot-content"> <div id="jot-content">
<div id="jot-sections"> <div id="jot-sections">

2
view/theme/frio/templates/searchbox.tpl
View File

@ -46,7 +46,7 @@ Some parts of this template will be moved by js to other places (see theme.js) -
</div> </div>
{{if $s}} {{if $s}}
<a href="search/saved/add?term={{$q}}&amp;return_url={{$return_url}}" class="btn btn-sm btn-main pull-right" id="search-save" title="{{$save_label}}" aria-label="{{$save_label}}" value="{{$save_label}}" data-toggle="tooltip"> <a href="search/saved/add?term={{$q}}&amp;return_url={{$return_url}}" class="btn btn-sm btn-primary pull-right" id="search-save" title="{{$save_label}}" aria-label="{{$save_label}}" value="{{$save_label}}" data-toggle="tooltip">
{{if $mode == "tag"}} {{if $mode == "tag"}}
<i class="fa fa-plus fa-2x" aria-hidden="true"></i> <i class="fa fa-plus fa-2x" aria-hidden="true"></i>
{{else}} {{else}}