From e08e12de1f78d21d9c7c84e7846b2c8cd9e39fee Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 12 Nov 2019 10:59:17 +0000 Subject: [PATCH] Change password on edit profile screen --- daemon.py | 9 ++++++++- translations/ar.json | 4 +++- translations/ca.json | 4 +++- translations/cy.json | 4 +++- translations/de.json | 4 +++- translations/en.json | 4 +++- translations/es.json | 4 +++- translations/fr.json | 4 +++- translations/ga.json | 4 +++- translations/hi.json | 4 +++- translations/it.json | 4 +++- translations/ja.json | 4 +++- translations/oc.json | 4 +++- translations/pt.json | 4 +++- translations/ru.json | 4 +++- translations/zh.json | 4 +++- webinterface.py | 6 ++++++ 17 files changed, 59 insertions(+), 16 deletions(-) diff --git a/daemon.py b/daemon.py index 8d693e4a6..dbcfc1901 100644 --- a/daemon.py +++ b/daemon.py @@ -65,6 +65,7 @@ from auth import authorize from auth import createPassword from auth import createBasicAuthHeader from auth import authorizeBasic +from auth import storeBasicCredentials from threads import threadWithTrace from threads import removeDormantThreads from media import getMediaPath @@ -3139,7 +3140,7 @@ class PubServer(BaseHTTPRequestHandler): print('profile update POST '+mType+' image saved to '+postImageFilename) actorChanged=True else: - print('ERROR: profile update POST '+mType+' image could not be saved to '+postImageFilename) + print('ERROR: profile update POST '+mType+' image could not be saved to '+postImageFilename) fields=extractTextFieldsInPOST(postBytes,boundary,self.server.debug) if self.server.debug: @@ -3175,6 +3176,12 @@ class PubServer(BaseHTTPRequestHandler): if len(actorJson['skills'].items())!=len(newSkills.items()): actorChanged=True actorJson['skills']=newSkills + if fields.get('password'): + if fields.get('passwordconfirm'): + if actorJson['password']==fields['passwordconfirm']: + if len(actorJson['password'])>2: + # set password + storeBasicCredentials(self.server.baseDir,nickname,actorJson['password']) if fields.get('displayNickname'): if fields['displayNickname']!=actorJson['name']: actorJson['name']=fields['displayNickname'] diff --git a/translations/ar.json b/translations/ar.json index 047c77e26..eaa071f71 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -171,5 +171,7 @@ "Snooze": "غفوة", "Unsnooze": "استيقظ", "Donations link": "رابط التبرعات", - "Donate": "تبرع" + "Donate": "تبرع", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/ca.json b/translations/ca.json index db7c1b3bd..3eaa8ea90 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -171,5 +171,7 @@ "Snooze": "Dormitar", "Unsnooze": "Desperta", "Donations link": "Enllaç de donacions", - "Donate": "Donar" + "Donate": "Donar", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/cy.json b/translations/cy.json index 5226a3cbc..1a8257513 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -171,5 +171,7 @@ "Snooze": "Cwsg", "Unsnooze": "Deffro", "Donations link": "Dolen rhoddion", - "Donate": "Cyfrannu" + "Donate": "Cyfrannu", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/de.json b/translations/de.json index 922b68745..3943134fc 100644 --- a/translations/de.json +++ b/translations/de.json @@ -171,5 +171,7 @@ "Snooze": "Schläfchen", "Unsnooze": "Aufwachen", "Donations link": "Spenden Link", - "Donate": "Spenden" + "Donate": "Spenden", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/en.json b/translations/en.json index 51a334e6a..f83ee038d 100644 --- a/translations/en.json +++ b/translations/en.json @@ -171,5 +171,7 @@ "Snooze": "Snooze", "Unsnooze": "Unsnooze", "Donations link": "Donations link", - "Donate": "Donate" + "Donate": "Donate", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/es.json b/translations/es.json index 4d841d4e4..3500e66fb 100644 --- a/translations/es.json +++ b/translations/es.json @@ -171,5 +171,7 @@ "Snooze": "dormitar", "Unsnooze": "Despierta", "Donations link": "Enlace de donaciones", - "Donate": "Donar" + "Donate": "Donar", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/fr.json b/translations/fr.json index 9293ff162..18047642c 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -171,5 +171,7 @@ "Snooze": "Roupillon", "Unsnooze": "Réveillez-vous", "Donations link": "Lien vers les dons", - "Donate": "Faire un don" + "Donate": "Faire un don", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/ga.json b/translations/ga.json index d19bbaf0c..bae1a501b 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -171,5 +171,7 @@ "Snooze": "Codladh", "Unsnooze": "Dúisigh", "Donations link": "Nasc síntiús", - "Donate": "Síntiús" + "Donate": "Síntiús", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/hi.json b/translations/hi.json index 8830e7b5e..6338ac095 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -171,5 +171,7 @@ "Snooze": "दिन में झपकी लेना", "Unsnooze": "उठो", "Donations link": "दान लिंक", - "Donate": "दान करना" + "Donate": "दान करना", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/it.json b/translations/it.json index a96badb41..df270aab2 100644 --- a/translations/it.json +++ b/translations/it.json @@ -171,5 +171,7 @@ "Snooze": "Sonnellino", "Unsnooze": "Svegliati", "Donations link": "Link alle donazioni", - "Donate": "Donare" + "Donate": "Donare", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/ja.json b/translations/ja.json index 2c14e7594..3f63f1a7b 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -171,5 +171,7 @@ "Snooze": "スヌーズ", "Unsnooze": "目を覚ます", "Donations link": "寄付リンク", - "Donate": "寄付する" + "Donate": "寄付する", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/oc.json b/translations/oc.json index 81e627c24..f26e69114 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -167,5 +167,7 @@ "Undo the repeat": "Anullar lo partatge", "Repeat this post": "Repetir la publicacion", "Show profile": "Veire lo perfil", - "SHOW MORE": "NE VEIRE MAI" + "SHOW MORE": "NE VEIRE MAI", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/pt.json b/translations/pt.json index 834e744ea..6427ff2d1 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -171,5 +171,7 @@ "Snooze": "Soneca", "Unsnooze": "Acorde", "Donations link": "Link de doações", - "Donate": "Doar" + "Donate": "Doar", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/ru.json b/translations/ru.json index da89b2996..fb067ab73 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -171,5 +171,7 @@ "Snooze": "вздремнуть", "Unsnooze": "Проснись", "Donations link": "Ссылка на пожертвования", - "Donate": "жертвовать" + "Donate": "жертвовать", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/translations/zh.json b/translations/zh.json index 8b41e9f0e..3586ae5bd 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -171,5 +171,7 @@ "Snooze": "打盹", "Unsnooze": "醒来", "Donations link": "捐款连结", - "Donate": "捐" + "Donate": "捐", + "Change Password": "Change Password", + "Confirm Password": "Confirm Password" } diff --git a/webinterface.py b/webinterface.py index 6dd4a39c3..729d769dc 100644 --- a/webinterface.py +++ b/webinterface.py @@ -627,6 +627,12 @@ def htmlEditProfile(translate: {},baseDir: str,path: str,domain: str,port: int) editProfileForm+=' accept=".png">' editProfileForm+=' ' editProfileForm+='
' + editProfileForm+=translate['Change Password']+'
' + editProfileForm+=' ' + editProfileForm+=translate['Confirm Password']+'
' + editProfileForm+=' ' + editProfileForm+='
' + editProfileForm+='
' editProfileForm+=' '+translate['Approve follower requests']+'
' editProfileForm+=' '+translate['This is a bot account']+'
' editProfileForm+=' '+translate['This is a group account']+'
'