mirror of
https://github.com/YunoHost-Apps/roundcube_ynh.git
synced 2024-09-03 20:16:28 +02:00
Merge branch 'testing' into 1.5.0
This commit is contained in:
commit
3107098e26
2 changed files with 15 additions and 0 deletions
|
@ -8,6 +8,7 @@
|
|||
|
||||
source _common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
ynh_abort_if_errors
|
||||
|
||||
#=================================================
|
||||
# RETRIEVE ARGUMENTS
|
||||
|
|
14
sources/patches/app-fix-login-page-when-ssoed.patch
Normal file
14
sources/patches/app-fix-login-page-when-ssoed.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
diff -ruN roundcube.orig/index.php roundcube/index.php
|
||||
--- roundcube.orig/index.php 2021-04-26 14:48:33.169655413 +0200
|
||||
+++ roundcube/index.php 2021-04-26 14:54:07.594479133 +0200
|
||||
@@ -210,6 +210,10 @@
|
||||
if (!$RCMAIL->session->check_auth()) {
|
||||
$RCMAIL->kill_session();
|
||||
$session_error = 'sessionerror';
|
||||
+ if (!empty($_SERVER['PHP_AUTH_USER'])) {
|
||||
+ header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
|
||||
+ exit;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in a new issue