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

Fix patch by & transform EOL to CRLF as agendav 2.2.1+ archive uses

Browse source
This commit is contained in:
Nicolas Frandeboeuf 2021-10-01 13:12:56 +00:00
parent 2373262f81
commit dc8b2cf105
1 changed files with 55 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
sources/patches/app-00-add-http-auth.patch
View file

@ -1,53 +1,55 @@
--- a/web/app/controllers.php diff --git a/web/app/controllers.php b/web/app/controllers.php
+++ b/web/app/controllers.php index 08db57e3..3d186c5e 100644
@@ -58,14 +58,20 @@ $controllers->before(function(Request $request, Silex\Application $app) { --- a/web/app/controllers.php
// processing the request +++ b/web/app/controllers.php
if ($app['session']->has('username')) { @@ -58,14 +58,20 @@ $controllers->before(function(Request $request, Silex\Application $app) {
$username = $app['session']->get('username'); // processing the request
- $preferences = $app['preferences.repository']->userPreferences($username); if ($app['session']->has('username')) {
- $app['user.preferences'] = $preferences; $username = $app['session']->get('username');
- $app['user.timezone'] = $preferences->get('timezone'); - $preferences = $app['preferences.repository']->userPreferences($username);
- - $app['user.preferences'] = $preferences;
- // Set application language - $app['user.timezone'] = $preferences->get('timezone');
- $request->setLocale($preferences->get('language')); -
- $app['translator']->setLocale($preferences->get('language')); - // Set application language
- return; - $request->setLocale($preferences->get('language'));
+ // Clear user session if HTTP authentication changed - $app['translator']->setLocale($preferences->get('language'));
+ if (isset($_SERVER['PHP_AUTH_USER']) - return;
+ && $username != $_SERVER['PHP_AUTH_USER']) { + // Clear user session if HTTP authentication changed
+ $app['session']->clear(); + if (isset($_SERVER['PHP_AUTH_USER'])
+ } else { + && $username != $_SERVER['PHP_AUTH_USER']) {
+ $preferences = $app['preferences.repository']->userPreferences($username); + $app['session']->clear();
+ $app['user.preferences'] = $preferences; + } else {
+ $app['user.timezone'] = $preferences->get('timezone'); + $preferences = $app['preferences.repository']->userPreferences($username);
+ + $app['user.preferences'] = $preferences;
+ // Set application language + $app['user.timezone'] = $preferences->get('timezone');
+ $request->setLocale($preferences->get('language')); +
+ $app['translator']->setLocale($preferences->get('language')); + // Set application language
+ return; + $request->setLocale($preferences->get('language'));
+ } + $app['translator']->setLocale($preferences->get('language'));
} + return;
+ }
if ($request->isXmlHttpRequest()) { }
diff --git a/web/src/Controller/Authentication.php b/web/src/Controller/Authentication.php
index deebb751..134cc9a8 100644 if ($request->isXmlHttpRequest()) {
--- a/web/src/Controller/Authentication.php diff --git a/web/src/Controller/Authentication.php b/web/src/Controller/Authentication.php
+++ b/web/src/Controller/Authentication.php index deebb751..134cc9a8 100644
@@ -34,9 +34,14 @@ class Authentication --- a/web/src/Controller/Authentication.php
$success = false; +++ b/web/src/Controller/Authentication.php
$template_vars = []; @@ -34,9 +34,14 @@ class Authentication
$success = false;
- if ($request->isMethod('POST')) { $template_vars = [];
- $user = $request->request->get('user');
- $password = $request->request->get('password'); - if ($request->isMethod('POST')) {
+ if ($request->isMethod('POST') || isset($_SERVER['PHP_AUTH_USER'])) { - $user = $request->request->get('user');
+ if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) { - $password = $request->request->get('password');
+ $user = $_SERVER['PHP_AUTH_USER']; + if ($request->isMethod('POST') || isset($_SERVER['PHP_AUTH_USER'])) {
+ $password = $_SERVER['PHP_AUTH_PW']; + if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+ } else { + $user = $_SERVER['PHP_AUTH_USER'];
+ $user = $request->request->get('user'); + $password = $_SERVER['PHP_AUTH_PW'];
+ $password = $request->request->get('password'); + } 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');
if (empty($user) || empty($password)) {
$template_vars['error'] = $app['translator']->trans('messages.error_empty_fields');