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

Merge branch 'testing' into 1.5.0

Browse source
This commit is contained in:
ericgaspar 2021-08-18 19:22:58 +02:00
commit 3107098e26
No known key found for this signature in database
GPG key ID: 574F281483054D44
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/change_url
View file

@ -8,6 +8,7 @@
source _common.sh source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
ynh_abort_if_errors
#================================================= #=================================================
# RETRIEVE ARGUMENTS # RETRIEVE ARGUMENTS

14
sources/patches/app-fix-login-page-when-ssoed.patch Normal file
View 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;
+ }
}
}