From 60d1529c89759133373749cbc352919072c395dd Mon Sep 17 00:00:00 2001
From: Unknown <flifloo@gmail.com>
Date: Fri, 22 Mar 2019 08:45:27 +0100
Subject: [PATCH] Fix strings

---
 Setup.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Setup.py b/Setup.py
index 1e74c01..2fbc96b 100644
--- a/Setup.py
+++ b/Setup.py
@@ -13,11 +13,9 @@ def ap(switch):
 def writeconfig(ssid, password):
     rtline = "\n"
     with io.open("/etc/wpa_supplicant/wpa_supplicant.conf", "w", encoding="utf8") as note:
-        conf = "ctrl_interface=/var/run/wpa_supplicant\nupdate_config=1\ncountry=FR\nnetwork={\nssid=\""
-        conf += ssid
-        conf += "\"\nscan_ssid=1\npsk=\""
-        conf += password
-        conf += "\"\n}"
+        conf = str()
+        for i in ["ctrl_interface=/var/run/wpa_supplicant\nupdate_config=1\ncountry=FR\nnetwork={\nssid=\"", ssid, "\"\nscan_ssid=1\npsk=\"", password, "\"\n}"]:
+            conf += i
         note.write(conf)
     ap(False)
     subprocess.check_call(["sudo", "wpa_cli", "-i", "wlan0", "reconfigure"])
@@ -38,7 +36,9 @@ def web_setup():
     else:
         writeconfig(request.args.get("ssid"), request.args.get("password"))
         if testinternet():
-            r = get(f"http://flifloo.ddns.net:5000/locksetup?mac={io.open("/sys/class/net/wlan0/address").read()}&id={io.open("/sys/class/net/wlan0/address").read()}")
+            mac = io.open("/sys/class/net/wlan0/address").read()
+            id = request.args.get("id")
+            r = get(f"http://flifloo.ddns.net:5000/locksetup?mac={mac}&id={id}")
         else:
             ap(True)
             return "Cant connect"