some bug fixes in wp manager

filemanager/views.py

@@ -211,6 +211,9 @@ def FileManagerRoot(request):
 
     try:
 
+        from plogical.processUtilities import ProcessUtilities
+        if ProcessUtilities.decideServer() == ProcessUtilities.OLS:
+
             url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission"
             data = {
                 "name": "Filemanager",
@@ -225,7 +228,8 @@ def FileManagerRoot(request):
                 template = 'baseTemplate/FileManager.html'
             else:
               return  redirect("https://cyberpanel.net/cyberpanel-addons")
-
+        else:
+            template = 'baseTemplate/FileManager.html'
     except BaseException as msg:
         template = 'baseTemplate/FileManager.html'
 

plogical/IncScheduler.py

@@ -383,6 +383,8 @@ class IncScheduler(multi.Thread):
 
                     #logging.writeToFile('job completed')
 
+
+
                     url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission"
                     data = {
                         "name": "backups-retention",
@@ -393,7 +395,7 @@ class IncScheduler(multi.Thread):
                     response = requests.post(url, data=json.dumps(data))
                     Status = response.json()['status']
 
-                    if (Status == 1):
+                    if (Status == 1) or ProcessUtilities.decideServer() == ProcessUtilities.ent:
                         try:
 
                             page_token = None
@@ -457,7 +459,6 @@ class IncScheduler(multi.Thread):
                             except BaseException as msg:
                                     print('An error occurred fetch child: %s' % msg)
                                     logging.writeToFile('An error occurred fetch child: %s' % msg)
-
                         except BaseException as msg:
                             logging.writeToFile('job not completed [ERROR:]..%s'%msg)
 

plogical/acl.py

@@ -931,4 +931,30 @@ class ACLManager:
 
         return wpsites
 
+    @staticmethod
+    def GetServerIP():
+        ipFile = "/etc/cyberpanel/machineIP"
+        f = open(ipFile)
+        ipData = f.read()
+        return ipData.split('\n', 1)[0]
+
+    @staticmethod
+    def CheckForPremFeature(feature):
+        try:
+
+            if ProcessUtilities.decideServer() == ProcessUtilities.ent:
+                return 1
+
+            url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission"
+            data = {
+                "name": feature,
+                "IP": ACLManager.GetServerIP()
+            }
+
+            import requests
+            response = requests.post(url, data=json.dumps(data))
+            return response.json()['status']
+        except:
+            return 1
+
 

websiteFunctions/website.py

@@ -17,7 +17,7 @@ from plogical.virtualHostUtilities import virtualHostUtilities
 import subprocess
 import shlex
 from plogical.installUtilities import installUtilities
-from django.shortcuts import HttpResponse, render
+from django.shortcuts import HttpResponse, render, redirect
 from loginSystem.models import Administrator, ACL
 from packages.models import Package
 from plogical.mailUtilities import mailUtilities
@@ -60,6 +60,17 @@ class WebsiteManager:
         return proc.render()
 
     def WPCreate(self, request=None, userID=None, data=None):
+        url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission"
+        data = {
+            "name": "wp-manager",
+            "IP": ACLManager.GetServerIP()
+        }
+
+        import requests
+        response = requests.post(url, data=json.dumps(data))
+        Status = response.json()['status']
+
+        if (Status == 1) or ProcessUtilities.decideServer() == ProcessUtilities.ent:
             currentACL = ACLManager.loadedACL(userID)
             adminNames = ACLManager.loadAllUsers(userID)
             packagesName = ACLManager.loadPackages(userID, currentACL)
@@ -85,6 +96,8 @@ class WebsiteManager:
             proc = httpProc(request, 'websiteFunctions/WPCreate.html',
                             Data, 'createWebsite')
             return proc.render()
+        else:
+            return redirect("https://cyberpanel.net/cyberpanel-addons")
 
     def ListWPSites(self, request=None, userID=None, DeleteID=None):
         currentACL = ACLManager.loadedACL(userID)
@@ -126,6 +139,17 @@ class WebsiteManager:
         else:
             return ACLManager.loadError()
 
+        url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission"
+        data = {
+            "name": "wp-manager",
+            "IP": ACLManager.GetServerIP()
+        }
+
+        import requests
+        response = requests.post(url, data=json.dumps(data))
+        Status = response.json()['status']
+
+        if (Status == 1) or ProcessUtilities.decideServer() == ProcessUtilities.ent:
             Data['wpsite'] = WPobj
 
             try:
@@ -141,12 +165,15 @@ class WebsiteManager:
             proc = httpProc(request, 'websiteFunctions/WPsiteHome.html',
                             Data, 'createWebsite')
             return proc.render()
-
+        else:
+            return redirect("https://cyberpanel.net/cyberpanel-addons")
 
     def RestoreHome(self, request=None, userID=None, BackupID=None ):
         Data = {}
         currentACL = ACLManager.loadedACL(userID)
 
+        if ACLManager.CheckForPremFeature('wp-manager'):
+
             Data['backupobj'] = WPSitesBackup.objects.get(pk=BackupID)
 
             config = json.loads(Data['backupobj'].config)
@@ -159,12 +186,26 @@ class WebsiteManager:
             proc = httpProc(request, 'websiteFunctions/WPRestoreHome.html',
                             Data, 'createWebsite')
             return proc.render()
+        else:
+            return redirect("https://cyberpanel.net/cyberpanel-addons")
 
     def RestoreBackups(self, request=None, userID=None, DeleteID=None):
         Data = {}
         currentACL = ACLManager.loadedACL(userID)
         admin = Administrator.objects.get(pk=userID)
 
+        url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission"
+        data = {
+            "name": "wp-manager",
+            "IP": ACLManager.GetServerIP()
+        }
+
+        import requests
+        response = requests.post(url, data=json.dumps(data))
+        Status = response.json()['status']
+
+        if (Status == 1) or ProcessUtilities.decideServer() == ProcessUtilities.ent:
+
             backobj = WPSitesBackup.objects.filter(owner=admin).order_by('-id')
 
             try:
@@ -203,12 +244,11 @@ class WebsiteManager:
                 })
 
 
-
-
-
             proc = httpProc(request, 'websiteFunctions/RestoreBackups.html',
                             Data, 'createWebsite')
             return proc.render()
+        else:
+            return redirect("https://cyberpanel.net/cyberpanel-addons")
 
     def AutoLogin(self, request=None, userID=None):
 
@@ -225,6 +265,18 @@ class WebsiteManager:
         #php = VirtualHost.getPHPString(self.data['PHPVersion'])
         #FinalPHPPath = '/usr/local/lsws/lsphp%s/bin/php' % (php)
 
+        url = "https://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission"
+        data = {
+            "name": "wp-manager",
+            "IP": ACLManager.GetServerIP()
+        }
+
+        import requests
+        response = requests.post(url, data=json.dumps(data))
+        Status = response.json()['status']
+
+        if (Status == 1) or ProcessUtilities.decideServer() == ProcessUtilities.ent:
+
             ## Get title
 
             password = randomPassword.generate_pass(10)
@@ -249,10 +301,12 @@ class WebsiteManager:
             proc = httpProc(request, 'websiteFunctions/AutoLogin.html',
                             data, 'createWebsite')
             return proc.render()
+        else:
+            return redirect("https://cyberpanel.net/cyberpanel-addons")
 
     def ConfigurePlugins(self, request=None, userID=None, data=None):
 
-        DataPass ={}
+        if ACLManager.CheckForPremFeature('wp-manager'):
             currentACL = ACLManager.loadedACL(userID)
             userobj = Administrator.objects.get(pk=userID)
 
@@ -264,8 +318,11 @@ class WebsiteManager:
             proc = httpProc(request, 'websiteFunctions/WPConfigurePlugins.html',
                             Data, 'createWebsite')
             return proc.render()
+        else:
+            return redirect("https://cyberpanel.net/cyberpanel-addons")
 
     def Addnewplugin(self, request=None, userID=None, data=None):
+        if ACLManager.CheckForPremFeature('wp-manager'):
             currentACL = ACLManager.loadedACL(userID)
             adminNames = ACLManager.loadAllUsers(userID)
             packagesName = ACLManager.loadPackages(userID, currentACL)
@@ -275,9 +332,11 @@ class WebsiteManager:
             proc = httpProc(request, 'websiteFunctions/WPAddNewPlugin.html',
                             Data, 'createWebsite')
             return proc.render()
+        return redirect("https://cyberpanel.net/cyberpanel-addons")
 
     def SearchOnkeyupPlugin(self, userID=None, data=None):
         try:
+            if ACLManager.CheckForPremFeature('wp-manager'):
                 currentACL = ACLManager.loadedACL(userID)
 
                 pluginname = data['pluginname']
@@ -295,6 +354,10 @@ class WebsiteManager:
 
                 json_data = json.dumps(data_ret)
                 return HttpResponse(json_data)
+            else:
+                data_ret = {'status': 0, 'createWebSiteStatus': 0, 'error_message': 'Premium feature not available.'}
+                json_data = json.dumps(data_ret)
+                return HttpResponse(json_data)
 
         except BaseException as msg:
             data_ret = {'status': 0, 'createWebSiteStatus': 0, 'error_message': str(msg)}
@@ -715,7 +778,6 @@ class WebsiteManager:
             json_data = json.dumps(data_ret)
             return HttpResponse(json_data)
 
-
     def DeploytoProduction(self, userID=None, data=None):
         try:
 
@@ -762,7 +824,6 @@ class WebsiteManager:
             json_data = json.dumps(data_ret)
             return HttpResponse(json_data)
 
-
     def WPCreateBackup(self, userID=None, data=None):
         try:
 
@@ -802,7 +863,6 @@ class WebsiteManager:
             json_data = json.dumps(data_ret)
             return HttpResponse(json_data)
 
-
     def RestoreWPbackupNow(self, userID=None, data=None):
         try:
 
@@ -812,6 +872,7 @@ class WebsiteManager:
             backupid = data['backupid']
             DesSiteID = data['DesSite']
 
+
             Domain = data['Domain']