removed token requirement for core update

This commit is contained in:
denisdulici 2017-09-21 18:07:30 +03:00
parent 3b3e3bbb66
commit 380bd753e3
3 changed files with 9 additions and 17 deletions

View File

@ -6,26 +6,11 @@ use App\Http\Controllers\Controller;
use App\Models\Module\Module as Model;
use App\Utilities\Updater;
use App\Utilities\Versions;
use Illuminate\Routing\Route;
use Module;
class Updates extends Controller
{
/**
* Instantiate a new controller instance.
*
* @param Route $route
*/
public function __construct(Route $route)
{
if (!setting('general.api_token')) {
return redirect('modules/token/create')->send();
}
parent::__construct($route);
}
/**
* Show the form for creating a new resource.
*

View File

@ -124,7 +124,7 @@ class Updater
// Get data from cache
$data = Cache::get('updates');
if (!empty($data) || !setting('general.api_token')) {
if (!empty($data)) {
return $data;
}

View File

@ -60,7 +60,7 @@ class Versions
// Get data from cache
$data = Cache::get('versions');
if (!empty($data) || !setting('general.api_token')) {
if (!empty($data)) {
return $data;
}
@ -74,6 +74,13 @@ class Versions
$data['core'] = static::getLatestVersion($url);
// API token required for modules
if (!setting('general.api_token')) {
Cache::put('versions', $data, Date::now()->addHour(6));
return $data;
}
// Then modules
foreach ($modules as $module) {
$alias = $module->get('alias');