From fdbeca267e5dbedcb5295fef0c686ee513906472 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Wed, 6 Apr 2022 22:23:22 +0500
Subject: [PATCH 1/2] change file manager location

---
 baseTemplate/templates/baseTemplate/index.html | 14 ++++++++------
 baseTemplate/views.py                          |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index 18d2ad160..57282e9af 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -333,12 +333,6 @@
                                        data-original-title=".icon-comments-alt" aria-describedby="tooltip896208"></i>
                                     <span>{% trans "Community" %}</span>
                                 </a>
-                                <a href="{% url 'Filemanager' %}"
-                                   title="{% trans 'FileManager' %}">
-                                    <i class="glyph-icon tooltip-button icon-link" title="{% trans 'FileManager' %}"
-                                       data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
-                                    <span>{% trans "FileManager" %}</span>
-                                </a>
 
                             {% endif %}
                         </li>
@@ -741,6 +735,14 @@
                         {% if admin %}
 
                             <li class="header"><span>{% trans "Server" %}</span></li>
+                            <li>
+                                <a href="{% url 'Filemanager' %}"
+                                   title="{% trans 'FileManager' %}">
+                                    <i class="glyph-icon tooltip-button icon-link" title="{% trans 'FileManager' %}"
+                                       data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
+                                    <span>{% trans "FileManager" %}</span>
+                                </a>
+                            </li>
 
 
 
diff --git a/baseTemplate/views.py b/baseTemplate/views.py
index 1127a37a5..3d7b4f2b5 100755
--- a/baseTemplate/views.py
+++ b/baseTemplate/views.py
@@ -314,7 +314,6 @@ def FileManager(request):
 
     template = 'baseTemplate/FileManager.html'
 
-
     proc = httpProc(request, template,)
     return proc.render()
 

From d4e55339a16ee8d0b686a3699ac95a485364e69b Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Wed, 6 Apr 2022 22:27:47 +0500
Subject: [PATCH 2/2] add permissions to root FM

---
 .../templates/baseTemplate/FileManager.html      |  2 +-
 baseTemplate/views.py                            | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/baseTemplate/templates/baseTemplate/FileManager.html b/baseTemplate/templates/baseTemplate/FileManager.html
index 5824d9bdf..12f387f07 100644
--- a/baseTemplate/templates/baseTemplate/FileManager.html
+++ b/baseTemplate/templates/baseTemplate/FileManager.html
@@ -41,7 +41,7 @@
 
 <nav id="navBar" class="navbar navbar-expand-lg navbar-light bg-light">
     <div class="header-logo">
-        <a href="/websites/{{ domainName }}"><img src="{% static 'filemanager/images/fileManager.png' %}"> <span style="display: none" id="domainNameInitial">{{ domainName }}</span></a>
+        <a href="{% url 'index' %}"><img src="{% static 'filemanager/images/fileManager.png' %}"> <span style="display: none" id="domainNameInitial">{{ domainName }}</span></a>
     </div>
     <!--- second bar ---->
 
diff --git a/baseTemplate/views.py b/baseTemplate/views.py
index 3d7b4f2b5..822409565 100755
--- a/baseTemplate/views.py
+++ b/baseTemplate/views.py
@@ -300,17 +300,13 @@ def getthemedata(request):
 
 
 def FileManager(request):
-    ### Load Custom CSS
-    try:
-        from baseTemplate.models import CyberPanelCosmetic
-        cosmetic = CyberPanelCosmetic.objects.get(pk=1)
-    except:
-        from baseTemplate.models import CyberPanelCosmetic
-        cosmetic = CyberPanelCosmetic()
-        cosmetic.save()
-
-
+    val = request.session['userID']
+    currentACL = ACLManager.loadedACL(val)
 
+    if currentACL['admin'] == 1:
+        pass
+    else:
+        return ACLManager.loadErrorJson('FilemanagerAdmin', 0)
 
     template = 'baseTemplate/FileManager.html'