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
3307363f
Commit
3307363f
authored
2 years ago
by
David Siegfried
Browse files
Options
Downloads
Patches
Plain Diff
prevent php-warnings, closes #2214
Closes #2214 Merge request
studip/studip!1444
parent
3a6bf9db
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/controllers/news.php
+16
-12
16 additions, 12 deletions
app/controllers/news.php
with
16 additions
and
12 deletions
app/controllers/news.php
+
16
−
12
View file @
3307363f
...
@@ -154,7 +154,7 @@ class NewsController extends StudipController
...
@@ -154,7 +154,7 @@ class NewsController extends StudipController
URLHelper
::
addLinkParam
(
'nshow_all'
,
1
);
URLHelper
::
addLinkParam
(
'nshow_all'
,
1
);
}
}
$this
->
news
=
StudipNews
::
GetNewsByRange
(
$range_id
,
!
$this
->
show_all_news
,
true
);
$this
->
news
=
StudipNews
::
GetNewsByRange
(
$range_id
,
!
$this
->
show_all_news
,
true
);
$this
->
count_all_news
=
$this
->
show_all_news
?
count
(
$this
->
news
)
:
count
(
StudipNews
::
GetNewsByRange
(
$range_id
,
false
));
$this
->
count_all_news
=
$this
->
show_all_news
?
count
(
$this
->
news
)
:
count
(
StudipNews
::
GetNewsByRange
(
$range_id
));
$this
->
rss_id
=
Config
::
get
()
->
NEWS_RSS_EXPORT_ENABLE
?
StudipNews
::
GetRssIdFromRangeId
(
$range_id
)
:
false
;
$this
->
rss_id
=
Config
::
get
()
->
NEWS_RSS_EXPORT_ENABLE
?
StudipNews
::
GetRssIdFromRangeId
(
$range_id
)
:
false
;
$this
->
range
=
$range_id
;
$this
->
range
=
$range_id
;
$this
->
nobody
=
!
$GLOBALS
[
'user'
]
->
id
||
$GLOBALS
[
'user'
]
->
id
===
'nobody'
;
$this
->
nobody
=
!
$GLOBALS
[
'user'
]
->
id
||
$GLOBALS
[
'user'
]
->
id
===
'nobody'
;
...
@@ -223,7 +223,7 @@ class NewsController extends StudipController
...
@@ -223,7 +223,7 @@ class NewsController extends StudipController
}
}
if
(
$id
===
'new'
)
{
if
(
$id
===
'new'
)
{
unset
(
$id
)
;
$id
=
null
;
PageLayout
::
setTitle
(
_
(
'Ankündigung erstellen'
));
PageLayout
::
setTitle
(
_
(
'Ankündigung erstellen'
));
}
else
}
else
PageLayout
::
setTitle
(
_
(
'Ankündigung bearbeiten'
));
PageLayout
::
setTitle
(
_
(
'Ankündigung bearbeiten'
));
...
@@ -275,7 +275,7 @@ class NewsController extends StudipController
...
@@ -275,7 +275,7 @@ class NewsController extends StudipController
return
;
return
;
}
}
$ranges
=
$news_template
->
news_ranges
->
toArray
();
$ranges
=
$news_template
->
news_ranges
->
toArray
();
$changed_areas
=
0
;
// remove those ranges for which user doesn't have permission
// remove those ranges for which user doesn't have permission
foreach
(
$ranges
as
$key
=>
$news_range
)
foreach
(
$ranges
as
$key
=>
$news_range
)
if
(
!
$news
->
haveRangePermission
(
'edit'
,
$news_range
[
'range_id'
]))
{
if
(
!
$news
->
haveRangePermission
(
'edit'
,
$news_range
[
'range_id'
]))
{
...
@@ -457,17 +457,19 @@ class NewsController extends StudipController
...
@@ -457,17 +457,19 @@ class NewsController extends StudipController
$remove_ranges
[
$news_id
][]
=
$range_id
;
$remove_ranges
[
$news_id
][]
=
$range_id
;
}
}
$this
->
flash
[
'question_text'
]
=
remove_news
(
$remove_ranges
);
$this
->
flash
[
'question_text'
]
=
remove_news
(
$remove_ranges
);
$this
->
flash
[
'question_param'
]
=
[
'mark_news'
=>
Request
::
optionArray
(
'mark_news'
),
$this
->
flash
[
'question_param'
]
=
[
'remove_marked_news'
=>
1
];
'mark_news'
=>
Request
::
optionArray
(
'mark_news'
),
'remove_marked_news'
=>
1
];
}
}
// apply filter
// apply filter
if
(
Request
::
submitted
(
'apply_news_filter'
))
{
if
(
Request
::
submitted
(
'apply_news_filter'
))
{
$this
->
news_isvisible
[
'basic'
]
=
!
$this
->
news_isvisible
[
'basic'
];
$this
->
news_isvisible
[
'basic'
]
=
!
$this
->
news_isvisible
[
'basic'
];
if
(
Request
::
get
(
'news_searchterm'
)
&&
mb_strlen
(
trim
(
Request
::
get
(
'news_searchterm'
)))
<
3
)
{
if
(
Request
::
get
(
'news_searchterm'
)
&&
mb_strlen
(
trim
(
Request
::
get
(
'news_searchterm'
)))
<
3
)
{
PageLayout
::
postError
(
_
(
'Der Suchbegriff muss mindestens 3 Zeichen lang sein.'
));
PageLayout
::
postError
(
_
(
'Der Suchbegriff muss mindestens 3 Zeichen lang sein.'
));
}
elseif
((
Request
::
get
(
'news_startdate'
)
&&
!
$this
->
getTimeStamp
(
Request
::
get
(
'news_startdate'
)
,
'start'
))
||
(
Request
::
get
(
'news_enddate'
)
&&
!
$this
->
getTimeStamp
(
Request
::
get
(
'news_enddate'
),
'end'
)))
{
}
elseif
((
Request
::
get
(
'news_startdate'
)
&&
!
$this
->
getTimeStamp
(
Request
::
get
(
'news_startdate'
)))
||
(
Request
::
get
(
'news_enddate'
)
&&
!
$this
->
getTimeStamp
(
Request
::
get
(
'news_enddate'
),
'end'
)))
{
PageLayout
::
postError
(
_
(
'Ungültige Datumsangabe. Bitte geben Sie ein Datum im Format TT.MM.JJJJ ein.'
));
PageLayout
::
postError
(
_
(
'Ungültige Datumsangabe. Bitte geben Sie ein Datum im Format TT.MM.JJJJ ein.'
));
}
elseif
(
Request
::
get
(
'news_startdate'
)
&&
Request
::
get
(
'news_enddate'
)
&&
(
$this
->
getTimeStamp
(
Request
::
get
(
'news_startdate'
)
,
'start'
)
>
$this
->
getTimeStamp
(
Request
::
get
(
'news_enddate'
),
'end'
)))
{
}
elseif
(
Request
::
get
(
'news_startdate'
)
&&
Request
::
get
(
'news_enddate'
)
&&
(
$this
->
getTimeStamp
(
Request
::
get
(
'news_startdate'
))
>
$this
->
getTimeStamp
(
Request
::
get
(
'news_enddate'
),
'end'
)))
{
PageLayout
::
postError
(
_
(
'Das Startdatum muss vor dem Enddatum liegen.'
));
PageLayout
::
postError
(
_
(
'Das Startdatum muss vor dem Enddatum liegen.'
));
}
}
...
@@ -475,7 +477,7 @@ class NewsController extends StudipController
...
@@ -475,7 +477,7 @@ class NewsController extends StudipController
$this
->
news_searchterm
=
Request
::
get
(
'news_searchterm'
);
$this
->
news_searchterm
=
Request
::
get
(
'news_searchterm'
);
}
}
$this
->
news_startdate
=
$this
->
getTimeStamp
(
Request
::
get
(
'news_startdate'
)
,
'start'
);
$this
->
news_startdate
=
$this
->
getTimeStamp
(
Request
::
get
(
'news_startdate'
));
$this
->
news_enddate
=
$this
->
getTimeStamp
(
Request
::
get
(
'news_enddate'
),
'end'
)
?:
time
();
$this
->
news_enddate
=
$this
->
getTimeStamp
(
Request
::
get
(
'news_enddate'
),
'end'
)
?:
time
();
}
}
// fetch news list
// fetch news list
...
@@ -528,8 +530,10 @@ class NewsController extends StudipController
...
@@ -528,8 +530,10 @@ class NewsController extends StudipController
// has trash icon been clicked?
// has trash icon been clicked?
if
(
Request
::
submitted
(
'news_remove_'
.
$news
[
'object'
]
->
news_id
.
'_'
.
$news
[
'range_id'
])
&&
Request
::
isPost
())
{
if
(
Request
::
submitted
(
'news_remove_'
.
$news
[
'object'
]
->
news_id
.
'_'
.
$news
[
'range_id'
])
&&
Request
::
isPost
())
{
$this
->
flash
[
'question_text'
]
=
remove_news
([
$news
[
'object'
]
->
news_id
=>
$news
[
'range_id'
]]);
$this
->
flash
[
'question_text'
]
=
remove_news
([
$news
[
'object'
]
->
news_id
=>
$news
[
'range_id'
]]);
$this
->
flash
[
'question_param'
]
=
[
'mark_news'
=>
[
$news
[
'object'
]
->
news_id
.
'_'
.
$news
[
'range_id'
]],
$this
->
flash
[
'question_param'
]
=
[
'remove_marked_news'
=>
1
];
'mark_news'
=>
[
$news
[
'object'
]
->
news_id
.
'_'
.
$news
[
'range_id'
]],
'remove_marked_news'
=>
1
];
}
}
// check if result set too big
// check if result set too big
$counter
++
;
$counter
++
;
...
@@ -645,7 +649,7 @@ class NewsController extends StudipController
...
@@ -645,7 +649,7 @@ class NewsController extends StudipController
$statement
->
bindValue
(
':semester_id'
,
$current_semester
->
semester_id
);
$statement
->
bindValue
(
':semester_id'
,
$current_semester
->
semester_id
);
$statement
->
execute
();
$statement
->
execute
();
$seminars
=
$statement
->
fetchAll
(
PDO
::
FETCH_ASSOC
);
$seminars
=
$statement
->
fetchAll
(
PDO
::
FETCH_ASSOC
);
foreach
(
$seminars
as
$key
=>
$sem
)
{
foreach
(
$seminars
as
$sem
)
{
$tmp_result
[
$sem
[
'Seminar_id'
]]
=
[
$tmp_result
[
$sem
[
'Seminar_id'
]]
=
[
'name'
=>
$sem
[
'sem_name'
],
'name'
=>
$sem
[
'sem_name'
],
'type'
=>
'sem'
,
'type'
=>
'sem'
,
...
@@ -676,7 +680,7 @@ class NewsController extends StudipController
...
@@ -676,7 +680,7 @@ class NewsController extends StudipController
$statement
->
bindValue
(
':semester_id'
,
$next_semester
->
semester_id
);
$statement
->
bindValue
(
':semester_id'
,
$next_semester
->
semester_id
);
$statement
->
execute
();
$statement
->
execute
();
$seminars
=
$statement
->
fetchAll
(
PDO
::
FETCH_ASSOC
);
$seminars
=
$statement
->
fetchAll
(
PDO
::
FETCH_ASSOC
);
foreach
(
$seminars
as
$key
=>
$sem
)
{
foreach
(
$seminars
as
$sem
)
{
$tmp_result
[
$sem
[
'Seminar_id'
]]
=
[
$tmp_result
[
$sem
[
'Seminar_id'
]]
=
[
'name'
=>
$sem
[
'sem_name'
],
'name'
=>
$sem
[
'sem_name'
],
'type'
=>
'sem'
,
'type'
=>
'sem'
,
...
...
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