Fixes #1435: wrong encoding on saved maps layer titles (#1923)

geosolutions-it · Jun 12, 2017 · 4148717 · 4148717
1 parent ba2b14a
commit 4148717
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 22 deletions.
diff --git a/docs/developer-guide/application-tutorial.md b/docs/developer-guide/application-tutorial.md
@@ -19,7 +19,7 @@ Writing a new MapStore2 based application can be done following these steps:
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>MyApp</title>
         <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />

diff --git a/package.json b/package.json
@@ -97,6 +97,7 @@
     "html2canvas": "0.5.0-beta4",
     "intl": "1.2.2",
     "ismobilejs": "0.4.0",
+    "jsesc": "1.3.0",
     "json-loader": "0.5.4",
     "jsonix": "2.4.1",
     "keymirror": "0.1.1",

diff --git a/project/index.html b/project/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>__PROJECTDESCRIPTION__</title>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css" />

diff --git a/web/client/api.html b/web/client/api.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Page with MapStore 2 API</title>
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>

diff --git a/web/client/api/GeoStoreDAO.js b/web/client/api/GeoStoreDAO.js
@@ -11,6 +11,7 @@ const assign = require('object-assign');
 const uuidv1 = require('uuid/v1');
 const ConfigUtils = require('../utils/ConfigUtils');
 const {findIndex} = require('lodash');
+const jsesc = require('jsesc');
 
 let parseOptions = (opts) => opts;
 
@@ -99,10 +100,10 @@ var Api = {
     putResource: function(resourceId, content, options) {
         return axios.put(
             "data/" + resourceId,
-            content,
+            jsesc(content, {json: true, wrap: false, quotes: 'backtick'}),
             this.addBaseUrl(_.merge({
                 headers: {
-                    'Content-Type': "application/json"
+                    'Content-Type': "text/plain;charset=utf-8"
                 }
             }, options)));
     },

diff --git a/web/client/components/share/api-template.raw b/web/client/components/share/api-template.raw
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Page with MapStore 2 API</title>
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>

diff --git a/web/client/embedded.html b/web/client/embedded.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>MapStore 2 HomePage</title>
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>

diff --git a/web/client/examples/3dviewer/index.html b/web/client/examples/3dviewer/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
         <script src="https://cdnjs.cloudflare.com/ajax/libs/proj4js/2.3.10/proj4.js"></script>

diff --git a/web/client/examples/api/index.html b/web/client/examples/api/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />

diff --git a/web/client/examples/featuregrid/index.html b/web/client/examples/featuregrid/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>FeatureGrid</title>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ol3/4.0.1/ol.css"/>

diff --git a/web/client/examples/layertree/index.html b/web/client/examples/layertree/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>MapStore 2 Example: LayerTree</title>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />

diff --git a/web/client/examples/login/index.html b/web/client/examples/login/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Login sample</title>
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">

diff --git a/web/client/examples/mouseposition/index.html b/web/client/examples/mouseposition/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>MapStore 2 Example: Mouse Position</title>
         <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=PT+Sans:400normal,700italic|Droid+Sans:400normal|Rancho&amp;subset=all&amp;effect=shadow-multiple"/>

diff --git a/web/client/examples/myapp/index.html b/web/client/examples/myapp/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>MyApp</title>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />

diff --git a/web/client/examples/plugins/index.html b/web/client/examples/plugins/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />

diff --git a/web/client/examples/print/index.html b/web/client/examples/print/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Print</title>
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">

diff --git a/web/client/examples/queryform/index.html b/web/client/examples/queryform/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>QueryForm</title>
         <link rel="stylesheet" href="https://rawgit.com/Leaflet/Leaflet.draw/v0.2.4/dist/leaflet.draw.css" />

diff --git a/web/client/examples/rasterstyler/index.html b/web/client/examples/rasterstyler/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Raster Styler</title>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />

diff --git a/web/client/examples/scalebar/index.html b/web/client/examples/scalebar/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>MapStore 2 Example: ScaleBar</title>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />

diff --git a/web/client/examples/styler/index.html b/web/client/examples/styler/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Styler</title>
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>

diff --git a/web/client/index.html b/web/client/index.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>MapStore 2 HomePage</title>
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>

diff --git a/web/client/simple.html b/web/client/simple.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="UTF-8">
-        <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
+        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>MapStore 2 HomePage</title>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css" />