X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=1af89261d2ea4973dd846d16f95d5dff51fc0c57;hp=50bfa739e35e1042bd38a947d9b793f52ce8e30b;hb=99bb37d9938f3d88ce7551ded454146359fadc03;hpb=b79832bf9c4c21b05629cfd2fdbd008ad690572f;ds=sidebyside

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 50bfa739..1af89261 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -207,6 +207,16 @@ void Core::syncStorage() {
 }
 
 /*** Storage Access ***/
+void Core::setUserSetting(UserId userId, const QString &settingName, const QVariant &data) {
+  QMutexLocker locker(&mutex);
+  instance()->storage->setUserSetting(userId, settingName, data);
+}
+
+QVariant Core::getUserSetting(UserId userId, const QString &settingName, const QVariant &data) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->getUserSetting(userId, settingName, data);
+}
+
 bool Core::createNetwork(UserId user, NetworkInfo &info) {
   QMutexLocker locker(&mutex);
   NetworkId networkId = instance()->storage->createNetwork(user, info);
@@ -292,9 +302,9 @@ QList<Message> Core::requestMsgRange(UserId user, BufferId buffer, int first, in
   return instance()->storage->requestMsgRange(user, buffer, first, last);
 }
 
-QList<BufferInfo> Core::requestBuffers(UserId user, QDateTime since) {
+QList<BufferInfo> Core::requestBuffers(UserId user) {
   QMutexLocker locker(&mutex);
-  return instance()->storage->requestBuffers(user, since);
+  return instance()->storage->requestBuffers(user);
 }
 
 bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
@@ -334,7 +344,6 @@ void Core::stopListening() {
 }
 
 void Core::incomingConnection() {
-  // TODO implement SSL
   while(server.hasPendingConnections()) {
     QTcpSocket *socket = server.nextPendingConnection();
     connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
@@ -385,9 +394,14 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
                             "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuild)
                             .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate));
 
+#ifndef QT_NO_OPENSSL
     SslServer *sslServer = qobject_cast<SslServer *>(&server);
     QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
     bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid();
+#else
+    bool supportSsl = false;
+#endif
+    
     reply["SupportSsl"] = supportSsl;
     // switch to ssl after client has been informed about our capabilities (see below)
 
@@ -422,13 +436,14 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
     reply["MsgType"] = "ClientInitAck";
     SignalProxy::writeDataToDevice(socket, reply);
 
+#ifndef QT_NO_OPENSSL
     // after we told the client that we are ssl capable we switch to ssl mode
     if(supportSsl && msg["UseSsl"].toBool()) {
       qDebug() << "Starting TLS for Client:"  << qPrintable(socket->peerAddress().toString());
       connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
       sslSocket->startServerEncryption();
     }
-    
+#endif
 
   } else {
     // for the rest, we need an initialized connection
@@ -463,7 +478,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
       }
       reply["MsgType"] = "ClientLoginAck";
       SignalProxy::writeDataToDevice(socket, reply);
-      qDebug() << qPrintable(tr("Client %1 initialized and authentificated successfully as \"%2\".").arg(socket->peerAddress().toString(), msg["User"].toString()));
+      qDebug() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).").arg(socket->peerAddress().toString(), msg["User"].toString()).arg(uid.toInt()));
       setupClientSession(socket, uid);
     }
   }
@@ -515,12 +530,14 @@ SessionThread *Core::createSession(UserId uid, bool restore) {
   return sess;
 }
 
+#ifndef QT_NO_OPENSSL
 void Core::sslErrors(const QList<QSslError> &errors) {
   Q_UNUSED(errors);
   QSslSocket *socket = qobject_cast<QSslSocket *>(sender());
   if(socket)
     socket->ignoreSslErrors();
 }
+#endif
 
 void Core::socketError(QAbstractSocket::SocketError err) {
   QAbstractSocket *socket = qobject_cast<QAbstractSocket *>(sender());