blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 14:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixed not-array-error-msg in Ampelverwaltung

Browse Source
This commit is contained in:
Cris
2018-09-13 09:39:50 +02:00
parent b564c67a76
commit 352ccf530c
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/tools/ampelverwaltung.php
+14 -4
View File
@@ -112,7 +112,10 @@ list(
getUserAmpelData($user);
//sort ampeln
$user_ampel_arr = sortUserAmpelData($user_ampel_arr);
if (!empty($user_ampel_arr))
{
$user_ampel_arr = sortUserAmpelData($user_ampel_arr);
}
//filter ampeln for popup (if at least one mandatory, which is neither expired nor before vorlaufzeit)
if ($is_popup)
@@ -224,20 +227,27 @@ function getUserAmpelData($user)
function sortUserAmpelData($user_ampel_arr)
{
//first: sort deadline
$deadline_arr = array();
foreach ($user_ampel_arr as $key => $val)
$deadline[$key] = $val['deadline'];
{
$deadline_arr[$key] = $val['deadline'];
}
array_multisort($deadline, SORT_DESC, $user_ampel_arr);
array_multisort($deadline_arr, SORT_DESC, $user_ampel_arr);
//second: sort inactive after active
$active_ampel_arr = array();
$inactive_ampel_arr = array();
foreach ($user_ampel_arr as $user_ampel)
{
if ($user_ampel['active'])
{
$active_ampel_arr[] = $user_ampel;
}
else
{
$inactive_ampel_arr[] = $user_ampel;
}
}
return $user_ampel_arr = array_merge($active_ampel_arr, $inactive_ampel_arr);
}