From: Manuel Nickschas Date: Sun, 14 Sep 2014 15:22:37 +0000 (+0200) Subject: Merge pull request #88 from mamarley/psqllimitallfix X-Git-Tag: 0.11.0~12 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a20c9bf454288c998cb2a5d2a1fdf0927c93f1f3;hp=6d2798ada0b9e770f821e039431cc9dc3b5f85cf Merge pull request #88 from mamarley/psqllimitallfix Use null QVariant instead of "ALL" for select limit on psql --- diff --git a/README b/README index 49b53c0c..1877b621 100644 --- a/README +++ b/README @@ -5,11 +5,11 @@ Please find the current release notes at . On first run of the Quassel core, it will wait for a client to connect and present a first-run wizard that will allow you to create the database -and one admin user for the core-side storage. Note that Quassel does not -support the administration of user accounts yet, this includes adding -more users, changing passwords and so on. -However, you can add more users, or change passwords of existing ones, -using manageusers.py to be found in the scripts/ directory. +and one admin user for the core-side storage. + +To add more users, run: `quasselcore --add-user` +To change the password of an existing user: `quasselcore --change-userpass=username` +The manageusers.py script is deprecated. IRC is the preferred means of getting in touch with the developers. The Quassel IRC Team can be contacted on Freenode/#quassel (or diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp index 2a323edd..2f890810 100644 --- a/src/client/clientuserinputhandler.cpp +++ b/src/client/clientuserinputhandler.cpp @@ -129,7 +129,7 @@ void ClientUserInputHandler::switchBuffer(const NetworkId &networkId, const QStr QList bufferViewConfigList = clientBufferViewManager->clientBufferViewConfigs(); foreach(ClientBufferViewConfig *bufferViewConfig, bufferViewConfigList) { if (bufferViewConfig->temporarilyRemovedBuffers().contains(newBufId)) { - bufferViewConfig->addBuffer(newBufId, bufferViewConfig->bufferList().length()); + bufferViewConfig->requestAddBuffer(newBufId, bufferViewConfig->bufferList().length()); //if (bufferViewConfig->sortAlphabetically()) { // TODO we need to trigger a sort here, but can't reach the model required // to get a bufferviewfilter, as the bufferviewmanager only managers configs diff --git a/src/common/protocol.h b/src/common/protocol.h index 053ab29b..b219e018 100644 --- a/src/common/protocol.h +++ b/src/common/protocol.h @@ -80,12 +80,12 @@ struct ClientDenied : public HandshakeMessage struct ClientRegistered : public HandshakeMessage { - inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported, const QDateTime &coreStartTime) + inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported, const QString &coreInfo) : coreFeatures(coreFeatures) , coreConfigured(coreConfigured) , backendInfo(backendInfo) , sslSupported(sslSupported) - , coreStartTime(coreStartTime) + , coreInfo(coreInfo) {} quint32 coreFeatures; @@ -94,7 +94,7 @@ struct ClientRegistered : public HandshakeMessage // this is only used by the LegacyProtocol in compat mode bool sslSupported; - QDateTime coreStartTime; + QString coreInfo; }; diff --git a/src/common/protocols/datastream/datastreampeer.cpp b/src/common/protocols/datastream/datastreampeer.cpp index 7c45b461..393d0e2c 100644 --- a/src/common/protocols/datastream/datastreampeer.cpp +++ b/src/common/protocols/datastream/datastreampeer.cpp @@ -124,7 +124,7 @@ void DataStreamPeer::handleHandshakeMessage(const QVariantList &mapData) } else if (msgType == "ClientInitAck") { - handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false, QDateTime())); // SupportsSsl and coreStartTime obsolete + handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false, QString())); // SupportsSsl and coreInfo obsolete } else if (msgType == "CoreSetupData") { diff --git a/src/common/protocols/legacy/legacypeer.cpp b/src/common/protocols/legacy/legacypeer.cpp index 982ffd7c..98a7afa9 100644 --- a/src/common/protocols/legacy/legacypeer.cpp +++ b/src/common/protocols/legacy/legacypeer.cpp @@ -19,10 +19,10 @@ ***************************************************************************/ #include +#include #include #include "legacypeer.h" -#include "quassel.h" /* version.inc is no longer used for this */ const uint protocolVersion = 10; @@ -170,7 +170,7 @@ void LegacyPeer::handleHandshakeMessage(const QVariant &msg) socket()->setProperty("UseCompression", true); #endif - handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), m["SupportSsl"].toBool(), QDateTime())); + handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), m["SupportSsl"].toBool(), QString())); } else if (msgType == "CoreSetupData") { @@ -249,15 +249,7 @@ void LegacyPeer::dispatch(const ClientRegistered &msg) { m["SupportsCompression"] = socket()->property("UseCompression").toBool(); // this property gets already set in the ClientInit handler // This is only used for old v10 clients (pre-0.5) - int uptime = msg.coreStartTime.secsTo(QDateTime::currentDateTime().toUTC()); - int updays = uptime / 86400; uptime %= 86400; - int uphours = uptime / 3600; uptime %= 3600; - int upmins = uptime / 60; - m["CoreInfo"] = tr("Quassel Core Version %1
" - "Built: %2
" - "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString) - .arg(Quassel::buildInfo().buildDate) - .arg(updays).arg(uphours, 2, 10, QChar('0')).arg(upmins, 2, 10, QChar('0')).arg(msg.coreStartTime.toString(Qt::TextDate)); + m["CoreInfo"] = msg.coreInfo; m["LoginEnabled"] = m["Configured"] = msg.coreConfigured; diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp index 9ef67fa2..d52a50b8 100644 --- a/src/core/coreauthhandler.cpp +++ b/src/core/coreauthhandler.cpp @@ -169,8 +169,18 @@ void CoreAuthHandler::handle(const RegisterClient &msg) if (!configured) backends = Core::backendInfo(); - // useSsl and startTime are only used for the legacy protocol - _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, Core::instance()->startTime())); + int uptime = Core::instance()->startTime().secsTo(QDateTime::currentDateTime().toUTC()); + int updays = uptime / 86400; uptime %= 86400; + int uphours = uptime / 3600; uptime %= 3600; + int upmins = uptime / 60; + QString coreInfo = tr("Quassel Core Version %1
" + "Built: %2
" + "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString) + .arg(Quassel::buildInfo().buildDate) + .arg(updays).arg(uphours, 2, 10, QChar('0')).arg(upmins, 2, 10, QChar('0')).arg(Core::instance()->startTime().toString(Qt::TextDate)); + + // useSsl and coreInfo are only used for the legacy protocol + _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, coreInfo)); if (_legacy && useSsl) startSsl();