X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=a418d05516dcfd44ceb114feaf0c33292b964242;hp=054b3899f48e74fff19b0ca3716840f93c8d7310;hb=d747c2060a17ddc24dcc83d6a7aa87066765c9dc;hpb=4c83963b1d77f4c2dbae606876be0eee59f53dae

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 054b3899..a418d055 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -416,12 +416,19 @@ bool SqliteStorage::updateNetwork(UserId user, const NetworkInfo &info) {
   QSqlQuery insertServersQuery(logDb());
   insertServersQuery.prepare(queryString("insert_server"));
   foreach(Network::Server server, info.serverList) {
+    insertServersQuery.bindValue(":userid", user.toInt());
+    insertServersQuery.bindValue(":networkid", info.networkId.toInt());
     insertServersQuery.bindValue(":hostname", server.host);
     insertServersQuery.bindValue(":port", server.port);
     insertServersQuery.bindValue(":password", server.password);
     insertServersQuery.bindValue(":ssl", server.useSsl ? 1 : 0);
-    insertServersQuery.bindValue(":userid", user.toInt());
-    insertServersQuery.bindValue(":networkid", info.networkId.toInt());
+    insertServersQuery.bindValue(":sslversion", server.sslVersion);
+    insertServersQuery.bindValue(":useproxy", server.useProxy ? 1 : 0);
+    insertServersQuery.bindValue(":proxytype", server.proxyType);
+    insertServersQuery.bindValue(":proxyhost", server.proxyHost);
+    insertServersQuery.bindValue(":proxyport", server.proxyPort);
+    insertServersQuery.bindValue(":proxyuser", server.proxyUser);
+    insertServersQuery.bindValue(":proxypass", server.proxyPass);
 
     safeExec(insertServersQuery);
     if(!watchQuery(insertServersQuery))
@@ -533,6 +540,13 @@ QList<NetworkInfo> SqliteStorage::networks(UserId user) {
       server.port = serversQuery.value(1).toUInt();
       server.password = serversQuery.value(2).toString();
       server.useSsl = serversQuery.value(3).toInt() == 1 ? true : false;
+      server.sslVersion = serversQuery.value(4).toInt();
+      server.useProxy = serversQuery.value(5).toInt() == 1 ? true : false;
+      server.proxyType = serversQuery.value(6).toInt();
+      server.proxyHost = serversQuery.value(7).toString();
+      server.proxyPort = serversQuery.value(8).toUInt();
+      server.proxyUser = serversQuery.value(9).toString();
+      server.proxyPass = serversQuery.value(10).toString();
       servers << server;
     }
     net.serverList = servers;