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
0
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
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
60f7bce2
Commit
60f7bce2
authored
6 years ago
by
Tim van Dijen
Browse files
Options
Downloads
Patches
Plain Diff
Fixes for modules/admin
parent
4e29a1a3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/admin/lib/Menu.php
+1
-0
1 addition, 0 deletions
modules/admin/lib/Menu.php
modules/admin/lib/TestController.php
+29
-1
29 additions, 1 deletion
modules/admin/lib/TestController.php
with
30 additions
and
1 deletion
modules/admin/lib/Menu.php
+
1
−
0
View file @
60f7bce2
...
@@ -51,6 +51,7 @@ final class Menu
...
@@ -51,6 +51,7 @@ final class Menu
* @param string $id The identifier of this option.
* @param string $id The identifier of this option.
* @param string $url The URL this option points to.
* @param string $url The URL this option points to.
* @param string $name The name of the option for display purposes.
* @param string $name The name of the option for display purposes.
* @return void
*/
*/
public
function
addOption
(
$id
,
$url
,
$name
)
public
function
addOption
(
$id
,
$url
,
$name
)
{
{
...
...
This diff is collapsed.
Click to expand it.
modules/admin/lib/TestController.php
+
29
−
1
View file @
60f7bce2
...
@@ -45,6 +45,7 @@ class TestController
...
@@ -45,6 +45,7 @@ class TestController
/**
/**
* Display the list of available authsources.
* Display the list of available authsources.
*
*
* @param string|null $as
* @return \SimpleSAML\XHTML\Template
* @return \SimpleSAML\XHTML\Template
*/
*/
public
function
main
(
Request
$request
,
$as
)
public
function
main
(
Request
$request
,
$as
)
...
@@ -67,7 +68,7 @@ class TestController
...
@@ -67,7 +68,7 @@ class TestController
}
}
if
(
!
$authsource
->
isAuthenticated
())
{
if
(
!
$authsource
->
isAuthenticated
())
{
$url
=
\SimpleSAML\Module
::
getModuleURL
(
'admin/test/'
.
$as
,
[]);
$url
=
\SimpleSAML\Module
::
getModuleURL
(
'admin/test/'
.
$as
,
[]);
$params
=
[
$params
=
[
'ErrorURL'
=>
$url
,
'ErrorURL'
=>
$url
,
'ReturnTo'
=>
$url
,
'ReturnTo'
=>
$url
,
...
@@ -99,6 +100,11 @@ class TestController
...
@@ -99,6 +100,11 @@ class TestController
}
}
/**
* @param \SimpleSAML\XHTML\Template $t
* @param \SAML2\XML\saml\NameID $nameId
* @return string
*/
private
function
getNameIDHTML
(
\SimpleSAML\XHTML\Template
$t
,
\SAML2\XML\saml\NameID
$nameId
)
private
function
getNameIDHTML
(
\SimpleSAML\XHTML\Template
$t
,
\SAML2\XML\saml\NameID
$nameId
)
{
{
$result
=
''
;
$result
=
''
;
...
@@ -126,6 +132,12 @@ class TestController
...
@@ -126,6 +132,12 @@ class TestController
}
}
/**
* @param \SimpleSAML\XHTML\Template $t
* @param array $attributes
* @param string $nameParent
* @return string
*/
private
function
getAttributesHTML
(
\SimpleSAML\XHTML\Template
$t
,
$attributes
,
$nameParent
)
private
function
getAttributesHTML
(
\SimpleSAML\XHTML\Template
$t
,
$attributes
,
$nameParent
)
{
{
$alternate
=
[
'pure-table-odd'
,
'pure-table-even'
];
$alternate
=
[
'pure-table-odd'
,
'pure-table-even'
];
...
@@ -197,6 +209,11 @@ class TestController
...
@@ -197,6 +209,11 @@ class TestController
return
$str
;
return
$str
;
}
}
/**
* @param array|string $attr
* @return string
*/
private
function
present_list
(
$attr
)
private
function
present_list
(
$attr
)
{
{
if
(
is_array
(
$attr
)
&&
count
(
$attr
)
>
1
)
{
if
(
is_array
(
$attr
)
&&
count
(
$attr
)
>
1
)
{
...
@@ -211,6 +228,11 @@ class TestController
...
@@ -211,6 +228,11 @@ class TestController
}
}
}
}
/**
* @param array|string $attr
* @return string
*/
private
function
present_assoc
(
$attr
)
private
function
present_assoc
(
$attr
)
{
{
if
(
is_array
(
$attr
))
{
if
(
is_array
(
$attr
))
{
...
@@ -225,6 +247,12 @@ class TestController
...
@@ -225,6 +247,12 @@ class TestController
}
}
}
}
/**
* @param \SimpleSAML\Locale\Translate $t
* @param \SAML2\XML\saml\NameID $nameID
* @return string
*/
private
function
present_eptid
(
\SimpleSAML\Locale\Translate
$t
,
\SAML2\XML\saml\NameID
$nameID
)
private
function
present_eptid
(
\SimpleSAML\Locale\Translate
$t
,
\SAML2\XML\saml\NameID
$nameID
)
{
{
$eptid
=
[
$eptid
=
[
...
...
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