modExt updates

Cleans name, caption, and description fields on the front end (js) side before they are submitted to processors.

manager/assets/modext/util/utilities.js

@@ -168,6 +168,27 @@ MODx.util.safeHtml = function (input, allowedTags, allowedAttributes) {
  return input.replace(eventAttributes, 'on​$1');
 };
 
+/**
+ * Cleans and resets or returns a field's value; typically called:
+ *
+ * 1] via an event in a form field component's listeners object (use onChange callback)
+ * 2] via an event in a grid's column model (use onColumnRender callback)
+ * 3] directly via run
+ */
+MODx.util.stripAndEncode = {
+ onChange: function(cmp, newVal, originalVal) {
+ const value = cmp.getValue();
+ cmp.setValue(MODx.util.stripAndEncode.run(value));
+ },
+ onColumnRender: function(value, metaData, record, rowIndex, colIndex) {
+ return MODx.util.stripAndEncode.run(value);
+ },
+ run: function(value) {
+ value = Ext.util.Format.stripTags(value).replace(/\s{2,}/g, ' ');
+ return Ext.util.Format.htmlEncode(value);
+ }
+}
+
 /****************************************************************************
  * Ext-specific overrides/extensions *
  ****************************************************************************/

manager/assets/modext/widgets/element/modx.panel.tv.js

@@ -86,6 +86,7 @@ MODx.panel.TV = function(config) {
  ,maxLength: 50
  ,enableKeyEvents: true
  ,allowBlank: false
+ ,blankText: _('tv_err_ns_name')
  ,value: config.record.name
  ,tabIndex: 1
  ,listeners: {
@@ -98,6 +99,16 @@ MODx.panel.TV = function(config) {
  MODx.setStaticElementPath('tv');
  }
  ,scope: this
+ },
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ },
+ blur: {
+ fn: function(cmp) {
+ if (!cmp.getValue()) {
+ cmp.markInvalid(_('tv_err_ns_name'));
+ }
+ }
  }
  }
  },{
@@ -174,6 +185,11 @@ MODx.panel.TV = function(config) {
  ,id: 'modx-tv-caption'
  ,tabIndex: 3
  ,value: config.record.caption
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: MODx.expandHelp ? 'label' : 'hidden'
  ,forId: 'modx-tv-caption'
@@ -236,6 +252,11 @@ MODx.panel.TV = function(config) {
  ,maxLength: 255
  ,tabIndex: 5
  ,value: config.record.description || ''
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: MODx.expandHelp ? 'label' : 'hidden'
  ,forId: 'modx-tv-description'

manager/assets/modext/widgets/fc/modx.panel.fcset.js

@@ -264,9 +264,6 @@ MODx.grid.FCSetFields = function(config) {
  header: _('label')
  ,dataIndex: 'label'
  ,editor: { xtype: 'textfield' }
- ,renderer: function(v,md) {
- return Ext.util.Format.htmlEncode(v);
- }
  },{
  header: _('default_value')
  ,dataIndex: 'default_value'
@@ -288,6 +285,14 @@ MODx.grid.FCSetFields = function(config) {
  });
  MODx.grid.FCSetFields.superclass.constructor.call(this,config);
  this.propRecord = Ext.data.Record.create(config.fields);
+ this.on('afteredit', function(e) {
+ if (e.field === 'label') {
+ const value = MODx.util.stripAndEncode.run(e.value);
+ e.record.set('label', value);
+ e.record.commit();
+ }
+
+ });
 };
 Ext.extend(MODx.grid.FCSetFields,MODx.grid.LocalGrid);
 Ext.reg('modx-grid-fc-set-fields',MODx.grid.FCSetFields);
@@ -341,6 +346,14 @@ MODx.grid.FCSetTabs = function(config) {
  });
  MODx.grid.FCSetTabs.superclass.constructor.call(this,config);
  this.propRecord = Ext.data.Record.create(config.fields);
+ this.on('afteredit', function(e) {
+ if (e.field === 'label') {
+ const value = MODx.util.stripAndEncode.run(e.value);
+ e.record.set('label', value);
+ e.record.commit();
+ }
+
+ });
 };
 Ext.extend(MODx.grid.FCSetTabs,MODx.grid.LocalGrid,{
  getMenu: function(g,ri) {
@@ -460,6 +473,14 @@ MODx.grid.FCSetTVs = function(config) {
  });
  MODx.grid.FCSetTVs.superclass.constructor.call(this,config);
  this.propRecord = Ext.data.Record.create(config.fields);
+ this.on('afteredit', function(e) {
+ if (e.field === 'label') {
+ const value = MODx.util.stripAndEncode.run(e.value);
+ e.record.set('label', value);
+ e.record.commit();
+ }
+
+ });
 };
 Ext.extend(MODx.grid.FCSetTVs,MODx.grid.LocalGrid,{
 });

manager/assets/modext/widgets/windows.js

@@ -248,6 +248,13 @@ MODx.window.CreateCategory = function(config) {
  ,id: 'modx-'+this.ident+'-category'
  ,xtype: 'textfield'
  ,anchor: '100%'
+ ,allowBlank: false
+ ,blankText: _('category_err_ns_name')
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  fieldLabel: _('parent')
  ,name: 'parent'
@@ -296,6 +303,13 @@ MODx.window.RenameCategory = function(config) {
  ,width: 150
  ,value: config.record.category
  ,anchor: '100%'
+ ,allowBlank: false
+ ,blankText: _('category_err_ns_name')
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  fieldLabel: _('rank')
  ,name: 'rank'
@@ -398,6 +412,13 @@ MODx.window.QuickCreateChunk = function(config) {
  ,name: 'name'
  ,fieldLabel: _('name')
  ,anchor: '100%'
+ ,allowBlank: false
+ ,blankText: _('chunk_err_ns_name')
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'modx-combo-category'
  ,name: 'category'
@@ -408,6 +429,11 @@ MODx.window.QuickCreateChunk = function(config) {
  ,name: 'description'
  ,fieldLabel: _('description')
  ,anchor: '100%'
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'textarea'
  ,name: 'snippet'
@@ -479,6 +505,13 @@ MODx.window.QuickCreateTemplate = function(config) {
  ,name: 'templatename'
  ,fieldLabel: _('name')
  ,anchor: '100%'
+ ,allowBlank: false
+ ,blankText: _('template_err_ns_name')
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'modx-combo-category'
  ,name: 'category'
@@ -489,6 +522,11 @@ MODx.window.QuickCreateTemplate = function(config) {
  ,name: 'description'
  ,fieldLabel: _('description')
  ,anchor: '100%'
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'textarea'
  ,name: 'content'
@@ -561,6 +599,13 @@ MODx.window.QuickCreateSnippet = function(config) {
  ,name: 'name'
  ,fieldLabel: _('name')
  ,anchor: '100%'
+ ,allowBlank: false
+ ,blankText: _('snippet_err_ns_name')
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'modx-combo-category'
  ,name: 'category'
@@ -571,6 +616,11 @@ MODx.window.QuickCreateSnippet = function(config) {
  ,name: 'description'
  ,fieldLabel: _('description')
  ,anchor: '100%'
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'textarea'
  ,name: 'snippet'
@@ -644,6 +694,13 @@ MODx.window.QuickCreatePlugin = function(config) {
  ,name: 'name'
  ,fieldLabel: _('name')
  ,anchor: '100%'
+ ,allowBlank: false
+ ,blankText: _('plugin_err_ns_name')
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'modx-combo-category'
  ,name: 'category'
@@ -655,6 +712,11 @@ MODx.window.QuickCreatePlugin = function(config) {
  ,fieldLabel: _('description')
  ,anchor: '100%'
  ,rows: 2
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'textarea'
  ,name: 'plugincode'
@@ -740,12 +802,24 @@ MODx.window.QuickCreateTV = function(config) {
  ,name: 'name'
  ,fieldLabel: _('name')
  ,anchor: '100%'
+ ,allowBlank: false
+ ,blankText: _('tv_err_ns_name')
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'textfield'
  ,name: 'caption'
  ,id: 'modx-'+this.ident+'-caption'
  ,fieldLabel: _('caption')
  ,anchor: '100%'
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  },{
  xtype: 'label'
  ,forId: 'modx-'+this.ident+'-caption'
@@ -761,6 +835,11 @@ MODx.window.QuickCreateTV = function(config) {
  ,name: 'description'
  ,fieldLabel: _('description')
  ,anchor: '100%'
+ ,listeners: {
+ change: {
+ fn: MODx.util.stripAndEncode.onChange
+ }
+ }
  }]
  },{
  columnWidth: .4