Changeset dce2de164f254dc3594775f54a9c35f31fa331b8

Timestamp:

01/06/07 23:39:25 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

f13160d360e09c0436c3b46d129005c4ce03d34b

Children:

7a86085442974ccd345ab17c16afadb4916ef073

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:39:25Z+0000

Message:

[project @ Replace all non-ascii characters in UI XML [fixes #44]]

Original author: Armin Burgmeier <armin@…>
Date: 2005-06-15 16:11:54+00:00

Location:

src

Files:

• header.cpp (modified) (3 diffs)
• logview.cpp (modified) (1 diff)
• statusbar.cpp (modified) (2 diffs)

src/header.cpp

@@ -67 +67 @@
                 "</ui>";
 
-        void replace_string(Glib::ustring& string,
-                            const Glib::ustring& find,
-                            const Glib::ustring& replace)
+        /** Replaces dangerous characters for an XML attribute by their
+         * Unicode value.
+         */
+        void remove_dangerous_xml(Glib::ustring& string)
         {
-                Glib::ustring::size_type pos = 0;
-                while((pos = string.find(find, pos)) != Glib::ustring::npos)
+                for(Glib::ustring::iterator iter = string.begin();
+                    iter != string.end();
+                    ++ iter)
                 {
-                        string.replace(pos, find.length(), replace);
-                        pos += replace.length();
+                        // Get current character
+                        gunichar c = *iter;
+
+                        // Not an ASCII character, or a dangerous one?
+                        if(c == '<' || c == '>' || c == '\"' || c > 0x7f)
+                        {
+                                // Get next iter to find the end position
+                                Glib::ustring::iterator next = iter;
+                                ++ next;
+
+                                // Build value string
+                                std::stringstream value_stream;
+                                value_stream << c;
+
+                                // Erase dangerous character
+                                iter = string.erase(iter, next);
+
+                                // Insert string char by char to keep the
+                                // iterator valid.
+                                char cval;
+                                while(value_stream >> cval)
+                                        iter = string.insert(iter, cval);
+                        }
                 }
-        }
-        
-        void remove_entities(Glib::ustring& string)
-        {
-                // Note that this file needs to be UTF-8 encoded!
-                replace_string(string, "À", "auml");
-                replace_string(string, "Ä", "Auml");
-                replace_string(string, "ö", "ouml");
-                replace_string(string, "Ö", "Ouml");
-                replace_string(string, "Ì", "uuml");
-                replace_string(string, "Ü", "Uuml");
-                replace_string(string, "ß", "szlig");
-                replace_string(string, "<", "lt");
-                replace_string(string, ">", "gt");
-                replace_string(string, "\"", "quot");
-
-                // TODO: Remove some more dangerous characters
         }
 }
@@ -298 +304 @@
                 // Build description string
                 obby::format_string str(_("Selects %0 as language") );
-                str << language->get_name();
+                str << language->get_name().raw();
 
                 // Add language to action group
-                remove_entities(language_xml_name);
+                remove_dangerous_xml(language_xml_name);
                 m_group_app->add(
                         Gtk::RadioAction::create(
@@ -622 +628 @@
         Glib::ustring langname = document.get_language() ?
                 document.get_language()->get_name() : "None";
-        remove_entities(langname);
+        remove_dangerous_xml(langname);
         Glib::RefPtr<Gtk::RadioAction>::cast_static<Gtk::Action>(
                 m_group_app->get_action("ViewLanguage" + langname)

src/logview.cpp

@@ -52 +52 @@
         cur_time = localtime(&cur_time_t);
 
+        // TODO: Use strftime
         std::stringstream timestream;
         timestream << "[";

src/statusbar.cpp

@@ -58 +58 @@
 
 #ifdef WITH_GTKSOURCEVIEW
+#include <iostream>
 void Gobby::StatusBar::update_language(Document& document)
 {
@@ -64 +65 @@
         {
                 obby::format_string str(_("Selected language: %0") );
-                str << document.get_language()->get_name();
+                str << document.get_language()->get_name().raw();
                 m_language.set_text(str.str() );
         }