diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php index 5892e1d5..e1c2000a 100644 --- a/app/Http/Controllers/ItemController.php +++ b/app/Http/Controllers/ItemController.php @@ -66,7 +66,7 @@ class ItemController extends Controller $item = Item::findOrFail($id); $item->pinned = true; $item->save(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route); } @@ -80,7 +80,7 @@ class ItemController extends Controller $item = Item::findOrFail($id); $item->pinned = false; $item->save(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route); } @@ -105,7 +105,7 @@ class ItemController extends Controller $data['ajax'] = true; return view('sortable', $data); } else { - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route); } } @@ -188,7 +188,7 @@ class ItemController extends Controller $item->parents()->sync($request->tags); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success', __('app.alert.success.item_created')); } @@ -265,7 +265,7 @@ class ItemController extends Controller $item->parents()->sync($request->tags); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.item_updated')); } @@ -288,7 +288,7 @@ class ItemController extends Controller Item::find($id)->delete(); } - $route = route('items.index', [], false); + $route = route('items.index', []); return redirect($route) ->with('success',__('app.alert.success.item_deleted')); } @@ -306,7 +306,7 @@ class ItemController extends Controller ->where('id', $id) ->restore(); - $route = route('items.inded', [], false); + $route = route('items.inded', []); return redirect($route) ->with('success',__('app.alert.success.item_restored')); } diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 71297a5a..3d79db50 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -47,7 +47,7 @@ class SettingsController extends Controller 'setting' => $setting, ]); } else { - $route = route('settings.list', [], false); + $route = route('settings.list', []); return redirect($route) ->with([ 'error' => __('app.alert.error.not_exist'), @@ -85,13 +85,13 @@ class SettingsController extends Controller $user->settings()->detach($setting->id); $user->settings()->save($setting, ['uservalue' => $setting_value]); - $route = route('settings.index', [], false); + $route = route('settings.index', []); return redirect($route) ->with([ 'success' => __('app.alert.success.setting_updated'), ]); } else { - $route = route('settings.index', [], false); + $route = route('settings.index', []); return redirect($route) ->with([ 'error' => __('app.alert.error.not_exist'), @@ -111,7 +111,7 @@ class SettingsController extends Controller $user->settings()->detach($setting->id); $user->settings()->save($setting, ['uservalue' => '']); } - $route = route('settings.index', [], false); + $route = route('settings.index', []); return redirect($route) ->with([ 'success' => __('app.alert.success.setting_updated'), diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 324cfabe..77723911 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -74,7 +74,7 @@ class TagController extends Controller //die(print_r($request->all())); Item::create($request->all()); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success', __('app.alert.success.tag_created')); } @@ -139,7 +139,7 @@ class TagController extends Controller Item::find($id)->update($request->all()); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.tag_updated')); } @@ -162,7 +162,7 @@ class TagController extends Controller Item::find($id)->delete(); } - $route = route('tags.index', [], false); + $route = route('tags.index', []); return redirect($route) ->with('success',__('app.alert.success.item_deleted')); } @@ -179,7 +179,7 @@ class TagController extends Controller Item::withTrashed() ->where('id', $id) ->restore(); - $route = route('tags.index', [], false); + $route = route('tags.index', []); return redirect($route) ->with('success',__('app.alert.success.item_restored')); } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index df28a1f8..7448cd22 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -80,7 +80,7 @@ class UserController extends Controller $user->save(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.user_updated')); } @@ -150,7 +150,7 @@ class UserController extends Controller $user->save(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.user_updated')); @@ -166,7 +166,7 @@ class UserController extends Controller { if($user->id !== 1) { $user->delete(); - $route = route('dash', [], false); + $route = route('dash', []); return redirect($route) ->with('success',__('app.alert.success.user_deleted')); diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 4d7d39c8..7945af40 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -12,7 +12,7 @@ class TrustProxies extends Middleware * * @var array */ - protected $proxies = ['192.168.0.0/16', '172.16.0.0/12','10.0.0.0/8']; + protected $proxies = ['192.168.0.0/16', '172.16.0.0/12','10.0.0.0/8', '127.0.0.1']; /** * The current proxy header mappings. diff --git a/resources/views/item.blade.php b/resources/views/item.blade.php index c6b21582..738dbe96 100644 --- a/resources/views/item.blade.php +++ b/resources/views/item.blade.php @@ -13,6 +13,6 @@ link_target !!} href="{{ $app->link }}"> - + diff --git a/resources/views/items/form.blade.php b/resources/views/items/form.blade.php index be2656bb..45fb3415 100644 --- a/resources/views/items/form.blade.php +++ b/resources/views/items/form.blade.php @@ -16,7 +16,7 @@ - {{ __('app.buttons.cancel') }} + {{ __('app.buttons.cancel') }}
{!! __('app.dash.no_apps', [ - 'link1' => ''.__('app.dash.link1').'', + 'link1' => ''.__('app.dash.link1').'', 'link2' => ''.__('app.dash.link2').'' ]) !!}