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
fde40a59
Commit
fde40a59
authored
8 months ago
by
André Noack
Committed by
David Siegfried
8 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Resolve "PHP8 Warning bei Export von Ablaufplan"
Closes #4399 Merge request
studip/studip!3213
parent
f84b6123
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/course/dates/export.php
+12
-9
12 additions, 9 deletions
app/views/course/dates/export.php
lib/raumzeit/Issue.php
+3
-3
3 additions, 3 deletions
lib/raumzeit/Issue.php
with
15 additions
and
12 deletions
app/views/course/dates/export.php
+
12
−
9
View file @
fde40a59
...
@@ -19,18 +19,21 @@
...
@@ -19,18 +19,21 @@
<?
<?
$all_semester
=
Semester
::
findAllVisible
(
false
);
$all_semester
=
Semester
::
findAllVisible
(
false
);
$grenze
=
0
;
foreach
(
$dates
as
$date
)
:
foreach
(
$dates
as
$date
)
:
if
(
(
$grenze
==
0
)
||
(
$grenze
<
$date
[
'start'
])
)
{
if
(
(
$grenze
==
0
)
||
(
$grenze
<
$date
[
'start'
])
)
{
foreach
(
$all_semester
as
$zwsem
)
{
foreach
(
$all_semester
as
$zwsem
)
{
if
(
(
$zwsem
[
'beginn'
]
<
$date
[
'start'
])
&&
(
$zwsem
[
'ende'
]
>
$date
[
'start'
])
)
{
if
(
!
empty
(
$zwsem
[
'beginn'
]))
{
$grenze
=
$zwsem
[
'ende'
];
if
(
(
$zwsem
[
'beginn'
]
<
$date
[
'start'
])
&&
(
$zwsem
[
'ende'
]
>
$date
[
'start'
])
)
{
?>
$grenze
=
$zwsem
[
'ende'
];
<tr>
?>
<td
colspan=
"5"
>
<tr>
<h3>
<?=
htmlReady
(
$zwsem
[
'name'
])
?>
</h3>
<td
colspan=
"5"
>
</td>
<h3>
<?=
htmlReady
(
$zwsem
[
'name'
])
?>
</h3>
</tr>
</td>
<?
</tr>
<?
}
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
lib/raumzeit/Issue.php
+
3
−
3
View file @
fde40a59
...
@@ -62,10 +62,10 @@ class Issue {
...
@@ -62,10 +62,10 @@ class Issue {
function
__construct
(
$data
=
[])
{
function
__construct
(
$data
=
[])
{
global
$user
;
global
$user
;
if
(
$data
[
'issue_id'
])
{
if
(
!
empty
(
$data
[
'issue_id'
])
)
{
$this
->
issue_id
=
$data
[
'issue_id'
];
$this
->
issue_id
=
$data
[
'issue_id'
];
$this
->
restore
();
$this
->
restore
();
}
else
if
(
$data
[
'seminar_id'
])
{
}
else
if
(
!
empty
(
$data
[
'seminar_id'
])
)
{
$this
->
issue_id
=
md5
(
uniqid
(
'Issue'
));
$this
->
issue_id
=
md5
(
uniqid
(
'Issue'
));
$this
->
seminar_id
=
$data
[
'seminar_id'
];
$this
->
seminar_id
=
$data
[
'seminar_id'
];
$this
->
mkdate
=
time
();
$this
->
mkdate
=
time
();
...
@@ -190,7 +190,7 @@ class Issue {
...
@@ -190,7 +190,7 @@ class Issue {
$this
->
mkdate
=
$data
[
'mkdate'
];
$this
->
mkdate
=
$data
[
'mkdate'
];
$this
->
chdate
=
$data
[
'chdate'
];
$this
->
chdate
=
$data
[
'chdate'
];
$this
->
priority
=
$data
[
'priority'
];
$this
->
priority
=
$data
[
'priority'
];
$this
->
file
=
(
$data
[
'range_id'
]
==
''
)
?
FALSE
:
TRUE
;
$this
->
file
=
!
empty
(
$data
[
'range_id'
]
)
;
if
(
$this
->
file
)
{
if
(
$this
->
file
)
{
$this
->
folder_id
=
$data
[
'folder_id'
];
$this
->
folder_id
=
$data
[
'folder_id'
];
}
}
...
...
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