Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stud.IP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marcus Eibrink-Lunzenauer
Stud.IP
Commits
102efecd
Commit
102efecd
authored
4 months ago
by
André Noack
Browse files
Options
Downloads
Patches
Plain Diff
Resolve #5029 "„Error: Fehlende Session.“ beim Aufruf einer falschen Trails URL"
Closes #5029 Merge request
studip/studip!3800
parent
c70749a6
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
templates/header.php
+5
-5
5 additions, 5 deletions
templates/header.php
templates/login/_header_languages.php
+2
-2
2 additions, 2 deletions
templates/login/_header_languages.php
with
7 additions
and
7 deletions
templates/header.php
+
5
−
5
View file @
102efecd
...
@@ -123,10 +123,10 @@ if ($navigation) {
...
@@ -123,10 +123,10 @@ if ($navigation) {
&&
Navigation
::
getItem
(
'/profile'
)
->
isActive
();
&&
Navigation
::
getItem
(
'/profile'
)
->
isActive
();
?>
?>
<?
if
(
is_object
(
$GLOBALS
[
'perm'
])
&&
PersonalNotifications
::
isActivated
()
&&
$GLOBALS
[
'perm'
]
->
have_perm
(
'autor'
))
:
?>
<?
if
(
is_object
(
$GLOBALS
[
'perm'
])
&&
PersonalNotifications
::
isActivated
()
&&
$GLOBALS
[
'perm'
]
->
have_perm
(
'autor'
))
:
?>
<?
$notifications
=
PersonalNotifications
::
getMyNotifications
()
?>
<?
$notifications
=
PersonalNotifications
::
getMyNotifications
()
?>
<?
$lastvisit
=
(
int
)
UserConfig
::
get
(
$GLOBALS
[
'user'
]
->
id
)
->
getValue
(
'NOTIFICATIONS_SEEN_LAST_DATE'
)
?>
<?
$lastvisit
=
(
int
)
UserConfig
::
get
(
$GLOBALS
[
'user'
]
->
id
)
->
getValue
(
'NOTIFICATIONS_SEEN_LAST_DATE'
)
?>
<?
foreach
(
$notifications
as
$notification
)
{
<?
foreach
(
$notifications
as
$notification
)
{
...
@@ -137,7 +137,7 @@ if ($navigation) {
...
@@ -137,7 +137,7 @@ if ($navigation) {
<!-- User-Avatar -->
<!-- User-Avatar -->
<li
class=
"header_avatar_container
<?=
!
empty
(
$alert
)
?
'alert'
:
''
?>
<?
if
(
$active
)
echo
'active'
;
?>
"
id=
"avatar-menu-container"
>
<li
class=
"header_avatar_container
<?=
!
empty
(
$alert
)
?
'alert'
:
''
?>
<?
if
(
$active
)
echo
'active'
;
?>
"
id=
"avatar-menu-container"
>
<div
id=
"notification-container"
<?=
count
(
$notifications
)
>
0
?
' class="hoverable"'
:
''
?>
>
<div
id=
"notification-container"
<?=
count
(
$notifications
)
>
0
?
' class="hoverable"'
:
''
?>
>
<button
id=
"notification_marker"
data-toggles=
"#notification_checkbox"
<?=
!
empty
(
$alert
)
?
' class="alert"'
:
""
?>
<button
id=
"notification_marker"
data-toggles=
"#notification_checkbox"
<?=
!
empty
(
$alert
)
?
' class="alert"'
:
""
?>
title=
"
<?=
sprintf
(
title=
"
<?=
sprintf
(
ngettext
(
'%u Benachrichtigung'
,
'%u Benachrichtigungen'
,
count
(
$notifications
)),
ngettext
(
'%u Benachrichtigung'
,
'%u Benachrichtigungen'
,
count
(
$notifications
)),
...
@@ -212,7 +212,7 @@ if ($navigation) {
...
@@ -212,7 +212,7 @@ if ($navigation) {
<?
else
:
?>
<?
else
:
?>
<li>
<li>
<form
method=
"post"
action=
"
<?=
URLHelper
::
getLink
(
Request
::
url
(),
[
'cancel_login'
=>
null
])
?>
"
>
<form
method=
"post"
action=
"
<?=
URLHelper
::
getLink
(
Request
::
url
(),
[
'cancel_login'
=>
null
])
?>
"
>
<?
=
CSRFProtection
::
tokenTag
()
?>
<?
try
{
echo
CSRFProtection
::
tokenTag
()
;}
catch
(
SessionRequiredException
){}
?>
<input
type=
"hidden"
name=
"user_config_submitted"
value=
"1"
>
<input
type=
"hidden"
name=
"user_config_submitted"
value=
"1"
>
<div
id=
"contrast"
>
<div
id=
"contrast"
>
<?
if
(
!
empty
(
$_SESSION
[
'contrast'
]))
:
?>
<?
if
(
!
empty
(
$_SESSION
[
'contrast'
]))
:
?>
...
@@ -222,7 +222,7 @@ if ($navigation) {
...
@@ -222,7 +222,7 @@ if ($navigation) {
<?
else
:
?>
<?
else
:
?>
<?=
Icon
::
create
(
'accessibility'
,
Icon
::
ROLE_INFO_ALT
)
->
asImg
(
24
)
?>
<?=
Icon
::
create
(
'accessibility'
,
Icon
::
ROLE_INFO_ALT
)
->
asImg
(
24
)
?>
<button
class=
"as-link"
name=
"set_contrast"
>
<?=
_
(
'Hohen Kontrast aktivieren'
)
?>
</button>
<button
class=
"as-link"
name=
"set_contrast"
>
<?=
_
(
'Hohen Kontrast aktivieren'
)
?>
</button>
<?=
tooltipIcon
(
_
(
'Aktiviert einen hohen Kontrast gemäß WCAG 2.1. Diese Einstellung wird nach dem Login übernommen.
<?=
tooltipIcon
(
_
(
'Aktiviert einen hohen Kontrast gemäß WCAG 2.1. Diese Einstellung wird nach dem Login übernommen.
Sie können sie in Ihren persönlichen Einstellungen ändern.'
),
false
,
false
,
true
);
?>
Sie können sie in Ihren persönlichen Einstellungen ändern.'
),
false
,
false
,
true
);
?>
<?
endif
?>
<?
endif
?>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
templates/login/_header_languages.php
+
2
−
2
View file @
102efecd
<form
id=
"language-selector"
method=
"POST"
action=
"
<?=
URLHelper
::
getLink
(
Request
::
url
(),
[
'cancel_login'
=>
null
])
?>
"
>
<form
id=
"language-selector"
method=
"POST"
action=
"
<?=
URLHelper
::
getLink
(
Request
::
url
(),
[
'cancel_login'
=>
null
])
?>
"
>
<?
=
CSRFProtection
::
tokenTag
()
?>
<?
try
{
echo
CSRFProtection
::
tokenTag
()
;}
catch
(
SessionRequiredException
){}
?>
<input
type=
"hidden"
name=
"user_config_submitted"
value=
"1"
>
<input
type=
"hidden"
name=
"user_config_submitted"
value=
"1"
>
<select
id=
"languages"
name=
"set_language"
class=
"select2"
onchange=
"this.form.submit()"
>
<select
id=
"languages"
name=
"set_language"
class=
"select2"
onchange=
"this.form.submit()"
>
<?
foreach
(
$GLOBALS
[
'INSTALLED_LANGUAGES'
]
as
$temp_language_key
=>
$temp_language
)
:
?>
<?
foreach
(
$GLOBALS
[
'INSTALLED_LANGUAGES'
]
as
$temp_language_key
=>
$temp_language
)
:
?>
...
@@ -32,4 +32,4 @@
...
@@ -32,4 +32,4 @@
templateSelection
:
format
templateSelection
:
format
});
});
});
});
</script>
</script>
\ No newline at end of file
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