Commit 2a970c84 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '1159-settings-page-not-accessible-via-tor-on-en-version' into 'development'

Resolve "Settings page not accessible via Tor on (en) version"

Closes #1159

See merge request !1928
parents abf8ac6b 22d72552
README.md
CHANGELOG.md
docker-compose.yml
Dockerfile
\ No newline at end of file
Dockerfile
.dockerignore
.git
.gitattributes
.gitignore
.gitlab
.gitlab-ci.yml
vendor/
node_modules/
\ No newline at end of file
<?php
Route::get('meta/key', "KeyController@index")->middleware('removekey')->name('keyindex');
Route::post('meta/key', 'KeyController@setKey');
Route::any('meta/key/remove', 'KeyController@removeKey')->name("removeCookie");
Route::group([
'prefix' => 'meta/key/change'
], function () {
// Routes to change the key for members
Route::get('remove-current', 'KeyController@changeKeyIndex')->middleware('removekey')->name('changeKeyOne');
Route::post('remove-current', 'KeyController@removeCurrent')->middleware('removekey');
Route::get('generate-new', 'KeyController@generateNew')->name('changeKeyTwo');
Route::post('generate-new', 'KeyController@generateNewPost');
Route::get('save-new', function () {
return view('keychangethree', ["title" => trans('titles.keychange'), "css" => [mix('css/keychange/index.css')]]);
})->name('changeKeyThree');
});
Route::group(
[
'prefix' => LaravelLocalization::setLocale(), /*,
'middleware' => [ 'localeSessionRedirect', 'localizationRedirect' ]*/
'prefix' => 'meta/settings',
],
function () {
Route::get('meta/key', "KeyController@index")->middleware('removekey')->name('keyindex');
Route::post('meta/key', 'KeyController@setKey');
Route::any('meta/key/remove', 'KeyController@removeKey')->name("removeCookie");
Route::group([
'prefix' => 'meta/key/change'
], function() {
// Routes to change the key for members
Route::get('remove-current', 'KeyController@changeKeyIndex')->middleware('removekey')->name('changeKeyOne');
Route::post('remove-current', 'KeyController@removeCurrent')->middleware('removekey');
Route::get('generate-new', 'KeyController@generateNew')->name('changeKeyTwo');
Route::post('generate-new', 'KeyController@generateNewPost');
Route::get('save-new', function(){
return view('keychangethree', ["title" => trans('titles.keychange'), "css" => [mix('css/keychange/index.css')]]);
})->name('changeKeyThree');
});
Route::group([
'prefix' => 'meta/settings',
],
function () {
Route::get('/', 'SettingsController@index')->name('settings');
Route::post('de', 'SettingsController@disableSearchEngine')->name('disableEngine');
Route::post('ee', 'SettingsController@enableSearchEngine')->name('enableEngine');
Route::post('ef', 'SettingsController@enableFilter')->name('enableFilter');
Route::post('es', 'SettingsController@enableSetting')->name('enableSetting');
Route::post('ds', 'SettingsController@deleteSettings')->name('deleteSettings');
Route::post('nb', 'SettingsController@newBlacklist')->name('newBlacklist');
Route::post('db', 'SettingsController@deleteBlacklist')->name('deleteBlacklist');
Route::post('cb', 'SettingsController@clearBlacklist')->name('clearBlacklist');
# Route to show and delete all settings
Route::get('all-settings', 'SettingsController@allSettingsIndex')->name('showAllSettings');
Route::post('all-settings/removeOne', 'SettingsController@removeOneSetting')->name('removeOneSetting');
Route::post('all-settings/removeAll', 'SettingsController@removeAllSettings')->name('removeAllSettings');
Route::get('load-settings', 'SettingsController@loadSettings')->name('loadSettings');
});
Route::get('/', 'SettingsController@index')->name('settings');
Route::post('de', 'SettingsController@disableSearchEngine')->name('disableEngine');
Route::post('ee', 'SettingsController@enableSearchEngine')->name('enableEngine');
Route::post('ef', 'SettingsController@enableFilter')->name('enableFilter');
Route::post('es', 'SettingsController@enableSetting')->name('enableSetting');
Route::post('ds', 'SettingsController@deleteSettings')->name('deleteSettings');
Route::post('nb', 'SettingsController@newBlacklist')->name('newBlacklist');
Route::post('db', 'SettingsController@deleteBlacklist')->name('deleteBlacklist');
Route::post('cb', 'SettingsController@clearBlacklist')->name('clearBlacklist');
# Route to show and delete all settings
Route::get('all-settings', 'SettingsController@allSettingsIndex')->name('showAllSettings');
Route::post('all-settings/removeOne', 'SettingsController@removeOneSetting')->name('removeOneSetting');
Route::post('all-settings/removeAll', 'SettingsController@removeAllSettings')->name('removeAllSettings');
Route::get('load-settings', 'SettingsController@loadSettings')->name('loadSettings');
}
);
<?php
# In this File we collect all routes which require a session or other cookies to be active
Route::group(
[
'prefix' => LaravelLocalization::setLocale(), /*,
'middleware' => [ 'localeSessionRedirect', 'localizationRedirect' ]*/
],
function () {
Route::match(['get', 'post'], 'meta/verification/{id}/{uid}/{url?}', 'HumanVerification@captcha')->name('verification');
}
);
Route::match(['get', 'post'], 'meta/verification/{id}/{uid}/{url?}', 'HumanVerification@captcha')->name('verification');
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment