mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ability to clear some fields

main
Bob Mottram 2019-12-17 23:21:59 +00:00
parent 07ec615e6f
commit 29d0a8dcc6
1 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
daemon.py
View File

@ -4287,43 +4287,69 @@ class PubServer(BaseHTTPRequestHandler):
if fields.get('themeDropdown'): if fields.get('themeDropdown'):
setTheme(self.server.baseDir,fields['themeDropdown']) setTheme(self.server.baseDir,fields['themeDropdown'])
#self.server.iconsCache={} #self.server.iconsCache={}
currentEmailAddress=getEmailAddress(actorJson)
if fields.get('email'): if fields.get('email'):
currentEmailAddress=getEmailAddress(actorJson)
if fields['email']!=currentEmailAddress: if fields['email']!=currentEmailAddress:
setEmailAddress(actorJson,fields['email']) setEmailAddress(actorJson,fields['email'])
actorChanged=True actorChanged=True
else:
if currentEmailAddress:
setEmailAddress(actorJson,'')
actorChanged=True
currentXmppAddress=getXmppAddress(actorJson)
if fields.get('xmppAddress'): if fields.get('xmppAddress'):
currentXmppAddress=getXmppAddress(actorJson)
if fields['xmppAddress']!=currentXmppAddress: if fields['xmppAddress']!=currentXmppAddress:
setXmppAddress(actorJson,fields['xmppAddress']) setXmppAddress(actorJson,fields['xmppAddress'])
actorChanged=True actorChanged=True
else:
if currentXmppAddress:
setXmppAddress(actorJson,'')
actorChanged=True
currentMatrixAddress=getMatrixAddress(actorJson)
if fields.get('matrixAddress'): if fields.get('matrixAddress'):
currentMatrixAddress=getMatrixAddress(actorJson)
if fields['matrixAddress']!=currentMatrixAddress: if fields['matrixAddress']!=currentMatrixAddress:
setMatrixAddress(actorJson,fields['matrixAddress']) setMatrixAddress(actorJson,fields['matrixAddress'])
actorChanged=True actorChanged=True
else:
if currentMatrixAddress:
setMatrixAddress(actorJson,'')
actorChanged=True
currentPGPpubKey=getPGPpubKey(actorJson)
if fields.get('pgp'): if fields.get('pgp'):
currentPGPpubKey=getPGPpubKey(actorJson)
if fields['pgp']!=currentPGPpubKey: if fields['pgp']!=currentPGPpubKey:
setPGPpubKey(actorJson,fields['pgp']) setPGPpubKey(actorJson,fields['pgp'])
actorChanged=True actorChanged=True
else:
if currentPGPpubKey:
setPGPpubKey(actorJson,'')
actorChanged=True
currentDonateUrl=getDonationUrl(actorJson)
if fields.get('donateUrl'): if fields.get('donateUrl'):
currentDonateUrl=getDonationUrl(actorJson)
if fields['donateUrl']!=currentDonateUrl: if fields['donateUrl']!=currentDonateUrl:
setDonationUrl(actorJson,fields['donateUrl']) setDonationUrl(actorJson,fields['donateUrl'])
actorChanged=True actorChanged=True
else:
if currentDonateUrl:
setDonationUrl(actorJson,'')
actorChanged=True
if fields.get('instanceTitle'): if fields.get('instanceTitle'):
currInstanceTitle=getConfigParam(self.server.baseDir,'instanceTitle') currInstanceTitle=getConfigParam(self.server.baseDir,'instanceTitle')
if fields['instanceTitle']!=currInstanceTitle: if fields['instanceTitle']!=currInstanceTitle:
setConfigParam(self.server.baseDir,'instanceTitle',fields['instanceTitle']) setConfigParam(self.server.baseDir,'instanceTitle',fields['instanceTitle'])
currInstanceDescriptionShort=getConfigParam(self.server.baseDir,'instanceDescriptionShort')
if fields.get('instanceDescriptionShort'): if fields.get('instanceDescriptionShort'):
currInstanceDescriptionShort=getConfigParam(self.server.baseDir,'instanceDescriptionShort')
if fields['instanceDescriptionShort']!=currInstanceDescriptionShort: if fields['instanceDescriptionShort']!=currInstanceDescriptionShort:
setConfigParam(self.server.baseDir,'instanceDescriptionShort',fields['instanceDescriptionShort']) setConfigParam(self.server.baseDir,'instanceDescriptionShort',fields['instanceDescriptionShort'])
else:
if currInstanceDescriptionShort:
setConfigParam(self.server.baseDir,'instanceDescriptionShort','')
currInstanceDescription=getConfigParam(self.server.baseDir,'instanceDescription')
if fields.get('instanceDescription'): if fields.get('instanceDescription'):
currInstanceDescription=getConfigParam(self.server.baseDir,'instanceDescription')
if fields['instanceDescription']!=currInstanceDescription: if fields['instanceDescription']!=currInstanceDescription:
setConfigParam(self.server.baseDir,'instanceDescription',fields['instanceDescription']) setConfigParam(self.server.baseDir,'instanceDescription',fields['instanceDescription'])
else:
if currInstanceDescription:
setConfigParam(self.server.baseDir,'instanceDescription','')
if fields.get('bio'): if fields.get('bio'):
if fields['bio']!=actorJson['summary']: if fields['bio']!=actorJson['summary']:
actorTags={} actorTags={}
@ -4338,6 +4364,10 @@ class PubServer(BaseHTTPRequestHandler):
for tagName,tag in actorTags.items(): for tagName,tag in actorTags.items():
actorJson['tag'].append(tag) actorJson['tag'].append(tag)
actorChanged=True actorChanged=True
else:
if actorJson['summary']:
actorJson['summary']=''
actorChanged=True
if fields.get('moderators'): if fields.get('moderators'):
adminNickname=getConfigParam(self.server.baseDir,'admin') adminNickname=getConfigParam(self.server.baseDir,'admin')
if self.path.startswith('/users/'+adminNickname+'/'): if self.path.startswith('/users/'+adminNickname+'/'):