Merge pull request #105 from AttorneyOnline/bans-fixes

Bans fixes

akashi.pro

@@ -26,6 +26,9 @@ RC_ICONS = resource/icon/akashi.ico
 # Enable this to print network messages tothe console
 #DEFINES += NET_DEBUG
 
+# Enable this to skip all authentication checks
+#DEFINES += SKIP_AUTH
+
 SOURCES += src/advertiser.cpp \
     src/aoclient.cpp \
     src/aopacket.cpp \

include/db_manager.h

@@ -126,6 +126,7 @@ public:
         unsigned long time; //!< The time the ban was registered.
         QString reason; //!< The reason given for the ban by the moderator who registered it.
         long long duration; //!< The duration of the ban, in seconds.
+        int id; //!< The unique ID of the ban.
     };
 
     /**

src/aoclient.cpp

@@ -311,6 +311,9 @@ void AOClient::sendServerBroadcast(QString message)
 
 bool AOClient::checkAuth(unsigned long long acl_mask)
 {
+#ifdef SKIP_AUTH
+    return true;
+#endif
     if (acl_mask != ACLFlags.value("NONE")) {
         if (acl_mask == ACLFlags.value("CM")) {
             AreaData* area = server->areas[current_area];

src/commands/moderation.cpp

@@ -178,12 +178,12 @@ void AOClient::cmdBans(int argc, QStringList argv)
         if (ban.duration == -2)
             banned_until = "The heat death of the universe";
         else
-            banned_until = QDateTime::fromSecsSinceEpoch(ban.time).addSecs(ban.duration).toString("dd.MM.yyyy, hh:mm");
+            banned_until = QDateTime::fromSecsSinceEpoch(ban.time).addSecs(ban.duration).toString("MM/dd/yyyy, hh:mm");
-        recent_bans << "Ban ID: " + QString::number(server->db_manager->getBanID(ban.ipid));
+        recent_bans << "Ban ID: " + QString::number(ban.id);
         recent_bans << "Affected IPID: " + ban.ipid;
         recent_bans << "Affected HDID: " + ban.hdid;
         recent_bans << "Reason for ban: " + ban.reason;
-        recent_bans << "Date of ban: " + QDateTime::fromSecsSinceEpoch(ban.time).toString("dd.MM.yyyy, hh:mm");
+        recent_bans << "Date of ban: " + QDateTime::fromSecsSinceEpoch(ban.time).toString("MM/dd/yyyy, hh:mm");
         recent_bans << "Ban lasts until: " + banned_until;
         recent_bans << "-----";
     }

src/db_manager.cpp

@@ -126,7 +126,7 @@ long long DBManager::getBanDuration(QHostAddress ip)
 int DBManager::getBanID(QString hdid)
 {
     QSqlQuery query;
-    query.prepare("SELECT ID FROM BANS WHERE HDID = ?");
+    query.prepare("SELECT ID FROM BANS WHERE HDID = ? ORDER BY TIME DESC");
     query.addBindValue(hdid);
     query.exec();
     if (query.first()) {
@@ -141,7 +141,7 @@ int DBManager::getBanID(QString hdid)
 int DBManager::getBanID(QHostAddress ip)
 {
     QSqlQuery query;
-    query.prepare("SELECT ID FROM BANS WHERE IP = ?");
+    query.prepare("SELECT ID FROM BANS WHERE IP = ? ORDER BY TIME DESC");
     query.addBindValue(ip.toString());
     query.exec();
     if (query.first()) {
@@ -156,17 +156,18 @@ QList<DBManager::BanInfo> DBManager::getRecentBans()
 {
     QList<BanInfo> return_list;
     QSqlQuery query;
-    query.prepare("SELECT TOP(5) * FROM BANS ORDER BY TIME DESC");
+    query.prepare("SELECT * FROM BANS ORDER BY TIME DESC LIMIT 5");
     query.setForwardOnly(true);
     query.exec();
     while (query.next()) {
         BanInfo ban;
-        ban.ipid = query.value(0).toString();
+        ban.id = query.value(0).toInt();
-        ban.hdid = query.value(1).toString();
+        ban.ipid = query.value(1).toString();
-        ban.ip = QHostAddress(query.value(2).toString());
+        ban.hdid = query.value(2).toString();
-        ban.time = static_cast<unsigned long>(query.value(3).toULongLong());
+        ban.ip = QHostAddress(query.value(3).toString());
-        ban.reason = query.value(4).toString();
+        ban.time = static_cast<unsigned long>(query.value(4).toULongLong());
-        ban.duration = query.value(5).toLongLong();
+        ban.reason = query.value(5).toString();
+        ban.duration = query.value(6).toLongLong();
         return_list.append(ban);
     }
     std::reverse(return_list.begin(), return_list.end());