nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-28 02:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

helpers refactoring

Browse Source
This commit is contained in:
Peter Papp
2021-03-31 08:27:28 +02:00
parent 6ac6528243
commit a8fa3694be
30 changed files with 85 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/LanguageController.php
+4 -12
View File
@@ -56,9 +56,7 @@ class LanguageController extends Controller
*/
public function create_language(CreateLanguageRequest $request)
{
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
$language = Language::create([
'name' => $request->input('name'),
@@ -78,9 +76,7 @@ class LanguageController extends Controller
*/
public function update_language(UpdateLanguageRequest $request, Language $language)
{
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
$language->update(make_single_input($request));
@@ -98,9 +94,7 @@ class LanguageController extends Controller
*/
public function update_string(UpdateStringRequest $request, Language $language)
{
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
$language
->languageStrings()
@@ -122,9 +116,7 @@ class LanguageController extends Controller
*/
public function delete_language(Language $language)
{
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
if ($language->locale === 'en') {
abort(401, "Sorry, you can't delete default language.");
app/Http/Controllers/Admin/PagesController.php
+1 -3
View File
@@ -51,9 +51,7 @@ class PagesController extends Controller
*/
public function update(Request $request, Page $page)
{
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
$page->update(
make_single_input($request)
app/Http/Controllers/Admin/PlanController.php
+2 -6
View File
@@ -110,9 +110,7 @@ class PlanController extends Controller
*/
public function update(Request $request, $id)
{
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
// Update plan
$this->stripe->updatePlan($request, $id);
@@ -131,9 +129,7 @@ class PlanController extends Controller
*/
public function delete($id)
{
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
// Delete plan
$this->stripe->deletePlan($id);
app/Http/Controllers/Admin/SettingController.php
+3 -9
View File
@@ -49,9 +49,7 @@ class SettingController extends Controller
*/
public function update(Request $request)
{
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
// Store image if exist
if ($request->hasFile($request->name)) {
@@ -84,9 +82,7 @@ class SettingController extends Controller
public function set_email(Request $request)
{
// TODO: pridat validator do requestu
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
if (!app()->runningUnitTests()) {
@@ -178,9 +174,7 @@ class SettingController extends Controller
*/
public function flush_cache()
{
if (is_demo()) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo(), 204, 'Done.');
if (!app()->runningUnitTests()) {
Artisan::call('cache:clear');
app/Http/Controllers/Admin/UserController.php
+1 -2
View File
@@ -22,7 +22,6 @@ use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Password;
use Storage;
@@ -182,7 +181,7 @@ class UserController extends Controller
$user = User::forceCreate([
'role' => $request->role,
'email' => $request->email,
'password' => Hash::make($request->password),
'password' => bcrypt($request->password),
]);
UserSettings::unguard();
app/Http/Controllers/App/SetupWizardController.php
+1 -2
View File
@@ -21,7 +21,6 @@ use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Str;
use Schema;
@@ -413,7 +412,7 @@ class SetupWizardController extends Controller
$user = User::forceCreate([
'role' => 'admin',
'email' => $request->email,
'password' => Hash::make($request->password),
'password' => bcrypt($request->password),
]);
$user
app/Http/Controllers/Auth/AuthController.php
-6
View File
@@ -3,14 +3,8 @@
namespace App\Http\Controllers\Auth;
use App\Http\Requests\Auth\CheckAccountRequest;
use App\Models\Setting;
use App\Models\User;
use App\Models\UserSettings;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Route;
class AuthController extends Controller
{
app/Http/Controllers/FileManager/EditItemsController.php
+2 -6
View File
@@ -82,9 +82,7 @@ class EditItemsController extends Controller
*/
public function delete_item(DeleteItemRequest $request)
{
if (is_demo_account('howdy@hi5ve.digital')) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
foreach ($request->input('items') as $item) {
$this->filemanager->delete_item($item, $item['id']);
@@ -117,9 +115,7 @@ class EditItemsController extends Controller
*/
public function move(MoveItemRequest $request)
{
if (is_demo_account('howdy@hi5ve.digital')) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
$this->filemanager->move($request, $request->to_id);
app/Http/Controllers/FileManager/ShareController.php
+2 -5
View File
@@ -12,10 +12,7 @@ use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Notification;
use Illuminate\Support\Str;
use Validator;
class ShareController extends Controller
@@ -44,7 +41,7 @@ class ShareController extends Controller
{
// Create shared options
$shared = Share::create([
'password' => $request->has('password') ? Hash::make($request->password) : null,
'password' => $request->has('password') ? bcrypt($request->password) : null,
'type' => $request->type === 'folder' ? 'folder' : 'file',
'is_protected' => $request->isPassword,
'permission' => $request->permission ?? null,
@@ -87,7 +84,7 @@ class ShareController extends Controller
'permission' => $request->permission,
'is_protected' => $request->protected,
'expire_in' => $request->expiration,
'password' => $request->password ? Hash::make($request->password) : $shared->password,
'password' => $request->password ? bcrypt($request->password) : $shared->password,
]);
// Return shared record
app/Http/Controllers/FileManager/TrashController.php
+2 -6
View File
@@ -43,9 +43,7 @@ class TrashController extends Controller
// Get user id
$user_id = Auth::id();
if (is_demo($user_id)) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
foreach ($request->input('items') as $restore) {
@@ -96,9 +94,7 @@ class TrashController extends Controller
// Get user id
$user_id = Auth::id();
if (is_demo($user_id)) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
// Get files and folders
$folders = Folder::onlyTrashed()->where('user_id', $user_id)->get();
app/Http/Controllers/Sharing/ManipulateShareItemsController.php
+3 -6
View File
@@ -121,9 +121,8 @@ class ManipulateShareItemsController extends Controller
*/
public function delete_item(DeleteItemRequest $request, Share $shared)
{
if (is_demo_account($shared->user->email)) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo_account($shared->user->email), 204, 'Done.');
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
@@ -195,9 +194,7 @@ class ManipulateShareItemsController extends Controller
*/
public function move(MoveItemRequest $request, Share $shared)
{
if (is_demo_account($shared->user->email)) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo_account($shared->user->email), 204, 'Done.');
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
app/Http/Controllers/User/AccountController.php
+4 -12
View File
@@ -3,8 +3,6 @@
namespace App\Http\Controllers\User;
use App\Http\Requests\User\UpdateUserPasswordRequest;
use App\Models\File;
use App\Models\Folder;
use App\Http\Resources\InvoiceCollection;
use App\Http\Resources\StorageDetailResource;
use App\Http\Resources\UserResource;
@@ -14,10 +12,7 @@ use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Support\Facades\Validator;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use Illuminate\Http\Request;
use ByteUnits\Metric;
use App\Models\User;
class AccountController extends Controller
{
@@ -88,9 +83,7 @@ class AccountController extends Controller
$user = Auth::user();
// Check if is demo
if (is_demo($user->id)) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
// Update avatar
if ($request->hasFile('avatar')) {
@@ -123,12 +116,11 @@ class AccountController extends Controller
// Get user
$user = Auth::user();
if (is_demo($user->id)) {
return $this->demo->response_with_no_content();
}
// Check if is demo
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
// Change and store new password
$user->password = Hash::make($request->input('password'));
$user->password = bcrypt($request->input('password'));
$user->save();
return response('Changed!', 204);
app/Http/Controllers/User/PaymentMethodsController.php
+2 -6
View File
@@ -97,9 +97,7 @@ class PaymentMethodsController extends Controller
$user = Auth::user();
// Check if is demo
if (is_demo($user->id)) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
// Update DefaultPayment Method
$user->updateDefaultPaymentMethod($id);
@@ -147,9 +145,7 @@ class PaymentMethodsController extends Controller
$user = Auth::user();
// Check if is demo
if (is_demo($user->id)) {
return $this->demo->response_with_no_content();
}
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
// Get payment method
$paymentMethod = $user->findPaymentMethod($id);