merge

[irc/quakenet/newserv.git] / request / lrequest.c

diff --git a/request/lrequest.c b/request/lrequest.c
index ac1d53a074601ae053233e8cb1f026f5158f1a7f..f8da1b2a67db9ba6259285bb63bb3579c6a3375b 100644 (file)
--- a/request/lrequest.c
+++ b/request/lrequest.c
@@ -15,13 +15,13 @@ int lr_floodattempts = 0;
 
 #define min(a,b) ((a > b) ? b : a)
 
-int lr_requestl(nick *svc, nick *np, channel *cp, nick *lnick) {
+int lr_requestl(nick *svc, nick *np, channel *cp, nick *qnick) {
   chanfix *cf;
   regop *rolist[LR_TOPX], *ro;
   int i, rocount;
 
   if (strlen(cp->index->name->content) > LR_MAXCHANLEN) {
-    sendnoticetouser(svc, np, "Channel name is too long. You will have to "
+    sendnoticetouser(svc, np, "Sorry, your channel name is too long. You will have to "
           "create a channel with a name less than %d characters long.",
           LR_MAXCHANLEN + 1);
 
@@ -31,7 +31,8 @@ int lr_requestl(nick *svc, nick *np, channel *cp, nick *lnick) {
   cf = cf_findchanfix(cp->index);
 
   if (cf == NULL) {
-    sendnoticetouser(svc, np, "Error: Sorry, Your channel '%s' was created recently. Please Try again in an hour.", cp->index->name->content);
+    sendnoticetouser(svc, np, "Sorry, your channel '%s' was created recently. "
+          "Please try again in an hour.", cp->index->name->content);
 
     lr_noregops++;
 
@@ -50,8 +51,8 @@ int lr_requestl(nick *svc, nick *np, channel *cp, nick *lnick) {
   }
 
   if (ro == NULL) {
-    sendnoticetouser(svc, np, "Error: Sorry, You must be one of the top %d ops "
-          "for the channel %s.", LR_TOPX, cp->index->name->content);
+    sendnoticetouser(svc, np, "Sorry, you must be one of the top %d ops "
+          "for the channel '%s'.", LR_TOPX, cp->index->name->content);
 
     lr_top5++;
 
@@ -61,7 +62,7 @@ int lr_requestl(nick *svc, nick *np, channel *cp, nick *lnick) {
   /* treat blocked users as if their score is too low */
   if (ro->score < LR_CFSCORE || rq_findblock(np->authname)) {
     if (rq_isspam(np)) {
-      sendnoticetouser(svc, np, "Error: Do not flood the request system. "
+      sendnoticetouser(svc, np, "Do not flood the request system. "
             "Try again in %s.", rq_longtoduration(rq_blocktime(np)));
 
       lr_floodattempts++;
@@ -69,27 +70,29 @@ int lr_requestl(nick *svc, nick *np, channel *cp, nick *lnick) {
       return RQ_ERROR;
     }
 
-    sendnoticetouser(svc, np, "Sorry You do not meet the "
-          "requirements to request L. Please Try again in an hour. "
-          "(see http://www.quakenet.org/faq/faq.php?c=3&f=112 )");
+    sendnoticetouser(svc, np, "Sorry, you do not meet the "
+          "%s request requirements; please try again in an hour, "
+          "see http://www.quakenet.org/faq/faq.php?c=1&f=6#6", RQ_QNICK);
 
     lr_scoretoolow++;
 
     return RQ_ERROR;
   }
 
-  sendmessagetouser(svc, lnick, "addchan %s #%s %s", cp->index->name->content,
+  
+  sendmessagetouser(svc, qnick, "addchan %s #%s +jp upgrade %s", cp->index->name->content,
         np->authname, np->nick);
 
-  sendnoticetouser(svc, np, "Requirements met, L should be added. Contact #help"
-        " should further assistance be required.");
+  sendnoticetouser(svc, np, "Success! %s has been added to '%s' "
+        "(contact #help if you require further assistance).", 
+        RQ_QNICK, cp->index->name->content);
 
   return RQ_OK;
 }
 
 void lr_requeststats(nick *rqnick, nick *np) {
-  sendnoticetouser(rqnick, np, "- No registered ops (L):          %d", lr_noregops);
-  sendnoticetouser(rqnick, np, "- Score too low (L):              %d", lr_scoretoolow);
-  sendnoticetouser(rqnick, np, "- Not in top%d (L):                %d", LR_TOPX, lr_top5);
-  sendnoticetouser(rqnick, np, "- Floods (L):                     %d", lr_floodattempts);
+  sendnoticetouser(rqnick, np, "- No registered ops (Q):          %d", lr_noregops);
+  sendnoticetouser(rqnick, np, "- Score too low (Q):              %d", lr_scoretoolow);
+  sendnoticetouser(rqnick, np, "- Not in top%d (Q):                %d", LR_TOPX, lr_top5);
+  sendnoticetouser(rqnick, np, "- Floods (Q):                     %d", lr_floodattempts);
 }