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

Tidying

main
Bob Mottram 2020-07-11 21:17:55 +01:00
parent 9f38c43254
commit 5fb01a6368
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon.py
View File

@ -2386,7 +2386,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.httpPrefix, self.server.httpPrefix,
self.server.domainFull, self.server.domainFull,
postId, postTime, postId, postTime,
postYear, postMonth, postDay) postYear, postMonth, postDay,
callingDomain)
if not msg: if not msg:
actor = \ actor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \

28
webinterface.py
View File

@ -79,6 +79,19 @@ from petnames import getPetName
from followingCalendar import receivingCalendarEvents from followingCalendar import receivingCalendarEvents
def getUrlPath(actor: str, domainFull: str, callingDomain: str) -> str:
"""Returns path from url
"""
postActor = actor
if callingDomain not in actor and domainFull in actor:
if callingDomain.endswith('.onion') or \
callingDomain.endswith('.i2p'):
postActor = \
'http://' + callingDomain + actor.split(domainFull)[1]
print('Changed POST domain from ' + actor + ' to ' + postActor)
return postActor
def getContentWarningButton(postID: str, translate: {}, def getContentWarningButton(postID: str, translate: {},
content: str) -> str: content: str) -> str:
"""Returns the markup for a content warning button """Returns the markup for a content warning button
@ -5162,14 +5175,8 @@ def htmlDeletePost(recentPostsCache: {}, maxRecentPosts: int,
deletePostStr += \ deletePostStr += \
' <p class="followText">' + \ ' <p class="followText">' + \
translate['Delete this post?'] + '</p>' translate['Delete this post?'] + '</p>'
postActor = actor
if callingDomain not in actor and domainFull in actor:
if callingDomain.endswith('.onion') or \
callingDomain.endswith('.i2p'):
postActor = \
'http://' + callingDomain + actor.split(domainFull)[1]
print('Changed POST domain from ' + actor + ' to ' + postActor)
postActor = getUrlPath(actor, domainFull, callingDomain)
deletePostStr += \ deletePostStr += \
' <form method="POST" action="' + postActor + '/rmpost">' ' <form method="POST" action="' + postActor + '/rmpost">'
deletePostStr += \ deletePostStr += \
@ -5194,7 +5201,7 @@ def htmlCalendarDeleteConfirm(translate: {}, baseDir: str,
path: str, httpPrefix: str, path: str, httpPrefix: str,
domainFull: str, postId: str, postTime: str, domainFull: str, postId: str, postTime: str,
year: int, monthNumber: int, year: int, monthNumber: int,
dayNumber: int) -> str: dayNumber: int, callingDomain: str) -> str:
"""Shows a screen asking to confirm the deletion of a calendar event """Shows a screen asking to confirm the deletion of a calendar event
""" """
nickname = getNicknameFromActor(path) nickname = getNicknameFromActor(path)
@ -5232,7 +5239,10 @@ def htmlCalendarDeleteConfirm(translate: {}, baseDir: str,
deletePostStr += '<center>' deletePostStr += '<center>'
deletePostStr += ' <p class="followText">' + \ deletePostStr += ' <p class="followText">' + \
translate['Delete this event'] + '</p>' translate['Delete this event'] + '</p>'
deletePostStr += ' <form method="POST" action="' + actor + '/rmpost">'
postActor = getUrlPath(actor, domainFull, callingDomain)
deletePostStr += \
' <form method="POST" action="' + postActor + '/rmpost">'
deletePostStr += ' <input type="hidden" name="year" value="' + \ deletePostStr += ' <input type="hidden" name="year" value="' + \
str(year) + '">' str(year) + '">'
deletePostStr += ' <input type="hidden" name="month" value="' + \ deletePostStr += ' <input type="hidden" name="month" value="' + \