--- hun-request.c 2004-12-21 13:05:54.000000000 +0100 +++ onze-request.c 2004-12-21 13:05:08.000000000 +0100 @@ -276,11 +276,14 @@ void handlerequest(char *chan, char *nick, char *arm) { // Return codes: 0 = banned 1 = Not on chan/no op 2 = No L, placed in queue 3 = Auto accepted 4 = Not auth'd 5 = No such user 6 = Internal error 7 = Not requestok 8 = Not enough users 9 = Not enough users with unique hosts struct activeuser *u; - - printf("Handleing request for %s to %s nick: %s\n", arm, chan, nick); + char moo[512]; + char mekker[512]; + printf(moo, 512, "Handleing request for %s to %s nick: %s\n", arm, chan, nick); + privmsg(HOMECHAN, moo); if(findarmbytype(BOT_CHECK)->status == 0 || findchannel(chan) != NULL || strcasecmp(chan, HOMECHAN) == 0) { - printf("Warning: Internal error in request.\n"); + printf(mekker, 512, "Warning: Internal error in request.\n"); + privmsg(HOMECHAN, mekker); response(6); return; } @@ -322,10 +325,10 @@ strcpy(queuea, "is"); queuen = ' '; } - - snprintf(msg, 512, "There %s %c%i%c item%c in queue.", queuea, BOLD, i, BOLD, queuen); - privmsg(PUBCHAN, msg); - + if (i > 0) { + snprintf(msg, 512, "There %s %c%i%c item%c in queue.", queuea, BOLD, i, BOLD, queuen); + privmsg(PUBCHAN, msg); + } nextspew = time(NULL) + QUEUEREPEAT; } } @@ -407,8 +410,10 @@ dbquery(query); EndDbQuery(); - + char msgm[512]; c_part(channel, "Request declined - Requester is not on channel/is not op"); + snprintf(msgm, MAX_QUERY, "%c4Alert:%c Request for %s has been auto declined. Reason: Requester is not on channel/is not op.", COLORS, COLORS, channel); + privmsg(HOMECHAN, msgm); return; } @@ -425,8 +430,11 @@ dbquery(query); EndDbQuery(); - + char msgm[512]; c_part(channel, "Request declined - Not enough users on channel"); + snprintf(msgm, MAX_QUERY, "%c4Alert:%c Request for %s has been auto declined. Reason: Not enough users on channel.", COLORS, COLORS, channel); + privmsg(HOMECHAN, msgm); + return; } @@ -443,8 +451,10 @@ dbquery(query); EndDbQuery(); - + char msgm[512]; c_part(channel, "Request declined - Not enough unique users on channel"); + snprintf(msgm, MAX_QUERY, "%c4Alert:%c Request for %s has been auto declined. Reason: Not enough unique users on channel.", COLORS, COLORS, channel); + privmsg(HOMECHAN, msgm); return; } @@ -461,14 +471,14 @@ free(estopic); free(esnick); - dbquery(query); EndDbQuery(); - + c_part(channel, "Request placed in queue"); - snprintf(query, MAX_QUERY, "There is a new request in queue for channel: %c%s%c", BOLD, channel, BOLD); - privmsg(HOMECHAN, query); + snprintf(query, MAX_QUERY, "newrequest %s", channel); + privmsg(SERVICEBOT, query); + return; #ifdef AUTOACCEPT @@ -499,31 +509,30 @@ } void handleaccept(char *chan, char *nick, char *arm, int uid) { - char msg[512]; + char acceptmsg[512]; struct arm *a; + char homechanmsg[512]; if((a = findarm(arm)) == NULL) return; c_join(chan, a); c_setlev(uid, chan, CHAN_OWNER); - snprintf(msg, MAX_QUERY, "Request is accepted. If you have any channel service, you need to set me to +ao. I.e /msg L chanlev %s %s +ao More information and manuals can be found at: %c%s%c The channel owner is: %c%s%c.", chan, arm, BOLD, HELPSITE, BOLD, BOLD, nick, BOLD); - privmsg(chan, msg); - + snprintf(acceptmsg, MAX_QUERY, "Request is accepted. If you have any channel service, you need to set me to +ao. I.e /msg L chanlev %s %s +ao More information and manuals can be found at: %c%s%c The channel owner is: %c%s%c.", chan, arm, BOLD, HELPSITE, BOLD, BOLD, nick, BOLD); + privmsg(chan, acceptmsg); + snprintf(homechanmsg, MAX_QUERY, "Request for %c%s%c is accepted.", BOLD, chan, BOLD); + privmsg(HOMECHAN, homechanmsg); response(1); /* Return 1 on success */ } void handledecline(char *chan, char *nick, char *arm, int uid) { char msg[512]; + char declinemsg[512]; struct arm *a = findarmbytype(BOT_CHECK); - snprintf(msg, 512, "JOIN %s\n\r", chan); - putserver(msg, a); - snprintf(msg, 512, "PRIVMSG %s :Your request has been declined. Please check our homepage for more information.\n\r", chan); + snprintf(msg, 512, "PRIVMSG %s :The request for %c%s%c has been declined.\n\r", HOMECHAN, BOLD, chan, BOLD); putserver(msg, a); - snprintf(msg, 512, "PART %s :Request declined\n\r", chan); - putserver(msg, a); - - snprintf(msg, 512, "Your request for %c%s%c has been declined. Please check your E-Mail or go to our homepage for more information.", BOLD, chan, BOLD); - privmsg(nick, msg); + + snprintf(declinemsg, 512, "Your request for %c%s%c has been declined. Please check your E-Mail or go to our homepage for more information.", BOLD, chan, BOLD); + privmsg(nick, declinemsg); }