kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-17 23:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1056

Browse Source
This commit is contained in:
James Cole
2017-12-19 19:25:50 +01:00
parent e21e339cb0
commit a69aad878e
25 changed files with 114 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/ConfigurationController.php
View File

@@ -23,7 +23,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsLimitedUser;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Middleware\IsSandStormUser;
use FireflyIII\Http\Requests\ConfigurationRequest;
use FireflyIII\Support\Facades\FireflyConfig;
use Preferences;
@@ -51,7 +52,8 @@ class ConfigurationController extends Controller
return $next($request);
}
);
$this->middleware(IsLimitedUser::class)->except(['index']);
$this->middleware(IsDemoUser::class)->except(['index']);
$this->middleware(IsSandStormUser::class);
}
/**

6
app/Http/Controllers/Admin/HomeController.php
View File

@@ -24,7 +24,8 @@ namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Events\AdminRequestedTestMessage;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsLimitedUser;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Middleware\IsSandStormUser;
use Illuminate\Http\Request;
use Log;
use Session;
@@ -40,7 +41,8 @@ class HomeController extends Controller
public function __construct()
{
parent::__construct();
$this->middleware(IsLimitedUser::class)->except(['index']);
$this->middleware(IsDemoUser::class)->except(['index']);
$this->middleware(IsSandStormUser::class)->except(['index']);
}

5
app/Http/Controllers/Admin/LinkController.php
View File

@@ -23,7 +23,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsLimitedUser;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Middleware\IsSandStormUser;
use FireflyIII\Http\Requests\LinkTypeFormRequest;
use FireflyIII\Models\LinkType;
use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
@@ -51,7 +52,7 @@ class LinkController extends Controller
return $next($request);
}
);
$this->middleware(IsLimitedUser::class)->except(['index', 'show']);
$this->middleware(IsDemoUser::class)->except(['index', 'show']);
}
/**

6
app/Http/Controllers/Admin/UserController.php
View File

@@ -23,7 +23,8 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsLimitedUser;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Middleware\IsSandStormUser;
use FireflyIII\Http\Requests\UserFormRequest;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\User;
@@ -52,7 +53,8 @@ class UserController extends Controller
return $next($request);
}
);
$this->middleware(IsLimitedUser::class)->except(['index', 'show']);
$this->middleware(IsDemoUser::class)->except(['index', 'show']);
$this->middleware(IsSandStormUser::class);
}
/**

6
app/Http/Controllers/HomeController.php
View File

@@ -27,7 +27,8 @@ use Carbon\Carbon;
use DB;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Http\Middleware\IsLimitedUser;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Middleware\IsSandStormUser;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -55,7 +56,8 @@ class HomeController extends Controller
parent::__construct();
app('view')->share('title', 'Firefly III');
app('view')->share('mainTitleIcon', 'fa-fire');
$this->middleware(IsLimitedUser::class)->except(['dateRange', 'index']);
$this->middleware(IsDemoUser::class)->except(['dateRange', 'index']);
$this->middleware(IsSandStormUser::class)->only('routes');
}
/**

4
app/Http/Controllers/Import/ConfigurationController.php
View File

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Import;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsLimitedUser;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Import\Configuration\ConfiguratorInterface;
use FireflyIII\Models\ImportJob;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
@@ -57,7 +57,7 @@ class ConfigurationController extends Controller
return $next($request);
}
);
$this->middleware(IsLimitedUser::class)->except(['index']);
$this->middleware(IsDemoUser::class)->except(['index']);
}
/**

4
app/Http/Controllers/Import/IndexController.php
View File

@@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Import;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsLimitedUser;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Import\Routine\ImportRoutine;
use FireflyIII\Import\Routine\RoutineInterface;
use FireflyIII\Models\ImportJob;
@@ -61,7 +61,7 @@ class IndexController extends Controller
}
);
$this->middleware(IsLimitedUser::class)->except(['create','index']);
$this->middleware(IsDemoUser::class)->except(['create','index']);
}
/**

6
app/Http/Controllers/ProfileController.php
View File

@@ -26,7 +26,8 @@ use Auth;
use FireflyIII\Events\UserChangedEmail;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Exceptions\ValidationException;
use FireflyIII\Http\Middleware\IsLimitedUser;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Middleware\IsSandStormUser;
use FireflyIII\Http\Requests\DeleteAccountFormRequest;
use FireflyIII\Http\Requests\EmailFormRequest;
use FireflyIII\Http\Requests\ProfileFormRequest;
@@ -62,7 +63,8 @@ class ProfileController extends Controller
return $next($request);
}
);
$this->middleware(IsLimitedUser::class)->except(['confirmEmailChange', 'index', 'undoEmailChange']);
$this->middleware(IsDemoUser::class)->except(['index']);
$this->middleware(IsSandStormUser::class)->except('index');
}
/**