X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbot_NeonHelp.c;h=1922262a33ca4606e7ddedbeb92af86bb1ce7674;hb=740649d6f206dc1f65e7550a842cf298fac7cb36;hp=a5eddd68b38ea31a6ad4e9def216a8ca93893a52;hpb=1baa9712172c18fef9390434000bda26bf56289d;p=NeonServV5.git

diff --git a/src/bot_NeonHelp.c b/src/bot_NeonHelp.c
index a5eddd6..1922262 100644
--- a/src/bot_NeonHelp.c
+++ b/src/bot_NeonHelp.c
@@ -60,6 +60,10 @@ static const struct default_language_entry msgtab[] = {
     {"NH_REQUESTS_STATE_ACTIVE", "active"},
     {"NH_REQUESTS_STATE_PENDING", "pending"},
     {"NH_REQUESTS_STATE_ERROR", "ERROR"},
+    {"NH_STATS_HEADER_USER", "User"},
+    {"NH_STATS_HEADER_LAST_24H", "last 24h"},
+    {"NH_STATS_HEADER_LAST_7DAY", "last 7d"},
+    {"NH_STATS_HEADER_LAST_30DAY", "last 30d"},
     {NULL, NULL}
 };
 
@@ -91,7 +95,10 @@ static void neonhelp_trigger_callback(int clientid, struct ChanNode *chan, char
     }
     printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
     res = mysql_use();
-    row = mysql_fetch_row(res);
+    if(!(row = mysql_fetch_row(res))) {
+        strcpy(trigger, "!");
+        return;
+    }
     if(row[0] && *row[0])
         strcpy(trigger, row[0]);
     else
@@ -260,7 +267,7 @@ static void neonhelp_event_privmsg_async(struct ClientSocket *client, struct Use
         }
     }
     printf_mysql_query("INSERT INTO `helpserv_requests` (`botid`, `host`, `hand`, `nick`, `status`, `supporter`, `time`, `text`) VALUES ('%d', '%s@%s', '%s', '%s', '0', '-1', UNIX_TIMESTAMP(), '%s')", client->clientid, escape_string(user->ident), escape_string(user->host), ((user->flags & USERFLAG_ISAUTHED) ? escape_string(user->auth) : "*"), escape_string(user->nick), escape_string(message));
-    helpnode->suppid = (int) mysql_insert_id(mysql_conn);
+    helpnode->suppid = (int) mysql_insert_id(get_mysql_conn());
     helpnode->log = NULL;
     helpnode->next = ((client->flags & SOCKET_HAVE_HELPNODE) ? client->botclass_helpnode : NULL);
     client->botclass_helpnode = helpnode;