Author: mir3x
Date: Mon Jun 27 17:38:50 2016
New Revision: 33065

URL: http://svn.gna.org/viewcvs/freeciv?rev=33065&view=rev
Log:
In received chat signs '<' and '>' are replaced by &lt; and &gt; 
so they wont be treated as html tags anymore. 

See patch #7263


Modified:
    branches/S2_5/client/gui-qt/chatline.cpp
    branches/S2_5/client/gui-qt/chatline.h

Modified: branches/S2_5/client/gui-qt/chatline.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/chatline.cpp?rev=33065&r1=33064&r2=33065&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/chatline.cpp    (original)
+++ branches/S2_5/client/gui-qt/chatline.cpp    Mon Jun 27 17:38:50 2016
@@ -35,7 +35,7 @@
 
 static bool gui_qt_allied_chat_only = false;
 static bool is_plain_public_message(QString s);
-static QString replace_html(QString str);
+static QString replace_signs(QString str);
 /***************************************************************************
   Constructor for chatwdg
 ***************************************************************************/
@@ -302,6 +302,39 @@
 }
 
 /***************************************************************************
+  increases tag start or stop if there are converted sings < and > by 
+  replace signs function
+***************************************************************************/
+int increase_tags(QString str, int i)
+{
+  int j = 0;
+  int k, l, m;
+  int count = 0;
+
+  j = 0;
+  while (1) {
+    m = str.indexOf("&gt;", j);
+    l = str.indexOf("&lt;", j);
+    if ( m != -1 && l != -1) {
+      k = qMin(m, l);
+    } else if (l == -1 && m != -1) {
+      k = m;
+    } else if (l != -1 && m == -1) {
+      k = l;
+    } else {
+      k = -1;
+    }
+    if (i <= k || k == -1) {
+      break;
+    }
+    i = i + 3;
+    j = k + 3;
+    count++;
+  }
+  return count * 3;
+}
+
+/***************************************************************************
   Applies tags to text
 ***************************************************************************/
 QString apply_tags(QString str, const struct text_tag_list *tags,
@@ -318,18 +351,18 @@
     return str;
   }
   text_tag_list_iterate(tags, ptag) {
-
-
     if ((text_tag_stop_offset(ptag) == FT_OFFSET_UNSET)) {
       stop = qba.count();
     } else {
       stop = text_tag_stop_offset(ptag);
+      stop = stop + increase_tags(str, stop);
     }
 
     if ((text_tag_start_offset(ptag) == FT_OFFSET_UNSET)) {
       start = 0;
     } else {
       start = text_tag_start_offset(ptag);
+      start = start + increase_tags(str, start);
     }
     switch (text_tag_type(ptag)) {
     case TTT_BOLD:
@@ -413,61 +446,32 @@
 }
 
 /**************************************************************************
-  Replace HTML tags first or it will be cut
-  Replace <player>
-  Replace <(player)>
+  Replace signs < and > with &lt; and &gt; or they would be treated
+  as html
 **************************************************************************/
-static QString replace_html(QString str)
+static QString replace_signs(QString str)
 {
   QString s, s2;
+  QStringList allowed_tags;
   int i, j;
-  conn_list_iterate(game.all_connections, pconn){
-    s = pconn->username;
-    s = "<(" + s + ")>";
-    if (str.contains(s)) {
-      s2 = "([" + QString(pconn->username) + ")]";
-      str = str.replace(s, s2);
-      break;
-    }
-    s = pconn->username;
-    s = "<" + s + ">";
-    if (str.contains(s)) {
-      s2 = "[" + QString(pconn->username) + "]";
-      str = str.replace(s, s2);
-    }
-  } conn_list_iterate_end;
-  players_iterate(pplayer) {
-    s = pplayer->name;
-    s = "(<" + s + ">)";
-    if (str.contains(s)) {
-      s2 = "([" + QString(pplayer->name) + ")]";
-      str = str.replace(s, s2);
-      break;
-    }
-    s = pplayer->name;
-    s = "<" + s + ">";
-    if (str.contains(s)) {
-      s2 = "[" + QString(pplayer->name) + "]";
-      str = str.replace(s, s2);
-    }
-  } players_iterate_end;
-  /* replace all <X...> where X is uppercase letter
-   * with [X ....], its definitely message from server
-   * not html tag */
+
   j = 0;
   while (1) {
-    QChar c;
     i = str.indexOf('<', j);
-    j = str.indexOf('>', i);
-    if (i + 1 >= str.length() || i == -1 || j == -1) {
-      break;
-    }
-    c = str.at(i + 1);
-    if (c.isUpper()) {
-      str.replace(i, 1 , '[');
-      str.replace(j, 1 , ']');
-    }
-    j++;
+    if (i == -1) {
+      break;
+    }
+   str.replace(i, 1 , "&lt;");
+   j++;
+  }
+  j = 0;
+  while (1) {
+    i = str.indexOf('>', j);
+    if (i == -1) {
+      break;
+    }
+   str.replace(i, 1 , "&gt;");
+   j++;
   }
   return str;
 }
@@ -535,7 +539,7 @@
   gui()->set_status_bar(str);
   gui()->update_completer();
 
-  str = replace_html(str);
+  str = replace_signs(str);
   gui()->append_output_window(apply_tags(str, tags, false));
   if (gui()->infotab != NULL) {
     gui()->infotab->chtwdg->append(apply_tags(str, tags, true));

Modified: branches/S2_5/client/gui-qt/chatline.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/chatline.h?rev=33065&r1=33064&r2=33065&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/chatline.h      (original)
+++ branches/S2_5/client/gui-qt/chatline.h      Mon Jun 27 17:38:50 2016
@@ -31,6 +31,7 @@
 
 QString apply_tags(QString str, const struct text_tag_list *tags,
                    bool colors_change);
+int increase_tags(QString str, int i);
 /***************************************************************************
   Class for chat widget
 ***************************************************************************/


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to