Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
simplesamlphp
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Perun
Perun ProxyIdP
v1
simplesamlphp
Commits
337b532e
Commit
337b532e
authored
May 17, 2018
by
Tim van Dijen
Browse files
Options
Downloads
Patches
Plain Diff
Indentation fixes
parent
f93eb031
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/metarefresh/lib/MetaLoader.php
+440
-445
440 additions, 445 deletions
modules/metarefresh/lib/MetaLoader.php
with
440 additions
and
445 deletions
modules/metarefresh/lib/MetaLoader.php
+
440
−
445
View file @
337b532e
...
...
@@ -39,7 +39,6 @@ class sspmod_metarefresh_MetaLoader
}
$this
->
state
=
array
();
}
...
...
@@ -159,7 +158,9 @@ class sspmod_metarefresh_MetaLoader
}
$template
=
null
;
if
(
array_key_exists
(
'template'
,
$source
))
$template
=
$source
[
'template'
];
if
(
array_key_exists
(
'template'
,
$source
))
{
$template
=
$source
[
'template'
];
}
if
(
in_array
(
'shib13-sp-remote'
,
$this
->
types
))
{
$this
->
addMetadata
(
$source
[
'src'
],
$entity
->
getMetadata1xSP
(),
'shib13-sp-remote'
,
$template
);
...
...
@@ -197,7 +198,6 @@ class sspmod_metarefresh_MetaLoader
if
(
isset
(
$source
[
'conditionalGET'
])
&&
$source
[
'conditionalGET'
])
{
if
(
array_key_exists
(
$source
[
'src'
],
$this
->
state
))
{
$sourceState
=
$this
->
state
[
$source
[
'src'
]];
if
(
isset
(
$sourceState
[
'last-modified'
]))
{
...
...
@@ -250,7 +250,6 @@ class sspmod_metarefresh_MetaLoader
if
(
!
empty
(
$this
->
state
[
$source
[
'src'
]]))
{
// Timestamp when this src was requested.
$this
->
state
[
$source
[
'src'
]][
'requested_at'
]
=
$this
->
getTime
();
$this
->
changed
=
true
;
}
}
...
...
@@ -301,7 +300,6 @@ class sspmod_metarefresh_MetaLoader
echo
'/* The following data should be added to metadata/'
.
$category
.
'.php. */'
.
"
\n
"
;
foreach
(
$elements
as
$m
)
{
$filename
=
$m
[
'filename'
];
$entityID
=
$m
[
'metadata'
][
'entityid'
];
...
...
@@ -311,7 +309,6 @@ class sspmod_metarefresh_MetaLoader
echo
'$metadata[\''
.
addslashes
(
$entityID
)
.
'\'] = '
.
var_export
(
$m
[
'metadata'
],
true
)
.
';'
.
"
\n
"
;
}
echo
"
\n
"
;
echo
'/* End of data which should be added to metadata/'
.
$category
.
'.php. */'
.
"
\n
"
;
echo
"
\n
"
;
...
...
@@ -344,22 +341,18 @@ class sspmod_metarefresh_MetaLoader
// If expire is defined in constructor...
if
(
!
empty
(
$this
->
expire
))
{
// If expire is already in metadata
if
(
array_key_exists
(
'expire'
,
$metadata
))
{
// Override metadata expire with more restrictive global config-
if
(
$this
->
expire
<
$metadata
[
'expire'
])
if
(
$this
->
expire
<
$metadata
[
'expire'
])
{
$metadata
[
'expire'
]
=
$this
->
expire
;
}
// If expire is not already in metadata use global config
}
else
{
$metadata
[
'expire'
]
=
$this
->
expire
;
}
}
$this
->
metadata
[
$type
][]
=
array
(
'filename'
=>
$filename
,
'metadata'
=>
$metadata
);
}
...
...
@@ -376,7 +369,9 @@ class sspmod_metarefresh_MetaLoader
$md
=
array
();
foreach
(
$this
->
metadata
as
$category
=>
$elements
)
{
if
(
!
in_array
(
$category
,
$types
,
true
))
continue
;
if
(
!
in_array
(
$category
,
$types
,
true
))
{
continue
;
}
$md
=
array_merge
(
$md
,
$elements
);
}
...
...
@@ -425,7 +420,7 @@ class sspmod_metarefresh_MetaLoader
foreach
(
$elements
as
$m
)
{
$entityID
=
$m
[
'metadata'
][
'entityid'
];
$content
.
=
"
\n
"
;
$content
.
=
'$metadata[\''
.
addslashes
(
$entityID
)
.
'\'] = '
.
var_export
(
$m
[
'metadata'
],
TRUE
)
.
';'
.
"
\n
"
;
$content
.
=
'$metadata[\''
.
addslashes
(
$entityID
)
.
'\'] = '
.
var_export
(
$m
[
'metadata'
],
true
)
.
';'
.
"
\n
"
;
}
$content
.
=
"
\n
"
.
'?>'
;
...
...
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