clresellers and admins

CLScript/CloudLinuxAdmins.py

@@ -0,0 +1,58 @@
+#!/usr/local/CyberCP/bin/python
+import sys
+import os.path
+import django
+
+sys.path.append('/usr/local/CyberCP')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
+try:
+    django.setup()
+except:
+    pass
+from loginSystem.models import Administrator, ACL
+import argparse
+import pwd
+import json
+from CLScript.CLMain import CLMain
+
+
+class CloudLinuxAdmins(CLMain):
+
+    def __init__(self):
+        CLMain.__init__(self)
+
+    def listAll(self, owner=None):
+        users = []
+        acl = ACL.objects.get(name='admin')
+        for items in Administrator.objects.filter(acl=acl):
+
+            if items.userName == 'admin':
+                isMain = True
+            else:
+                isMain = False
+
+
+            user = {'name': items.userName,
+                    "locale_code": "EN_us",
+                    "unix_user": None,
+                     "email": items.email,
+                     "is_main": isMain
+                    }
+
+            users.append(user)
+
+        final = {'data': users, 'metadata': self.initialMeta}
+        print(json.dumps(final))
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='CyberPanel CloudLinux Manager')
+    parser.add_argument('--owner', help='Owner')
+
+    args = parser.parse_args()
+
+    pi = CloudLinuxAdmins()
+    try:
+        pi.listAll(args.owner)
+    except:
+        pi.listAll()

CLScript/CloudLinuxResellers.py

@@ -0,0 +1,52 @@
+#!/usr/local/CyberCP/bin/python
+import sys
+import os.path
+import django
+
+sys.path.append('/usr/local/CyberCP')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
+try:
+    django.setup()
+except:
+    pass
+from loginSystem.models import Administrator, ACL
+import argparse
+import pwd
+import json
+from CLScript.CLMain import CLMain
+
+
+class CloudLinuxResellers(CLMain):
+
+    def __init__(self):
+        CLMain.__init__(self)
+
+    def listAll(self, owner=None):
+        users = []
+        acl = ACL.objects.get(name='reseller')
+        for items in Administrator.objects.filter(acl=acl):
+
+
+            user = {'name': items.userName,
+                    "locale_code": "EN_us",
+                     "email": items.email,
+                    "id": None
+                    }
+
+            users.append(user)
+
+        final = {'data': users, 'metadata': self.initialMeta}
+        print(json.dumps(final))
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='CyberPanel CloudLinux Manager')
+    parser.add_argument('--owner', help='Owner')
+
+    args = parser.parse_args()
+
+    pi = CloudLinuxResellers()
+    try:
+        pi.listAll(args.owner)
+    except:
+        pi.listAll()

preUpgrade.sh

@@ -8,4 +8,4 @@ if [ ! -d "/usr/local/CyberPanel" ]; then
 fi
 rm -rf upgrade.py
 wget https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/plogical/upgrade.py
-/usr/local/CyberPanel/bin/python2 upgrade.py
+/usr/local/CyberPanel/bin/python upgrade.py