diff --git a/mod/newmember.php b/mod/newmember.php index cd59cc780c..c2ffe6464e 100644 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -8,7 +8,8 @@ use Friendica\Core\L10n; function newmember_content(App $a) { - $o = '

' . L10n::t('Welcome to Friendica') . '

'; + $o = '
'; + $o .= '

' . L10n::t('Welcome to Friendica') . '

'; $o .= '

' . L10n::t('New Member Checklist') . '

'; $o .= '
'; $o .= L10n::t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.'); @@ -54,6 +55,7 @@ function newmember_content(App $a) $o .= '
  • ' . '' . L10n::t('Go to the Help Section') . '
    ' . L10n::t('Our help pages may be consulted for detail on other program features and resources.') . '
    • ' . EOL; $o .= ''; $o .= '
    '; + $o .= '
    '; return $o; } diff --git a/mod/probe.php b/mod/probe.php index b448ffd2b2..7c41df8ac5 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -15,7 +15,8 @@ function probe_content(App $a) killme(); } - $o = '

    Probe Diagnostic

    '; + $o = '
    '; + $o .= '

    Probe Diagnostic

    '; $o .= '
    '; $o .= 'Lookup address: '; @@ -30,6 +31,7 @@ function probe_content(App $a) $o .= str_replace("\n", '
    ', print_r($res, true)); $o .= ''; } + $o .= '
    '; return $o; } diff --git a/mod/webfinger.php b/mod/webfinger.php index 01743f05b0..a48d2dba6b 100644 --- a/mod/webfinger.php +++ b/mod/webfinger.php @@ -20,7 +20,8 @@ function webfinger_content(App $a) killme(); } - $o = '

    Webfinger Diagnostic

    '; + $o = '
    '; + $o .= '

    Webfinger Diagnostic

    '; $o .= ''; $o .= 'Lookup address: '; @@ -35,5 +36,7 @@ function webfinger_content(App $a) $o .= str_replace("\n", '
    ', print_r($res, true)); $o .= ''; } + $o .= '
    '; + return $o; } diff --git a/src/Module/Feed.php b/src/Module/Feed.php index 4c7059c038..e5ebe2a4d6 100644 --- a/src/Module/Feed.php +++ b/src/Module/Feed.php @@ -44,6 +44,7 @@ class Feed extends BaseModule case 'posts': case 'comments': case 'activity': + // Correct type names, no change needed break; case 'replies': $type = 'comments'; @@ -53,8 +54,8 @@ class Feed extends BaseModule } $nickname = $a->argv[1]; - header("Content-type: application/atom+xml"); + header("Content-type: application/atom+xml; charset=utf-8"); echo OStatus::feed($nickname, $last_update, 10, $type, $nocache, true); - killme(); + exit(); } } diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php index 25312bdf3a..692e4043ad 100644 --- a/src/Module/Inbox.php +++ b/src/Module/Inbox.php @@ -9,6 +9,7 @@ use Friendica\Protocol\ActivityPub; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Util\HTTPSignature; +use Friendica\Core\Logger; /** * ActivityPub Inbox diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index 956d6ff372..07ff5e805d 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -204,6 +204,8 @@ class HTTPSignature if (preg_match('/algorithm="(.*?)"/ism', $header, $matches)) { $ret['algorithm'] = $matches[1]; + } else { + $ret['algorithm'] = 'rsa-sha256'; } if (preg_match('/headers="(.*?)"/ism', $header, $matches)) { diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl new file mode 100644 index 0000000000..9c737cf55a --- /dev/null +++ b/view/theme/frio/templates/auto_request.tpl @@ -0,0 +1,62 @@ +
    +

    {{$header}}

    + +{{if $myaddr == ""}} +

    +{{$page_desc}}
    +

    +

    +

    +{{$invite_desc}} +

    +

    +{{$desc}} +

    +{{/if}} + +{{if $request}} + +{{else}} + +{{/if}} + +{{if $photo}} + +{{/if}} + +{{if $url}}
    {{$url_label}}
    {{$url}}
    {{/if}} +{{if $location}}
    {{$location_label}}
    {{$location}}
    {{/if}} +{{if $keywords}}
    {{$keywords_label}}
    {{$keywords}}
    {{/if}} +{{if $about}}
    {{$about_label}}
    {{$about}}
    {{/if}} + +
    + + {{if $myaddr}} + {{$myaddr}} + + {{else}} + + {{/if}} + {{if $url}} + + {{/if}} +
    +
    + + +
    + +
    + +
    + {{if $submit}} + + {{/if}} + +
    + +
    \ No newline at end of file diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl index b0d201af63..8d9bd232a9 100644 --- a/view/theme/frio/templates/contact_edit.tpl +++ b/view/theme/frio/templates/contact_edit.tpl @@ -45,10 +45,8 @@ {{if $poll_enabled}}
  • {{$lastupdtext}} {{$last_update}}
    {{if $poll_interval}} -
    - {{$updpub}} {{$poll_interval}} - -
    + {{$updpub}} {{$poll_interval nofilter}} + {{/if}}
    • {{/if}} diff --git a/view/theme/frio/templates/dfrn_request.tpl b/view/theme/frio/templates/dfrn_request.tpl new file mode 100644 index 0000000000..2f363f5653 --- /dev/null +++ b/view/theme/frio/templates/dfrn_request.tpl @@ -0,0 +1,92 @@ +
    +

    {{$header}}

    + +{{if $myaddr}} +{{else}} +

    +{{$page_desc}}
    +

    +{{$invite_desc}} +

    +

    +{{$desc}} +

    +{{/if}} + +{{if $request}} +
    +{{else}} + +{{/if}} + +{{if $photo}} + +{{/if}} + +{{if $url}}
    {{$url_label}}
    {{$url}}
    {{/if}} +{{if $location}}
    {{$location_label}}
    {{$location}}
    {{/if}} +{{if $keywords}}
    {{$keywords_label}}
    {{$keywords}}
    {{/if}} +{{if $about}}
    {{$about_label}}
    {{$about}}
    {{/if}} + +
    + + {{if $myaddr}} + {{$myaddr}} + + {{else}} + + {{/if}} + {{if $url}} + + {{/if}} +
    +
    + +

    +{{$pls_answer}} +

    + +
    + +{{include file="field_yesno.tpl" field=$does_know_you}} + + +

    +{{$add_note}} +

    +
    + +
    + + +
    + +
    + {{if $submit}} + + {{/if}} + +
    +
    +
    \ No newline at end of file diff --git a/view/theme/frio/templates/settings/oauth_edit.tpl b/view/theme/frio/templates/settings/oauth_edit.tpl index 477adf77c7..419e1b203f 100644 --- a/view/theme/frio/templates/settings/oauth_edit.tpl +++ b/view/theme/frio/templates/settings/oauth_edit.tpl @@ -1,4 +1,4 @@ - +

    {{$title}}

    @@ -16,3 +16,4 @@
    +
    \ No newline at end of file