X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fcmd_neonserv_topic.c;h=906bd72be1e483c2d0467e99a98ccb70bf41c8d3;hb=44436a96352a38631237978c9fd431cef3d85cfb;hp=d3fc3d7108c3c2cc598c5e122cb9bbc12b911270;hpb=95fed4deda0319bee515e44ceec0c77061a2c04e;p=NeonServV5.git

diff --git a/src/cmd_neonserv_topic.c b/src/cmd_neonserv_topic.c
index d3fc3d7..906bd72 100644
--- a/src/cmd_neonserv_topic.c
+++ b/src/cmd_neonserv_topic.c
@@ -1,4 +1,4 @@
-/* cmd_neonserv_topic.c - NeonServ v5.0
+/* cmd_neonserv_topic.c - NeonServ v5.3
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -54,7 +54,7 @@ CMD_BIND(neonserv_cmd_topic) {
         logEvent(event);
         return;
     }
-    int uaccess = getChannelAccess(user, chan, 0);
+    int uaccess = getChannelAccess(user, chan);
     if(uaccess >= atoi((row[3] ? row[3] : default_row[1]))) {
         //just set the topic
         newtopic = merge_argv(argv, 0, argc);
@@ -107,10 +107,16 @@ CMD_BIND(neonserv_cmd_topic) {
         //now build the new topic and set it...
         topiclistpos = 0;
         b = row[2];
+        char *topicpart, *debugbb;
         while((a = strstr(b, "%")) != NULL) {
             *a = '\0';
             if(isdigit(a[1]) && a[1] - 48 > 0) {
-                topiclistpos += sprintf(topiclist + topiclistpos, "%s%s", b, advtopics[a[1] - 49]);
+                topicpart = advtopics[a[1] - 49];
+                if(isdigit(topicpart[0]) && isdigit(b[strlen(b)-1])) 
+                    debugbb = "\002\002"; //double bold to prevent following digits used as color code
+                else
+                    debugbb = "";
+                topiclistpos += sprintf(topiclist + topiclistpos, "%s%s%s", b, debugbb, topicpart);
                 b = a+2;
             } else {
                 topiclistpos += sprintf(topiclist + topiclistpos, "%s%%", b);
@@ -128,10 +134,15 @@ CMD_BIND(neonserv_cmd_topic) {
         char topiclist[MAXLEN*2];
         topiclist[0] = '\0';
         int topiclistpos = 0;
-         b = row[2];
+        b = row[2];
+        char *debugbb;
         while((a = strstr(b, "*")) != NULL) {
             *a = '\0';
-            topiclistpos += sprintf(topiclist + topiclistpos, "%s%s", b, newtopic);
+            if(isdigit(newtopic[0]) && isdigit(b[strlen(b)-1])) 
+                debugbb = "\002\002"; //double bold to prevent following digits used as color code
+            else
+                debugbb = "";
+            topiclistpos += sprintf(topiclist + topiclistpos, "%s%s%s", b, debugbb, newtopic);
             b = a+1;
         }
         topiclistpos += sprintf(topiclist + topiclistpos, "%s", b);