YunoHost-Apps/agendav_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/agendav_ynh.git synced 2024-09-03 20:36:12 +02:00
Code Issues Activity Actions

remove patchs

Browse source
This commit is contained in:
ericgaspar 2022-05-01 09:35:33 +02:00
parent a419d7b6f5
commit c46da1a5be
2 changed files with 0 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sources/patches/app-00-auth.patch
View file

@ -1,20 +0,0 @@
--- a/web/src/Controller/Authentication.php
+++ b/web/src/Controller/Authentication.php
@@ -34,9 +34,14 @@
$success = false;
$template_vars = [];
- if ($request->isMethod('POST')) {
- $user = $request->request->get('user');
- $password = $request->request->get('password');
+ if ($request->isMethod('POST') || isset($_SERVER['PHP_AUTH_USER'])) {
+ if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+ $user = $_SERVER['PHP_AUTH_USER'];
+ $password = $_SERVER['PHP_AUTH_PW'];
+ } else {
+ $user = $request->request->get('user');
+ $password = $request->request->get('password');
+ }
if (empty($user) || empty($password)) {
$template_vars['error'] = $app['translator']->trans('messages.error_empty_fields');

31
sources/patches/app-00-controller.patch
View file

@ -1,31 +0,0 @@
--- a/web/app/controllers.php
+++ b/web/app/controllers.php
@@ -58,14 +58,20 @@
// processing the request
if ($app['session']->has('username')) {
$username = $app['session']->get('username');
- $preferences = $app['preferences.repository']->userPreferences($username);
- $app['user.preferences'] = $preferences;
- $app['user.timezone'] = $preferences->get('timezone');
-
- // Set application language
- $request->setLocale($preferences->get('language'));
- $app['translator']->setLocale($preferences->get('language'));
- return;
+ // Clear user session if HTTP authentication changed
+ if (isset($_SERVER['PHP_AUTH_USER'])
+ && $username != $_SERVER['PHP_AUTH_USER']) {
+ $app['session']->clear();
+ } else {
+ $preferences = $app['preferences.repository']->userPreferences($username);
+ $app['user.preferences'] = $preferences;
+ $app['user.timezone'] = $preferences->get('timezone');
+
+ // Set application language
+ $request->setLocale($preferences->get('language'));
+ $app['translator']->setLocale($preferences->get('language'));
+ return;
+ }
}
if (isset($app['auth.methods'])) {