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

udpate global patches

Browse source
This commit is contained in:
Krakinou 2019-01-13 20:57:54 +01:00
parent 4e40df22a6
commit cbdef9bda7
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sources/patches/app-web.patch
View file

@ -1,19 +1,20 @@
--- a/cps/web.py 2019-01-12 09:01:08.000000000 +0100 --- ./ori-calibre-web/cps/web.py 2019-01-12 09:01:08.000000000 +0100
+++ b/cps/web.py 2019-01-13 16:13:23.000000000 +0100 +++ ./calibre-web-Yunohost_integration/cps/web.py 2019-01-13 20:11:57.000000000 +0100
@@ -58,6 +58,8 @@ @@ -58,6 +58,8 @@
import server import server
from reverseproxy import ReverseProxied from reverseproxy import ReverseProxied
+global vlogout +vlogout = 0
+ +
try: try:
from googleapiclient.errors import HttpError from googleapiclient.errors import HttpError
except ImportError: except ImportError:
@@ -2360,10 +2362,28 @@ @@ -2360,10 +2362,29 @@
return redirect(url_for('basic_configuration')) return redirect(url_for('basic_configuration'))
if current_user is not None and current_user.is_authenticated: if current_user is not None and current_user.is_authenticated:
return redirect(url_for('index')) return redirect(url_for('index'))
+ auth_user = request.headers.get('X-Remote-User') + auth_user = request.headers.get('X-Remote-User')
+ global vlogout
+ if auth_user and config.config_use_ldap and not vlogout: + if auth_user and config.config_use_ldap and not vlogout:
+ vlogout = 0 + vlogout = 0
+ user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == auth_user.strip().lower()).first() + user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == auth_user.strip().lower()).first()
@ -39,15 +40,16 @@
login_user(user, remember=True) login_user(user, remember=True)
flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success") flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
return redirect_back(url_for("index")) return redirect_back(url_for("index"))
@@ -2384,6 +2404,7 @@ @@ -2384,6 +2405,8 @@
@login_required @login_required
def logout(): def logout():
if current_user is not None and current_user.is_authenticated: if current_user is not None and current_user.is_authenticated:
+ global vlogout
+ vlogout = 1 + vlogout = 1
logout_user() logout_user()
return redirect(url_for('login')) return redirect(url_for('login'))
@@ -3088,6 +3109,21 @@ @@ -3088,6 +3111,21 @@
if "config_ebookconverter" in to_save: if "config_ebookconverter" in to_save:
content.config_ebookconverter = int(to_save["config_ebookconverter"]) content.config_ebookconverter = int(to_save["config_ebookconverter"])