From a9afbb544446f298bc8284dea7977bb67e662861 Mon Sep 17 00:00:00 2001 From: pk910 Date: Sun, 30 Oct 2011 23:36:48 +0100 Subject: [PATCH] repaired database upgrade code & updated database.defaults.sql --- database.defaults.sql | 68 ++++++++++++++++++++++++++++++++----------- src/mysqlConn.c | 2 +- 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/database.defaults.sql b/database.defaults.sql index 4413b58..d6b9ab9 100644 --- a/database.defaults.sql +++ b/database.defaults.sql @@ -1,3 +1,10 @@ +-- +-- Daten für Tabelle `bots` +-- + +INSERT INTO `bots` (`id`, `active`, `nick`, `server`, `port`, `pass`, `ssl`, `bind`, `ident`, `realname`, `automodes`, `botclass`, `textbot`, `queue`, `defaulttrigger`, `max_channels`, `register_priority`) VALUES +(1, 1, 'NeonTest', 'irc.WebGamesNet.net', 6667, '', 0, NULL, 'NeonServ', 'NeonServ Test Bot', 'iIncx', 1, 1, 0, '+', 20, 4), +(5, 1, 'SpamTest', 'irc.WebGamesNet.net', 6667, '', 0, NULL, 'SpamServ', 'NeonServ Anti Spam Service', '+xiIcn', 2, 1, 0, '~', 20, 5); -- -- Daten für Tabelle `bot_binds` @@ -124,7 +131,43 @@ INSERT INTO `bot_binds` (`id`, `botclass`, `command`, `function`, `parameters`, (122, 1, 'search', 'search', '', NULL, NULL, 0), (123, 1, 'command', 'command', '', NULL, NULL, 0), (126, 1, 'va', 'voiceall', '', NULL, NULL, 0), -(127, 1, 'setaccess', 'setaccess', '', NULL, NULL, 0); +(127, 1, 'setaccess', 'setaccess', '', NULL, NULL, 0), +(129, 1, 'suckers', 'bans', '', NULL, NULL, 0), +(130, 1, 'fu', 'kick', '', NULL, NULL, 0), +(131, 1, 'mobb', 'kick', '', NULL, NULL, 0), +(132, 1, 'blist', 'bans', '', NULL, NULL, 0), +(133, 1, 'addrank', 'addrank', '', NULL, NULL, 0), +(134, 1, 'delrank', 'delrank', '', NULL, NULL, 0), +(135, 1, 'listrank', 'listrank', '', NULL, NULL, 0), +(136, 1, 'rank', 'assignrank', '', NULL, NULL, 0), +(137, 1, 'assignrank', 'assignrank', '', NULL, NULL, 0), +(138, 1, 'setrank', 'setrank', '', NULL, NULL, 0), +(139, 1, 'ranks', 'listrank', '', NULL, NULL, 0), +(145, 1, 'setinfo', 'uset', 'info %1-', NULL, NULL, 0), +(147, 1, 'info', 'info', '', NULL, NULL, 0), +(148, 1, 'rename', 'rename', '', NULL, NULL, 0), +(149, 1, 'add', 'adduser', '', NULL, NULL, 0), +(164, 2, 'bind', 'bind', '', NULL, NULL, 0), +(165, 2, 'unbind', 'unbind', '', NULL, NULL, 0), +(166, 2, 'register', 'register', '', NULL, NULL, 0), +(167, 2, 'unregister', 'unregister', '', NULL, NULL, 0), +(168, 2, 'version', 'version', '', NULL, NULL, 0), +(169, 2, 'netinfo', 'netinfo', '', NULL, NULL, 0), +(170, 2, 'set', 'set', '', NULL, NULL, 0), +(171, 2, 'csuspend', 'csuspend', '', NULL, NULL, 0), +(172, 2, 'cunsuspend', 'cunsuspend', '', NULL, NULL, 0), +(173, 2, 'say', 'say', '', NULL, NULL, 0), +(174, 2, 'emote', 'emote', '', NULL, NULL, 0), +(175, 2, 'notice', 'notice', '', NULL, NULL, 0), +(176, 2, 'raw', 'raw', '', NULL, NULL, 0), +(177, 2, 'god', 'god', '', NULL, NULL, 0); + +-- +-- Daten für Tabelle `channels` +-- + +INSERT INTO `channels` (`channel_id`, `channel_name`, `channel_key`, `channel_maxusers`, `channel_lastvisit`, `channel_lastgiveowner`, `channel_pubcmd`, `channel_nodelete`, `channel_nogaccess`, `channel_canadd`, `channel_candel`, `channel_canclvl`, `channel_cankick`, `channel_canban`, `channel_staticban`, `channel_protect`, `channel_canop`, `channel_canvoice`, `channel_getop`, `channel_getvoice`, `channel_greeting`, `channel_usergreeting`, `channel_userinfo`, `channel_dynlimit`, `channel_getinvite`, `channel_topicmask`, `channel_exttopic`, `channel_exttopic_topic`, `channel_defaulttopic`, `channel_wipeinfo`, `channel_modes`, `channel_enfmodes`, `channel_enftopic`, `channel_topicsnarf`, `channel_changetopic`, `channel_setters`, `channel_canresync`, `channel_cansuspend`, `channel_notice`, `channel_noticereaction`, `channel_ctcp`, `channel_ctcpreaction`, `channel_registered`, `channel_registrator`, `channel_toys`, `channel_scanner`, `channel_spam_limit`, `channel_spam_reaction`, `channel_spam_reaction_duration`, `channel_spam_except`, `channel_flood_limit`, `channel_flood_time`, `channel_flood_reaction`, `channel_flood_reaction_duration`, `channel_flood_except`, `channel_join_limit`, `channel_join_time`, `channel_join_reaction`, `channel_join_reaction_duration`, `channel_join_except`, `channel_botnet_bantime`, `channel_botnet_except`, `channel_caps_percent`, `channel_caps_reaction`, `channel_caps_reaction_duration`, `channel_caps_except`, `channel_digit_percent`, `channel_digit_reaction`, `channel_digit_reaction_duration`, `channel_digit_except`) VALUES +(NULL, 'defaults', '', 0, 0, 0, 0, 0, 0, 300, 300, 300, 200, 200, 250, 0, 200, 200, 200, 100, '', '', 1, 0, 1, '', 0, '', '', 300, '+', 400, 400, 501, 200, 400, 200, 300, 0, 0, 0, 0, 0, 0, 0, '', 4, 0, 120, 400, 5, 3, 0, 120, 400, 4, 20, 2, 300, 400, 1800, 1, 60, 0, 60, 200, 60, 0, 60, 200); -- -- Daten für Tabelle `help` @@ -371,13 +414,13 @@ INSERT INTO `language` (`id`, `lang`, `ident`, `text`) VALUES (49, 'de', 'NS_NETINFO_CODE_VALUE', '%s Zeilen C-Code (http://git.pk910.de/?p'), (50, 'de', 'NS_NETINFO_CODE', 'Code:'), (51, 'de', 'NS_NETINFO_VERSION', 'Version:'), -(52, 'de', 'NS_NETINFO_OTHER', 'Anderes:'), -(53, 'de', 'NS_NETINFO_CHANUSER', 'Channel-User:'), -(54, 'de', 'NS_NETINFO_USER', 'User:'), -(55, 'de', 'NS_NETINFO_CHANNEL_BAN', 'Bans:'), -(56, 'de', 'NS_NETINFO_CHANNEL', 'Channel:'), -(57, 'de', 'NS_NETINFO_DATABASE', 'Datenbank:'), -(58, 'de', 'NS_NETINFO_CACHE', 'Offline Speicher:'), +(52, 'de', 'NS_NETINFO_OTHER', ' Anderes:'), +(53, 'de', 'NS_NETINFO_CHANUSER', ' Channel-User:'), +(54, 'de', 'NS_NETINFO_USER', ' User:'), +(55, 'de', 'NS_NETINFO_CHANNEL_BAN', ' Bans:'), +(56, 'de', 'NS_NETINFO_CHANNEL', ' Channel:'), +(57, 'de', 'NS_NETINFO_DATABASE', ' Datenbank:'), +(58, 'de', 'NS_NETINFO_CACHE', ' Zwischenspeicher:'), (59, 'de', 'NS_NETINFO_TRAFFIC', 'Daten-Verkehr:'), (60, 'de', 'NS_NETINFO_UPTIME', 'Online-Zeit:'), (61, 'de', 'NS_NETINFO_BOTS', 'Bots:'), @@ -541,12 +584,3 @@ INSERT INTO `language` (`id`, `lang`, `ident`, `text`) VALUES (218, 'de', 'NS_EVENTS_HEADER', 'Die folgenden Channel-Events wurden gefunden.'), (219, 'de', 'NS_INVITE_DONE_USER', 'Du wurdest von %2$s nach $b%1$s$b eingeladen. (Gib $b/msg %3$s %1$s uset noinvite 1$b ein, wenn du nicht mehr nach %1$s eingeladen werden möchtest.)'), (220, 'de', 'NS_TRIM_DONE', 'Es wurden $b%d User$b mit Access Leveln von %d bis %d von der %s Userliste gelöscht, welche für mindestens %s inaktiv waren.'); - --- --- Daten für Tabelle `bots` --- - -INSERT INTO `bots` (`id`, `active`, `nick`, `server`, `port`, `pass`, `ssl`, `bind`, `ident`, `realname`, `automodes`, `botclass`, `textbot`, `defaulttrigger`, `max_channels`, `register_priority`) VALUES -(4, 1, 'TestBot', '127.0.0.1', 6667, "", 0, NULL, 'testbot', 'TestBot2', 'ix', 1, 0, '+', 0, 0); - - diff --git a/src/mysqlConn.c b/src/mysqlConn.c index 27f01a1..faeb701 100644 --- a/src/mysqlConn.c +++ b/src/mysqlConn.c @@ -151,7 +151,7 @@ void init_mysql(char *host, int port, char *user, char *pass, char *base) { mysql_query(mysql_conn, query_buffer); query_buffer_pos = 0; } - } else if(!stricmp(query_buffer, line)) { + } else if(!stricmplen(query_buffer, line, strlen(query_buffer))) { use_querys = 1; } } -- 2.20.1