*** VERSION 5.2.0 ***

[NeonServV5.git] / src / cmd_neonserv_topic.c

diff --git a/src/cmd_neonserv_topic.c b/src/cmd_neonserv_topic.c
index 2673f15bdbe3b97c4f3936ada40f37c29adbd41a..88d396a97b3d0e283d6f8bade50741675b03d74f 100644 (file)
--- a/src/cmd_neonserv_topic.c
+++ b/src/cmd_neonserv_topic.c
@@ -1,3 +1,19 @@
+/* cmd_neonserv_topic.c - NeonServ v5.2
+ * Copyright (C) 2011  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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ */
 
 #include "cmd_neonserv.h"
 
@@ -91,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);
@@ -112,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);