node exists exception broken

Change-Id: I50370804af4a80cb360542b13df1621430a6e022
tine20 · Sep 8, 2017 · 24e39e1 · 24e39e1
1 parent e72e447
commit 24e39e1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/tine20/Calendar/js/MainScreenCenterPanel.js b/tine20/Calendar/js/MainScreenCenterPanel.js
@@ -1547,7 +1547,7 @@ Tine.Calendar.MainScreenCenterPanel = Ext.extend(Ext.Panel, {
                         eventInfo = Date.parseDate(fbInfo.dtstart, Date.patterns.ISO8601Long).format(dateFormat + ' ' + format) + ' - ' + Date.parseDate(fbInfo.dtend, Date.patterns.ISO8601Long).format(format);
                     }
                     if (fbInfo.event && fbInfo.event.summary) {
-                        eventInfo += ' : ' + fbInfo.event.summary;
+                        eventInfo += ' : ' + Ext.util.Format.htmlEncode(fbInfo.event.summary);
                     }
                     if (fbInfo.type == 'BUSY_UNAVAILABLE') {
                         denyIgnore = true;

diff --git a/tine20/Filemanager/js/ExceptionHandler.js b/tine20/Filemanager/js/ExceptionHandler.js
@@ -43,7 +43,7 @@ Tine.Filemanager.handleRequestException = function(exception, request) {
 
                 if (exception.existingnodesinfo) {
                     for (i = 0; i < exception.existingnodesinfo.length; i++) {
-                        existingFilenames.push(exception.existingnodesinfo[i].name);
+                        existingFilenames.push(Ext.util.Format.htmlEncode(exception.existingnodesinfo[i].name));
                     }
                 }
 

diff --git a/tine20/Filemanager/js/GridContextMenu.js b/tine20/Filemanager/js/GridContextMenu.js
@@ -125,15 +125,11 @@ Tine.Filemanager.GridContextMenu = {
             if(nodes && nodes.length) {
                 for(var i=0; i<nodes.length; i++) {
                     var currNodeData = nodes[i].data;
-
-                    if(typeof currNodeData.name == 'object') {
-                        nodeName += currNodeData.name.name + '<br />';
-                    }
-                    else {
-                        nodeName += currNodeData.name + '<br />';
-                    }
+
+                    nodeName += Ext.util.Format.htmlEncode(typeof currNodeData.name == 'object' ?
+                        currNodeData.name.name :
+                        currNodeData.name) + '<br />';
                 }
-
             }
 
             this.conflictConfirmWin = Tine.widgets.dialog.FileListDialog.openWindow({

diff --git a/tine20/Filemanager/js/NodeGridPanel.js b/tine20/Filemanager/js/NodeGridPanel.js
@@ -571,13 +571,10 @@ Tine.Filemanager.NodeGridPanel = Ext.extend(Tine.widgets.grid.GridPanel, {
         if(nodes && nodes.length) {
             for(var i=0; i<nodes.length; i++) {
                 var currNodeData = nodes[i].data;
-
-                if(typeof currNodeData.name == 'object') {
-                    nodeName += currNodeData.name.name + '<br />';
-                }
-                else {
-                    nodeName += currNodeData.name + '<br />';
-                }
+
+                nodeName += Ext.util.Format.htmlEncode(typeof currNodeData.name == 'object' ?
+                    currNodeData.name.name :
+                    currNodeData.name) + '<br />';
             }
         }
 

diff --git a/tine20/Tinebase/js/MainMenu.js b/tine20/Tinebase/js/MainMenu.js
@@ -63,7 +63,7 @@ Tine.Tinebase.MainMenu = Ext.extend(Ext.Toolbar, {
         // TODO add a bigger spacer here?
         { xtype: 'spacer' },
         {
-            text: String.format(i18n._('User: {0}'), Tine.Tinebase.registry.get('currentAccount').accountDisplayName),
+            text: Ext.util.Format.htmlEncode(String.format(i18n._('User: {0}'), Tine.Tinebase.registry.get('currentAccount').accountDisplayName)),
             menu: this.getUserActions(),
             menuAlign: 'tr-br',
             iconCls: Tine.Tinebase.registry.get('userAccountChanged') ? 'renderer_accountUserChangedIcon' : 'renderer_accountUserIcon'