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

View File

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

View File

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

View File

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