Merge branch 'development'

[NeonServV5.git] / database.sql

diff --git a/database.sql b/database.sql
index d3d9156e3be87e535b9885b749a47226482dc45c..d3781181034f7a3bc4f115b9ec8fc7626309ab4a 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -33,9 +33,12 @@ CREATE TABLE IF NOT EXISTS `bots` (
   `ident` varchar(12) NOT NULL,
   `realname` varchar(255) NOT NULL,
   `automodes` varchar(20) NOT NULL,
+  `oper_user` varchar(50) DEFAULT NULL,
+  `oper_pass` varchar(50) DEFAULT NULL,
   `botclass` int(10) NOT NULL,
   `textbot` tinyint(1) NOT NULL,
   `queue` tinyint(1) NOT NULL,
+  `secret` tinyint(1) NOT NULL,
   `defaulttrigger` varchar(10) NOT NULL,
   `max_channels` int(5) NOT NULL,
   `register_priority` int(2) NOT NULL,
@@ -157,6 +160,9 @@ CREATE TABLE IF NOT EXISTS `channels` (
   `channel_digit_reaction` tinyint(1) DEFAULT NULL,
   `channel_digit_reaction_duration` mediumint(7) DEFAULT NULL,
   `channel_digit_except` smallint(3) DEFAULT NULL,
+  `channel_badword_reaction` tinyint(1) DEFAULT NULL,
+  `channel_badword_reaction_duration` mediumint(7) DEFAULT NULL,
+  `channel_badword_except` smallint(3) DEFAULT NULL,
   PRIMARY KEY (`channel_id`),
   UNIQUE KEY `channel_name` (`channel_name`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1;
@@ -317,6 +323,7 @@ CREATE TABLE IF NOT EXISTS `users` (
   `user_god` tinyint(1) NOT NULL,
   `user_lang` varchar(6) NOT NULL,
   `user_reply_privmsg` tinyint(1) NOT NULL,
+  `user_block_invites` tinyint(1) NOT NULL,
   `user_registered` INT(20) NOT NULL,
   `user_lastcheck` INT(20) NOT NULL,
   PRIMARY KEY (`user_id`),
@@ -412,3 +419,25 @@ CREATE TABLE IF NOT EXISTS `settings` (
   `value` text NOT NULL,
   PRIMARY KEY (`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `spamserv_badwords`
+--
+
+CREATE TABLE IF NOT EXISTS `spamserv_badwords` (
+  `badword_id` int(11) NOT NULL AUTO_INCREMENT,
+  `badword_cid` int(11) NOT NULL,
+  `badword_match` varchar(128) NOT NULL,
+  `badword_uid` int(11) NOT NULL,
+  `badword_use_default` tinyint(1) NOT NULL,
+  `badword_exceptlevel` smallint(3) NOT NULL,
+  `badword_scan_ops` tinyint(1) NOT NULL,
+  `badword_scan_voice` tinyint(1) NOT NULL,
+  `badword_use_default_reaction` tinyint(1) NOT NULL,
+  `badword_reaction` tinyint(1) NOT NULL,
+  `badword_reaction_time` int(20) NOT NULL,
+  PRIMARY KEY (`badword_id`),
+  KEY `badword_cid` (`badword_cid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;