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

Removing share via its itemID

merge-requests/30/head
Bob Mottram 2021-07-28 15:22:06 +01:00
parent 4972c68773
commit c41aacba6f
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -11256,22 +11256,18 @@ 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:
print('Debug rmshare: 1: ' + self.path)
shareName = self.path.split('?rmshare=')[1] shareName = self.path.split('?rmshare=')[1]
shareName = urllib.parse.unquote_plus(shareName.strip()) shareName = urllib.parse.unquote_plus(shareName.strip())
print('Debug rmshare: 2: ' + shareName)
usersPath = self.path.split('?rmshare=')[0] usersPath = self.path.split('?rmshare=')[0]
actor = \ actor = \
self.server.httpPrefix + '://' + \ self.server.httpPrefix + '://' + \
self.server.domainFull + usersPath self.server.domainFull + usersPath
print('Debug rmshare: 3: ' + actor)
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, shareName,
callingDomain) callingDomain)
if not msg: if not msg:
print('Debug rmshare: no msg ' + actor)
if callingDomain.endswith('.onion') and \ if callingDomain.endswith('.onion') and \
self.server.onionDomain: self.server.onionDomain:
actor = 'http://' + self.server.onionDomain + usersPath actor = 'http://' + self.server.onionDomain + usersPath

5
webapp_confirm.py
View File

@ -104,11 +104,10 @@ def htmlConfirmDelete(cssCache: {},
def htmlConfirmRemoveSharedItem(cssCache: {}, translate: {}, baseDir: str, def htmlConfirmRemoveSharedItem(cssCache: {}, translate: {}, baseDir: str,
actor: str, shareName: str, actor: str, itemID: str,
callingDomain: str) -> str: callingDomain: str) -> str:
"""Shows a screen asking to confirm the removal of a shared item """Shows a screen asking to confirm the removal of a shared item
""" """
itemID = getValidSharedItemID(actor, shareName)
nickname = getNicknameFromActor(actor) nickname = getNicknameFromActor(actor)
domain, port = getDomainFromActor(actor) domain, port = getDomainFromActor(actor)
domainFull = getFullDomain(domain, port) domainFull = getFullDomain(domain, port)
@ -153,7 +152,7 @@ def htmlConfirmRemoveSharedItem(cssCache: {}, translate: {}, baseDir: str,
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="shareName" value="' + \
shareName + '">\n' itemID + '">\n'
sharesStr += \ sharesStr += \
' <button type="submit" class="button" name="submitYes">' + \ ' <button type="submit" class="button" name="submitYes">' + \
translate['Yes'] + '</button>\n' translate['Yes'] + '</button>\n'