fixed small unbind problem with these temporarily added commands

[NeonServV5.git] / src / cmd_neonserv_unbind.c

diff --git a/src/cmd_neonserv_unbind.c b/src/cmd_neonserv_unbind.c
index a0ce8f7f7d9aefa26bfc6920c9ba6fb7049ac09a..43f6c7272bb9bbb5b59ce9326eb54e7885d17ed5 100644 (file)
--- a/src/cmd_neonserv_unbind.c
+++ b/src/cmd_neonserv_unbind.c
@@ -1,4 +1,4 @@
-/* cmd_neonserv_unbind.c - NeonServ v5.0
+/* cmd_neonserv_unbind.c - NeonServ v5.2
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -24,14 +24,25 @@
 CMD_BIND(neonserv_cmd_unbind) {
     MYSQL_RES *res;
     MYSQL_ROW row;
-    printf_mysql_query("SELECT `id` FROM `bot_binds` WHERE `botclass` = '%d' AND `command` = '%s'", client->botid, escape_string(argv[0]));
+    struct cmd_binding *cbind = find_cmd_binding(client->botid, argv[0]);
+    printf_mysql_query("SELECT `function` FROM `bot_binds` WHERE `botclass` = '%d' AND `command` = '%s'", client->botid, escape_string(argv[0]));
     res = mysql_use();
-    if ((row = mysql_fetch_row(res)) == NULL) {
+    if ((row = mysql_fetch_row(res)) == NULL && (!cbind || !(cbind->flags & CMDFLAG_TEMPONARY_BIND))) {
         reply(getTextBot(), user, "NS_UNBIND_NOT_FOUND", argv[0]);
         return;
     }
+    struct cmd_function *function = find_cmd_function(client->botid, row[0]);
+    if(function && (function->flags & CMDFLAG_REQUIRED)) {
+        printf_mysql_query("SELECT `id` FROM `bot_binds` WHERE `botclass` = '%d' AND `function` = '%s'", client->botid, escape_string(function->name));
+        res = mysql_use();
+        if (mysql_num_rows(res) <= 1) {
+            reply(getTextBot(), user, "NS_UNBIND_REQUIRED", function->name);
+            return;
+        }
+    }
     unbind_cmd(client->botid, argv[0]);
-    printf_mysql_query("DELETE FROM `bot_binds` WHERE `id` = '%s'", row[0]);
+    if((!cbind || !(cbind->flags & CMDFLAG_TEMPONARY_BIND)))
+        printf_mysql_query("DELETE FROM `bot_binds` WHERE `id` = '%s'", row[0]);
     reply(getTextBot(), user, "NS_UNBIND_DONE", argv[0]);
     logEvent(event);
 }