Work In Progress (WIP)

README.md

@@ -47,9 +47,6 @@ optional arguments:
   -d alias@domain.com, --delete alias@domain.com
                         Delete alias.
                         
-  -i alias.json, --import alias.json
-                        Show current config and appliacation info
-                        
   -v, --version         Show current version and information
                         
   -c, --copy            Copy alias data from mailcow server to local DB.

malias.py

@@ -331,7 +331,7 @@ def checklist(alias):
 	remoteData = json.loads(remote)
 	i = 0
 	for search in remoteData:
-		if alias == remoteData[i]['address'] == alias in remoteData[i]['goto']:
+		if alias == remoteData[i]['address'] || alias in remoteData[i]['goto']:
 			alias_exist = True
 		i=i+1
 	cursor = conn.cursor()
@@ -514,21 +514,24 @@ def show_current_info():
 		else:
 			domain = domain + str(mail_domains[i]['domain_name'])
 		i+=1
-	print('\n[b]malias[/b] - Manage aliases on mailcow Instance.')
+	print('\n[b]malias[/b] - Manage aliases on Mailcow instance.')
 	print('===================================================')
-	print('API key 		: [b]%s[/b]' % (API))
+	print("API key\t\t\t: [b]%s[/b]" % (API))
-	print('Mailcow Instance 	: [b]%s[/b]' % (mail_server))
+    print("Mailcow Instance\t: [b]%s[/b]" % (mail_server))
-	print('Active domains		: [b]%s[/b]' % (domain))
+    print("Active domains\t\t: [b]%s[/b]" % (domain))
-	print('Mailcow version 	: [b]%s[/b]' % (mailcow_version))
+    print("Mailcow version\t\t: [b]%s[/b]" % (mailcow_version))
-	print('Logfile 		: [b]%s[/b]' % (logfile))
+    print("Logfile\t\t\t: [b]%s[/b]" % (logfile))
-	print('Databse 		: [b]%s[b]' % (database))
+    print("Databse\t\t\t: [b]%s[b]" % (database))
-	print('Aliases on server 	: [b]%s[/b]' % (aliases_server))
+    print("Aliases on server\t: [b]%s[/b]" % (aliases_server))
-	print('Aliases in DB 		: [b]%s[/b]' % (alias_db))
+    print("Aliases in DB\t\t: [b]%s[/b]" % (alias_db))
-	print('')
+    print("")
-	if app_version[:5] != latest_release:
+    if app_version[:3] != latest_release:
-		print('App version 		: [b]%s[/b] a new version (%s) is available @ https://iurl.no/malias' % (app_version,latest_release))
+        print(
-	else:
+            "App version\t\t\t\t: [b]%s[/b] a new version (%s) is available @ https://iurl.no/malias"
-		print('App version 		: [b]%s[/b]' % (app_version))
+            % (app_version, latest_release)
+        )
+    else:
+        print("App version\t\t: [b]%s[/b]" % (app_version))
 	print('')