From 5a67a30ac71b32d88dcb666842bdfd6b072b20d7 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Wed, 20 Jan 2021 00:15:59 +0500
Subject: [PATCH] add progress to install

---
 cyberpanel.sh         |  2 +-
 plogical/adminPass.py | 66 ++++++++++++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 1c22dbcf8..a8dcb845c 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -506,7 +506,7 @@ EOF
     check_return
 
   fi
-  echo 'Necessary components installed,5' >/var/log/installLogs.txt
+  echo 'Necessary components installed..,5' >/var/log/installLogs.txt
 }
 
 memcached_installation() {
diff --git a/plogical/adminPass.py b/plogical/adminPass.py
index bf32680c0..446e6329f 100755
--- a/plogical/adminPass.py
+++ b/plogical/adminPass.py
@@ -22,39 +22,53 @@ def main():
 
     parser = argparse.ArgumentParser(description='Reset admin user password!')
     parser.add_argument('--password', help='New Password')
+    parser.add_argument('--api', help='Enable/Disable API')
     args = parser.parse_args()
 
-    adminPass = args.password
+    if args.api != None:
+        if args.api == '1':
+            admin = Administrator.objects.get(userName="admin")
+            admin.api = 1
+            admin.save()
+            print("API Enabled.")
+        else:
+            admin = Administrator.objects.get(userName="admin")
+            admin.api = 0
+            admin.save()
+            print("API Disabled.")
+    else:
 
-    numberOfAdministrator = Administrator.objects.count()
-    if numberOfAdministrator == 0:
-        ACLManager.createDefaultACLs()
-        acl = ACL.objects.get(name='admin')
-        token = hashPassword.generateToken('admin', '1234567')
+        adminPass = args.password
 
-        email = 'usman@cyberpersons.com'
-        admin = Administrator(userName="admin", password=hashPassword.hash_password(adminPass), type=1, email=email,
-                              firstName="Cyber", lastName="Panel", acl=acl, token=token)
+        numberOfAdministrator = Administrator.objects.count()
+        if numberOfAdministrator == 0:
+            ACLManager.createDefaultACLs()
+            acl = ACL.objects.get(name='admin')
+            token = hashPassword.generateToken('admin', '1234567')
+
+            email = 'usman@cyberpersons.com'
+            admin = Administrator(userName="admin", password=hashPassword.hash_password(adminPass), type=1, email=email,
+                                  firstName="Cyber", lastName="Panel", acl=acl, token=token)
+            admin.save()
+
+            vers = version(currentVersion=VERSION, build=BUILD)
+            vers.save()
+
+            package = Package(admin=admin, packageName="Default", diskSpace=1000,
+                              bandwidth=1000, ftpAccounts=1000, dataBases=1000,
+                              emailAccounts=1000, allowedDomains=20)
+            package.save()
+
+            print("Admin password successfully changed!")
+            return 1
+
+        token = hashPassword.generateToken('admin', adminPass)
+        admin = Administrator.objects.get(userName="admin")
+        admin.password = hashPassword.hash_password(adminPass)
+        admin.token = token
         admin.save()
 
-        vers = version(currentVersion=VERSION, build=BUILD)
-        vers.save()
-
-        package = Package(admin=admin, packageName="Default", diskSpace=1000,
-                          bandwidth=1000, ftpAccounts=1000, dataBases=1000,
-                          emailAccounts=1000, allowedDomains=20)
-        package.save()
-
         print("Admin password successfully changed!")
-        return 1
-
-    token = hashPassword.generateToken('admin', adminPass)
-    admin = Administrator.objects.get(userName="admin")
-    admin.password = hashPassword.hash_password(adminPass)
-    admin.token = token
-    admin.save()
-
-    print("Admin password successfully changed!")
 
 if __name__ == "__main__":
     main()