fixed VALID_NICK_CHARS and WHOHandler multi-query support

diff --git a/DATABASE.txt b/DATABASE.txt
index e9d5397f3df1ddc24ad5f34b97fa2a31ada2d8c1..053096a56c8063cc0305bc842cf8728bd6c492f9 100644 (file)
--- a/DATABASE.txt
+++ b/DATABASE.txt
@@ -3,6 +3,7 @@
 ALTER TABLE `bots` CHANGE `botclass` `botclass` INT( 10 ) NOT NULL;
 
 ALTER TABLE `users` CHANGE `user_lang` `user_lang` VARCHAR( 6 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;
+ALTER TABLE `users` ADD `user_reply_privmsg` TINYINT( 1 ) NOT NULL ;
 
 CREATE TABLE IF NOT EXISTS `godlog` (
   `godlog_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -13,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `godlog` (
   PRIMARY KEY (`godlog_id`)
 ) ENGINE=MyISAM;
 
-ALTER TABLE `channels` ADD `channel_lastgiveowner` INT( 11 ) NOT NULL AFTER `channel_lastvisit` 
+ALTER TABLE `channels` ADD `channel_lastgiveowner` INT( 11 ) NOT NULL AFTER `channel_lastvisit`;
 
 CREATE TABLE IF NOT EXISTS `owner_history` (
 `owner_history_id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
@@ -26,11 +27,11 @@ INDEX ( `owner_history_cid` )
 ALTER TABLE `chanusers` ADD INDEX ( `chanuser_cid` ) ;
 ALTER TABLE `chanusers` ADD INDEX ( `chanuser_uid` ) ;
 
-ALTER TABLE `bot_binds` ADD `chan_access` VARCHAR( 256 ) NULL DEFAULT NULL AFTER `parameters` 
+ALTER TABLE `bot_binds` ADD `chan_access` VARCHAR( 256 ) NULL DEFAULT NULL AFTER `parameters`;
 
-ALTER TABLE `bot_binds` CHANGE `global_access` `global_access` INT( 3 ) NULL 
+ALTER TABLE `bot_binds` CHANGE `global_access` `global_access` INT( 3 ) NULL;
 
-ALTER TABLE `bans` CHANGE `ban_owner` `ban_owner` INT( 11 ) NOT NULL 
+ALTER TABLE `bans` CHANGE `ban_owner` `ban_owner` INT( 11 ) NOT NULL;
 
 ALTER TABLE `channels` ADD `channel_exttopic` TINYINT( 1 ) NOT NULL AFTER `channel_topicmask` ,
-ADD `channel_exttopic_topic` VARCHAR( 512 ) NOT NULL AFTER `channel_exttopic` 
+ADD `channel_exttopic_topic` VARCHAR( 512 ) NOT NULL AFTER `channel_exttopic`;

diff --git a/WHOHandler.c b/WHOHandler.c
index b74fb5cdbea4c1d1c0d1012c7485513dc297baf5..4f9675663c79598bf5d8846ec93e695ee570970f 100644 (file)
--- a/WHOHandler.c
+++ b/WHOHandler.c
@@ -32,12 +32,13 @@ static struct WHOQueueEntry* addWHOQueueEntry(struct ClientSocket *client) {
     }
     entry->next = NULL;
     entry->client = client;
-    if(last_entry)
+    if(last_entry) {
         last_entry->next = entry;
-    else
         last_entry = entry;
-    if(!first_entry)
+    } else {
+        last_entry = entry;
         first_entry = entry;
+    }
     return entry;
 }
 

diff --git a/main.h b/main.h
index 71b98db1beb5f2795212420e43155b649dc91461..9aa15a0db0f9ea6d6d95c523698ce9b50e56322f 100644 (file)
--- a/main.h
+++ b/main.h
@@ -64,7 +64,7 @@
 #define MAXMODES        6
 
 //valid nick chars
-#define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^_`"
+#define VALID_NICK_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890{|}~[\\]^-_`"
 //the first char is a little bit different
 //                              0        1         2         3         4         5          6
 //                              1234567890123456789012345678901234567890123456789012345678 9012   62