indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Removing a shared item

merge-requests/30/head
Bob Mottram 2021-07-28 15:27:20 +01:00
parent c41aacba6f
commit a5a6f2da89
3 changed files with 9 additions and 10 deletions

14
daemon.py
View File

@ -3351,14 +3351,14 @@ class PubServer(BaseHTTPRequestHandler):
shareActor = removeShareConfirmParams.split('actor=')[1] shareActor = removeShareConfirmParams.split('actor=')[1]
if '&' in shareActor: if '&' in shareActor:
shareActor = shareActor.split('&')[0] shareActor = shareActor.split('&')[0]
shareName = removeShareConfirmParams.split('shareName=')[1] itemID = removeShareConfirmParams.split('itemID=')[1]
if '&' in shareName: if '&' in itemID:
shareName = shareName.split('&')[0] itemID = itemID.split('&')[0]
shareNickname = getNicknameFromActor(shareActor) shareNickname = getNicknameFromActor(shareActor)
if shareNickname: if shareNickname:
shareDomain, sharePort = getDomainFromActor(shareActor) shareDomain, sharePort = getDomainFromActor(shareActor)
removeSharedItem(baseDir, removeSharedItem(baseDir,
shareNickname, shareDomain, shareName, shareNickname, shareDomain, itemID,
httpPrefix, domainFull) httpPrefix, domainFull)
if callingDomain.endswith('.onion') and onionDomain: if callingDomain.endswith('.onion') and onionDomain:
@ -11256,8 +11256,8 @@ class PubServer(BaseHTTPRequestHandler):
# remove a shared item # remove a shared item
if htmlGET and '?rmshare=' in self.path: if htmlGET and '?rmshare=' in self.path:
shareName = self.path.split('?rmshare=')[1] itemID = self.path.split('?rmshare=')[1]
shareName = urllib.parse.unquote_plus(shareName.strip()) itemID = urllib.parse.unquote_plus(itemID.strip())
usersPath = self.path.split('?rmshare=')[0] usersPath = self.path.split('?rmshare=')[0]
actor = \ actor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
@ -11265,7 +11265,7 @@ class PubServer(BaseHTTPRequestHandler):
msg = htmlConfirmRemoveSharedItem(self.server.cssCache, msg = htmlConfirmRemoveSharedItem(self.server.cssCache,
self.server.translate, self.server.translate,
self.server.baseDir, self.server.baseDir,
actor, shareName, actor, itemID,
callingDomain) callingDomain)
if not msg: if not msg:
if callingDomain.endswith('.onion') and \ if callingDomain.endswith('.onion') and \

3
shares.py
View File

@ -99,7 +99,7 @@ def getValidSharedItemID(actor: str, displayName: str) -> str:
def removeSharedItem(baseDir: str, nickname: str, domain: str, def removeSharedItem(baseDir: str, nickname: str, domain: str,
displayName: str, itemID: str,
httpPrefix: str, domainFull: str) -> None: httpPrefix: str, domainFull: str) -> None:
"""Removes a share for a person """Removes a share for a person
""" """
@ -114,7 +114,6 @@ def removeSharedItem(baseDir: str, nickname: str, domain: str,
return return
actor = httpPrefix + '://' + domainFull + '/users/' + nickname actor = httpPrefix + '://' + domainFull + '/users/' + nickname
itemID = getValidSharedItemID(actor, displayName)
if sharesJson.get(itemID): if sharesJson.get(itemID):
# remove any image for the item # remove any image for the item
itemIDfile = baseDir + '/sharefiles/' + nickname + '/' + itemID itemIDfile = baseDir + '/sharefiles/' + nickname + '/' + itemID

2
webapp_confirm.py
View File

@ -151,7 +151,7 @@ def htmlConfirmRemoveSharedItem(cssCache: {}, translate: {}, baseDir: str,
sharesStr += ' <form method="POST" action="' + postActor + '/rmshare">\n' sharesStr += ' <form method="POST" action="' + postActor + '/rmshare">\n'
sharesStr += \ sharesStr += \
' <input type="hidden" name="actor" value="' + actor + '">\n' ' <input type="hidden" name="actor" value="' + actor + '">\n'
sharesStr += ' <input type="hidden" name="shareName" value="' + \ sharesStr += ' <input type="hidden" name="itemID" value="' + \
itemID + '">\n' itemID + '">\n'
sharesStr += \ sharesStr += \
' <button type="submit" class="button" name="submitYes">' + \ ' <button type="submit" class="button" name="submitYes">' + \