return false;
}
- $xrd = XML::parseString($curlResult->getBody(), false);
+ $xrd = XML::parseString($curlResult->getBody());
if (!is_object($xrd)) {
return false;
}
DBA::close($gcontacts);
$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'];
}
DBA::close($apcontacts);
$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'];
}
DBA::close($pcontacts);
return;
}
- $xo = XML::parseString($item["object"], false);
- $xt = XML::parseString($item["target"], false);
+ $xo = XML::parseString($item["object"]);
+ $xt = XML::parseString($item["target"]);
if ($xt->type != Activity\ObjectType::NOTE) {
return;
$e['register_date'] = Temporal::getRelativeDate($e['register_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_deletable'] = (intval($e['uid']) != local_user());
$e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);
$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isSuccess()) {
$xml = $curlResult->getBody();
- $xrd = XML::parseString($xml, false);
+ $xrd = XML::parseString($xml, true);
if (!empty($url)) {
$host_url = 'https://' . $host;
} else {
}
$xml = $curlResult->getBody();
- $xrd = XML::parseString($xml, false);
+ $xrd = XML::parseString($xml, true);
$host_url = 'http://'.$host;
}
if (!is_object($xrd)) {
}
// If it is not JSON, maybe it is XML
- $xrd = XML::parseString($data, false);
+ $xrd = XML::parseString($data, true);
if (!is_object($xrd)) {
Logger::log("No webfinger data retrievable for ".$url, Logger::DEBUG);
return false;
*/
private static function createAddTag($item, $data)
{
- $object = XML::parseString($item['object'], false);
- $target = XML::parseString($item["target"], false);
+ $object = XML::parseString($item['object']);
+ $target = XML::parseString($item["target"]);
$data['diaspora:guid'] = $item['guid'];
$data['actor'] = $item['author-link'];
if ($activity) {
$entry = $doc->createElement($element);
- $r = XML::parseString($activity, false);
+ $r = XML::parseString($activity);
if (!$r) {
return false;
}
$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
- $data = XML::parseString("<dummy>" . $r->link . "</dummy>", false);
+ $data = XML::parseString("<dummy>" . $r->link . "</dummy>");
if (is_object($data)) {
foreach ($data->link as $link) {
$attributes = [];
if (!$verb) {
return;
}
- $xo = XML::parseString($item["object"], false);
+ $xo = XML::parseString($item["object"]);
if (($xo->type == Activity\ObjectType::PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
}
if (($item["verb"] == Activity::TAG) && ($item["object-type"] == Activity\ObjectType::TAGTERM)) {
- $xo = XML::parseString($item["object"], false);
- $xt = XML::parseString($item["target"], false);
+ $xo = XML::parseString($item["object"]);
+ $xt = XML::parseString($item["target"]);
if ($xt->type == Activity\ObjectType::NOTE) {
$item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
$item["object"] = self::transformActivity($xpath, $object, "object");
if (trim($item["object"]) != "") {
- $r = XML::parseString($item["object"], false);
+ $r = XML::parseString($item["object"]);
if (isset($r->type)) {
$item["object-type"] = $r->type;
}
*/
private static function verifyMagicEnvelope($envelope)
{
- $basedom = XML::parseString($envelope);
+ $basedom = XML::parseString($envelope, true);
if (!is_object($basedom)) {
Logger::log("Envelope is no XML file");
$xml = $raw;
}
- $basedom = XML::parseString($xml);
+ $basedom = XML::parseString($xml, true);
if (!is_object($basedom)) {
Logger::log('Received data does not seem to be an XML. Discarding. '.$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);
$x = @simplexml_load_string($s);
if (!$x) {
- Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
- foreach (libxml_get_errors() as $err) {
- Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ":" . $err->column, 'message' => $err->message]);
+ if (!$suppress_log) {
+ Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
+ 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();
}
return $x;
visibility: hidden;
}
-body a:hover, .btn-link:hover, .btn:hover,
-body a:focus, .btn-link:focus, .btn:focus,
-body a:active, .btn-link:active, .btn:active,
-body a.active, .btn-link.active, .btn.active {
+body a:hover, .btn-link:hover,
+body a:focus, .btn-link:focus,
+body a:active, .btn-link:active,
+body a.active, .btn-link.active {
color: $link_hover_color;
+ outline-color: $link_hover_color;;
text-decoration: none;
- outline: none;
}
.wall-item-container a:hover {
padding: 8px 16px;
color: inherit;
}
-a.btn:hover {
- color: #333;
+.btn:focus {
+ outline-color: $link_hover_color;
}
.btn-default {
padding: 1px 5px;
font-size: 12px;
}
-.btn-primary {
- background: $nav_bg !important;
- color: $btn_primary_color !important;
+.btn.btn-primary {
+ background: $nav_bg;
+ 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;
text-decoration: none;
}
-.btn-primary:active, .btn-primary.active {
- outline: 0;
- background: $btn_primary_hover_color !important;
+.btn.btn-primary:active, .btn.btn-primary.active {
+ background: $btn_primary_hover_color;
}
.btn-primary.active.focus, .btn-primary.active:focus, .btn-primary.active:hover,
.btn-separator {
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 {
border: 1px solid transparent;
}
box-shadow: none;
}
.form-control:focus {
- /*border: 2px solid #6fdbe8;*/
border: 2px solid $link_color;
- outline: 0;
box-shadow: none;
}
-
.checkbox input[type="checkbox"]:focus + label::before,
-.checkbox input[type="radio"]:focus + label::before {
- /*border: 2px solid #6fdbe8;*/
- border: 2px solid $link_color;
- outline: 0;
- box-shadow: none;
+.radio input[type="radio"]:focus + label::before {
+ outline-color: $link_hover_color;
}
/* Search form */
{{* 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-sections">
</div>
{{if $s}}
- <a href="search/saved/add?term={{$q}}&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}}&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"}}
<i class="fa fa-plus fa-2x" aria-hidden="true"></i>
{{else}}