diff --git a/cockatrice/src/remoteclient.cpp b/cockatrice/src/remoteclient.cpp index 2bb43b99..fac63019 100644 --- a/cockatrice/src/remoteclient.cpp +++ b/cockatrice/src/remoteclient.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "remoteclient.h" #include "protocol.h" #include "protocol_items.h" @@ -87,7 +88,7 @@ void RemoteClient::readData() connect(topLevelItem, SIGNAL(protocolItemReceived(ProtocolItem *)), this, SLOT(processProtocolItem(ProtocolItem *))); setStatus(StatusLoggingIn); - Command_Login *cmdLogin = new Command_Login(userName, password); + Command_Login *cmdLogin = new Command_Login(userName, QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1).toBase64()); connect(cmdLogin, SIGNAL(finished(ProtocolResponse *)), this, SLOT(loginResponse(ProtocolResponse *))); sendCommand(cmdLogin); } diff --git a/servatrice/servatrice.sql b/servatrice/servatrice.sql index 637d9a6b..f35b1d9f 100644 --- a/servatrice/servatrice.sql +++ b/servatrice/servatrice.sql @@ -117,6 +117,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_users` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=915 ; CREATE TABLE `cockatrice_uptime` ( + `id_server` tinyint(3) NOT NULL, `timest` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `uptime` int(11) DEFAULT NULL, `users_count` int(11) DEFAULT NULL, diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index c7bbd717..62992bf6 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -366,4 +366,4 @@ void Servatrice::statusUpdate() execSqlQuery(query); } -const QString Servatrice::versionString = "Servatrice 0.20110303"; +const QString Servatrice::versionString = "Servatrice 0.20110406";