diff --git a/digitaleagentur/utils.py b/digitaleagentur/utils.py index 2750adf..b6096cf 100644 --- a/digitaleagentur/utils.py +++ b/digitaleagentur/utils.py @@ -176,17 +176,20 @@ def getNCLoggedUserBySession(sid): nc_login_headers = {'Authorization' : 'Bearer ' + sid} r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status", headers=nc_login_headers) xpars = xmltodict.parse(r.text) + js = json.dumps(xpars) - final_json = json.loads(js) + + # New user login - set initial status + if(final_json['ocs']['meta']['status'] == 'failure'): + nc_login_headers = {'Authorization' : 'Bearer ' + sid, 'OCS-APIREQUEST' : 'true'} + r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status/status", headers=nc_login_headers, data={'statusType' : 'dnd'}) + + r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status", headers=nc_login_headers) + + xpars = xmltodict.parse(r.text) + js = json.dumps(xpars) + final_json = json.loads(js) + return final_json['ocs']['data']['userId'] - #except: - # return redirect('users-dashboard') - - - - - - - - + \ No newline at end of file diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index 546cb72..eb67271 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -3,7 +3,7 @@ {% block content %}
{% gettimemessage as timemessage %} -

{{timemessage}}, {{request.user.first_name}} {{request.user.last_name}}!

+

{{timemessage}}, {{request.user.first_name}}!

Letzter Login: {{ request.user.last_login }} {% getlocalweather request.user as weatherdata %} {% if request.user.profile.agency.city|length > 0 and weatherdata.0 != None %} diff --git a/users/templates/users/login.html b/users/templates/users/login.html index df8cad8..14ad496 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -1,8 +1,43 @@ {% load static %} -

Sie werden gleich zur neuen Login-Seite der Digitalen Agentur weitergeleitet. Sollte dies nicht gehen, klicken Sie auf folgenden Link:

- https://cloud.digitale-agentur.com/ + +
+
+