diff --git a/assets/functions.php b/assets/functions.php index c9f0905..015f9bf 100644 --- a/assets/functions.php +++ b/assets/functions.php @@ -2886,10 +2886,10 @@ function getRelativeTime($timestamp) { return $time_just_now; } elseif ($diff < $hour) { $minutes = floor($diff / $minute); - return $minutes.$time_minute . ($minutes != 1 ? $time_minutes : '') . " $suffix"; + return $minutes.(($minutes != 1) ? $time_minutes : $time_minute) . " $suffix"; } elseif ($diff < $day) { $hours = floor($diff / $hour); - return $hours.$time_hour . ($hours != 1 ? $time_hours : '') . " $suffix"; + return $hours.(($hours != 1) ? $time_hours : $time_hour) . " $suffix"; } elseif ($diff < $week) { $days = floor($diff / $day); diff --git a/histories.php b/histories.php index 1c6e1c8..bddbc19 100644 --- a/histories.php +++ b/histories.php @@ -110,13 +110,18 @@ $view .= ' $description = json_decode($response->description) ?? $response->description; $description = json_encode($description, JSON_PRETTY_PRINT); + //Replace JSON ITEMS + $search = ['{', '}', '"',':','[',']',',']; + $replace = ['', '','','=','','','']; + $description = str_replace($search, $replace, $description); + $view .= ' '.$response->historyID.' '.$response->type.' '.$response->created.' '.$response->createdby.' -
' . $description . '
+
' . $description . '
'.$general_view .' '; diff --git a/history.php b/history.php index 8db037a..5bdebc3 100644 --- a/history.php +++ b/history.php @@ -143,12 +143,17 @@ foreach ($responses as $response){ $description = json_decode($response->description) ?? $response->description; $description = json_encode($description, JSON_PRETTY_PRINT); +//Replace JSON ITEMS +$search = ['{', '}', '"',':','[',']',',']; +$replace = ['', '','','=','','','']; +$description = str_replace($search, $replace, $description); + $view .= ' '.$response->historyID.' '.$response->type.' '.$response->created.' '.$response->createdby.' -
' . $description . '
+
' . $description . '
'; if ($update_allowed === 1){ $view .= ' '.$general_view .'