Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
61227fa1
Commit
61227fa1
authored
Mar 19, 2019
by
Dominik Hebeler
Browse files
Merge branch 'development' of
https://gitlab.metager3.de/open-source/MetaGer
into development
parents
b373c185
4d8b1102
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/MetaGer.php
View file @
61227fa1
...
@@ -210,7 +210,7 @@ class MetaGer
...
@@ -210,7 +210,7 @@ class MetaGer
return
response
()
->
view
(
'resultpages.metager3resultsatom10'
,
[
'results'
=>
$viewResults
,
'eingabe'
=>
$this
->
eingabe
,
'metager'
=>
$this
,
'resultcount'
=>
sizeof
(
$viewResults
),
'key'
=>
$this
->
apiKey
,
'apiAuthorized'
=>
$this
->
apiAuthorized
])
->
header
(
'Content-Type'
,
'application/xml'
);
return
response
()
->
view
(
'resultpages.metager3resultsatom10'
,
[
'results'
=>
$viewResults
,
'eingabe'
=>
$this
->
eingabe
,
'metager'
=>
$this
,
'resultcount'
=>
sizeof
(
$viewResults
),
'key'
=>
$this
->
apiKey
,
'apiAuthorized'
=>
$this
->
apiAuthorized
])
->
header
(
'Content-Type'
,
'application/xml'
);
break
;
break
;
case
'atom10'
:
case
'atom10'
:
return
response
()
->
view
(
'resultpages.metager3resultsatom10'
,
[
'results'
=>
$viewResults
,
'eingabe'
=>
$this
->
eingabe
,
'metager'
=>
$this
,
'resultcount'
=>
sizeof
(
$viewResults
),
'apiAuthorized'
=>
true
])
return
response
()
->
view
(
'resultpages.metager3resultsatom10'
,
[
'results'
=>
$viewResults
,
'eingabe'
=>
$this
->
eingabe
,
'metager'
=>
$this
,
'resultcount'
=>
sizeof
(
$viewResults
),
'key'
=>
$this
->
apiKey
,
'apiAuthorized'
=>
true
])
->
header
(
'Content-Type'
,
'application/xml'
);
->
header
(
'Content-Type'
,
'application/xml'
);
break
;
break
;
case
'result-count'
:
case
'result-count'
:
...
...
resources/views/resultpages/metager3resultsatom10.blade.php
View file @
61227fa1
...
@@ -25,5 +25,13 @@
...
@@ -25,5 +25,13 @@
</content>
</content>
</entry>
</entry>
@endforeach
@endforeach
@else
<ad:advertisement>
<ad:callOut
type=
"TEXT"
>
Fehler
</ad:callOut>
<ad:title
type=
"TEXT"
>
Falscher Schlüssel angegeben
</ad:title>
<ad:displayUrl
type=
"TEXT"
>
https://metager.de/meta/key
</ad:displayUrl>
<ad:subTitle
type=
"TEXT"
>
Sie haben einen ungültigen Schlüssel angegeben
</ad:subTitle>
<link
href=
"https://metager.de/meta/key"
/>
</ad:advertisement>
@endif
@endif
</feed>
</feed>
storage/app/public/MetaGer-release.apk
View file @
61227fa1
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment