bug fix: CLScripts

CLScript/CloudLinuxAdmins.py

@@ -11,7 +11,6 @@ except:
     pass
 from loginSystem.models import Administrator, ACL
 import argparse
-import pwd
 import json
 from CLScript.CLMain import CLMain
 

CLScript/CloudLinuxDB.py

@@ -0,0 +1,25 @@
+#!/usr/local/CyberCP/bin/python
+import sys
+sys.path.append('/usr/local/CyberCP')
+import json
+from CLScript.CLMain import CLMain
+
+
+class PanelInfo(CLMain):
+    def __init__(self):
+        CLMain.__init__(self)
+
+    def emit(self):
+
+        initial = {
+            "mysql": None
+        }
+
+        final = {'data': initial, 'metadata': self.initialMeta}
+
+        print(json.dumps(final))
+
+
+if __name__ == '__main__':
+    pi = PanelInfo()
+    pi.emit()

CLScript/CloudLinuxDomains.py

@@ -9,7 +9,7 @@ try:
     django.setup()
 except:
     pass
-from websiteFunctions.models import Websites, ChildDomains
+from websiteFunctions.models import Websites
 import argparse
 import json
 from CLScript.CLMain import CLMain

CLScript/CloudLinuxPackages.py

@@ -9,9 +9,7 @@ try:
 except:
     pass
 from websiteFunctions.models import Websites
-from CLManager.CLPackages import CLPackages
 import argparse
-import pwd
 import json
 from CLScript.CLMain import CLMain
 
@@ -27,16 +25,14 @@ class CloudLinuxPackages(CLMain):
             for items in Websites.objects.all():
                 itemPackage = items.package
                 try:
-                    clPackage = CLPackages.objects.get(owner=itemPackage)
-                    packages.append({'name': clPackage.name, 'owner': items.externalApp})
+                    packages.append({'name': itemPackage.packageName, 'owner': items.externalApp})
                 except:
                     pass
         else:
             for items in Websites.objects.filter(externalApp=owner):
                 itemPackage = items.package
                 try:
-                    clPackage = CLPackages.objects.get(owner=itemPackage)
-                    packages.append({'name': clPackage.name, 'owner': items.externalApp})
+                    packages.append({'name': itemPackage.packageName, 'owner': items.externalApp})
                 except:
                     pass
 

CLScript/CloudLinuxResellers.py

@@ -11,7 +11,6 @@ except:
     pass
 from loginSystem.models import Administrator, ACL
 import argparse
-import pwd
 import json
 from CLScript.CLMain import CLMain
 

CLScript/CloudLinuxUsers.py

@@ -10,7 +10,6 @@ try:
 except:
     pass
 from websiteFunctions.models import Websites
-from CLManager.CLPackages import CLPackages
 import argparse
 import pwd
 import json
@@ -27,7 +26,10 @@ class CloudLinuxUsers(CLMain):
         self.packageName = packageName
         self.packageOwner = packageOwner
         self.fields = fields
-        self.uid = int(uid)
+        if uid!=None:
+            self.uid = int(uid)
+        else:
+            self.uid = uid
 
         if self.fields == None:
             self.id = 1
@@ -78,8 +80,7 @@ class CloudLinuxUsers(CLMain):
         users = []
         for webs in websites:
             itemPackage = webs.package
-            clPackage = CLPackages.objects.get(owner=itemPackage)
-            package = {'name': clPackage.name, 'owner': webs.externalApp}
+            package = {'name': itemPackage.packageName, 'owner': webs.externalApp}
 
             user = {}
 
@@ -124,7 +125,7 @@ class CloudLinuxUsers(CLMain):
         final = {'data': users, 'metadata': self.initialMeta}
         print(json.dumps(final))
 
-    def listAll(self, owner=None, username = None):
+    def listAll(self):
 
         if self.owner == None:
             websites = Websites.objects.all()

CLScript/UserInfo.py

@@ -0,0 +1,22 @@
+#!/usr/local/CyberCP/bin/python
+import getpass
+
+def main():
+    if getpass.getuser() == 'root':
+        userType = "admin"
+    else:
+        userType = "user"
+
+    data = """{
+    "userName": "%s",
+    "userType": "%s",
+    "lang": "en",
+    "assetsUri": "/usr/local/lvemanager",
+    "baseUri": "/usr/local/lvemanager",
+    "defaultDomain": "cyberpanel.net"
+}""" % (getpass.getuser(), userType)
+
+    print(data)
+
+if __name__ == '__main__':
+    main()