From 3492b3ed3e9f507c8c526ba478e41564d5c92d32 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Fri, 16 Jun 2017 09:08:11 +0200
Subject: [PATCH] Bugfix
---
app/Http/Controllers/AdminInterface.php | 10 ++++++----
resources/views/admin/count.blade.php | 3 +--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/Http/Controllers/AdminInterface.php b/app/Http/Controllers/AdminInterface.php
index c846657a7..f25ae6402 100644
--- a/app/Http/Controllers/AdminInterface.php
+++ b/app/Http/Controllers/AdminInterface.php
@@ -132,14 +132,16 @@ class AdminInterface extends Controller
}else{
$result = "";
foreach($oldLogs as $key => $value){
- $result .= '"' . date("D, d M y", mktime(date("H"),date("i"), date("s"), date("m"), date("d")-$key, date("Y"))) . '",';
- $result .= '"' . $value['sameTime'] . '",';
- $result .= '"' . $value['insgesamt'] . '",';
- $result .= '"' . $value['median'] . '"' . "\r\n";
+ $resultTmp = '"' . date("D, d M y", mktime(date("H"),date("i"), date("s"), date("m"), date("d")-$key, date("Y"))) . '",';
+ $resultTmp .= '"' . $value['sameTime'] . '",';
+ $resultTmp .= '"' . $value['insgesamt'] . '",';
+ $resultTmp .= '"' . $value['median'] . '"' . "\r\n";
+ $result = $resultTmp . $result;
}
return response($result, 200)
->header('Content-Type', 'text/csv')
->header('Content-Disposition', 'attachment; filename="count.csv"');
+
}
}
diff --git a/resources/views/admin/count.blade.php b/resources/views/admin/count.blade.php
index b57724b4c..494cffc8e 100644
--- a/resources/views/admin/count.blade.php
+++ b/resources/views/admin/count.blade.php
@@ -4,9 +4,8 @@
@section('content')
<h2>{{ exec("uptime") }}</h2>
- <h2>
<table class="table table-striped">
- <caption>Daten der letzten <form method="POST"><input type="number" name="days" value="{{days}}" /> Tage <button type="submit" class="btn btn-sm btn-default">Aktualisieren</button><button type="submit" name="out" value="csv" class="btn btn-sm btn-default">Als CSV exportieren</button></form></caption>
+ <caption>Daten der letzten <form method="POST"><input type="number" name="days" value="{{$days}}" /> Tage <button type="submit" class="btn btn-sm btn-default">Aktualisieren</button><button type="submit" name="out" value="csv" class="btn btn-sm btn-default">Als CSV exportieren</button></form></caption>
<tr>
<th>Datum</th>
<th>Suchanfragen zur gleichen Zeit</th>
--
GitLab