implement GRIDs

This commit is contained in:
2018-08-01 22:19:30 +02:00
parent 8988df93fd
commit 755c65a42d
12 changed files with 203 additions and 37 deletions
+10 -3
View File
@@ -189,12 +189,19 @@ class TableController extends Controller
// Preparing data to insert into the Rows table
$rowsData = null;
try {
$rowsData = array_map(function ($row) use ($columns) {
if (count($row) == 0 || count($row)==1&&$row[0]=='') return null;
$grid_range = Row::allocateGRIDs(count($rowTable));
$grid_cnt = $grid_range[0];
$rowsData = array_map(function ($row) use ($columns, &$grid_cnt) {
if (count($row) == 0 || count($row) == 1 && $row[0] == '') return null;
if (count($row) != count($columns)) {
throw new NotApplicableException("All rows must have " . count($columns) . " fields.");
}
$parsed = [];
$parsed = [
'_grid' => $grid_cnt++
];
foreach ($row as $i => $val) {
$key = $columns[$i]->name;
if (strlen($val) > 255) {
+14 -7
View File
@@ -2,6 +2,13 @@
namespace App\Http;
use App\Http\Middleware\ActivatedAccount;
use App\Http\Middleware\EncryptCookies;
use App\Http\Middleware\RedirectIfAuthenticated;
use App\Http\Middleware\ThrottleIfNotDebug;
use App\Http\Middleware\TrimStrings;
use App\Http\Middleware\TrustProxies;
use App\Http\Middleware\VerifyCsrfToken;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
class Kernel extends HttpKernel
@@ -16,9 +23,9 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
TrustProxies::class,
];
/**
@@ -29,12 +36,12 @@ class Kernel extends HttpKernel
protected $middlewareGroups = [
'web' => [
'throttle:120,15', // try to prevent people refresh-spamming the server to game table visit counts
\App\Http\Middleware\EncryptCookies::class,
EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
// \Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
VerifyCsrfToken::class,
'bindings',
],
@@ -52,14 +59,14 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'activated' => \App\Http\Middleware\ActivatedAccount::class,
'activated' => ActivatedAccount::class,
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'guest' => RedirectIfAuthenticated::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'throttle' => ThrottleIfNotDebug::class,
];
}
@@ -0,0 +1,19 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Routing\Middleware\ThrottleRequests;
class ThrottleIfNotDebug extends ThrottleRequests
{
public function handle($request, \Closure $next, $maxAttempts = 60, $decayMinutes = 1)
{
if (config('app.debug')) {
return $next($request);
}
return parent::handle($request, $next, $maxAttempts, $decayMinutes);
}
}