diff --git a/extension/Source/sql/formEditor.sql b/extension/Source/sql/formEditor.sql
index 0b252e6cc38ac672caf3ec080763f9aa5cb51e32..884e52421f88d42b55dfd58e62b94bb4014be18a 100644
--- a/extension/Source/sql/formEditor.sql
+++ b/extension/Source/sql/formEditor.sql
@@ -7,18 +7,18 @@ CREATE TABLE IF NOT EXISTS `Form`
`id` INT(11) NOT NULL AUTO_INCREMENT,
`name` VARCHAR(255) NOT NULL DEFAULT '',
`title` VARCHAR(511) NOT NULL DEFAULT '',
- `noteInternal` TEXT NOT NULL,
- `tableName` VARCHAR(255) NOT NULL DEFAULT '',
- `primaryKey` VARCHAR(255) NOT NULL DEFAULT '',
-
- `permitNew` ENUM ('sip', 'logged_in', 'logged_out', 'always', 'never') NOT NULL DEFAULT 'sip',
- `permitEdit` ENUM ('sip', 'logged_in', 'logged_out', 'always', 'never') NOT NULL DEFAULT 'sip',
- `restMethod` SET ('get','post','put','delete') NOT NULL DEFAULT '',
- `escapeTypeDefault` VARCHAR(32) NOT NULL DEFAULT 'c',
- `render` ENUM ('bootstrap', 'table', 'plain') NOT NULL DEFAULT 'bootstrap',
- `requiredParameterNew` VARCHAR(255) NOT NULL DEFAULT '',
- `requiredParameterEdit` VARCHAR(255) NOT NULL DEFAULT '',
- `dirtyMode` ENUM ('exclusive', 'advisory', 'none') NOT NULL DEFAULT 'exclusive',
+ `noteInternal` TEXT NOT NULL,
+ `tableName` VARCHAR(255) NOT NULL DEFAULT '',
+ `primaryKey` VARCHAR(255) NOT NULL DEFAULT '',
+
+ `permitNew` ENUM ('sip', 'logged_in', 'logged_out', 'always', 'never') NOT NULL DEFAULT 'sip',
+ `permitEdit` ENUM ('sip', 'logged_in', 'logged_out', 'always', 'never') NOT NULL DEFAULT 'sip',
+ `restMethod` SET ('get', 'post', 'put', 'delete') NOT NULL DEFAULT '',
+ `escapeTypeDefault` VARCHAR(32) NOT NULL DEFAULT 'c',
+ `render` ENUM ('bootstrap', 'table', 'plain') NOT NULL DEFAULT 'bootstrap',
+ `requiredParameterNew` VARCHAR(255) NOT NULL DEFAULT '',
+ `requiredParameterEdit` VARCHAR(255) NOT NULL DEFAULT '',
+ `dirtyMode` ENUM ('exclusive', 'advisory', 'none') NOT NULL DEFAULT 'exclusive',
`showButton` SET ('new', 'delete', 'close', 'save') NOT NULL DEFAULT 'new,delete,close,save',
`multiMode` ENUM ('none', 'horizontal', 'vertical') NOT NULL DEFAULT 'none',
`multiSql` TEXT NOT NULL,
@@ -64,29 +64,29 @@ CREATE TABLE IF NOT EXISTS `FormElement`
`enabled` ENUM ('yes', 'no') NOT NULL DEFAULT 'yes',
`name` VARCHAR(255) NOT NULL DEFAULT '',
- `label` VARCHAR(511) NOT NULL DEFAULT '',
+ `label` VARCHAR(511) NOT NULL DEFAULT '',
- `mode` ENUM ('show', 'required', 'readonly', 'hidden') NOT NULL DEFAULT 'show',
- `modeSql` TEXT NOT NULL,
- `class` ENUM ('native', 'action', 'container') NOT NULL DEFAULT 'native',
+ `mode` ENUM ('show', 'required', 'readonly', 'hidden') NOT NULL DEFAULT 'show',
+ `modeSql` TEXT NOT NULL,
+ `class` ENUM ('native', 'action', 'container') NOT NULL DEFAULT 'native',
`type` ENUM ('checkbox', 'date', 'datetime', 'dateJQW', 'datetimeJQW', 'extra', 'gridJQW', 'text',
- 'editor', 'annotate', 'time', 'note', 'password', 'radio', 'select', 'subrecord', 'upload',
- 'annotate', 'imageCut', 'fieldset', 'pill', 'templateGroup',
- 'beforeLoad', 'beforeSave', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterLoad',
- 'afterSave', 'afterInsert', 'afterUpdate', 'afterDelete', 'sendMail',
- 'paste') NOT NULL DEFAULT 'text',
- `subrecordOption` SET ('edit', 'delete', 'new') NOT NULL DEFAULT '',
- `encode` ENUM ('none', 'specialchar') NOT NULL DEFAULT 'specialchar',
+ 'editor', 'annotate', 'time', 'note', 'password', 'radio', 'select', 'subrecord', 'upload',
+ 'annotate', 'imageCut', 'fieldset', 'pill', 'templateGroup',
+ 'beforeLoad', 'beforeSave', 'beforeInsert', 'beforeUpdate', 'beforeDelete', 'afterLoad',
+ 'afterSave', 'afterInsert', 'afterUpdate', 'afterDelete', 'sendMail',
+ 'paste') NOT NULL DEFAULT 'text',
+ `subrecordOption` SET ('edit', 'delete', 'new') NOT NULL DEFAULT '',
+ `encode` ENUM ('none', 'specialchar') NOT NULL DEFAULT 'specialchar',
`checkType` ENUM ('auto', 'alnumx', 'digit', 'numerical', 'email', 'pattern', 'allbut',
- 'all') NOT NULL DEFAULT 'auto',
- `checkPattern` VARCHAR(255) NOT NULL DEFAULT '',
+ 'all') NOT NULL DEFAULT 'auto',
+ `checkPattern` VARCHAR(255) NOT NULL DEFAULT '',
- `onChange` VARCHAR(255) NOT NULL DEFAULT '',
+ `onChange` VARCHAR(255) NOT NULL DEFAULT '',
- `ord` INT(11) NOT NULL DEFAULT '0',
- `tabindex` INT(11) NOT NULL DEFAULT '0',
+ `ord` INT(11) NOT NULL DEFAULT '0',
+ `tabindex` INT(11) NOT NULL DEFAULT '0',
- `size` VARCHAR(255) NOT NULL DEFAULT '',
+ `size` VARCHAR(255) NOT NULL DEFAULT '',
`maxLength` VARCHAR(255) NOT NULL DEFAULT '',
`labelAlign` ENUM ('default', 'left', 'center', 'right') NOT NULL DEFAULT 'default',
`bsLabelColumns` VARCHAR(255) NOT NULL DEFAULT '',
@@ -264,7 +264,8 @@ VALUES
'specialchar', 'no', ''),
(1, 'prestMethod', 'Permit REST', 'show', 'checkbox', 'all', 'native', 370, 0, 10,
- '<a href="{{documentation:Y}}#rest">Info</a>', '', '', '', 'buttonClass=btn-default\nitemList=get,post:insert,put:update,delete', 4, '', '', '',
+ '<a href="{{documentation:Y}}#rest">Info</a>', '', '', '',
+ 'buttonClass=btn-default\nitemList=get,post:insert,put:update,delete', 4, '', '', '',
'specialchar', 'no', ''),
(1, 'escapeTypeDefault', 'Escape type default', 'show', 'radio', 'all', 'native', 380, 0, 10,
@@ -469,6 +470,8 @@ CREATE TABLE IF NOT EXISTS `MailLog`
`xId2` INT(11) NOT NULL DEFAULT '0',
`xId3` INT(11) NOT NULL DEFAULT '0',
`receiver` TEXT NOT NULL,
+ `cc` TEXT NOT NULL,
+ `bcc` TEXT NOT NULL,
`sender` VARCHAR(255) NOT NULL DEFAULT '',
`subject` VARCHAR(255) NOT NULL DEFAULT '',
`body` TEXT NOT NULL,