Remove server url from settings

Author: cpacia

api/restapi.py

@@ -681,7 +681,6 @@ def set_settings(self, request):
                 request.args["libbitcoin_server"][0],
                 1 if str_to_bool(request.args["ssl"][0]) else 0,
                 KeyChain(self.db).guid_privkey.encode("hex"),
-                request.args["server_url"][0],
                 request.args["terms_conditions"][0],
                 request.args["refund_policy"][0]
             )
@@ -717,9 +716,8 @@ def get_settings(self, request):
                 "libbitcoin_server": settings[14],
                 "ssl": True if settings[15] == 1 else False,
                 "seed": settings[16],
-                "server_url": settings[17],
-                "terms_conditions": settings[18],
-                "refund_policy": settings[19]
+                "terms_conditions": settings[17],
+                "refund_policy": settings[18]
             }
             request.write(json.dumps(settings_json, indent=4))
             request.finish()

db/datastore.py

@@ -66,7 +66,7 @@ def create_database(filepath=None):
         cursor.execute('''CREATE TABLE settings(id INTEGER PRIMARY KEY, refundAddress TEXT, currencyCode TEXT,
 country TEXT, language TEXT, timeZone TEXT, notifications INTEGER, shipToName TEXT, shipToStreet TEXT,
 shipToCity TEXT, shipToState TEXT, shipToPostalCode TEXT, shipToCountry TEXT, blocked BLOB, libbitcoinServer TEXT,
-SSL INTEGER, seed TEXT, server TEXT, terms_conditions TEXT, refund_policy TEXT)''')
+SSL INTEGER, seed TEXT, terms_conditions TEXT, refund_policy TEXT)''')
         db.commit()
         return db
 
@@ -555,17 +555,17 @@ def __init__(self):
 
         def update(self, refundAddress, currencyCode, country, language, timeZone, notifications, shipToName,
                    shipToStreet, shipToCity, shipToState, shipToPostalCode, shipToCountry, blocked,
-                   libbitcoinServer, ssl, seed, server, terms_conditions, refund_policy):
+                   libbitcoinServer, ssl, seed, terms_conditions, refund_policy):
             cursor = self.db.cursor()
             try:
                 cursor.execute('''INSERT OR REPLACE INTO settings(id, refundAddress, currencyCode, country,
 language, timeZone, notifications, shipToName, shipToStreet, shipToCity, shipToState, shipToPostalCode, shipToCountry,
-blocked, libbitcoinServer, ssl, seed, server, terms_conditions, refund_policy)
-VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', (1, refundAddress, currencyCode, country, language, timeZone,
-                                                      notifications, shipToName, shipToStreet, shipToCity,
-                                                      shipToState, shipToPostalCode, shipToCountry, blocked,
-                                                      libbitcoinServer, ssl, seed, server, terms_conditions,
-                                                      refund_policy))
+blocked, libbitcoinServer, ssl, seed, terms_conditions, refund_policy)
+VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', (1, refundAddress, currencyCode, country, language, timeZone,
+                                                    notifications, shipToName, shipToStreet, shipToCity,
+                                                    shipToState, shipToPostalCode, shipToCountry, blocked,
+                                                    libbitcoinServer, ssl, seed, terms_conditions,
+                                                    refund_policy))
             except Exception as e:
                 print e.message
             self.db.commit()