aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix calculation of ban expiration; fix #1283

Browse source
This commit is contained in:
Fabio Bas 2015-07-21 22:32:31 +02:00
parent 0d5e169648
commit 7f358d289e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servatrice/src/servatrice_database_interface.cpp
View file

@ -301,7 +301,7 @@ bool Servatrice_DatabaseInterface::checkUserIsBanned(const QString &ipAddress, c
bool Servatrice_DatabaseInterface::checkUserIsNameBanned(const QString &userName, QString &banReason, int &banSecondsRemaining) bool Servatrice_DatabaseInterface::checkUserIsNameBanned(const QString &userName, QString &banReason, int &banSecondsRemaining)
{ {
QSqlQuery *nameBanQuery = prepareQuery("select time_to_sec(timediff(now(), date_add(b.time_from, interval b.minutes minute))), b.minutes <=> 0, b.visible_reason from {prefix}_bans b where b.time_from = (select max(c.time_from) from {prefix}_bans c where c.user_name = :name2) and b.user_name = :name1"); QSqlQuery *nameBanQuery = prepareQuery("select timestampdiff(second, now(), date_add(b.time_from, interval b.minutes minute)), b.minutes <=> 0, b.visible_reason from {prefix}_bans b where b.time_from = (select max(c.time_from) from {prefix}_bans c where c.user_name = :name2) and b.user_name = :name1");
nameBanQuery->bindValue(":name1", userName); nameBanQuery->bindValue(":name1", userName);
nameBanQuery->bindValue(":name2", userName); nameBanQuery->bindValue(":name2", userName);
if (!execSqlQuery(nameBanQuery)) { if (!execSqlQuery(nameBanQuery)) {
@ -310,7 +310,7 @@ bool Servatrice_DatabaseInterface::checkUserIsNameBanned(const QString &userName
} }
if (nameBanQuery->next()) { if (nameBanQuery->next()) {
const int secondsLeft = -nameBanQuery->value(0).toInt(); const int secondsLeft = nameBanQuery->value(0).toInt();
const bool permanentBan = nameBanQuery->value(1).toInt(); const bool permanentBan = nameBanQuery->value(1).toInt();
if ((secondsLeft > 0) || permanentBan) { if ((secondsLeft > 0) || permanentBan) {
banReason = nameBanQuery->value(2).toString(); banReason = nameBanQuery->value(2).toString();
@ -326,7 +326,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIpBanned(const QString &ipAddress,
{ {
QSqlQuery *ipBanQuery = prepareQuery( QSqlQuery *ipBanQuery = prepareQuery(
"select" "select"
" time_to_sec(timediff(now(), date_add(b.time_from, interval b.minutes minute)))," " timestampdiff(second, now(), date_add(b.time_from, interval b.minutes minute)),"
" b.minutes <=> 0," " b.minutes <=> 0,"
" b.visible_reason" " b.visible_reason"
" from {prefix}_bans b" " from {prefix}_bans b"
@ -344,7 +344,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIpBanned(const QString &ipAddress,
} }
if (ipBanQuery->next()) { if (ipBanQuery->next()) {
const int secondsLeft = -ipBanQuery->value(0).toInt(); const int secondsLeft = ipBanQuery->value(0).toInt();
const bool permanentBan = ipBanQuery->value(1).toInt(); const bool permanentBan = ipBanQuery->value(1).toInt();
if ((secondsLeft > 0) || permanentBan) { if ((secondsLeft > 0) || permanentBan) {
banReason = ipBanQuery->value(2).toString(); banReason = ipBanQuery->value(2).toString();