From 15363595d8d91bce76974d0e425029b0b75d0d64 Mon Sep 17 00:00:00 2001
From: Holger Trampe <htrampe@gmail.com>
Date: Wed, 1 Sep 2021 16:43:19 +0200
Subject: [PATCH] =?UTF-8?q?Dateien=20werden=20gel=C3=B6scht=20im=20Standar?=
 =?UTF-8?q?d=20wenn=20auch=20in=20Cloud?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/urls.py                                   |   1 +
 api/views.py                                  |  17 ++++++++++++++++-
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 26526 -> 26509 bytes
 standards/templatetags/counter_tag.py         |   1 -
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/api/urls.py b/api/urls.py
index 1731738..f3f50e9 100644
--- a/api/urls.py
+++ b/api/urls.py
@@ -26,4 +26,5 @@ urlpatterns = [
     # EXTERNAL FROM NC
     path('logout/<str:uid>', views.apilogout, name="api-logout"),
     path('uschanged/<str:uid>/<str:sid>', views.userChangedInNc, name="api-userchanged"),
+    path('deletefile/<slug:fid>/<slug:secretkey>', views.deleteNCFile, name="api-deletencfile"),
 ]
\ No newline at end of file
diff --git a/api/views.py b/api/views.py
index 6000778..cb4a38b 100644
--- a/api/views.py
+++ b/api/views.py
@@ -439,4 +439,19 @@ def NCSwitchStandardFiles(request):
 				ncfile = NCFile.objects.create(agency=standard.agency, nc_id=fileid, file_id=f)
 				standard.addedfiles_nc.add(ncfile)
 		return JsonResponse({"status" : response_status})
-	return JsonResponse({"status" : "NO AUTH"})
\ No newline at end of file
+	return JsonResponse({"status" : "NO AUTH"})
+
+@api_view(['GET'], )
+def deleteNCFile(request, fid, secretkey):
+	if request.method == "GET":
+		if(secretkey == '87zuhjk87GHJ546tzgvhas76aaskbdhr45edfVHAKia87s6gbAVGFGSR3451627gBHAKJBN'):
+			try:
+				file_to_del = NCFile.objects.filter(nc_id=fid).first()
+				file_to_del.delete()
+			except:
+				pass
+			return JsonResponse({"status" : 'true'})
+		else:
+			return JsonResponse({"status" : "NO AUTH"})	
+	else:
+		return JsonResponse({"status" : "NO AUTH"})
\ No newline at end of file
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index c73c812a540f0111cd35e013867487a65c3047c1..eb5d89b4967977b7122da1f2902aa2d9e1ac239e 100644
GIT binary patch
delta 66
zcmbPtp0W2lBX1}#FBbz4uzBkz=56FHNn~pQ@~R3Z>&K={{+gJ<$UQkONpJGRqyTOK
SkUAzNMj1wp&F_*numAvET@m{L

delta 101
zcmeA@&p7WqBX1}#FBbz4IJ@g7)@|f1No4B-@~WyP>&Lptm2lQDXK^(%GBSYZ1>7lI
z3mI!!YFJXZB^efQPrjd6!pJi@BuS64VRBtk2(J*xASNb88Ac68uFZFoHn0EyGshW<

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index ba88977..a70e798 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -1141,7 +1141,6 @@ def getNCFileInfosURL(request, ncid):
 	try:
 		filesearchdata = '<?xml version="1.0" encoding="UTF-8"?><d:searchrequest xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns"><d:basicsearch><d:select><d:prop><d:displayname/></d:prop></d:select><d:from><d:scope><d:href>/files/' + request.user.username + '</d:href><d:depth>infinity</d:depth></d:scope></d:from><d:where><d:eq><d:prop><oc:fileid/></d:prop><d:literal>' + str(ncid) + '</d:literal></d:eq></d:where></d:basicsearch></d:searchrequest>'
 		r = requests.request("SEARCH", settings.NEXTCLOUD_URL +  "remote.php/dav/", data=filesearchdata, headers={'Content-Type' : 'text/xml', 'Authorization' : "Bearer " + request.user.profile.nc_sid})
-		print(r.text)
 		split_response = r.text.split("<d:href>")
 		split_fileele = split_response[1].split("</d:href>")
 		# Return file-link except first slash in string