Another year is about to end... So we have to update these damn copyright information :P

[NeonServV5.git] / src / cmd_neonserv_search.c

diff --git a/src/cmd_neonserv_search.c b/src/cmd_neonserv_search.c
index 35128ef66193fcaf66c8f810c659d397b2bfd4a0..a98d0e6d53bddbccde144270c410cf882648fe31 100644 (file)
--- a/src/cmd_neonserv_search.c
+++ b/src/cmd_neonserv_search.c
@@ -1,5 +1,5 @@
-/* cmd_neonserv_search.c - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* cmd_neonserv_search.c - NeonServ v5.3
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
 struct neonserv_cmd_search_criteria {
     char *name;
     char *registrar;
+    char *onchan;
     unsigned int flags : 16;
     unsigned int unvisited;
     unsigned int registered;
@@ -58,6 +59,7 @@ CMD_BIND(neonserv_cmd_search) {
         }
         if(!stricmp(argv[i], "name")) criteria->name = argv[i+1];
         else if(!stricmp(argv[i], "registrar")) criteria->registrar = argv[i+1];
+        else if(!stricmp(argv[i], "onchan")) criteria->onchan = argv[i+1];
         else if(!stricmp(argv[i], "unvisited")) criteria->unvisited = strToTime(user, argv[i+1]);
         else if(!stricmp(argv[i], "registered")) criteria->registered = strToTime(user, argv[i+1]);
         else if(!stricmp(argv[i], "flags")) {
@@ -127,7 +129,7 @@ CMD_BIND(neonserv_cmd_search) {
         if(criteria->unvisited) {
             printf_mysql_query("SELECT `chanuser_seen` FROM `chanusers` WHERE `chanuser_cid` = '%s' ORDER BY `chanuser_seen` DESC LIMIT 1", row[5]);
             res2 = mysql_use();
-            row2 = mysql_fetch_row(res);
+            row2 = mysql_fetch_row(res2);
             if(!row2) continue;
             if((time(0) - atoi(row2[0])) < criteria->unvisited) continue;
         }
@@ -137,8 +139,16 @@ CMD_BIND(neonserv_cmd_search) {
         if((criteria->flags & CMD_SEARCH_FLAG_NOT_NODELETE) && strcmp(row[3], "0")) continue;
         if((criteria->flags & CMD_SEARCH_FLAG_HAS_SUSPENDED) && strcmp(row[4], "1")) continue;
         if((criteria->flags & CMD_SEARCH_FLAG_NOT_SUSPENDED) && strcmp(row[4], "0")) continue;
-        if(criteria->flags & CMD_SEARCH_FLAG_STATES) {
+        if((criteria->flags & CMD_SEARCH_FLAG_STATES) || criteria->onchan) {
             struct ChanNode *channel = getChanByName(row[0]);
+            if(criteria->onchan) {
+                if(!channel) continue;
+                struct ChanUser *chanuser = NULL;
+                for(chanuser = getChannelUsers(channel, NULL); chanuser; chanuser = getChannelUsers(channel, chanuser)) {
+                    if(!match(criteria->onchan, chanuser->user->nick)) break;
+                }
+                if(!chanuser) continue;
+            }
             if((criteria->flags & CMD_SEARCH_FLAG_IS_JOINED) && !channel) continue;
             if((criteria->flags & CMD_SEARCH_FLAG_NOT_JOINED) && channel) continue;
             if(channel && (criteria->flags & (CMD_SEARCH_FLAG_IS_OPPED | CMD_SEARCH_FLAG_NOT_OPPED | CMD_SEARCH_FLAG_IS_VOICED | CMD_SEARCH_FLAG_NOT_VOICED))) {