diff --git a/app/Http/Controllers/Modules/Item.php b/app/Http/Controllers/Modules/Item.php index b302ac4f9..3e804520f 100644 --- a/app/Http/Controllers/Modules/Item.php +++ b/app/Http/Controllers/Modules/Item.php @@ -213,12 +213,12 @@ class Item extends Controller flash($message)->success(); - return redirect('modules/item/' . $alias)->send(); + return redirect('modules/' . $alias)->send(); } - public function enabled($alias) + public function enable($alias) { - $json = $this->enabledModule($alias); + $json = $this->enableModule($alias); $module = Module::where('alias', $alias)->first(); @@ -240,12 +240,12 @@ class Item extends Controller flash($message)->success(); - return redirect('modules/item/' . $alias)->send(); + return redirect('modules/' . $alias)->send(); } - public function disabled($alias) + public function disable($alias) { - $json = $this->disabledModule($alias); + $json = $this->disableModule($alias); $module = Module::where('alias', $alias)->first(); @@ -267,6 +267,6 @@ class Item extends Controller flash($message)->success(); - return redirect('modules/item/' . $alias)->send(); + return redirect('modules/' . $alias)->send(); } } diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index 1892e8aa7..5a550cffb 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -238,7 +238,7 @@ trait Modules ]; } - public function enabledModule($alias) + public function enableModule($alias) { $module = Module::findByAlias($alias); @@ -259,7 +259,7 @@ trait Modules ]; } - public function disabledModule($alias) + public function disableModule($alias) { $module = Module::findByAlias($alias); @@ -289,6 +289,7 @@ trait Modules $headers['headers'] = [ 'Authorization' => 'Bearer ' . setting('general.api_token'), 'Accept' => 'application/json', + 'referer' => env('APP_URL'), ]; $data['http_errors'] = false; diff --git a/app/Traits/SiteApi.php b/app/Traits/SiteApi.php index b06bb16e4..b76477a7e 100644 --- a/app/Traits/SiteApi.php +++ b/app/Traits/SiteApi.php @@ -16,6 +16,7 @@ trait SiteApi $headers['headers'] = array( 'Authorization' => 'Bearer ' . setting('general.api_token'), 'Accept' => 'application/json', + 'referer' => env('APP_URL'), ); $data['http_errors'] = false; diff --git a/app/Utilities/Updater.php b/app/Utilities/Updater.php index dbb4c3573..6c951b430 100644 --- a/app/Utilities/Updater.php +++ b/app/Utilities/Updater.php @@ -102,7 +102,7 @@ class Updater $url = 'modules/items/' . $alias . '/download/' . $version . '/' . $info['akaunting'] . '/' . $info['token']; } - $response = static::getRemote($url, ['timeout' => 30, 'referer' => true, 'track_redirects' => true]); + $response = static::getRemote($url, ['timeout' => 30, 'track_redirects' => true]); if ($response->getStatusCode() == 200) { $file = $response->getBody()->getContents(); diff --git a/resources/views/partials/modules/item.blade.php b/resources/views/partials/modules/item.blade.php index 9b1121830..7a7866d66 100644 --- a/resources/views/partials/modules/item.blade.php +++ b/resources/views/partials/modules/item.blade.php @@ -1,13 +1,13 @@
diff --git a/routes/web.php b/routes/web.php index 500b775de..b31cf78dd 100644 --- a/routes/web.php +++ b/routes/web.php @@ -89,18 +89,18 @@ Route::group(['middleware' => 'language'], function () { Route::group(['prefix' => 'modules'], function () { Route::resource('token', 'Modules\Token'); Route::resource('home', 'Modules\Home'); - Route::get('category/{alias}', 'Modules\Tiles@category'); + Route::get('categories/{alias}', 'Modules\Tiles@category'); Route::get('paid', 'Modules\Tiles@paid'); Route::get('new', 'Modules\Tiles@new'); Route::get('free', 'Modules\Tiles@free'); - Route::post('item/steps', 'Modules\Item@steps'); - Route::post('item/download', 'Modules\Item@download'); - Route::post('item/unzip', 'Modules\Item@unzip'); - Route::post('item/install', 'Modules\Item@install'); - Route::get('item/{alias}/uninstall', 'Modules\Item@uninstall'); - Route::get('item/{alias}/enabled', 'Modules\Item@enabled'); - Route::get('item/{alias}/disabled', 'Modules\Item@disabled'); - Route::resource('item', 'Modules\Item'); + Route::post('steps', 'Modules\Item@steps'); + Route::post('download', 'Modules\Item@download'); + Route::post('unzip', 'Modules\Item@unzip'); + Route::post('install', 'Modules\Item@install'); + Route::get('{alias}/uninstall', 'Modules\Item@uninstall'); + Route::get('{alias}/enable', 'Modules\Item@enable'); + Route::get('{alias}/disable', 'Modules\Item@disable'); + Route::get('{alias}', 'Modules\Item@show'); }); Route::group(['prefix' => 'install'], function () {