From c46da1a5bed7f8bd23e0afa66a0fd9f50e0253e6 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 1 May 2022 09:35:33 +0200
Subject: [PATCH] remove patchs

---
 sources/patches/app-00-auth.patch       | 20 ----------------
 sources/patches/app-00-controller.patch | 31 -------------------------
 2 files changed, 51 deletions(-)
 delete mode 100644 sources/patches/app-00-auth.patch
 delete mode 100644 sources/patches/app-00-controller.patch

diff --git a/sources/patches/app-00-auth.patch b/sources/patches/app-00-auth.patch
deleted file mode 100644
index cd7b47f..0000000
--- a/sources/patches/app-00-auth.patch
+++ /dev/null
@@ -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');
diff --git a/sources/patches/app-00-controller.patch b/sources/patches/app-00-controller.patch
deleted file mode 100644
index 5f7dfde..0000000
--- a/sources/patches/app-00-controller.patch
+++ /dev/null
@@ -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'])) {