Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
marcus-lodspeakr
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
uib-ub
Spesialsamlingene
marcus-lodspeakr
Commits
e435ae66
Commit
e435ae66
authored
3 years ago
by
Stein Magne Bjorklund
Browse files
Options
Downloads
Patches
Plain Diff
Fix Importer class
parent
b72ca8ca
No related branches found
Branches containing commit
No related tags found
1 merge request
!18
Resolve "Remove all use of GLOBALS"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
classes/Importer.php
+6
-4
6 additions, 4 deletions
classes/Importer.php
with
6 additions
and
4 deletions
classes/Importer.php
+
6
−
4
View file @
e435ae66
...
@@ -375,6 +375,7 @@ final class Importer
...
@@ -375,6 +375,7 @@ final class Importer
private
function
showInterface
():
void
private
function
showInterface
():
void
{
{
$import_url
=
$this
->
configuration
->
getConfigValue
(
'conf'
,
'basedir'
)
.
'import'
;
echo
<<<HTML
echo
<<<HTML
<html lang="eng">
<html lang="eng">
<head>
<head>
...
@@ -385,9 +386,9 @@ final class Importer
...
@@ -385,9 +386,9 @@ final class Importer
You can paste the data obtained from another LODSPeaKr instance here in the box.
You can paste the data obtained from another LODSPeaKr instance here in the box.
You can also automatize this import by adding a parameter '?import=URL' to this page.
You can also automatize this import by adding a parameter '?import=URL' to this page.
Usually, the URL will be of the for <pre>https://example.com/export</pre>
Usually, the URL will be of the for <pre>https://example.com/export</pre>
<form action=
'" . $this->basedir . "/
import
'
method=
'
post
'
>
<form action=
"$
import
_url"
method=
"
post
"
>
<textarea cols=
'
100
'
rows=
'
25
'
name=
'
importtext
'
></textarea>
<textarea cols=
"
100
"
rows=
"
25
"
name=
"
importtext
"
></textarea>
<input type=
'
submit
'
value=
'
Import
'
/>
<input type=
"
submit
"
value=
"
Import
"
/>
</form>
</form>
</body>
</body>
</html>
</html>
...
@@ -396,6 +397,7 @@ HTML;
...
@@ -396,6 +397,7 @@ HTML;
private
function
showFinishing
():
void
private
function
showFinishing
():
void
{
{
$base_dir
=
$this
->
configuration
->
getConfigValue
(
'conf'
,
'basedir'
);
echo
<<<HTML
echo
<<<HTML
<html lang="eng">
<html lang="eng">
<head>
<head>
...
@@ -403,7 +405,7 @@ HTML;
...
@@ -403,7 +405,7 @@ HTML;
</head>
</head>
<body>
<body>
<h2>Import finished</h2>
<h2>Import finished</h2>
Your new application is ready. Please go to the <a href=
'" . $this->
basedir
. "'
>home page</a>.
Your new application is ready. Please go to the <a href=
"$
base
_
dir
"
>home page</a>.
</body>
</body>
</html>
</html>
HTML;
HTML;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment